Fix #58

Author: angelozerr

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

@@ -21,6 +21,7 @@
 import ts.client.quickinfo.ITypeScriptQuickInfoCollector;
 import ts.client.references.ITypeScriptReferencesCollector;
 import ts.client.signaturehelp.ITypeScriptSignatureHelpCollector;
+import ts.internal.client.protocol.ConfigureRequestArguments;
 
 /**
  * TypeScript client API which communicates with tsserver.
@@ -81,4 +82,6 @@ void occurrences(String fileName, int line, int offset, ITypeScriptOccurrencesCo
 
 	boolean isDisposed();
 
+	void configure(ConfigureRequestArguments arguments) throws TypeScriptException;
+
 }

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

@@ -45,6 +45,8 @@
 import ts.internal.client.protocol.CloseRequest;
 import ts.internal.client.protocol.CompletionDetailsRequest;
 import ts.internal.client.protocol.CompletionsRequest;
+import ts.internal.client.protocol.ConfigureRequest;
+import ts.internal.client.protocol.ConfigureRequestArguments;
 import ts.internal.client.protocol.DefinitionRequest;
 import ts.internal.client.protocol.FormatRequest;
 import ts.internal.client.protocol.GeterrRequest;
@@ -206,6 +208,15 @@ public void quickInfo(String fileName, int line, int offset, ITypeScriptQuickInf
 		execute(request);
 	}
 
+	// ---------------- Configure
+
+	@Override
+	public void configure(ConfigureRequestArguments arguments)
+			throws TypeScriptException {
+		ConfigureRequest request = new ConfigureRequest(arguments);
+		execute(request);
+	}
+
 	@Override
 	public void changeFile(String fileName, int line, int offset, int endLine, int endOffset, String newText)
 			throws TypeScriptException {

core/ts.core/src/ts/client/format/EditorOptions.java

@@ -0,0 +1,47 @@
+package ts.client.format;
+
+import com.eclipsesource.json.JsonObject;
+
+import ts.utils.JsonHelper;
+
+/**
+ * Editor Options
+ * 
+ * @see https://github.com/Microsoft/TypeScript/blob/master/src/server/protocol.
+ *      d.ts
+ */
+public class EditorOptions extends JsonObject {
+
+	public Integer getTabSize() {
+		return JsonHelper.getInteger(this, "tabSize");
+	}
+
+	public void setTabSize(Integer tabSize) {
+		super.set("tabSize", tabSize);
+	}
+
+	public Integer getIndentSize() {
+		return JsonHelper.getInteger(this, "indentSize");
+	}
+
+	public void setIndentSize(Integer indentSize) {
+		super.set("indentSize", indentSize);
+	}
+
+	public String getNewLineCharacter() {
+		return super.getString("newLineCharacter", null);
+	}
+
+	public void setNewLineCharacter(String newLineCharacter) {
+		super.set("newLineCharacter", newLineCharacter);
+	}
+
+	public Boolean getConvertTabsToSpaces() {
+		return JsonHelper.getBoolean(this, "convertTabsToSpaces");
+	}
+
+	public void setConvertTabsToSpaces(Boolean convertTabsToSpaces) {
+		super.set("convertTabsToSpaces", convertTabsToSpaces);
+	}
+
+}

core/ts.core/src/ts/client/format/FormatOptions.java

