@@ -1081,7 +1081,8 @@
 					"description": "Provider for formatting. Possible options include 'autopep8' and 'yapf'.",
 					"enum": [
 						"autopep8",
-						"yapf"
+						"yapf",
+						"none"
 					]
 				},
 				"python.formatting.autopep8Path": {
 
@@ -100,9 +100,11 @@ export function activate(context: vscode.ExtensionContext) {
     if (pythonSettings.devOptions.indexOf('DISABLE_SIGNATURE') === -1) {
         context.subscriptions.push(vscode.languages.registerSignatureHelpProvider(PYTHON, new PythonSignatureProvider(context, jediProx), '(', ','));
     }
-    const formatProvider = new PythonFormattingEditProvider(context, formatOutChannel, pythonSettings);
-    context.subscriptions.push(vscode.languages.registerDocumentFormattingEditProvider(PYTHON, formatProvider));
-    context.subscriptions.push(vscode.languages.registerDocumentRangeFormattingEditProvider(PYTHON, formatProvider));
+    if (pythonSettings.formatting.provider !== 'none') {
+        const formatProvider = new PythonFormattingEditProvider(context, formatOutChannel, pythonSettings);
+        context.subscriptions.push(vscode.languages.registerDocumentFormattingEditProvider(PYTHON, formatProvider));
+        context.subscriptions.push(vscode.languages.registerDocumentRangeFormattingEditProvider(PYTHON, formatProvider));
+    }
 
     const jupyterExtInstalled = vscode.extensions.getExtension('donjayamanne.jupyter');
     let linterProvider = new LintProvider(context, lintingOutChannel, (a, b) => Promise.resolve(false));
 
@@ -0,0 +1,16 @@
+'use strict';
+
+import * as vscode from 'vscode';
+import { BaseFormatter } from './baseFormatter';
+import * as settings from './../common/configSettings';
+import { Product } from '../common/installer';
+
+export class DummyFormatter extends BaseFormatter {
+    constructor(outputChannel: vscode.OutputChannel, pythonSettings: settings.IPythonSettings, workspaceRootPath?: string) {
+        super('none', Product.yapf, outputChannel, pythonSettings, workspaceRootPath);
+    }
+
+    public formatDocument(document: vscode.TextDocument, options: vscode.FormattingOptions, token: vscode.CancellationToken, range?: vscode.Range): Thenable<vscode.TextEdit[]> {
+        return Promise.resolve([]);
+    }
+}
@@ -1,9 +1,10 @@
 'use strict';
 
 import * as vscode from 'vscode';
-import {BaseFormatter} from './../formatters/baseFormatter';
-import {YapfFormatter} from './../formatters/yapfFormatter';
-import {AutoPep8Formatter} from './../formatters/autoPep8Formatter';
+import { BaseFormatter } from './../formatters/baseFormatter';
+import { YapfFormatter } from './../formatters/yapfFormatter';
+import { AutoPep8Formatter } from './../formatters/autoPep8Formatter';
+import { DummyFormatter } from './../formatters/dummyFormatter';
 import * as settings from './../common/configSettings';
 
 export class PythonFormattingEditProvider implements vscode.DocumentFormattingEditProvider, vscode.DocumentRangeFormattingEditProvider {
@@ -12,8 +13,10 @@ export class PythonFormattingEditProvider implements vscode.DocumentFormattingEd
     public constructor(context: vscode.ExtensionContext, outputChannel: vscode.OutputChannel, private settings: settings.IPythonSettings) {
         let yapfFormatter = new YapfFormatter(outputChannel, settings);
         let autoPep8 = new AutoPep8Formatter(outputChannel, settings);
+        let dummy = new DummyFormatter(outputChannel, settings);
         this.formatters.set(yapfFormatter.Id, yapfFormatter);
         this.formatters.set(autoPep8.Id, autoPep8);
+        this.formatters.set(dummy.Id, dummy);
     }
 
     public provideDocumentFormattingEdits(document: vscode.TextDocument, options: vscode.FormattingOptions, token: vscode.CancellationToken): Thenable<vscode.TextEdit[]> {