modified import sort provider to re-use existing method to create tmp file from doc contents #157

DonJayamanne · DonJayamanne · commit 91d7dcd526ea · 2016-06-15T13:11:23.000+10:00
diff --git a/src/client/formatters/autoPep8Formatter.ts b/src/client/formatters/autoPep8Formatter.ts
@@ -4,7 +4,7 @@ import * as vscode from "vscode";
 import {BaseFormatter} from "./baseFormatter";
 
 export class AutoPep8Formatter extends BaseFormatter {
-    constructor(outputChannel:vscode.OutputChannel) {
+    constructor(outputChannel: vscode.OutputChannel) {
         super("autopep8", outputChannel);
     }
 
diff --git a/src/client/providers/importSortProvider.ts b/src/client/providers/importSortProvider.ts
@@ -4,38 +4,35 @@ import * as vscode from "vscode";
 import * as path from "path";
 import * as fs from "fs";
 import * as child_process from "child_process";
-import {getTextEditsFromPatch} from "../common/editor";
+import {getTextEditsFromPatch, getTempFileWithDocumentContents} from "../common/editor";
 
 export class PythonImportSortProvider {
     public sortImports(extensionDir: string, document: vscode.TextDocument): Promise<vscode.TextEdit[]> {
         if (document.lineCount === 1) {
             return Promise.resolve([]);
         }
-        let filePath = document.uri.fsPath;
-        let importScript = path.join(extensionDir, "pythonFiles", "sortImports.py");
         return new Promise<vscode.TextEdit[]>((resolve, reject) => {
-            let ext = path.extname(filePath);
-            let tmp = require("tmp");
-            tmp.file({ postfix: ext }, function (err, tmpFilePath, fd) {
-                if (err) {
-                    return reject(err);
-                }
-                fs.writeFile(tmpFilePath, document.getText(), ex => {
-                    if (ex) {
-                        return reject(`Failed to create a temporary file, ${ex.message}`);
+            // isort does have the ability to read from the process input stream and return the formatted code out of the output stream
+            // However they don't support returning the diff of the formatted text when reading data from the input stream
+            // Yes getting text formatted that way avoids having to create a temporary file, however the diffing will have
+            // to be done here in node (extension), i.e. extension cpu, i.e. les responsive solution
+            let importScript = path.join(extensionDir, "pythonFiles", "sortImports.py");
+            let tmpFileCreated = document.isDirty;
+            let filePromise = tmpFileCreated ? getTempFileWithDocumentContents(document) : Promise.resolve(document.fileName);
+            filePromise.then(filePath => {
+                child_process.exec(`python "${importScript}" "${filePath}" --diff`, (error, stdout, stderr) => {
+                    if (tmpFileCreated) {
+                        fs.unlink(filePath);
+                    }
+                    if (error || (stderr && stderr.length > 0)) {
+                        return reject(error ? error : stderr);
                     }
 
-                    child_process.exec(`python "${importScript}" "${tmpFilePath}" --diff`, (error, stdout, stderr) => {
-                        if (error || (stderr && stderr.length > 0)) {
-                            return reject(error ? error : stderr);
-                        }
-
-                        let formattedText = stdout;
-                        let edits = getTextEditsFromPatch(document.getText(), stdout);
-                        resolve(edits);
-                    });
+                    let formattedText = stdout;
+                    let edits = getTextEditsFromPatch(document.getText(), stdout);
+                    resolve(edits);
                 });
-            });
+            }).catch(reject);
         });
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import * as vscode from "vscode";`
`4`	`4`	`import {BaseFormatter} from "./baseFormatter";`
`5`	`5`
`6`	`6`	`export class AutoPep8Formatter extends BaseFormatter {`
`7`		`- constructor(outputChannel:vscode.OutputChannel) {`
	`7`	`+ constructor(outputChannel: vscode.OutputChannel) {`
`8`	`8`	`super("autopep8", outputChannel);`
`9`	`9`	`}`
`10`	`10`