Renames and fixes to stats url. Add test.

Author: Layoric

src/ServiceStackIDEA/.idea/workspace.xml

@@ -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());

src/ServiceStackIDEA/src/main/java/net/servicestack/idea/AddTypeScriptAction.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);

src/ServiceStackIDEA/src/main/java/net/servicestack/idea/AddTypeScriptRefHandler.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};

src/ServiceStackIDEA/src/main/java/net/servicestack/idea/Analytics.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);
+    }
 }

src/ServiceStackIDEA/src/main/java/net/servicestack/idea/BaseNativeTypesHandler.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;
     }
 }

src/ServiceStackIDEA/src/main/java/net/servicestack/idea/IDEAUtils.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();
 }

src/ServiceStackIDEA/src/main/java/net/servicestack/idea/INativeTypesHandler.java

@@ -6,6 +6,6 @@
 public enum NativeTypesLanguage {
     Java,
     Kotlin,
-    TypeScript,
-    TypeScriptDefinition
+    TypeScriptConcrete,
+    TypeScript
 }

src/ServiceStackIDEA/src/main/java/net/servicestack/idea/NativeTypesLanguage.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;
+    }
+}