handle situations where text returned by formaters is empty #171

DonJayamanne · DonJayamanne · commit 91429cc43a65 · 2016-06-17T21:28:17.000+10:00
diff --git a/src/client/common/editor.ts b/src/client/common/editor.ts
@@ -48,6 +48,9 @@ export function getTextEditsFromPatch(before: string, patch: string): TextEdit[]
         // Strip the first two lines
         patch = patch.substring(patch.indexOf("@@"));
     }
+    if (patch.length === 0) {
+        return [];
+    }
 
     let d = new dmp.diff_match_patch();
     let patches = <Patch[]>(<any>d).patch_fromText(patch);
diff --git a/src/client/formatters/baseFormatter.ts b/src/client/formatters/baseFormatter.ts
@@ -32,7 +32,7 @@ export abstract class BaseFormatter {
         let tmpFileCreated = document.isDirty;
         let filePromise = tmpFileCreated ? getTempFileWithDocumentContents(document) : Promise.resolve(document.fileName);
         return filePromise.then(filePath => {
-            if (token.isCancellationRequested) {
+            if (token && token.isCancellationRequested) {
                 return [filePath, ""];
             }
             return Promise.all<string>([Promise.resolve(filePath), sendCommand(cmdLine + ` "${filePath}"`, vscode.workspace.rootPath)]);
@@ -41,7 +41,7 @@ export abstract class BaseFormatter {
             if (tmpFileCreated) {
                 fs.unlink(data[0]);
             }
-            if (token.isCancellationRequested) {
+            if (token && token.isCancellationRequested) {
                 return [];
             }
             return getTextEditsFromPatch(document.getText(), data[1]);
diff --git a/src/client/providers/formatOnSaveProvider.ts b/src/client/providers/formatOnSaveProvider.ts
@@ -36,14 +36,15 @@ export function activateFormatOnSaveProvider(languageFilter: vscode.DocumentFilt
             let delays = new telemetryHelper.Delays();
 
             formatter.formatDocument(document, null, null).then(edits => {
+                if (edits.length === 0) return false;
                 return textEditor.edit(editBuilder => {
                     edits.forEach(edit => editBuilder.replace(edit.range, edit.newText));
                 });
             }).then(applied => {
                 delays.stop();
                 telemetryHelper.sendTelemetryEvent(telemetryContracts.IDE.Format, { Format_Provider: formatter.Id, Format_OnSave: "true" }, delays.toMeasures());
                 ignoreNextSave.add(document);
-                return document.save();
+                return applied ? document.save() : true;
             }).then(() => {
                 ignoreNextSave.delete(document);
             }, () => {

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,9 @@ export function getTextEditsFromPatch(before: string, patch: string): TextEdit[]`
`48`	`48`	`// Strip the first two lines`
`49`	`49`	`patch = patch.substring(patch.indexOf("@@"));`
`50`	`50`	`}`
	`51`	`+ if (patch.length === 0) {`
	`52`	`+ return [];`
	`53`	`+ }`
`51`	`54`
`52`	`55`	`let d = new dmp.diff_match_patch();`
`53`	`56`	`let patches = <Patch[]>(<any>d).patch_fromText(patch);`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ export abstract class BaseFormatter {`
`32`	`32`	`let tmpFileCreated = document.isDirty;`
`33`	`33`	`let filePromise = tmpFileCreated ? getTempFileWithDocumentContents(document) : Promise.resolve(document.fileName);`
`34`	`34`	`return filePromise.then(filePath => {`
`35`		`- if (token.isCancellationRequested) {`
	`35`	`+ if (token && token.isCancellationRequested) {`
`36`	`36`	`return [filePath, ""];`
`37`	`37`	`}`
`38`	`38`	return Promise.all<string>([Promise.resolve(filePath), sendCommand(cmdLine + ` "${filePath}"`, vscode.workspace.rootPath)]);
`@@ -41,7 +41,7 @@ export abstract class BaseFormatter {`
`41`	`41`	`if (tmpFileCreated) {`
`42`	`42`	`fs.unlink(data[0]);`
`43`	`43`	`}`
`44`		`- if (token.isCancellationRequested) {`
	`44`	`+ if (token && token.isCancellationRequested) {`
`45`	`45`	`return [];`
`46`	`46`	`}`
`47`	`47`	`return getTextEditsFromPatch(document.getText(), data[1]);`