Fix cursor jumping issue #1346

microsoft · Nov 19, 2017 · 7d591f1 · 7d591f1
1 parent adbca1d
commit 7d591f1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/Go-latest.vsix b/Go-latest.vsix
diff --git a/src/diffUtils.ts b/src/diffUtils.ts
@@ -111,7 +111,8 @@ function parseUniDiffs(diffOutput: jsDiff.IUniDiff[]): FilePatch[] {
 						if (edit == null) {
 							edit = new Edit(EditTypes.EDIT_INSERT, new Position(startLine - 1, 0));
 						} else if (edit.action === EditTypes.EDIT_DELETE) {
-							edit.action = EditTypes.EDIT_REPLACE;
+							edits.push(edit);
+							edit = new Edit(EditTypes.EDIT_INSERT, new Position(startLine - 1, 0));
 						}
 						edit.text += line.substr(1) + '\n';
 						break;

diff --git a/src/goFormat.ts b/src/goFormat.ts
@@ -37,8 +37,8 @@ export class Formatter {
 						return reject(missingToolMsg + formatTool);
 					}
 					if (err) {
-						console.log(err);
-						return reject('Cannot format due to syntax errors.');
+						console.log(err.message || stderr);
+						return reject('Check the console in dev tools to find errors when formatting.');
 					};
 
 					let textEdits: vscode.TextEdit[] = [];

diff --git a/src/goMain.ts b/src/goMain.ts
@@ -56,7 +56,7 @@ export function activate(ctx: vscode.ExtensionContext): void {
 		  "data": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 	   }
 	 */
-	sendTelemetryEvent('beta-testing', { version: '0.6.68', date: '11/16/2017' });
+	sendTelemetryEvent('beta-testing', { version: '0.6.68', date: '11/19/2017' });
 
 	let useLangServer = vscode.workspace.getConfiguration('go')['useLanguageServer'];
 	let langServerFlags: string[] = vscode.workspace.getConfiguration('go')['languageServerFlags'] || [];