@@ -0,0 +1,86 @@
+package ts.client.format;
+
+import ts.utils.JsonHelper;
+
+public class FormatOptions extends EditorOptions {
+
+	public Boolean getInsertSpaceAfterCommaDelimiter() {
+		return JsonHelper.getBoolean(this, "insertSpaceAfterCommaDelimiter");
+	}
+
+	public void setInsertSpaceAfterCommaDelimiter(Boolean insertSpaceAfterCommaDelimiter) {
+		super.set("insertSpaceAfterCommaDelimiter", insertSpaceAfterCommaDelimiter);
+	}
+
+	public Boolean getInsertSpaceAfterSemicolonInForStatements() {
+		return JsonHelper.getBoolean(this, "insertSpaceAfterSemicolonInForStatements");
+	}
+
+	public void setInsertSpaceAfterSemicolonInForStatements(Boolean insertSpaceAfterSemicolonInForStatements) {
+		super.set("insertSpaceAfterSemicolonInForStatements", insertSpaceAfterSemicolonInForStatements);
+	}
+
+	public Boolean getInsertSpaceBeforeAndAfterBinaryOperators() {
+		return JsonHelper.getBoolean(this, "insertSpaceBeforeAndAfterBinaryOperators");
+	}
+
+	public void setInsertSpaceBeforeAndAfterBinaryOperators(Boolean insertSpaceBeforeAndAfterBinaryOperators) {
+		super.set("insertSpaceBeforeAndAfterBinaryOperators", insertSpaceBeforeAndAfterBinaryOperators);
+	}
+
+	public Boolean getInsertSpaceAfterKeywordsInControlFlowStatements() {
+		return JsonHelper.getBoolean(this, "insertSpaceAfterKeywordsInControlFlowStatements");
+	}
+
+	public void setInsertSpaceAfterKeywordsInControlFlowStatements(
+			Boolean insertSpaceAfterKeywordsInControlFlowStatements) {
+		super.set("insertSpaceAfterKeywordsInControlFlowStatements", insertSpaceAfterKeywordsInControlFlowStatements);
+	}
+
+	public Boolean getInsertSpaceAfterFunctionKeywordForAnonymousFunctions() {
+		return JsonHelper.getBoolean(this, "insertSpaceAfterFunctionKeywordForAnonymousFunctions");
+	}
+
+	public void setInsertSpaceAfterFunctionKeywordForAnonymousFunctions(
+			Boolean insertSpaceAfterFunctionKeywordForAnonymousFunctions) {
+		super.set("insertSpaceAfterFunctionKeywordForAnonymousFunctions",
+				insertSpaceAfterFunctionKeywordForAnonymousFunctions);
+	}
+
+	public Boolean getInsertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis() {
+		return JsonHelper.getBoolean(this, "insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis");
+	}
+
+	public void setInsertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis(
+			Boolean insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis) {
+		super.set("insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis",
+				insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis);
+	}
+
+	public Boolean getInsertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets() {
+		return JsonHelper.getBoolean(this, "insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets");
+	}
+
+	public void setInsertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets(
+			Boolean insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets) {
+		super.set("insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets",
+				insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets);
+	}
+
+	public Boolean getPlaceOpenBraceOnNewLineForFunctions() {
+		return JsonHelper.getBoolean(this, "placeOpenBraceOnNewLineForFunctions");
+	}
+
+	public void setPlaceOpenBraceOnNewLineForFunctions(Boolean placeOpenBraceOnNewLineForFunctions) {
+		super.set("placeOpenBraceOnNewLineForFunctions", placeOpenBraceOnNewLineForFunctions);
+	}
+
+	public Boolean getPlaceOpenBraceOnNewLineForControlBlocks() {
+		return JsonHelper.getBoolean(this, "placeOpenBraceOnNewLineForControlBlocks");
+	}
+
+	public void setPlaceOpenBraceOnNewLineForControlBlocks(Boolean placeOpenBraceOnNewLineForControlBlocks) {
+		super.set("placeOpenBraceOnNewLineForControlBlocks", placeOpenBraceOnNewLineForControlBlocks);
+	}
+
+}

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

@@ -18,8 +18,8 @@ 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");
+					"definition"), SignatureHelp("signatureHelp"), QuickInfo("quickinfo"), Geterr("geterr"), Format(
+							"format"), References("references"), Occurrences("occurrences"), Configure("configure");
 
 	private final String name;
 

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

@@ -0,0 +1,18 @@
+package ts.internal.client.protocol;
+
+import com.eclipsesource.json.JsonObject;
+
+import ts.TypeScriptException;
+
+public class ConfigureRequest extends SimpleRequest {
+
+	public ConfigureRequest(ConfigureRequestArguments arguments) {
+		super(CommandNames.Configure, arguments, null);
+	}
+
+	@Override
+	public void collect(JsonObject response) throws TypeScriptException {
+
+	}
+
+}

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

