fix #42

DonJayamanne · DonJayamanne · commit d2f238bd36f9 · 2016-10-25T13:07:30.000+11:00
diff --git a/package.json b/package.json
@@ -468,6 +468,14 @@
           "default": "python",
           "description": "Path to Python, you can use a custom version of Python by modifying this setting to include the full path."
         },
+        "python.sortImports.args": {
+          "type": "array",
+          "description": "Arguments passed in. Each argument is a separate item in the array.",
+          "default": [],
+          "items": {
+            "type": "string"
+          }
+        },
         "python.linting.enabled": {
           "type": "boolean",
           "default": true,
diff --git a/src/client/common/configSettings.ts b/src/client/common/configSettings.ts
@@ -14,7 +14,13 @@ export interface IPythonSettings {
     autoComplete: IAutoCompeteSettings;
     terminal: ITerminalSettings;
     jupyter: JupyterSettings;
+    sortImports: ISortImportSettings;
 }
+
+export interface ISortImportSettings {
+    args: string[];
+}
+
 export interface IUnitTestSettings {
     nosetestsEnabled: boolean;
     nosetestPath: string;
@@ -113,11 +119,17 @@ export class PythonSettings extends EventEmitter implements IPythonSettings {
         }
         else {
             this.linting = lintingSettings;
-            if (IS_TEST_EXECUTION && !this.linting) {
-                this.linting = {} as ILintingSettings;
-            }
+        }
+        let sortImportSettings = systemVariables.resolveAny(pythonSettings.get<ISortImportSettings>('sortImports'));
+        if (this.sortImports) {
+            Object.assign<ISortImportSettings, ISortImportSettings>(this.sortImports, sortImportSettings);
+        }
+        else {
+            this.sortImports = sortImportSettings;
         }
         // Support for travis
+        this.sortImports = this.sortImports ? this.sortImports : { args: [] };
+        // Support for travis
         this.linting = this.linting ? this.linting : {
             enabled: false,
             flake8Args: [], flake8Enabled: false, flake8Path: 'flake',
@@ -182,6 +194,7 @@ export class PythonSettings extends EventEmitter implements IPythonSettings {
             }
         }
         this.emit('change');
+
         // Support for travis
         this.unitTest = this.unitTest ? this.unitTest : {
             nosetestArgs: [], nosetestPath: 'nosetest', nosetestsEnabled: false,
@@ -228,6 +241,7 @@ export class PythonSettings extends EventEmitter implements IPythonSettings {
     public unitTest: IUnitTestSettings;
     public terminal: ITerminalSettings;
     public jupyter: JupyterSettings;
+    public sortImports: ISortImportSettings;
 }
 
 function getAbsolutePath(pathToCheck: string, rootDir: string): string {
diff --git a/src/client/providers/importSortProvider.ts b/src/client/providers/importSortProvider.ts
@@ -22,7 +22,8 @@ export class PythonImportSortProvider {
             let filePromise = tmpFileCreated ? getTempFileWithDocumentContents(document) : Promise.resolve(document.fileName);
             filePromise.then(filePath => {
                 const pythonPath = settings.PythonSettings.getInstance().pythonPath;
-                child_process.exec(`${pythonPath} "${importScript}" "${filePath}" --diff`, (error, stdout, stderr) => {
+                const args = settings.PythonSettings.getInstance().sortImports.args.join(' ');
+                child_process.exec(`${pythonPath} "${importScript}" "${filePath}" --diff ${args}`, (error, stdout, stderr) => {
                     if (tmpFileCreated) {
                         fs.unlink(filePath);
                     }
