Reactivate compile on save + manage marker error. See

#109

Author: angelozerr

core/ts.core.tests/src/ts/core/tests/CompilerWithTsserverTest.java

@@ -0,0 +1,41 @@
+package ts.core.tests;
+
+import java.io.File;
+import java.util.List;
+
+import ts.client.ITypeScriptServiceClient;
+import ts.client.LoggingInterceptor;
+import ts.client.TypeScriptServiceClient;
+import ts.client.compileonsave.CompileOnSaveAffectedFileListSingleProject;
+import ts.utils.FileUtils;
+
+public class CompilerWithTsserverTest {
+
+	public static void main(String[] args) throws Exception {
+		File projectDir = new File("./samples");
+		// sample.ts has the following content:
+		// var s = "";s.
+		File sampleFile = new File(projectDir, "sample.ts");
+		String fileName = FileUtils.getPath(sampleFile);
+
+		// Create TypeScript client
+		ITypeScriptServiceClient client = new TypeScriptServiceClient(projectDir,
+				new File("../ts.repository/node_modules/typescript/bin/tsserver"), null);
+
+		client.addInterceptor(LoggingInterceptor.getInstance());
+
+		client.openFile(fileName, null);
+
+		List<CompileOnSaveAffectedFileListSingleProject> projects = client.compileOnSaveAffectedFileList(fileName)
+				.get();
+		for (CompileOnSaveAffectedFileListSingleProject project : projects) {
+			for (String file : project.getFileNames()) {
+				Boolean result = client.compileOnSaveEmitFile(file, true).get();
+				System.err.println(result);
+			}
+		}
+		client.closeFile(fileName);
+
+		client.dispose();
+	}
+}

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

@@ -169,7 +169,7 @@ public List<String> createNodeArgs() {
 						if (disableAutomaticTypingAcquisition) {
 							args.add("--disableAutomaticTypingAcquisition");
 						}
-						//args.add("--useSingleInferredProject");
+						// args.add("--useSingleInferredProject");
 						return args;
 					}
 				}, TSSERVER_FILE_TYPE));

core/ts.core/src/ts/resources/jsonconfig/TsconfigJson.java