@@ -0,0 +1,49 @@
+package ts.internal.client.protocol;
+
+import com.eclipsesource.json.JsonObject;
+import com.eclipsesource.json.JsonValue;
+
+import ts.client.format.FormatOptions;
+
+/**
+ * Information found in a configure request.
+ */
+public class ConfigureRequestArguments extends JsonObject {
+
+	public ConfigureRequestArguments(FormatOptions formatOptions, String file) {
+		setFile(file);
+		setFormatOptions(formatOptions);
+	}
+
+	/**
+	 * Information about the host, for example 'Emacs 24.4' or 'Sublime Text
+	 * version 3075'
+	 */
+	public String getHostInfo() {
+		return super.getString("hostInfo", null);
+	}
+
+	/**
+	 * If present, tab settings apply only to this file.
+	 */
+	public String getFile() {
+		return super.getString("file", null);
+	}
+
+	public void setFile(String file) {
+		super.set("file", file);
+	}
+
+	/**
+	 * The format options to use during formatting and other code editing
+	 * features.
+	 */
+	public FormatOptions getFormatOptions() {
+		JsonValue value = super.get("formatOptions");
+		return value != null ? (FormatOptions) value.asObject() : null;
+	}
+
+	public void setFormatOptions(FormatOptions formatOptions) {
+		super.set("formatOptions", formatOptions);
+	}
+}

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

@@ -19,12 +19,14 @@
 import ts.client.Location;
 import ts.client.completions.ITypeScriptCompletionCollector;
 import ts.client.definition.ITypeScriptDefinitionCollector;
+import ts.client.format.FormatOptions;
 import ts.client.format.ITypeScriptFormatCollector;
 import ts.client.navbar.ITypeScriptNavBarCollector;
 import ts.client.navbar.NavigationBarItem;
 import ts.client.occurrences.ITypeScriptOccurrencesCollector;
 import ts.client.references.ITypeScriptReferencesCollector;
 import ts.internal.LocationReader;
+import ts.internal.client.protocol.ConfigureRequestArguments;
 
 /**
  * Abstract TypeScript file.
@@ -40,12 +42,15 @@ public abstract class AbstractTypeScriptFile implements ITypeScriptFile {
 	private final List<INavbarListener> listeners;
 	private List<NavigationBarItem> navbar;
 	private TypeScriptNavBarCollector navBarCollector;
+	private FormatOptions formatOptions;
+	private boolean configureAlreadyDone;
 
 	public AbstractTypeScriptFile(ITypeScriptProject tsProject) {
 		this.tsProject = tsProject;
 		this.listeners = new ArrayList<INavbarListener>();
 		this.navBarCollector = new TypeScriptNavBarCollector();
 		this.setDirty(false);
+		this.configureAlreadyDone = false;
 	}
 
 	@Override
@@ -125,11 +130,31 @@ public void format(int startPosition, int endPosition, ITypeScriptFormatCollecto
 			throws TypeScriptException {
 		this.synch();
 		ITypeScriptServiceClient client = tsProject.getClient();
+		this.ensureFormatOptions(client);
 		Location start = this.getLocation(startPosition);
 		Location end = this.getLocation(endPosition);
 		client.format(this.getName(), start.getLine(), start.getOffset(), end.getLine(), end.getOffset(), collector);
 	}
 
+	private void ensureFormatOptions(ITypeScriptServiceClient client) throws TypeScriptException {
+		FormatOptions oldFormatOptions = formatOptions;
+		FormatOptions newFormatOptions = getFormatOptions();
+		if (!configureAlreadyDone || !newFormatOptions.equals(oldFormatOptions)) {
+			configureAlreadyDone = true;
+			client.configure(new ConfigureRequestArguments(newFormatOptions, getName()));
+		}
+	}
+
+	@Override
+	public FormatOptions getFormatOptions() {
+		formatOptions = tsProject.getProjectSettings().getFormatOptions();
+		return formatOptions;
+	}
+
+	public void setFormatOptions(FormatOptions formatOptions) {
+		this.formatOptions = formatOptions;
+	}
+
 	@Override
 	public void references(int position, ITypeScriptReferencesCollector collector) throws TypeScriptException {
 		this.synch();

core/ts.core/src/ts/resources/AbstractTypeScriptFile.java

@@ -14,6 +14,7 @@
 
 import ts.TypeScriptException;
 import ts.client.completions.ICompletionEntryMatcher;
+import ts.client.format.FormatOptions;
 import ts.cmd.tslint.TslintSettingsStrategy;
 import ts.internal.repository.TypeScriptRepository;
 import ts.repository.ITypeScriptRepository;
@@ -101,4 +102,10 @@ public boolean isUseCodeSnippetsOnMethodSuggest() {
 	public void dispose() {
 		// Do nothing
 	}
+
+	@Override
+	public FormatOptions getFormatOptions() {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }