Integrates tsserver-plugins. See

#133

Author: angelozerr

core/ts.core.tests/samples/tsconfig.json

@@ -1,12 +1,7 @@
 {
+	"compileOnSave": true,
     "compilerOptions": {
-        "module": "commonjs",
-        "noImplicitAny": true,
-        "removeComments": true,
-        "preserveConstEnums": true,
+        "outDir": "out",
         "sourceMap": true
-    },
-    "files": [
-        "sample.ts"
-    ]
+    }
 }

core/ts.core/src/ts/client/TypeScriptServiceClient.java

@@ -81,6 +81,7 @@
 import ts.nodejs.INodejsProcessListener;
 import ts.nodejs.NodejsProcessAdapter;
 import ts.nodejs.NodejsProcessManager;
+import ts.utils.FileUtils;
 
 /**
  * TypeScript service client implementation.
@@ -150,12 +151,13 @@ private static class PendingRequestEventInfo {
 	}
 
 	public TypeScriptServiceClient(final File projectDir, File tsserverFile, File nodeFile) throws TypeScriptException {
-		this(projectDir, tsserverFile, nodeFile, false, false);
+		this(projectDir, tsserverFile, nodeFile, false, false, null);
 	}
 
 	public TypeScriptServiceClient(final File projectDir, File tsserverFile, File nodeFile, boolean enableTelemetry,
-			boolean disableAutomaticTypingAcquisition) throws TypeScriptException {
-		this(NodejsProcessManager.getInstance().create(projectDir, tsserverFile, nodeFile,
+			boolean disableAutomaticTypingAcquisition, File tsserverPluginsFile) throws TypeScriptException {
+		this(NodejsProcessManager.getInstance().create(projectDir,
+				tsserverPluginsFile != null ? tsserverPluginsFile : tsserverFile, nodeFile,
 				new INodejsLaunchConfiguration() {
 
 					@Override
@@ -169,6 +171,10 @@ public List<String> createNodeArgs() {
 						if (disableAutomaticTypingAcquisition) {
 							args.add("--disableAutomaticTypingAcquisition");
 						}
+						if (tsserverPluginsFile != null) {
+							args.add("--typescriptDir");
+							args.add(FileUtils.getPath(tsserverFile.getParentFile().getParentFile()));
+						}
 						// args.add("--useSingleInferredProject");
 						return args;
 					}

core/ts.core/src/ts/internal/repository/TypeScriptRepository.java

@@ -23,6 +23,7 @@ public class TypeScriptRepository implements ITypeScriptRepository {
 	private String tslintName;
 	private String typesScriptVersion;
 	private String tslintVersion;
+	private File tsserverPluginsFile;
 
 	public TypeScriptRepository(File baseDir) throws TypeScriptRepositoryException {
 		this(baseDir, null);
@@ -58,6 +59,8 @@ private void updateBaseDir(File baseDir) throws TypeScriptRepositoryException {
 			this.tslintVersion = TypeScriptRepositoryManager.getPackageJsonVersion(tslintBaseDir);
 			this.tslintName = generateName("tslint", tslintVersion);
 		}
+		// tsserver-plugins
+		this.tsserverPluginsFile = new File(baseDir, "tsserver-plugins/bin/tsserver-plugins");
 	}
 
 	private String generateName(String prefix, String version) {
@@ -124,4 +127,9 @@ public String getTslintName() {
 		return tslintName;
 	}
 
+	@Override
+	public File getTsserverPluginsFile() {
+		return tsserverPluginsFile;
+	}
+
 }

core/ts.core/src/ts/repository/ITypeScriptRepository.java

@@ -77,4 +77,6 @@ public interface ITypeScriptRepository {
 	 */
 	String getTslintName();
 
+	File getTsserverPluginsFile();
+
 }

core/ts.core/src/ts/repository/TypeScriptRepositoryManager.java

@@ -99,4 +99,11 @@ public static String getPackageJsonVersion(File baseDir) {
 			return null;
 		}
 	}
+
+	public static File getTsserverPluginsFile(File typesScriptDir) {
+		if (typesScriptDir.getName().equals("tsserver-plugins")) {
+			return typesScriptDir;
+		}
+		return new File(typesScriptDir, "bin/tsserver-plugins");
+	}
 }

core/ts.core/src/ts/resources/BasicTypeScriptProjectSettings.java

@@ -73,6 +73,11 @@ public File getTscFile() {
 	public File getTsserverFile() {
 		return repository.getTsserverFile();
 	}
+	
+	@Override
+	public File getTsserverPluginsFile() throws TypeScriptException {
+		return repository.getTsserverPluginsFile();
+	}
 
 	@Override
 	public File getTslintFile() throws TypeScriptException {

core/ts.core/src/ts/resources/ITypeScriptProjectSettings.java

@@ -66,6 +66,8 @@ public interface ITypeScriptProjectSettings {
 	 */
 	File getTsserverFile() throws TypeScriptException;
 
+	File getTsserverPluginsFile() throws TypeScriptException;
+
 	/**
 	 * Returns the tslint/bin/tslint file to execute.
 	 * 
@@ -102,4 +104,5 @@ public interface ITypeScriptProjectSettings {
 	boolean isEnableTelemetry();
 
 	boolean isDisableAutomaticTypingAcquisition();
+
 }

core/ts.core/src/ts/resources/TypeScriptProject.java

@@ -172,7 +172,7 @@ protected ITypeScriptServiceClient createServiceClient(File projectDir) throws T
 		File nodeFile = getProjectSettings().getNodejsInstallPath();
 		File tsserverFile = getProjectSettings().getTsserverFile();
 		TypeScriptServiceClient client = new TypeScriptServiceClient(getProjectDir(), tsserverFile, nodeFile,
-				getProjectSettings().isEnableTelemetry(), getProjectSettings().isDisableAutomaticTypingAcquisition());
+				getProjectSettings().isEnableTelemetry(), getProjectSettings().isDisableAutomaticTypingAcquisition(), getProjectSettings().getTsserverPluginsFile());
 		client.setCompletionEntryMatcherProvider(this);
 		return client;
 	}