WIP

Layoric · Layoric · commit eebc7234f2b2 · 2016-05-13T18:36:06.000+10:00
Builds fine, but different IDEA based IDEs have different classes
available at runtime, will have to try to stick to common subset.

WebStorm support should be based on similar version as AS and IntelliJ,
eg ~141 which is WebStorm 10.x.
diff --git a/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/AddServiceStackRefHandler.java b/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/AddServiceStackRefHandler.java
@@ -117,8 +117,10 @@ private static List<String> getDtoLines(String addressUrl, String qualifiedPacka
     }
 
     private static INativeTypesHandler getNativeTypesHandler(String fileName) {
-        if(fileName.endsWith(".kt")) return new KotlinNativeTypesHandler();
-        if(fileName.endsWith(".java")) return new JavaNativeTypesHandler();
+        INativeTypesHandler nativeTypesHandler = IDEAUtils.getNativeTypesHandler(fileName);
+        if(nativeTypesHandler != null) {
+            return nativeTypesHandler;
+        }
         return defaultNativeTypesHandler;
     }
 
diff --git a/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/AddServiceStackReference.java b/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/AddServiceStackReference.java
@@ -8,14 +8,15 @@
 import com.intellij.notification.Notifications;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.actionSystem.DataKeys;
+import com.intellij.openapi.actionSystem.LangDataKeys;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.*;
+import com.intellij.util.PlatformUtils;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
@@ -33,7 +34,7 @@ public void actionPerformed(AnActionEvent e) {
         dialog.setTitle("Add ServiceStack Reference");
 
         //Check if a package was selected in the left hand menu, populate package name
-        PsiElement element = DataKeys.PSI_ELEMENT.getData(e.getDataContext());
+        PsiElement element = LangDataKeys.PSI_ELEMENT.getData(e.getDataContext());
         if (element != null && element instanceof PsiPackage) {
             PsiPackage psiPackage = (PsiPackage) element;
             dialog.setSelectedPackage(psiPackage);
@@ -79,7 +80,7 @@ public void actionPerformed(AnActionEvent e) {
         }
 
         //Check if a Java file was selected, display without a package name if no file.
-        VirtualFile selectedFile = DataKeys.VIRTUAL_FILE.getData(e.getDataContext());
+        VirtualFile selectedFile = LangDataKeys.VIRTUAL_FILE.getData(e.getDataContext());
         if (selectedFile == null) {
             Notification notification = new Notification("ServiceStackIDEA", "Error Add ServiceStack Reference", "Context menu failed find folder or file.", NotificationType.ERROR);
             Notifications.Bus.notify(notification);
@@ -153,7 +154,7 @@ public void update(AnActionEvent e) {
 
         boolean isMavenModule =  IDEAPomFileHelper.isMavenModule(module);
 
-        if (isAndroidProject(module) || isMavenModule) {
+        if (isAndroidProject(module) || isMavenModule || PlatformUtils.isWebStorm()) {
             e.getPresentation().setEnabled(true);
         } else {
             e.getPresentation().setEnabled(false);
@@ -184,9 +185,9 @@ private static boolean isAndroidProject(@NotNull Module module) {
     }
 
     static Module getModule(AnActionEvent e) {
-        Module module = e.getData(DataKeys.MODULE);
+        Module module = e.getData(LangDataKeys.MODULE);
         if (module == null) {
-            Project project = e.getData(DataKeys.PROJECT);
+            Project project = e.getData(LangDataKeys.PROJECT);
             return getModule(project);
         } else {
             return module;
diff --git a/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/IDEAUtils.java b/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/IDEAUtils.java
@@ -9,6 +9,7 @@
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.VirtualFileManager;
 import com.intellij.psi.PsiDocumentManager;
+import com.intellij.util.PlatformUtils;
 
 import java.io.File;
 
@@ -70,12 +71,19 @@ public static INativeTypesHandler getDefaultNativeTypesHandler(Module module) {
         if(IDEAPomFileHelper.isMavenProjectWithKotlin(module)) {
             return new KotlinNativeTypesHandler();
         }
+
+        if(PlatformUtils.isWebStorm()) {
+            return new TypeScriptNativeTypesHandler();
+        }
+
         return new JavaNativeTypesHandler();
     }
 
-    public static INativeTypesHandler getNativeTypesHandler(Module module,String fileName) {
-        if(fileName.endsWith(".kt")) return new KotlinNativeTypesHandler();
-        if(fileName.endsWith(".java")) return new JavaNativeTypesHandler();
-        return getDefaultNativeTypesHandler(module);
+    public static INativeTypesHandler getNativeTypesHandler(String fileName) {
+        INativeTypesHandler result = null;
+        if(fileName.endsWith(".kt")) result =  new KotlinNativeTypesHandler();
+        if(fileName.endsWith(".java")) result =  new JavaNativeTypesHandler();
+        if(fileName.endsWith(".dtos.ts")) result = new TypeScriptNativeTypesHandler();
+        return result;
     }
 }
diff --git a/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/NativeTypesLanguage.java b/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/NativeTypesLanguage.java
@@ -5,5 +5,6 @@
  */
 public enum NativeTypesLanguage {
     Java,
-    Kotlin
+    Kotlin,
+    TypeScript
 }
diff --git a/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/TypeScriptNativeTypesHandler.java b/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/TypeScriptNativeTypesHandler.java
@@ -0,0 +1,21 @@
+package net.servicestack.idea;
+
+/**
+ * Created by Layoric on 13/05/2016.
+ */
+public class TypeScriptNativeTypesHandler extends BaseNativeTypesHandler {
+    @Override
+    public String getFileExtension() {
+        return ".dtos.ts";
+    }
+
+    @Override
+    public String getRelativeTypesUrl() {
+        return "types/typescript";
+    }
+
+    @Override
+    public NativeTypesLanguage getTypesLanguage() {
+        return NativeTypesLanguage.TypeScript;
+    }
+}
diff --git a/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/UpdateServiceStackReference.java b/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/UpdateServiceStackReference.java
@@ -2,7 +2,7 @@
 
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.actionSystem.DataKeys;
+import com.intellij.openapi.actionSystem.LangDataKeys;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
@@ -40,8 +40,9 @@ public void update(AnActionEvent e) {
             return;
         }
 
-        if(!psiFile.getFileType().getDefaultExtension().equals("java") &&
-                !psiFile.getFileType().getDefaultExtension().equals("kt")) {
+        INativeTypesHandler nativeTypesHandler = IDEAUtils.getNativeTypesHandler(psiFile.getName());
+
+        if(nativeTypesHandler == null) {
             e.getPresentation().setVisible(false);
             return;
         }
@@ -71,7 +72,7 @@ private static PsiFile getPsiFile(AnActionEvent e) {
         if(module == null) {
             return null;
         }
-        VirtualFile selectedFile = DataKeys.VIRTUAL_FILE.getData(e.getDataContext());
+        VirtualFile selectedFile = LangDataKeys.VIRTUAL_FILE.getData(e.getDataContext());
         if(selectedFile == null) {
             return null;
         }
@@ -90,9 +91,9 @@ private static PsiFile getPsiFile(AnActionEvent e) {
     }
 
     static Module getModule(AnActionEvent e) {
-        Module module = e.getData(DataKeys.MODULE);
+        Module module = e.getData(LangDataKeys.MODULE);
         if (module == null) {
-            Project project = e.getData(DataKeys.PROJECT);
+            Project project = e.getData(LangDataKeys.PROJECT);
             return getModule(project);
         } else {
             return module;
diff --git a/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/UpdateServiceStackReferenceIntention.java b/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/UpdateServiceStackReferenceIntention.java
@@ -2,12 +2,9 @@
 
 import com.intellij.codeInsight.intention.impl.QuickEditAction;
 import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.module.Module;
-import com.intellij.openapi.module.ModuleUtil;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Iconable;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiJavaFile;
+import com.intellij.psi.*;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 
@@ -34,9 +31,11 @@ public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile psiF
             if(psiFile == null) {
                 return false;
             }
-            if(!(psiFile instanceof PsiJavaFile || psiFile.getFileType().getDefaultExtension().equals("kt"))) {
+            INativeTypesHandler nativeTypesHandler = IDEAUtils.getNativeTypesHandler(psiFile.getName());
+            if(nativeTypesHandler == null) {
                 return false;
             }
+
             if(UpdateServiceStackUtils.containsOptionsHeader(psiFile)) {
                 return true;
             }
diff --git a/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/UpdateServiceStackUtils.java b/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/UpdateServiceStackUtils.java
@@ -9,8 +9,6 @@
 import com.intellij.openapi.module.ModuleUtil;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiJavaFile;
-import org.apache.commons.httpclient.NameValuePair;
 import org.apache.http.client.utils.URIBuilder;
 
 import java.io.BufferedReader;
@@ -65,8 +63,7 @@ public static void updateServiceStackReference(PsiFile psiFile) {
             return;
         }
 
-        Module module = ModuleUtil.findModuleForPsiElement(psiFile);
-        INativeTypesHandler nativeTypesHandler = IDEAUtils.getNativeTypesHandler(module,psiFile.getName());
+        INativeTypesHandler nativeTypesHandler = IDEAUtils.getNativeTypesHandler(psiFile.getName());
 
         String existingPath = builder.getPath();
         if(existingPath == null || existingPath.equals("/")) {
diff --git a/src/ServiceStackIDEA/src/main/resources/META-INF/plugin.xml b/src/ServiceStackIDEA/src/main/resources/META-INF/plugin.xml
@@ -1,15 +1,16 @@
 <idea-plugin version="2">
   <id>net.servicestack.ideaplugin</id>
   <name>ServiceStack</name>
-  <version>1.0.9</version>
+  <version>1.0.10</version>
   <vendor email="team@servicestack.net" url="https://servicestack.net/">ServiceStack</vendor>
 
   <description><![CDATA[
       Integration with ServiceStack Web Services, includes support for Java and Kotlin Add ServiceStack Reference.
     ]]></description>
 
   <change-notes><![CDATA[
-      1.0.9 - Fix plugin to support Android Studio 2.0.
+      1.0.10 - Add TypeScript support and enable extension for use with WebStorm. <br />
+      1.0.9 - Fix plugin to support Android Studio 2.0. <br />
       1.0.8 - Add support for Kotlin projects with Add/Update ServiceStack reference. <br />
       1.0.7 - Bug fixes and client now gets dependency version from ServiceStack.Java tags, falls back to 1.0.15 if it fails. <br />
       1.0.6 - Update client and android dependency versions to 1.0.13. <br />
@@ -27,6 +28,7 @@
   <!-- please see http://confluence.jetbrains.com/display/IDEADEV/Plugin+Compatibility+with+IntelliJ+Platform+Products
        on how to target different products -->
   <depends>com.intellij.modules.lang</depends>
+  <depends>com.intellij.modules.platform</depends>
 
   <extensions defaultExtensionNs="com.intellij">
     <!-- Add your extensions here -->

Original file line number	Diff line number	Diff line change
`@@ -117,8 +117,10 @@ private static List<String> getDtoLines(String addressUrl, String qualifiedPacka`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`private static INativeTypesHandler getNativeTypesHandler(String fileName) {`
`120`		`- if(fileName.endsWith(".kt")) return new KotlinNativeTypesHandler();`
`121`		`- if(fileName.endsWith(".java")) return new JavaNativeTypesHandler();`
	`120`	`+ INativeTypesHandler nativeTypesHandler = IDEAUtils.getNativeTypesHandler(fileName);`
	`121`	`+ if(nativeTypesHandler != null) {`
	`122`	`+ return nativeTypesHandler;`
	`123`	`+ }`
`122`	`124`	`return defaultNativeTypesHandler;`
`123`	`125`	`}`
`124`	`126`
Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,6 @@`
`5`	`5`	`*/`
`6`	`6`	`public enum NativeTypesLanguage {`
`7`	`7`	`Java,`
`8`		`- Kotlin`
	`8`	`+ Kotlin,`
	`9`	`+ TypeScript`
`9`	`10`	`}`