Fix angelozerr#97

Author: angelozerr

core/ts.core.tests/src/ts/core/tests/Main.java

@@ -5,6 +5,7 @@
 import java.util.List;
 
 import ts.TypeScriptException;
+import ts.client.CodeEdit;
 import ts.client.ITypeScriptServiceClient;
 import ts.client.TypeScriptServiceClient;
 import ts.client.completions.CompletionInfo;
@@ -13,7 +14,6 @@
 import ts.client.definition.DefinitionsInfo;
 import ts.client.format.ITypeScriptFormatCollector;
 import ts.client.navbar.ITypeScriptNavBarCollector;
-import ts.client.navbar.NavigationBarItem;
 import ts.client.navbar.NavigationBarItemRoot;
 import ts.utils.FileUtils;
 
@@ -55,21 +55,22 @@ public static void main(String[] args) throws InterruptedException, TypeScriptEx
 
 		client.format(fileName, 1, 1, 1, 12, new ITypeScriptFormatCollector() {
 			@Override
-			public void format(int startLine, int startOffset, int endLine, int endOffset, String newText)
-					throws TypeScriptException {
-				System.err.println(newText);
+			public void format(List<CodeEdit> codeEdits) throws TypeScriptException {
+				for (CodeEdit codeEdit : codeEdits) {
+					System.err.println(codeEdit.getNewText());
+				}
 			}
 		});
-		
+
 		client.navbar(fileName, null, new ITypeScriptNavBarCollector() {
-			
+
 			@Override
 			public void setNavBar(NavigationBarItemRoot root) {
 				System.err.println(root);
 			}
 		});
 
-		//client.join();
+		// client.join();
 		client.dispose();
 
 	}

core/ts.core.tests/src/ts/core/tests/Main2.java

@@ -58,10 +58,9 @@ public static void main(String[] args) throws InterruptedException, TypeScriptEx
 	private static void validate(File sampleFile, MockTypeScriptProject tsProject, boolean normalize) throws TypeScriptException {
 		MockTypeScriptFile tsFile = tsProject.openFile(sampleFile, normalize);
 		tsFile.getProject().geterr(tsFile, 0, new ITypeScriptGeterrCollector() {
-			
 			@Override
-			public void addDiagnostic(String event, String file, String text, int startLine, int startOffset, int endLine,
-					int endOffset) {
+			public void addDiagnostic(String event, String file, String text, int startLine, int startOffset,
+					int endLine, int endOffset, String category, int code) {			
 				System.err.println(event);
 			}
 		});

core/ts.core/src/ts/client/CodeEdit.java

@@ -0,0 +1,64 @@
+/**
+ *  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.client;
+
+/**
+ * Object found in response messages defining an editing instruction for a span
+ * of text in source code. The effect of this instruction is to replace the text
+ * starting at start and ending one character before end with newText. For an
+ * insertion, the text span is empty. For a deletion, newText is empty.
+ */
+public class CodeEdit {
+
+	/**
+	 * First character of the text span to edit.
+	 */
+	private Location start;
+
+	/**
+	 * One character past last character of the text span to edit.
+	 */
+	private Location end;
+
+	/**
+	 * Replace the span defined above with this string (may be the empty
+	 * string).
+	 */
+	private String newText;
+
+	/**
+	 * Returns first character of the text span to edit.
+	 * 
+	 * @return first character of the text span to edit.
+	 */
+	public Location getStart() {
+		return start;
+	}
+
+	/**
+	 * Returns one character past last character of the text span to edit.
+	 * 
+	 * @return one character past last character of the text span to edit.
+	 */
+	public Location getEnd() {
+		return end;
+	}
+
+	/**
+	 * Replace the span defined above with this string (may be the empty string)
+	 * 
+	 * @return replace the span defined above with this string (may be the empty
+	 *         string)
+	 */
+	public String getNewText() {
+		return newText;
+	}
+}

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

@@ -46,7 +46,8 @@ public enum CommandNames {
 	NavTree("navtree", "2.0.6"),
 
 	// 2.1.0
-	Implementation("implementation", "2.1.0"),  
+	Implementation("implementation", "2.1.0"),
+	GetSupportedCodeFixes("getSupportedCodeFixes", "2.1.0"),
 	GetCodeFixes("getCodeFixes", "2.1.0");
 
 	private final String name;

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

@@ -12,6 +12,7 @@
 
 import ts.TypeScriptException;
 import ts.client.codefixes.ITypeScriptGetCodeFixesCollector;
+import ts.client.codefixes.ITypeScriptGetSupportedCodeFixesCollector;
 import ts.client.completions.ITypeScriptCompletionCollector;
 import ts.client.completions.ITypeScriptCompletionEntryDetailsCollector;
 import ts.client.definition.ITypeScriptDefinitionCollector;
@@ -95,20 +96,22 @@ void syntacticDiagnosticsSync(String file, Boolean includeLinePosition, ITypeScr
 			throws TypeScriptException;
 
 	// Since 2.0.5
-	
+
 	void compileOnSaveEmitFile(String fileName, Boolean forced) throws TypeScriptException;
-	
+
 	// Since 2.0.6
 
 	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;
+			int endOffset, String[] errorCodes, ITypeScriptGetCodeFixesCollector collector) throws TypeScriptException;
+
+	void getSupportedCodeFixes(ITypeScriptGetSupportedCodeFixesCollector collector) throws TypeScriptException;
 
 	void implementation(String fileName, int line, int offset, ITypeScriptDefinitionCollector collector)
 			throws TypeScriptException;
-	
+
 }

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

@@ -28,6 +28,7 @@
 
 import ts.TypeScriptException;
 import ts.client.codefixes.ITypeScriptGetCodeFixesCollector;
+import ts.client.codefixes.ITypeScriptGetSupportedCodeFixesCollector;
 import ts.client.completions.ITypeScriptCompletionCollector;
 import ts.client.completions.ITypeScriptCompletionEntryDetailsCollector;
 import ts.client.definition.ITypeScriptDefinitionCollector;
@@ -52,6 +53,7 @@
 import ts.internal.client.protocol.ConfigureRequestArguments;
 import ts.internal.client.protocol.DefinitionRequest;
 import ts.internal.client.protocol.FormatRequest;
+import ts.internal.client.protocol.GetSupportedCodeFixesRequest;
 import ts.internal.client.protocol.GeterrRequest;
 import ts.internal.client.protocol.ImplementationRequest;
 import ts.internal.client.protocol.NavBarRequest;
@@ -267,7 +269,7 @@ private void collect(JsonObject response, ITypeScriptDiagnosticsCollector collec
 			start = diagnostic.get("start").asObject();
 			end = diagnostic.get("end").asObject();
 			collector.addDiagnostic(event, file, text, start.getInt("line", -1), start.getInt("offset", -1),
-					end.getInt("line", -1), end.getInt("offset", -1));
+					end.getInt("line", -1), end.getInt("offset", -1), null, -1);
 		}
 	}
 
