Merge pull request #61206 from roytang/master

Fixes #15043 Format selection keyboard shortcut will …
microsoft · Oct 23, 2018 · e489a70 · e489a70
2 parents d1206c6 + 250f27a
commit e489a70
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/vs/editor/contrib/format/formatActions.ts b/src/vs/editor/contrib/format/formatActions.ts
@@ -341,7 +341,7 @@ export class FormatSelectionAction extends AbstractFormatAction {
 			id: 'editor.action.formatSelection',
 			label: nls.localize('formatSelection.label', "Format Selection"),
 			alias: 'Format Code',
-			precondition: ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasNonEmptySelection),
+			precondition: ContextKeyExpr.and(EditorContextKeys.writable),
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
 				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_F),
@@ -357,8 +357,14 @@ export class FormatSelectionAction extends AbstractFormatAction {
 
 	protected _getFormattingEdits(editor: ICodeEditor, token: CancellationToken): Promise<ISingleEditOperation[]> {
 		const model = editor.getModel();
+		let selection = editor.getSelection();
+		if (selection.isEmpty()) {
+			const maxColumn = model.getLineMaxColumn(selection.startLineNumber);
+			selection = selection.setStartPosition(selection.startLineNumber, 1);
+			selection = selection.setEndPosition(selection.endLineNumber, maxColumn);
+		}
 		const { tabSize, insertSpaces } = model.getOptions();
-		return getDocumentRangeFormattingEdits(model, editor.getSelection(), { tabSize, insertSpaces }, token);
+		return getDocumentRangeFormattingEdits(model, selection, { tabSize, insertSpaces }, token);
 	}
 
 	protected _notifyNoProviderError(notificationService: INotificationService, language: string): void {