Consume compileOnSaveEmitFile tsserver command. See

#109

Author: angelozerr

core/ts.core/src/ts/client/CommandNames.java

@@ -18,14 +18,36 @@
  */
 public enum CommandNames {
 
-	Open("open"), Close("close"), Change("change"), NavBar("navbar"), Completions(
-			"completions"), CompletionEntryDetails("completionEntryDetails"), Reload("reload"), Definition(
-					"definition"), SignatureHelp("signatureHelp"), QuickInfo("quickinfo"), Geterr("geterr"), Format(
-							"format"), References("references"), Occurrences("occurrences"), Configure(
-									"configure"), SemanticDiagnosticsSync("semanticDiagnosticsSync",
-											"2.0.3"), SyntacticDiagnosticsSync("syntacticDiagnosticsSync",
-													"2.0.3"), Implementation("implementation", "2.0.6"), NavTree(
-															"navtree", "2.0.6"), GetCodeFixes("getCodeFixes", "2.1.0");
+	Open("open"), 
+	Close("close"), 
+	Change("change"), 
+	NavBar("navbar"), 
+	Completions("completions"), 
+	CompletionEntryDetails("completionEntryDetails"), 
+	Reload("reload"), 
+	Definition("definition"), 
+	SignatureHelp("signatureHelp"), 
+	QuickInfo("quickinfo"), 
+	Geterr("geterr"), 
+	Format("format"), 
+	References("references"), 
+	Occurrences("occurrences"), 
+	Configure("configure"), 
+	
+	// 2.0.3
+	SemanticDiagnosticsSync("semanticDiagnosticsSync", "2.0.3"), 
+	SyntacticDiagnosticsSync("syntacticDiagnosticsSync", "2.0.3"), 
+	
+	// 2.0.5
+	compileOnSaveAffectedFileList("CompileOnSaveAffectedFileList", "2.0.5"),
+	compileOnSaveEmitFile("compileOnSaveEmitFile", "2.0.5"),
+	
+	// 2.0.6
+	NavTree("navtree", "2.0.6"),
+	
+	// 2.1.0
+	Implementation("implementation", "2.1.0"),  
+	GetCodeFixes("getCodeFixes", "2.1.0");
 
 	private final String name;
 	private final String sinceVersion;

core/ts.core/src/ts/client/ITypeScriptServiceClient.java

@@ -94,15 +94,21 @@ void semanticDiagnosticsSync(String file, Boolean includeLinePosition, ITypeScri
 	void syntacticDiagnosticsSync(String file, Boolean includeLinePosition, ITypeScriptDiagnosticsCollector collector)
 			throws TypeScriptException;
 
+	// Since 2.0.5
+	
+	void compileOnSaveEmitFile(String fileName, Boolean forced) throws TypeScriptException;
+	
 	// Since 2.0.6
 
-	void implementation(String fileName, int line, int offset, ITypeScriptDefinitionCollector collector)
-			throws TypeScriptException;
-
 	void navtree(String fileName, IPositionProvider positionProvider, ITypeScriptNavBarCollector collector)
 			throws TypeScriptException;
 
 	// Since 2.1.0
+	
 	void getCodeFixes(String fileName, IPositionProvider positionProvider, int startLine, int startOffset, int endLine,
 			int endOffset, ITypeScriptGetCodeFixesCollector collector) throws TypeScriptException;
+
+	void implementation(String fileName, int line, int offset, ITypeScriptDefinitionCollector collector)
+			throws TypeScriptException;
+	
 }

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

@@ -45,6 +45,7 @@
 import ts.internal.client.protocol.ChangeRequest;
 import ts.internal.client.protocol.CloseRequest;
 import ts.internal.client.protocol.CodeFixRequest;
+import ts.internal.client.protocol.CompileOnSaveEmitFileRequest;
 import ts.internal.client.protocol.CompletionDetailsRequest;
 import ts.internal.client.protocol.CompletionsRequest;
 import ts.internal.client.protocol.ConfigureRequest;
@@ -324,15 +325,16 @@ public void syntacticDiagnosticsSync(String fileName, Boolean includeLinePositio
 		execute(request);
 	}
 
-	// ---------------- Since 2.0.6
+	// ---------------- Since 2.0.5
 
 	@Override
-	public void implementation(String fileName, int line, int offset, ITypeScriptDefinitionCollector collector)
-			throws TypeScriptException {
-		ImplementationRequest request = new ImplementationRequest(fileName, line, offset, collector);
-		execute(request);
+	public void compileOnSaveEmitFile(String fileName, Boolean forced) throws TypeScriptException {
+		CompileOnSaveEmitFileRequest request = new CompileOnSaveEmitFileRequest(fileName, forced);
+		execute(request, false, null);
 	}
 
+	// ---------------- Since 2.0.6
+
 	@Override
 	public void navtree(String fileName, IPositionProvider positionProvider, ITypeScriptNavBarCollector collector)
 			throws TypeScriptException {
@@ -350,6 +352,13 @@ public void getCodeFixes(String fileName, IPositionProvider positionProvider, in
 		execute(request);
 	}
 
+	@Override
+	public void implementation(String fileName, int line, int offset, ITypeScriptDefinitionCollector collector)
+			throws TypeScriptException {
+		ImplementationRequest request = new ImplementationRequest(fileName, line, offset, collector);
+		execute(request);
+	}
+
 	private void execute(Request request) throws TypeScriptException {
 		if (!request.isAsynch()) {
 			try {

core/ts.core/src/ts/internal/client/protocol/CodeFixRequestArgs.java

@@ -1,7 +1,15 @@
+/**
+ *  Copyright (c) 2015-2016 Angelo ZERR.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *
+ *  Contributors:
+ *  Angelo Zerr <[email protected]> - initial API and implementation
+ */
 package ts.internal.client.protocol;
 
-import com.eclipsesource.json.JsonArray;
-
 public class CodeFixRequestArgs extends FileRequestArgs {
 
 	public CodeFixRequestArgs(String file, int startLine, int startOffset, int endLine, int endOffset) {
@@ -10,10 +18,10 @@ public CodeFixRequestArgs(String file, int startLine, int startOffset, int endLi
 		super.add("startOffset", startOffset);
 		super.add("endLine", endLine);
 		super.add("endOffset", endOffset);
-		
-//		JsonArray errorCodes = new JsonArray();
-//		errorCodes.add(2377);
-//		super.add("errorCodes", errorCodes);
+
+		// JsonArray errorCodes = new JsonArray();
+		// errorCodes.add(2377);
+		// super.add("errorCodes", errorCodes);
 	}
 
 }

core/ts.core/src/ts/internal/client/protocol/CompileOnSaveEmitFileRequest.java

@@ -0,0 +1,33 @@
+/**
+ *  Copyright (c) 2015-2016 Angelo ZERR.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *
+ *  Contributors:
+ *  Angelo Zerr <[email protected]> - initial API and implementation
+ */
+package ts.internal.client.protocol;
+
+import com.eclipsesource.json.JsonObject;
+
+import ts.TypeScriptException;
+import ts.client.CommandNames;
+
+/**
+ * Request to recompile the file. All generated outputs (.js, .d.ts or .js.map
+ * files) is written on disk.
+ */
+public class CompileOnSaveEmitFileRequest extends FileRequest {
+
+	public CompileOnSaveEmitFileRequest(String fileName, Boolean forced) {
+		super(CommandNames.compileOnSaveEmitFile, new CompileOnSaveEmitFileRequestArgs(fileName, forced), null);
+	}
+
+	@Override
+	public void collect(JsonObject response) throws TypeScriptException {
+
+	}
+
+}

core/ts.core/src/ts/internal/client/protocol/CompileOnSaveEmitFileRequestArgs.java

@@ -0,0 +1,22 @@
+package ts.internal.client.protocol;
+
+/**
+ * Arguments for CompileOnSaveEmitFileRequest
+ */
+public class CompileOnSaveEmitFileRequestArgs extends FileRequestArgs {
+
+	/**
+	 * 
+	 * @param file
+	 * @param forced
+	 *            if true - then file should be recompiled even if it does not
+	 *            have any changes.
+	 */
+	public CompileOnSaveEmitFileRequestArgs(String file, Boolean forced) {
+		super(file);
+		if (forced != null) {
+			super.add("forced", forced);
+		}
+	}
+
+}

eclipse/ts.eclipse.ide.core/src/ts/eclipse/ide/core/builder/TypeScriptBuilder.java

@@ -16,11 +16,13 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 
 import ts.TypeScriptException;
+import ts.client.CommandNames;
 import ts.eclipse.ide.core.resources.IIDETypeScriptProject;
-import ts.eclipse.ide.core.resources.buildpath.ITypeScriptBuildPath;
 import ts.eclipse.ide.core.resources.buildpath.ITsconfigBuildPath;
+import ts.eclipse.ide.core.resources.buildpath.ITypeScriptBuildPath;
 import ts.eclipse.ide.core.resources.jsconfig.IDETsconfigJson;
 import ts.eclipse.ide.core.utils.TypeScriptResourceUtil;
+import ts.eclipse.ide.core.utils.WorkbenchResourceUtil;
 import ts.eclipse.ide.internal.core.Trace;
 
 /**
@@ -128,6 +130,74 @@ private void addTsFile(final ITypeScriptBuildPath buildPath,
 		});
 
 		// Compile ts files *.ts
+		if (tsProject.canSupport(CommandNames.compileOnSaveEmitFile)) {
+			// TypeScript >=2.0.5: compile is done with tsserver
+			compileWithTsserver(tsProject, tsFilesToCompile);
+		} else {
+			// TypeScript < 2.0.5: compile is done with tsc which is not very
+			// performant.
+			compileWithTsc(tsProject, tsFilesToCompile);
+		}
+
+		// Delete emitted files *.js, *.js.map
+		for (Entry<ITsconfigBuildPath, List<IFile>> entries : tsFilesToDelete.entrySet()) {
+			ITsconfigBuildPath tsContainer = entries.getKey();
+			List<IFile> tsFiles = entries.getValue();
+			IDETsconfigJson tsconfig = tsContainer.getTsconfig();
+			for (IFile tsFile : tsFiles) {
+				TypeScriptResourceUtil.deleteEmittedFiles(tsFile, tsconfig);
+			}
+
+		}
+	}
+
+	/**
+	 * Compile the given ts files with tsserver by consumming
+	 * "compileOnSaveEmitFile" command.
+	 * 
+	 * @param tsProject
+	 * @param tsFilesToCompile
+	 * @throws CoreException
+	 */
+	private void compileWithTsserver(IIDETypeScriptProject tsProject,
+			final Map<ITsconfigBuildPath, List<IFile>> tsFilesToCompile) {
+		for (Entry<ITsconfigBuildPath, List<IFile>> entries : tsFilesToCompile.entrySet()) {
+			try {
+				ITsconfigBuildPath tsContainer = entries.getKey();
+				List<IFile> tsFiles = entries.getValue();
+				IDETsconfigJson tsconfig = tsContainer.getTsconfig();
+				if (tsconfig.isCompileOnSave()) {
+					// tsconfig.json defines compileOnSave
+					// loop for each ts files to compile
+					for (IFile tsFile : tsFiles) {
+						try {
+							// compile the current ts file with
+							// "compileOnSaveEmitFile"
+							tsProject.getClient().compileOnSaveEmitFile(WorkbenchResourceUtil.getFileName(tsFile),
+									null);
+							// TODO: Refresh UI
+							TypeScriptResourceUtil.refreshAndCollectEmittedFiles(tsFile, tsconfig, true, null);
+							//tsconfig.getTsconfigFile().getParent().refreshLocal(IResource.DEPTH_INFINITE, null);
+						} catch (TypeScriptException e) {
+							Trace.trace(Trace.SEVERE, "Error while tsserver compilation", e);
+						}
+					}
+				}
+			} catch (Exception e) {
+				Trace.trace(Trace.SEVERE, "Error while tsserver compilation", e);
+			}
+		}
+	}
+
+	/**
+	 * Compile the given ts files with tsc.
+	 * 
+	 * @param tsProject
+	 * @param tsFilesToCompile
+	 * @throws CoreException
+	 */
+	private void compileWithTsc(IIDETypeScriptProject tsProject,
+			final Map<ITsconfigBuildPath, List<IFile>> tsFilesToCompile) throws CoreException {
 		for (Entry<ITsconfigBuildPath, List<IFile>> entries : tsFilesToCompile.entrySet()) {
 			ITsconfigBuildPath tsContainer = entries.getKey();
 			List<IFile> tsFiles = entries.getValue();
@@ -141,16 +211,5 @@ private void addTsFile(final ITypeScriptBuildPath buildPath,
 				Trace.trace(Trace.SEVERE, "Error while tsc compilation", e);
 			}
 		}
-		// Delete emitted files *.js, *.js.map
-		for (Entry<ITsconfigBuildPath, List<IFile>> entries : tsFilesToDelete.entrySet()) {
-			ITsconfigBuildPath tsContainer = entries.getKey();
-			List<IFile> tsFiles = entries.getValue();
-			IDETsconfigJson tsconfig = tsContainer.getTsconfig();
-			for (IFile tsFile : tsFiles) {
-				TypeScriptResourceUtil.deleteEmittedFiles(tsFile, tsconfig);
-			}
-
-		}
 	}
-
 }