Fixes eclipse-che#2728: Respect user settings when sending formatting…

… options to LS (eclipse-che#2735) * Fixes eclipse-che#2728: Respect user settings when sending formatting options to LS Signed-off-by: Kaloyan Raev <kaloyan.r@zend.com> * Remove spaces in empty line
JPinkney · Nov 8, 2016 · e1e6a3f · e1e6a3f
1 parent 7107b7d
commit e1e6a3f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/...a/org/eclipse/che/plugin/languageserver/ide/editor/LanguageServerEditorConfiguration.java b/...a/org/eclipse/che/plugin/languageserver/ide/editor/LanguageServerEditorConfiguration.java
@@ -57,7 +57,6 @@ public LanguageServerEditorConfiguration(LanguageServerCodeassistProcessorFactor
             (serverCapabilities.isDocumentRangeFormattingProvider() != null && serverCapabilities.isDocumentRangeFormattingProvider()) ||
             serverCapabilities.getDocumentOnTypeFormattingProvider() != null) {
             this.formatter = formatterFactory.create(serverCapabilities);
-            formatter.setTabWidth(getTabWidth());
         }
         this.serverCapabilities = serverCapabilities;
         this.annotationModel = annotationModelFactory.get(docPositionMapProvider.get());

diff --git a/...c/main/java/org/eclipse/che/plugin/languageserver/ide/editor/LanguageServerFormatter.java b/...c/main/java/org/eclipse/che/plugin/languageserver/ide/editor/LanguageServerFormatter.java
@@ -38,6 +38,8 @@
 import org.eclipse.che.ide.api.editor.texteditor.UndoableEditor;
 import org.eclipse.che.ide.api.notification.NotificationManager;
 import org.eclipse.che.ide.dto.DtoFactory;
+import org.eclipse.che.ide.editor.preferences.editorproperties.EditorProperties;
+import org.eclipse.che.ide.editor.preferences.editorproperties.EditorPropertiesManager;
 import org.eclipse.che.ide.util.loging.Log;
 import org.eclipse.che.plugin.languageserver.ide.service.TextDocumentServiceClient;
 
@@ -53,22 +55,20 @@ public class LanguageServerFormatter implements ContentFormatter {
     private final DtoFactory                dtoFactory;
     private final NotificationManager       manager;
     private final ServerCapabilities        capabilities;
-    private       int                       tabWidth;
+    private final EditorPropertiesManager   editorPropertiesManager;
     private       TextEditor                editor;
 
     @Inject
     public LanguageServerFormatter(TextDocumentServiceClient client,
                                    DtoFactory dtoFactory,
                                    NotificationManager manager,
-                                   @Assisted ServerCapabilities capabilities) {
+                                   @Assisted ServerCapabilities capabilities,
+                                   EditorPropertiesManager editorPropertiesManager) {
         this.client = client;
         this.dtoFactory = dtoFactory;
         this.manager = manager;
         this.capabilities = capabilities;
-    }
-
-    public void setTabWidth(int tabWidth) {
-        this.tabWidth = tabWidth;
+        this.editorPropertiesManager = editorPropertiesManager;
     }
 
     @Override
@@ -176,11 +176,15 @@ private void applyEdits(List<TextEditDTO> edits, Document document) {
 
     private FormattingOptionsDTO getFormattingOptions() {
         FormattingOptionsDTO options = dtoFactory.createDto(FormattingOptionsDTO.class);
-        options.setInsertSpaces(true);
-        options.setTabSize(tabWidth);
+        options.setInsertSpaces(Boolean.parseBoolean(getEditorProperty(EditorProperties.EXPAND_TAB)));
+        options.setTabSize(Integer.parseInt(getEditorProperty(EditorProperties.TAB_SIZE)));
         return options;
     }
 
+    private String getEditorProperty(EditorProperties property) {
+        return editorPropertiesManager.getEditorProperties().get(property.toString()).toString();
+    }
+
     private void formatRange(TextRange selectedRange, Document document) {
         DocumentRangeFormattingParamsDTO params = dtoFactory.createDto(DocumentRangeFormattingParamsDTO.class);