@@ -47,7 +47,7 @@ public class TsconfigJson {
 	private List<String> defaultExclude;
 
 	public TsconfigJson() {
-		this.compileOnSave = true;
+		this.compileOnSave = false;
 		this.buildOnSave = false;
 	}
 

eclipse/json/ts.eclipse.ide.json.ui/src/ts/eclipse/ide/json/ui/internal/tsconfig/OverviewPage.java

@@ -172,7 +172,7 @@ public void widgetSelected(SelectionEvent e) {
 		Composite compileBuildOnSaveBody = toolkit.createComposite(body);
 		compileBuildOnSaveBody.setLayout(new GridLayout());
 		compileOnSave = createCheckbox(compileBuildOnSaveBody, TsconfigEditorMessages.OverviewPage_compileOnSave_label,
-				new JSONPath("compileOnSave"), true);
+				new JSONPath("compileOnSave"));
 		buildOnSave = createCheckbox(compileBuildOnSaveBody, TsconfigEditorMessages.OverviewPage_buildOnSave_label,
 				new JSONPath("buildOnSave"));
 		updateCompileBuildOnSaveEnable(hasTypeScriptBuilder);

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

@@ -1,3 +1,13 @@
+/**
+ *  Copyright (c) 2015-2017 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.eclipse.ide.core.builder;
 
 import java.util.ArrayList;
@@ -14,43 +24,28 @@
 import org.eclipse.core.resources.IncrementalProjectBuilder;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
 
 import ts.TypeScriptException;
 import ts.client.CommandNames;
-import ts.eclipse.ide.core.resources.IIDETypeScriptFile;
+import ts.eclipse.ide.core.TypeScriptCorePlugin;
 import ts.eclipse.ide.core.resources.IIDETypeScriptProject;
 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;
 
 /**
- * Builder to transpiles TypeScript files into JavaScript files and source map
- * if needed.
+ * Builder to transpile TypeScript files into JavaScript files and source map if
+ * needed.
  *
  */
 public class TypeScriptBuilder extends IncrementalProjectBuilder {
 
 	public static final String ID = "ts.eclipse.ide.core.typeScriptBuilder";
 
-//	private static final ITypeScriptDiagnosticsCollector DIAGNOSTICS_COLLECTOR = new ITypeScriptDiagnosticsCollector() {
-//
-//		@Override
-//		public void addDiagnostic(String event, String filename, String text, int startLine, int startOffset,
-//				int endLine, int endOffset, String category, int code) {
-//			try {
-//				IFile f = WorkbenchResourceUtil.findFileFromWorkspace(filename);
-//				if (f != null && f.exists()) {
-//					TypeScriptResourceUtil.addTscMarker(f, text, IMarker.SEVERITY_ERROR, startLine);
-//				}
-//			} catch (CoreException e) {
-//				TypeScriptCorePlugin.logError(e);
-//			}
-//		}
-//	};
-
 	@Override
 	protected IProject[] build(int kind, Map<String, String> args, final IProgressMonitor monitor)
 			throws CoreException {
@@ -90,6 +85,25 @@ private void fullBuild(IIDETypeScriptProject tsProject, IProgressMonitor monitor
 
 	private void incrementalBuild(IIDETypeScriptProject tsProject, IResourceDelta delta, IProgressMonitor monitor)
 			throws CoreException {
+		if (tsProject.canSupport(CommandNames.CompileOnSaveEmitFile)) {
+			// compile with tsserver (since TypeScript 2.0.5)
+			compileWithTsserver(tsProject, delta, monitor);
+		} else {
+			// compile with tsc (more slow than tsserver).
+			compileWithTsc(tsProject, delta, monitor);
+		}
+	}
+
+	/**
+	 * Compile files with tsc.
+	 * 
+	 * @param tsProject
+	 * @param delta
+	 * @param monitor
+	 * @throws CoreException
+	 */
+	private void compileWithTsc(IIDETypeScriptProject tsProject, IResourceDelta delta, IProgressMonitor monitor)
+			throws CoreException {
 
 		final ITypeScriptBuildPath buildPath = tsProject.getTypeScriptBuildPath();
 		final Map<ITsconfigBuildPath, List<IFile>> tsFilesToCompile = new HashMap<ITsconfigBuildPath, List<IFile>>();
@@ -153,7 +167,7 @@ private void addTsFile(final ITypeScriptBuildPath buildPath,
 				if (!tsconfig.isBuildOnSave() && tsconfig.isCompileOnSave()
 						&& tsProject.canSupport(CommandNames.CompileOnSaveEmitFile)) {
 					// TypeScript >=2.0.5: compile is done with tsserver
-					//compileWithTsserver(tsProject, tsFiles, tsconfig);
+					// compileWithTsserver(tsProject, tsFiles, tsconfig);
 					compileWithTsc(tsProject, tsFiles, tsconfig);
 				} else {
 					// TypeScript < 2.0.5: compile is done with tsc which is not
@@ -189,56 +203,64 @@ private void addTsFile(final ITypeScriptBuildPath buildPath,
 	 * @throws TypeScriptException
 	 * @throws CoreException
 	 */
-	public void compileWithTsc(IIDETypeScriptProject tsProject, List<IFile> tsFiles, IDETsconfigJson tsconfig)
+	private void compileWithTsc(IIDETypeScriptProject tsProject, List<IFile> tsFiles, IDETsconfigJson tsconfig)
 			throws TypeScriptException, CoreException {
 		tsProject.getCompiler().compile(tsconfig, tsFiles);
 	}
 
 	/**
-	 * Compile the given ts files with tsserver by consumming
-	 * "compileOnSaveEmitFile" tsserver command.
+	 * Compile files with tsserver (since TypeScript 2.0.5).
 	 * 
 	 * @param tsProject
-	 * @param tsFiles
-	 * @param tsconfig
+	 * @param delta
+	 * @param monitor
 	 * @throws CoreException
 	 */
-	private void compileWithTsserver(IIDETypeScriptProject tsProject, List<IFile> tsFiles, IDETsconfigJson tsconfig)
-			throws CoreException {		
-		for (final IFile file : tsFiles) {
-			try {
-				IIDETypeScriptFile tsFile = tsProject.getOpenedFile(file);
-				// delete marker for the given ts file
-				TypeScriptResourceUtil.deleteTscMarker(file);
-				// compile the current ts file with "compileOnSaveEmitFile"
-				tsFile.compileOnSaveEmitFile(null);
-				// Refresh of js file, map file cannot work.
-				// See
-				TypeScriptResourceUtil.refreshAndCollectEmittedFiles(file, tsconfig, true, null);
-			} catch (TypeScriptException e) {
-				Trace.trace(Trace.SEVERE, "Error while tsserver compilation", e);
-			}
-		}
-		
-		try {
-			tsProject.geterrForProject(WorkbenchResourceUtil.getFileName(tsFiles.get(0)), 0).thenAccept(events -> {
-				System.err.println(events);
-			});
-		} catch (TypeScriptException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		
+	private void compileWithTsserver(IIDETypeScriptProject tsProject, IResourceDelta delta, IProgressMonitor monitor)
+			throws CoreException {
+
+		final List<IFile> updatedTsFiles = new ArrayList<>();
+		final List<IFile> removedTsFiles = new ArrayList<>();
+		delta.accept(new IResourceDeltaVisitor() {
+
+			@Override
+			public boolean visit(IResourceDelta delta) throws CoreException {
+				IResource resource = delta.getResource();
+				if (resource == null) {
+					return false;
+				}
+				switch (resource.getType()) {
+				case IResource.ROOT:
+				case IResource.FOLDER:
+					return true;
+				case IResource.PROJECT:
+					return TypeScriptResourceUtil.isTypeScriptProject((IProject) resource);
+				case IResource.FILE:
+					if (!TypeScriptResourceUtil.isTsOrTsxFile(resource)) {
+						return false;
+					}
+					int kind = delta.getKind();
+					switch (kind) {
+					case IResourceDelta.ADDED:
+					case IResourceDelta.CHANGED:
+						updatedTsFiles.add((IFile) resource);
+						break;
+					case IResourceDelta.REMOVED:
+						removedTsFiles.add((IFile) resource);
+						break;
+					}
+					return false;
+				default:
+					return false;
+				}
+			};
+		});
+
 		try {
-			tsProject.geterrForProject(WorkbenchResourceUtil.getFileName(tsFiles.get(0)), 0);
+			tsProject.compileWithTsserver(updatedTsFiles, removedTsFiles, monitor);
 		} catch (TypeScriptException e) {
-			Trace.trace(Trace.SEVERE, "Error while tsserver compilation", e);
+			throw new CoreException(new Status(IStatus.ERROR, TypeScriptCorePlugin.PLUGIN_ID,
+					"Error while compiling with tsserver", e));
 		}
-//		try {
-//			tsProject.getClient().projectInfo("", WorkbenchResourceUtil.getFileName(tsconfig.getTsconfigFile()), true);
-//		} catch (TypeScriptException e) {
-//			// TODO Auto-generated catch block
-//			e.printStackTrace();
-//		}
 	}
 }

eclipse/ts.eclipse.ide.core/src/ts/eclipse/ide/core/resources/IIDETypeScriptProject.java

@@ -10,8 +10,12 @@
  */
 package ts.eclipse.ide.core.resources;
 
+import java.util.List;
+
+import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.text.IDocument;
 
 import ts.TypeScriptException;
@@ -99,4 +103,12 @@ public interface IIDETypeScriptProject extends ITypeScriptProject {
 
 	IIDETypeScriptLint getTslint() throws TypeScriptException;
 
+	/**
+	 * 
+	 * @param updatedTsFiles
+	 * @param removedTsFiles
+	 * @throws TypeScriptException
+	 */
+	void compileWithTsserver(List<IFile> updatedTsFiles, List<IFile> removedTsFiles, IProgressMonitor monitor) throws TypeScriptException;
+
 }