using line edits for sorting of imports #151

DonJayamanne · DonJayamanne · commit ce54b2c5ff05 · 2016-06-13T14:42:18.000+10:00
diff --git a/src/client/providers/importSortProvider.ts b/src/client/providers/importSortProvider.ts
@@ -4,57 +4,38 @@ 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";
 
 export class PythonImportSortProvider {
-    public sortImports(extensionDir: string, document: vscode.TextDocument): Thenable<vscode.TextEdit[]> {
+    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 filePath = document.uri.fsPath;
-            let importScript = path.join(extensionDir, "pythonFiles", "sortImports.py");
-            if (!fs.existsSync(filePath)) {
-                vscode.window.showErrorMessage(`File ${filePath} does not exist`);
-                return resolve([]);
-            }
-
             let ext = path.extname(filePath);
             let tmp = require("tmp");
-            tmp.file({ postfix: ext }, function _tempFileCreated(err, tmpFilePath, fd) {
+            tmp.file({ postfix: ext }, function (err, tmpFilePath, fd) {
                 if (err) {
-                    reject(err);
-                    return;
+                    return reject(err);
                 }
-                let documentText = document.getText();
-                fs.writeFile(tmpFilePath, documentText, ex => {
+                fs.writeFile(tmpFilePath, document.getText(), ex => {
                     if (ex) {
-                        vscode.window.showErrorMessage(`Failed to create a temporary file, ${ex.message}`);
-                        return;
+                        return reject(`Failed to create a temporary file, ${ex.message}`);
                     }
 
-                    child_process.exec(`python "${importScript}" "${tmpFilePath}"`, (error, stdout, stderr) => {
-                        if (error || stderr) {
-                            vscode.window.showErrorMessage(`File ${filePath} does not exist`);
-                            return resolve([]);
+                    child_process.exec(`python "${importScript}" "${tmpFilePath}" --diff`, (error, stdout, stderr) => {
+                        if (error || (stderr && stderr.length > 0)) {
+                            return reject(error ? error : stderr);
                         }
 
-                        fs.readFile(tmpFilePath, (ex, data) => {
-                            if (ex) {
-                                vscode.window.showErrorMessage(`Failed to create a temporary file for sorting, ${ex.message}`);
-                                return;
-                            }
-
-                            let formattedText = data.toString("utf-8");
-                            // Nothing to do 
-                            if (document.getText() === formattedText) {
-                                return resolve([]);
-                            }
-
-                            let range = new vscode.Range(document.lineAt(0).range.start, document.lineAt(document.lineCount - 1).range.end);
-                            let txtEdit = new vscode.TextEdit(range, formattedText);
-                            resolve([txtEdit]);
-                        });
+                        let formattedText = stdout;
+                        let edits = getTextEditsFromPatch(document.getText(), stdout);
+                        resolve(edits);
                     });
                 });
             });
-
         });
     }
-}
+}
diff --git a/src/client/sortImports.ts b/src/client/sortImports.ts
@@ -1,26 +1,29 @@
-'use strict';
+"use strict";
 
-import * as vscode from 'vscode';
-import * as sortProvider from './providers/importSortProvider';
+import * as vscode from "vscode";
+import * as sortProvider from "./providers/importSortProvider";
 
 export function activate(context: vscode.ExtensionContext) {
-    var rootDir = context.asAbsolutePath(".");
-    var disposable = vscode.commands.registerCommand('python.sortImports', () => {
-        
-        var activeEditor = vscode.window.activeTextEditor;
-        if (activeEditor) {
-            new sortProvider.PythonImportSortProvider().sortImports(rootDir, activeEditor.document).then(changes=> {
-                if (!Array.isArray(changes) || changes.length === 0) {
-                    return;
-                }
+    let rootDir = context.asAbsolutePath(".");
+    let disposable = vscode.commands.registerCommand("python.sortImports", () => {
+        let activeEditor = vscode.window.activeTextEditor;
+        if (!activeEditor || activeEditor.document.languageId !== "python") {
+            vscode.window.showErrorMessage("Please open a Python source file to sort the imports.");
+            return;
+        }
+        new sortProvider.PythonImportSortProvider().sortImports(rootDir, activeEditor.document).then(changes => {
+            if (changes.length === 0) {
+                return;
+            }
 
-                activeEditor.edit(builder=> {
-                    builder.replace(changes[0].range, changes[0].newText)
-                });
+            activeEditor.edit(builder => {
+                changes.forEach(change => builder.replace(change.range, change.newText));
             });
-        }
+        }).catch(error => {
+            let message = typeof error === "string" ? error : (error.message ? error.message : error);
+            vscode.window.showErrorMessage(message);
+        });
     });
 
-
     context.subscriptions.push(disposable);
-}
+}
