Merge pull request #236 from lgrignon/master

open external project & reload file without content & tss env vars

Author: angelozerr

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

@@ -37,7 +37,7 @@ public enum CommandNames implements ISupportable {
 	ProjectInfo("projectInfo"),
 	Rename("rename"),
 	NavTo("navto"),
-	
+
 	// 2.0.0
 	SemanticDiagnosticsSync("semanticDiagnosticsSync", "2.0.0"), 
 	SyntacticDiagnosticsSync("syntacticDiagnosticsSync", "2.0.0"), 
@@ -57,7 +57,9 @@ public enum CommandNames implements ISupportable {
 
 	// 2.4.0
 	GetApplicableRefactors("getApplicableRefactors", "2.4.0"),
-    GetEditsForRefactor("getEditsForRefactor", "2.4.0");
+    GetEditsForRefactor("getEditsForRefactor", "2.4.0"),
+	
+	OpenExternalProject("openExternalProject");
 
 	private final String name;
 	private final String sinceVersion;

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

@@ -34,6 +34,8 @@
 import ts.client.references.ReferencesResponseBody;
 import ts.client.rename.RenameResponseBody;
 import ts.client.signaturehelp.SignatureHelpItems;
+import ts.cmd.tsc.CompilerOptions;
+import ts.internal.client.protocol.OpenExternalProjectRequestArgs.ExternalFile;
 
 /**
  * TypeScript client API which communicates with tsserver.
@@ -62,6 +64,9 @@ public interface ITypeScriptServiceClient {
 	 */
 	void openFile(String fileName, String content, ScriptKindName scriptKindName) throws TypeScriptException;
 
+	void openExternalProject(String projectFileName, List<ExternalFile> rootFiles,
+			CompilerOptions options) throws TypeScriptException;
+	
 	/**
 	 * Close the given file name.
 	 * 

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

@@ -13,6 +13,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -50,6 +51,7 @@
 import ts.client.references.ReferencesResponseBody;
 import ts.client.rename.RenameResponseBody;
 import ts.client.signaturehelp.SignatureHelpItems;
+import ts.cmd.tsc.CompilerOptions;
 import ts.internal.FileTempHelper;
 import ts.internal.SequenceHelper;
 import ts.internal.client.protocol.ChangeRequest;
@@ -76,6 +78,7 @@
 import ts.internal.client.protocol.NavToRequest;
 import ts.internal.client.protocol.NavTreeRequest;
 import ts.internal.client.protocol.OccurrencesRequest;
+import ts.internal.client.protocol.OpenExternalProjectRequest;
 import ts.internal.client.protocol.OpenRequest;
 import ts.internal.client.protocol.ProjectInfoRequest;
 import ts.internal.client.protocol.QuickInfoRequest;
@@ -87,6 +90,7 @@
 import ts.internal.client.protocol.SemanticDiagnosticsSyncRequest;
 import ts.internal.client.protocol.SignatureHelpRequest;
 import ts.internal.client.protocol.SyntacticDiagnosticsSyncRequest;
+import ts.internal.client.protocol.OpenExternalProjectRequestArgs.ExternalFile;
 import ts.nodejs.INodejsLaunchConfiguration;
 import ts.nodejs.INodejsProcess;
 import ts.nodejs.INodejsProcessListener;
@@ -164,12 +168,12 @@ private static class PendingRequestEventInfo {
 	}
 
 	public TypeScriptServiceClient(final File projectDir, File tsserverFile, File nodeFile) throws TypeScriptException {
-		this(projectDir, tsserverFile, nodeFile, false, false, null, null);
+		this(projectDir, tsserverFile, nodeFile, false, false, null, null, null);
 	}
 
 	public TypeScriptServiceClient(final File projectDir, File typescriptDir, File nodeFile, boolean enableTelemetry,
-			boolean disableAutomaticTypingAcquisition, String cancellationPipeName, File tsserverPluginsFile)
-			throws TypeScriptException {
+			boolean disableAutomaticTypingAcquisition, String cancellationPipeName, File tsserverPluginsFile,
+			TypeScriptServiceLogConfiguration logConfiguration) throws TypeScriptException {
 		this(NodejsProcessManager.getInstance().create(projectDir,
 				tsserverPluginsFile != null ? tsserverPluginsFile
 						: TypeScriptRepositoryManager.getTsserverFile(typescriptDir),
@@ -197,6 +201,16 @@ public List<String> createNodeArgs() {
 						// args.add("--useSingleInferredProject");
 						return args;
 					}
+
+					@Override
+					public Map<String, String> createNodeEnvironmentVariables() {
+						Map<String, String> environmentVariables = new HashMap<>();
+						if (logConfiguration != null) {
+							environmentVariables.put("TSS_LOG",
+									"-level " + logConfiguration.level.name() + " -file " + logConfiguration.file);
+						}
+						return environmentVariables;
+					}
 				}, TSSERVER_FILE_TYPE), cancellationPipeName);
 	}
 
@@ -213,6 +227,20 @@ public TypeScriptServiceClient(INodejsProcess process, String cancellationPipeNa
 		this.cancellationPipeName = cancellationPipeName;
 	}
 
+	public static enum TypeScriptServiceLogLevel {
+		verbose, normal, terse, requestTime
+	}
+
+	public static class TypeScriptServiceLogConfiguration {
+		String file;
+		TypeScriptServiceLogLevel level;
+
+		public TypeScriptServiceLogConfiguration(String file, TypeScriptServiceLogLevel level) {
+			this.file = file;
+			this.level = level;
+		}
+	}
+
 	private void dispatchMessage(String message) {
 		JsonObject json = GsonHelper.parse(message).getAsJsonObject();
 		JsonElement typeElement = json.get("type");
@@ -293,6 +321,12 @@ public void openFile(String fileName, String content, ScriptKindName scriptKindN
 		execute(new OpenRequest(fileName, null, content, scriptKindName), false);
 	}
 
+	@Override
+	public void openExternalProject(String projectFileName, List<ExternalFile> rootFiles, CompilerOptions options)
+			throws TypeScriptException {
+		execute(new OpenExternalProjectRequest(projectFileName, rootFiles, options), false);
+	}
+
 	@Override
 	public void closeFile(String fileName) throws TypeScriptException {
 		execute(new CloseRequest(fileName), false);
@@ -314,7 +348,10 @@ public void changeFile(String fileName, int line, int offset, int endLine, int e
 	@Override
 	public void updateFile(String fileName, String newText) throws TypeScriptException {
 		int seq = SequenceHelper.getRequestSeq();
-		String tempFileName = FileTempHelper.updateTempFile(newText, seq);
+		String tempFileName = null;
+		if (newText != null) {
+			tempFileName = FileTempHelper.updateTempFile(newText, seq);
+		}
 		try {
 			execute(new ReloadRequest(fileName, tempFileName, seq), true).get(5000, TimeUnit.MILLISECONDS);
 		} catch (Exception e) {

core/ts.core/src/ts/cmd/AbstractCmd.java

@@ -3,6 +3,7 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import ts.TypeScriptException;
 import ts.nodejs.INodejsLaunchConfiguration;
@@ -40,6 +41,11 @@ public List<String> createNodeArgs() {
 						fillOptions(options, filenames, args);
 						return args;
 					}
+					
+					@Override
+					public Map<String, String> createNodeEnvironmentVariables() {
+						return null;
+					}
 				}, binFileType);
 
 		if (listener != null) {

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

@@ -0,0 +1,29 @@
+package ts.internal.client.protocol;
+
+import java.util.List;
+
+import com.google.gson.JsonObject;
+
+import ts.client.CommandNames;
+import ts.cmd.tsc.CompilerOptions;
+import ts.internal.client.protocol.OpenExternalProjectRequestArgs.ExternalFile;
+
+/**
+ * Request to open or update external project.
+ * 
+ * @see https://github.com/Microsoft/TypeScript/blob/master/src/server/protocol.ts
+ * 
+ */
+public class OpenExternalProjectRequest extends Request<OpenExternalProjectRequestArgs> {
+
+	public OpenExternalProjectRequest(String projectFileName, List<ExternalFile> rootFiles, CompilerOptions options) {
+		super(CommandNames.OpenExternalProject.getName(),
+				new OpenExternalProjectRequestArgs(projectFileName, rootFiles, options));
+	}
+
+	@Override
+	public Response<?> parseResponse(JsonObject json) {
+		// This request doesn't return response.
+		return null;
+	}
+}

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

@@ -0,0 +1,63 @@
+package ts.internal.client.protocol;
+
+import java.util.List;
+
+import ts.client.ScriptKindName;
+import ts.cmd.tsc.CompilerOptions;
+
+/**
+ * @see https://github.com/Microsoft/TypeScript/blob/master/src/server/protocol.ts
+ */
+public class OpenExternalProjectRequestArgs {
+
+	public static class ExternalFile {
+		/**
+		 * Name of file file
+		 */
+		String fileName;
+		/**
+		 * Script kind of the file
+		 */
+		ScriptKindName scriptKind;
+		/**
+		 * Whether file has mixed content (i.e. .cshtml file that combines html markup
+		 * with C#/JavaScript)
+		 */
+		Boolean hasMixedContent;
+		/**
+		 * Content of the file
+		 */
+		String content;
+
+		public ExternalFile(String fileName, ScriptKindName scriptKind, Boolean hasMixedContent, String content) {
+			this.fileName = fileName;
+			this.scriptKind = scriptKind;
+			this.hasMixedContent = hasMixedContent;
+			this.content = content;
+		}
+
+	}
+
+	/**
+	 * Project name
+	 */
+	String projectFileName;
+	/**
+	 * List of root files in project
+	 */
+	List<ExternalFile> rootFiles;
+	/**
+	 * Compiler options for the project
+	 */
+	CompilerOptions options;
+	// /**
+	// * Explicitly specified type acquisition for the project
+	// */
+	// typeAcquisition?: TypeAcquisition;
+	public OpenExternalProjectRequestArgs(String projectFileName, List<ExternalFile> rootFiles,
+			CompilerOptions options) {
+		this.projectFileName = projectFileName;
+		this.rootFiles = rootFiles;
+		this.options = options;
+	}
+}

core/ts.core/src/ts/nodejs/AbstractNodejsProcess.java

@@ -13,6 +13,7 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import ts.TypeScriptException;
 import ts.utils.FileUtils;
@@ -89,6 +90,13 @@ protected List<String> createNodeArgs() {
 		}
 		return launchConfiguration.createNodeArgs();
 	}
+	
+	protected Map<String, String> createNodeEnvironmentVariables() {
+		if (launchConfiguration == null) {
+			return null;
+		}
+		return launchConfiguration.createNodeEnvironmentVariables();
+	}
 
 	/**
 	 * return the project dir where tsconfig.json is hosted.

core/ts.core/src/ts/nodejs/INodejsLaunchConfiguration.java

@@ -1,6 +1,7 @@
 package ts.nodejs;
 
 import java.util.List;
+import java.util.Map;
 
 public interface INodejsLaunchConfiguration {
 
@@ -10,4 +11,6 @@ public interface INodejsLaunchConfiguration {
 	 * @return a list of arguments for the node command.
 	 */
 	List<String> createNodeArgs();
+
+	Map<String, String> createNodeEnvironmentVariables();
 }

