Fix microsoft#29347. Skip empty lines when searching for preceding line who matches onEnter rules.

rebornix · rebornix · commit da4f67029cc7 · 2017-06-25T18:34:19.000-07:00
diff --git a/src/vs/editor/contrib/linesOperations/common/moveLinesCommand.ts b/src/vs/editor/contrib/linesOperations/common/moveLinesCommand.ts
@@ -235,7 +235,17 @@ export class MoveLinesCommand implements ICommand {
 		};
 	}
 
-	private matchEnterRule(model: ITokenizedModel, oneLineAbove: number, line: number, indentConverter: IndentConverter, tabSize: number) {
+	private matchEnterRule(model: ITokenizedModel, oneLineAbove: number, line: number, indentConverter: IIndentConverter, tabSize: number) {
+		while (oneLineAbove >= 1) {
+			// ship empty lines as empty lines just inherit indentation
+			let lineContent = model.getLineContent(oneLineAbove);
+			let nonWhitespaceIdx = strings.lastNonWhitespaceIndex(lineContent);
+			if (nonWhitespaceIdx >= 0) {
+				break;
+			}
+			oneLineAbove--;
+	}
+
 		if (oneLineAbove < 1 || line > model.getLineCount()) {
 			return null;
 		}
