Merge pull request #1055 from filipw/feature/834

Pass editor tab/indentation settings to OmniSharp
dotnet · Dec 19, 2016 · 4628a74 · 4628a74
2 parents fe153eb + 48d27c8
commit 4628a74
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -365,6 +365,11 @@
           "type": "number",
           "default": 250,
           "description": "The maximum number of projects to be shown in the 'Select Project' dropdown (maximum 250)."
+        },
+        "omnisharp.useEditorFormattingSettings": {
+          "type": "boolean",
+          "default": true,
+          "description": "Specifes whether OmniSharp should use VS Code editor settings for C# code formatting (use of tabs, indentation size)."
         }
       }
     },

diff --git a/src/omnisharp/launcher.ts b/src/omnisharp/launcher.ts
@@ -161,6 +161,14 @@ function launch(cwd: string, args: string[]): Promise<LaunchResult> {
     return PlatformInformation.GetCurrent().then(platformInfo => {
         const options = Options.Read();
 
+        if (options.useEditorFormattingSettings) 
+        {
+            let editorConfig = vscode.workspace.getConfiguration('editor');
+            args.push(`formattingOptions:useTabs=${!editorConfig.get('insertSpaces', true)}`);
+            args.push(`formattingOptions:tabSize=${editorConfig.get('tabSize', 4)}`);
+            args.push(`formattingOptions:indentationSize=${editorConfig.get('tabSize',4)}`);
+        }
+
         if (options.path && options.useMono) {
             return launchNixMono(options.path, cwd, args);
         }

diff --git a/src/omnisharp/options.ts b/src/omnisharp/options.ts
@@ -12,7 +12,8 @@ export class Options {
         public loggingLevel?: string,
         public autoStart?: boolean,
         public projectLoadTimeout?: number,
-        public maxProjectResults?: number) { }
+        public maxProjectResults?: number,
+        public useEditorFormattingSettings?: boolean) { }
 
     public static Read(): Options {
         // Extra effort is taken below to ensure that legacy versions of options
@@ -37,7 +38,8 @@ export class Options {
 
         const projectLoadTimeout = omnisharpConfig.get<number>('projectLoadTimeout', 60);
         const maxProjectResults = omnisharpConfig.get<number>('maxProjectResults', 250);
+        const useEditorFormattingSettings = omnisharpConfig.get<boolean>('useEditorFormattingSettings', true);
 
-        return new Options(path, useMono, loggingLevel, autoStart, projectLoadTimeout, maxProjectResults);
+        return new Options(path, useMono, loggingLevel, autoStart, projectLoadTimeout, maxProjectResults, useEditorFormattingSettings);
     }
 }