core/ts.core/src/ts/nodejs/NodejsProcess.java

@@ -19,6 +19,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 
 import ts.TypeScriptException;
 import ts.utils.FileUtils;
@@ -136,6 +137,14 @@ public void start() {
 		try {
 			List<String> commands = createCommands();
 			ProcessBuilder builder = new ProcessBuilder(commands);
+
+			Map<String, String> environmentVariables = this.createNodeEnvironmentVariables();
+			if (environmentVariables != null) {
+				for (Map.Entry<String, String> environmentVariableEntry : environmentVariables.entrySet()) {
+					builder.environment().put(environmentVariableEntry.getKey(), environmentVariableEntry.getValue());
+				}
+			}
+
 			builder.directory(getProjectDir());
 
 			this.process = builder.start();

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

@@ -187,7 +187,7 @@ protected ITypeScriptServiceClient createServiceClient(File projectDir) throws T
 		File typescriptDir = getProjectSettings().getTypesScriptDir();
 		TypeScriptServiceClient client = new TypeScriptServiceClient(getProjectDir(), typescriptDir, nodeFile,
 				getProjectSettings().isEnableTelemetry(), getProjectSettings().isDisableAutomaticTypingAcquisition(),
-				getCancellationPipeName(), getProjectSettings().getTsserverPluginsFile());
+				getCancellationPipeName(), getProjectSettings().getTsserverPluginsFile(), null);
 		client.setCompletionEntryMatcherProvider(this);
 		return client;
 	}