Merge pull request #1735 from Leopotam/optional-format-support

Support for optional formatting.

Author: DustinCampbell

package.json

@@ -214,6 +214,11 @@
     "configuration": {
       "title": "C# configuration",
       "properties": {
+        "csharp.format.enable": {
+          "type": "boolean",
+          "default": true,
+          "description": "Enable/disable default C# formatter (requires restart)."
+        },
         "csharp.suppressDotnetInstallWarning": {
           "type": "boolean",
           "default": false,
@@ -2139,4 +2144,4 @@
       }
     ]
   }
-}
+}

src/omnisharp/extension.ts

@@ -37,6 +37,8 @@ export function activate(context: vscode.ExtensionContext, reporter: TelemetryRe
         scheme: 'file' // only files from disk
     };
 
+    const options = Options.Read();
+
     const server = new OmniSharpServer(reporter);
     const advisor = new Advisor(server); // create before server is started
     const disposables: vscode.Disposable[] = [];
@@ -60,8 +62,10 @@ export function activate(context: vscode.ExtensionContext, reporter: TelemetryRe
         localDisposables.push(vscode.languages.registerReferenceProvider(documentSelector, new ReferenceProvider(server, reporter)));
         localDisposables.push(vscode.languages.registerHoverProvider(documentSelector, new HoverProvider(server, reporter)));
         localDisposables.push(vscode.languages.registerRenameProvider(documentSelector, new RenameProvider(server, reporter)));
-        localDisposables.push(vscode.languages.registerDocumentRangeFormattingEditProvider(documentSelector, new FormatProvider(server, reporter)));
-        localDisposables.push(vscode.languages.registerOnTypeFormattingEditProvider(documentSelector, new FormatProvider(server, reporter), '}', ';'));
+        if (options.useFormatting) {
+            localDisposables.push(vscode.languages.registerDocumentRangeFormattingEditProvider(documentSelector, new FormatProvider(server, reporter)));
+            localDisposables.push(vscode.languages.registerOnTypeFormattingEditProvider(documentSelector, new FormatProvider(server, reporter), '}', ';'));
+        }
         localDisposables.push(vscode.languages.registerCompletionItemProvider(documentSelector, new CompletionItemProvider(server, reporter), '.'));
         localDisposables.push(vscode.languages.registerWorkspaceSymbolProvider(new WorkspaceSymbolProvider(server, reporter)));
         localDisposables.push(vscode.languages.registerSignatureHelpProvider(documentSelector, new SignatureHelpProvider(server, reporter), '(', ','));
@@ -137,7 +141,6 @@ export function activate(context: vscode.ExtensionContext, reporter: TelemetryRe
     // read and store last solution or folder path
     disposables.push(server.onBeforeServerStart(path => context.workspaceState.update('lastSolutionPathOrFolder', path)));
 
-    const options = Options.Read();
     if (options.autoStart) {
         server.autoStart(context.workspaceState.get<string>('lastSolutionPathOrFolder'));
     }

src/omnisharp/options.ts

@@ -14,7 +14,8 @@ export class Options {
         public autoStart?: boolean,
         public projectLoadTimeout?: number,
         public maxProjectResults?: number,
-        public useEditorFormattingSettings?: boolean) { }
+        public useEditorFormattingSettings?: boolean,
+        public useFormatting?: boolean) { }
 
     public static Read(): Options {
         // Extra effort is taken below to ensure that legacy versions of options
@@ -48,6 +49,8 @@ export class Options {
         const maxProjectResults = omnisharpConfig.get<number>('maxProjectResults', 250);
         const useEditorFormattingSettings = omnisharpConfig.get<boolean>('useEditorFormattingSettings', true);
 
-        return new Options(path, useMono, waitForDebugger, loggingLevel, autoStart, projectLoadTimeout, maxProjectResults, useEditorFormattingSettings);
+        const useFormatting = csharpConfig.get<boolean>('format.enable', true);
+
+        return new Options(path, useMono, waitForDebugger, loggingLevel, autoStart, projectLoadTimeout, maxProjectResults, useEditorFormattingSettings, useFormatting);
     }
 }