Renames and fixes to stats url. Add test.

Layoric · Layoric · commit e488898d9c2b · 2016-05-29T19:22:31.000+10:00
diff --git a/src/ServiceStackIDEA/.idea/workspace.xml b/src/ServiceStackIDEA/.idea/workspace.xml
diff --git a/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/AddTypeScriptAction.java b/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/AddTypeScriptAction.java
@@ -24,9 +24,9 @@ public void actionPerformed(AnActionEvent anActionEvent) {
         dialog.setLocationRelativeTo(null);
         dialog.setSize(dialog.getPreferredSize());
         dialog.setResizable(true);
-        dialog.setTitle("Add TypeScript ServiceStack Reference");
+        dialog.setTitle("Add TypeScriptConcrete ServiceStack Reference");
         PsiElement element = LangDataKeys.PSI_ELEMENT.getData(anActionEvent.getDataContext());
-        INativeTypesHandler defaultTsNativeTypesHandler = new TypeScriptDefinitionNativeTypesHandler();
+        INativeTypesHandler defaultTsNativeTypesHandler = new TypeScriptNativeTypesHandler();
         if (element != null && element instanceof PsiDirectory) {
             PsiDirectory selectedDir = (PsiDirectory)element;
             dialog.setSelectedDirectory(selectedDir.getVirtualFile().getPath());
diff --git a/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/AddTypeScriptRefHandler.java b/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/AddTypeScriptRefHandler.java
@@ -2,7 +2,6 @@
 
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.vfs.VirtualFileManager;
-import com.intellij.util.EnvironmentUtil;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -11,7 +10,6 @@
 import java.net.URISyntaxException;
 import java.util.List;
 
-import static net.servicestack.idea.IDEAUtils.getNativeTypesHandler;
 import static net.servicestack.idea.IDEAUtils.refreshFile;
 
 public class AddTypeScriptRefHandler {
@@ -25,8 +23,8 @@ static void handleOk(Module module,
         File file = new File(selectedDirectory);
         INativeTypesHandler nativeTypesHandler =
                 definitionsOnly ?
-                        new TypeScriptDefinitionNativeTypesHandler() :
-                        new TypeScriptNativeTypesHandler();
+                        new TypeScriptNativeTypesHandler() :
+                        new TypeScriptConcreteNativeTypesHandler();
 
         String dtoPath = file.getAbsolutePath() + File.separator
                 + getDtoFileName(fileName,nativeTypesHandler);
diff --git a/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/Analytics.java b/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/Analytics.java
@@ -16,7 +16,7 @@ public final class Analytics {
     public static void SubmitAnonymousAddReferenceUsage(INativeTypesHandler typesHandler) {
         PluginSettingsService settings = PluginSettingsService.getInstance();
         if(!settings.optOutOfStats) {
-            final String url = addRefUrl + typesHandler.getTypesLanguage().name();
+            final String url = addRefUrl + typesHandler.getLanguageUrlName();
             final URL[] serviceUrl = {null};
             final URLConnection[] responseConnection = {null};
             final BufferedReader[] responseReader = {null};
diff --git a/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/BaseNativeTypesHandler.java b/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/BaseNativeTypesHandler.java
@@ -64,10 +64,14 @@ public URIBuilder getUrl(String baseUrl) throws MalformedURLException, URISyntax
         return builder;
     }
 
-    public static String toParentPath(String path)
-    {
+    public static String toParentPath(String path) {
         int pos = path.lastIndexOf("/");
         if (pos == -1) return "/";
         return path.substring(0, pos);
     }
+
+    @Override
+    public String getLanguageUrlName() {
+        return this.getRelativeTypesUrl().substring(6);
+    }
 }
diff --git a/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/IDEAUtils.java b/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/IDEAUtils.java
@@ -8,7 +8,6 @@
 import com.intellij.openapi.vfs.LocalFileSystem;
 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.*;
@@ -102,7 +101,7 @@ public static INativeTypesHandler getDefaultNativeTypesHandler(Module module) {
         }
 
         if(PlatformUtils.isWebStorm()) {
-            return new TypeScriptNativeTypesHandler();
+            return new TypeScriptConcreteNativeTypesHandler();
         }
 
         return new JavaNativeTypesHandler();
@@ -112,8 +111,8 @@ 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();
-        if(fileName.endsWith(".dtos.d.ts")) result = new TypeScriptDefinitionNativeTypesHandler();
+        if(fileName.endsWith(".dtos.ts")) result = new TypeScriptConcreteNativeTypesHandler();
+        if(fileName.endsWith(".dtos.d.ts")) result = new TypeScriptNativeTypesHandler();
         return result;
     }
 }
diff --git a/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/INativeTypesHandler.java b/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/INativeTypesHandler.java
@@ -17,4 +17,5 @@ public interface INativeTypesHandler {
     List<String> getUpdatedCode(String baseUrl, Map<String, String> options) throws IOException, URISyntaxException;
     String getRelativeTypesUrl();
     NativeTypesLanguage getTypesLanguage();
+    String getLanguageUrlName();
 }
diff --git a/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/NativeTypesLanguage.java b/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/NativeTypesLanguage.java
@@ -6,6 +6,6 @@
 public enum NativeTypesLanguage {
     Java,
     Kotlin,
-    TypeScript,
-    TypeScriptDefinition
+    TypeScriptConcrete,
+    TypeScript
 }
diff --git a/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/TypeScriptConcreteNativeTypesHandler.java b/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/TypeScriptConcreteNativeTypesHandler.java
@@ -0,0 +1,21 @@
+package net.servicestack.idea;
+
+/**
+ * Created by Layoric on 13/05/2016.
+ */
+public class TypeScriptConcreteNativeTypesHandler extends BaseNativeTypesHandler {
+    @Override
+    public String getFileExtension() {
+        return ".dtos.ts";
+    }
+
+    @Override
+    public String getRelativeTypesUrl() {
+        return "types/typescript";
+    }
+
+    @Override
+    public NativeTypesLanguage getTypesLanguage() {
+        return NativeTypesLanguage.TypeScriptConcrete;
+    }
+}
diff --git a/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/TypeScriptDefinitionNativeTypesHandler.java b/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/TypeScriptDefinitionNativeTypesHandler.java
diff --git a/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/TypeScriptNativeTypesHandler.java b/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/TypeScriptNativeTypesHandler.java
@@ -1,17 +1,17 @@
 package net.servicestack.idea;
 
 /**
- * Created by Layoric on 13/05/2016.
+ * Created by Layoric on 29/05/2016.
  */
 public class TypeScriptNativeTypesHandler extends BaseNativeTypesHandler {
     @Override
     public String getFileExtension() {
-        return ".dtos.ts";
+        return ".dtos.d.ts";
     }
 
     @Override
     public String getRelativeTypesUrl() {
-        return "types/typescript";
+        return "types/typescript.d";
     }
 
     @Override
diff --git a/src/ServiceStackIDEA/src/test/java/AddRefTest.java b/src/ServiceStackIDEA/src/test/java/AddRefTest.java
@@ -33,4 +33,16 @@ public void testCreateUrl() throws MalformedURLException, URISyntaxException {
         URIBuilder kotlinUriBuilder = kotlinNativeTypesHandler.getUrl("techstacks.io");
         assertEquals(kotlinUriBuilder.build().toString(),"http://techstacks.io/types/kotlin");
     }
+
+    public void testTypeHandlersLanguageName() {
+        INativeTypesHandler java = new JavaNativeTypesHandler();
+        INativeTypesHandler kotlin = new KotlinNativeTypesHandler();
+        INativeTypesHandler typeScriptD = new TypeScriptNativeTypesHandler();
+        INativeTypesHandler typeScript = new TypeScriptConcreteNativeTypesHandler();
+
+        assertEquals(java.getLanguageUrlName(),"java");
+        assertEquals(kotlin.getLanguageUrlName(),"kotlin");
+        assertEquals(typeScriptD.getLanguageUrlName(),"typescript.d");
+        assertEquals(typeScript.getLanguageUrlName(),"typescript");
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -64,10 +64,14 @@ public URIBuilder getUrl(String baseUrl) throws MalformedURLException, URISyntax`
`64`	`64`	`return builder;`
`65`	`65`	`}`
`66`	`66`
`67`		`- public static String toParentPath(String path)`
`68`		`- {`
	`67`	`+ public static String toParentPath(String path) {`
`69`	`68`	`int pos = path.lastIndexOf("/");`
`70`	`69`	`if (pos == -1) return "/";`
`71`	`70`	`return path.substring(0, pos);`
`72`	`71`	`}`
	`72`	`+`
	`73`	`+ @Override`
	`74`	`+ public String getLanguageUrlName() {`
	`75`	`+ return this.getRelativeTypesUrl().substring(6);`
	`76`	`+ }`
`73`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`import com.intellij.openapi.vfs.LocalFileSystem;`
`9`	`9`	`import com.intellij.openapi.vfs.VirtualFile;`
`10`	`10`	`import com.intellij.openapi.vfs.VirtualFileManager;`
`11`		`-import com.intellij.psi.PsiDocumentManager;`
`12`	`11`	`import com.intellij.util.PlatformUtils;`
`13`	`12`
`14`	`13`	`import java.io.*;`
`@@ -102,7 +101,7 @@ public static INativeTypesHandler getDefaultNativeTypesHandler(Module module) {`
`102`	`101`	`}`
`103`	`102`
`104`	`103`	`if(PlatformUtils.isWebStorm()) {`
`105`		`- return new TypeScriptNativeTypesHandler();`
	`104`	`+ return new TypeScriptConcreteNativeTypesHandler();`
`106`	`105`	`}`
`107`	`106`
`108`	`107`	`return new JavaNativeTypesHandler();`
`@@ -112,8 +111,8 @@ public static INativeTypesHandler getNativeTypesHandler(String fileName) {`
`112`	`111`	`INativeTypesHandler result = null;`
`113`	`112`	`if(fileName.endsWith(".kt")) result = new KotlinNativeTypesHandler();`
`114`	`113`	`if(fileName.endsWith(".java")) result = new JavaNativeTypesHandler();`
`115`		`- if(fileName.endsWith(".dtos.ts")) result = new TypeScriptNativeTypesHandler();`
`116`		`- if(fileName.endsWith(".dtos.d.ts")) result = new TypeScriptDefinitionNativeTypesHandler();`
	`114`	`+ if(fileName.endsWith(".dtos.ts")) result = new TypeScriptConcreteNativeTypesHandler();`
	`115`	`+ if(fileName.endsWith(".dtos.d.ts")) result = new TypeScriptNativeTypesHandler();`
`117`	`116`	`return result;`
`118`	`117`	`}`
`119`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,4 +17,5 @@ public interface INativeTypesHandler {`
`17`	`17`	`List<String> getUpdatedCode(String baseUrl, Map<String, String> options) throws IOException, URISyntaxException;`
`18`	`18`	`String getRelativeTypesUrl();`
`19`	`19`	`NativeTypesLanguage getTypesLanguage();`
	`20`	`+ String getLanguageUrlName();`
`20`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@`
`6`	`6`	`public enum NativeTypesLanguage {`
`7`	`7`	`Java,`
`8`	`8`	`Kotlin,`
`9`		`- TypeScript,`
`10`		`- TypeScriptDefinition`
	`9`	`+ TypeScriptConcrete,`
	`10`	`+ TypeScript`
`11`	`11`	`}`