@@ -344,11 +346,19 @@ public void navtree(String fileName, IPositionProvider positionProvider, ITypeSc
 
 	// ---------------- Since 2.1.0
 
+	@Override
+	public void getSupportedCodeFixes(ITypeScriptGetSupportedCodeFixesCollector collector)
+			throws TypeScriptException {
+		GetSupportedCodeFixesRequest request = new GetSupportedCodeFixesRequest(collector);
+		execute(request);
+	}
+
 	@Override
 	public void getCodeFixes(String fileName, IPositionProvider positionProvider, int startLine, int startOffset,
-			int endLine, int endOffset, ITypeScriptGetCodeFixesCollector collector) throws TypeScriptException {
+			int endLine, int endOffset, String[] errorCodes, ITypeScriptGetCodeFixesCollector collector)
+			throws TypeScriptException {
 		CodeFixRequest request = new CodeFixRequest(fileName, positionProvider, startLine, startOffset, endLine,
-				endOffset, collector);
+				endOffset, errorCodes, collector);
 		execute(request);
 	}
 

core/ts.core/src/ts/client/codefixes/CodeEdit.java

@@ -1,15 +1,19 @@
 package ts.client.codefixes;
 
+import java.util.List;
+
+import ts.client.CodeEdit;
+
 public class FileCodeEdits {
 
 	private String fileName;
-	private CodeEdit textChanges;
+	private List<CodeEdit> textChanges;
 
 	public String getFileName() {
 		return fileName;
 	}
 
-	public CodeEdit getTextChanges() {
+	public List<CodeEdit> getTextChanges() {
 		return textChanges;
 	}
 }

core/ts.core/src/ts/client/codefixes/FileCodeEdits.java

@@ -1,7 +1,10 @@
 package ts.client.codefixes;
 
+import java.util.List;
+
 import ts.client.ITypeScriptCollector;
 
 public interface ITypeScriptGetCodeFixesCollector extends ITypeScriptCollector {
 
+	void fix(List<CodeAction> codeActions);
 }

core/ts.core/src/ts/client/codefixes/ITypeScriptGetCodeFixesCollector.java

@@ -0,0 +1,10 @@
+package ts.client.codefixes;
+
+import java.util.List;
+
+import ts.client.ITypeScriptCollector;
+
+public interface ITypeScriptGetSupportedCodeFixesCollector extends ITypeScriptCollector {
+
+	void setSupportedCodeFixes(List<String> errorCodes);
+}