@codingame/monaco-vscode-api 18.4.0 → 19.0.1

package/vscode/src/vs/editor/contrib/gpu/browser/gpuActions.js

@@ -19,7 +19,7 @@ class DebugEditorGpuRendererAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.debugEditorGpuRenderer',
-            label: ( localize2(1159, "Developer: Debug Editor GPU Renderer")),
+            label: ( localize2(1170, "Developer: Debug Editor GPU Renderer")),
             precondition: ContextKeyExpr.true(),
         });
     }
@@ -28,15 +28,15 @@ class DebugEditorGpuRendererAction extends EditorAction {
         const quickInputService = accessor.get(IQuickInputService);
         const choice = await quickInputService.pick([
             {
-                label: ( localize(1160, "Log Texture Atlas Stats")),
+                label: ( localize(1171, "Log Texture Atlas Stats")),
                 id: 'logTextureAtlasStats',
             },
             {
-                label: ( localize(1161, "Save Texture Atlas")),
+                label: ( localize(1172, "Save Texture Atlas")),
                 id: 'saveTextureAtlas',
             },
             {
-                label: ( localize(1162, "Draw Glyph")),
+                label: ( localize(1173, "Draw Glyph")),
                 id: 'drawGlyph',
             },
         ], { canPickMany: false });
@@ -87,7 +87,12 @@ class DebugEditorGpuRendererAction extends EditorAction {
                     const atlas = ViewGpuContext.atlas;
                     const fontFamily = configurationService.getValue('editor.fontFamily');
                     const fontSize = configurationService.getValue('editor.fontSize');
-                    const rasterizer = ( new GlyphRasterizer(fontSize, fontFamily, getActiveWindow().devicePixelRatio));
+                    const rasterizer = ( new GlyphRasterizer(
+                        fontSize,
+                        fontFamily,
+                        getActiveWindow().devicePixelRatio,
+                        ViewGpuContext.decorationStyleCache
+                    ));
                     let chars = await quickInputService.input({
                         prompt: 'Enter a character to draw (prefix with 0x for code point))'
                     });

package/vscode/src/vs/editor/contrib/hover/browser/contentHoverRendered.js

@@ -250,19 +250,19 @@ let RenderedContentHoverParts = class RenderedContentHoverParts extends Disposab
             return '';
         }
         if (renderedPart.type === 'statusBar') {
-            const statusBarDescription = [( localize(1163, "This is a hover status bar."))];
+            const statusBarDescription = [( localize(1174, "This is a hover status bar."))];
             for (const action of renderedPart.actions) {
                 const keybinding = action.actionKeybindingLabel;
                 if (keybinding) {
                     statusBarDescription.push(( localize(
-                        1164,
+                        1175,
                         "It has an action with label {0} and keybinding {1}.",
                         action.actionLabel,
                         keybinding
                     )));
                 }
                 else {
-                    statusBarDescription.push(( localize(1165, "It has an action with label {0}.", action.actionLabel)));
+                    statusBarDescription.push(( localize(1176, "It has an action with label {0}.", action.actionLabel)));
                 }
             }
             return statusBarDescription.join('\n');

package/vscode/src/vs/editor/contrib/hover/browser/hoverAccessibleViews.js

@@ -20,12 +20,12 @@ import { labelForHoverVerbosityAction } from './markdownHoverParticipant.js';
 var HoverAccessibilityHelpNLS;
 (function (HoverAccessibilityHelpNLS) {
     HoverAccessibilityHelpNLS.increaseVerbosity = ( localize(
-        1166,
+        1177,
         '- The focused hover part verbosity level can be increased with the Increase Hover Verbosity command.',
         `<keybinding:${INCREASE_HOVER_VERBOSITY_ACTION_ID}>`
     ));
     HoverAccessibilityHelpNLS.decreaseVerbosity = ( localize(
-        1167,
+        1178,
         '- The focused hover part verbosity level can be decreased with the Decrease Hover Verbosity command.',
         `<keybinding:${DECREASE_HOVER_VERBOSITY_ACTION_ID}>`
     ));

package/vscode/src/vs/editor/contrib/hover/browser/hoverActionIds.js

@@ -14,9 +14,9 @@ const GO_TO_TOP_HOVER_ACTION_ID = 'editor.action.goToTopHover';
 const GO_TO_BOTTOM_HOVER_ACTION_ID = 'editor.action.goToBottomHover';
 const INCREASE_HOVER_VERBOSITY_ACTION_ID = 'editor.action.increaseHoverVerbosityLevel';
 const INCREASE_HOVER_VERBOSITY_ACCESSIBLE_ACTION_ID = 'editor.action.increaseHoverVerbosityLevelFromAccessibleView';
-const INCREASE_HOVER_VERBOSITY_ACTION_LABEL = ( localize(1168, "Increase Hover Verbosity Level"));
+const INCREASE_HOVER_VERBOSITY_ACTION_LABEL = ( localize(1179, "Increase Hover Verbosity Level"));
 const DECREASE_HOVER_VERBOSITY_ACTION_ID = 'editor.action.decreaseHoverVerbosityLevel';
 const DECREASE_HOVER_VERBOSITY_ACCESSIBLE_ACTION_ID = 'editor.action.decreaseHoverVerbosityLevelFromAccessibleView';
-const DECREASE_HOVER_VERBOSITY_ACTION_LABEL = ( localize(1169, "Decrease Hover Verbosity Level"));
+const DECREASE_HOVER_VERBOSITY_ACTION_LABEL = ( localize(1180, "Decrease Hover Verbosity Level"));
 
 export { DECREASE_HOVER_VERBOSITY_ACCESSIBLE_ACTION_ID, DECREASE_HOVER_VERBOSITY_ACTION_ID, DECREASE_HOVER_VERBOSITY_ACTION_LABEL, GO_TO_BOTTOM_HOVER_ACTION_ID, GO_TO_TOP_HOVER_ACTION_ID, HIDE_HOVER_ACTION_ID, INCREASE_HOVER_VERBOSITY_ACCESSIBLE_ACTION_ID, INCREASE_HOVER_VERBOSITY_ACTION_ID, INCREASE_HOVER_VERBOSITY_ACTION_LABEL, PAGE_DOWN_HOVER_ACTION_ID, PAGE_UP_HOVER_ACTION_ID, SCROLL_DOWN_HOVER_ACTION_ID, SCROLL_LEFT_HOVER_ACTION_ID, SCROLL_RIGHT_HOVER_ACTION_ID, SCROLL_UP_HOVER_ACTION_ID, SHOW_DEFINITION_PREVIEW_HOVER_ACTION_ID, SHOW_OR_FOCUS_HOVER_ACTION_ID };

package/vscode/src/vs/editor/contrib/hover/browser/hoverActions.js

@@ -26,10 +26,10 @@ class ShowOrFocusHoverAction extends EditorAction {
     constructor() {
         super({
             id: SHOW_OR_FOCUS_HOVER_ACTION_ID,
-            label: ( localize2(1170, "Show or Focus Hover")),
+            label: ( localize2(1181, "Show or Focus Hover")),
             metadata: {
                 description: ( localize2(
-                    1171,
+                    1182,
                     'Show or focus the editor hover which shows documentation, references, and other content for a symbol at the current cursor position.'
                 )),
                 args: [{
@@ -41,9 +41,9 @@ class ShowOrFocusHoverAction extends EditorAction {
                                     description: 'Controls if and when the hover should take focus upon being triggered by this action.',
                                     enum: [HoverFocusBehavior.NoAutoFocus, HoverFocusBehavior.FocusIfVisible, HoverFocusBehavior.AutoFocusImmediately],
                                     enumDescriptions: [
-                                        ( localize(1172, 'The hover will not automatically take focus.')),
-                                        ( localize(1173, 'The hover will take focus only if it is already visible.')),
-                                        ( localize(1174, 'The hover will automatically take focus when it appears.')),
+                                        ( localize(1183, 'The hover will not automatically take focus.')),
+                                        ( localize(1184, 'The hover will take focus only if it is already visible.')),
+                                        ( localize(1185, 'The hover will automatically take focus when it appears.')),
                                     ],
                                     default: HoverFocusBehavior.FocusIfVisible,
                                 }
@@ -98,10 +98,10 @@ class ShowDefinitionPreviewHoverAction extends EditorAction {
     constructor() {
         super({
             id: SHOW_DEFINITION_PREVIEW_HOVER_ACTION_ID,
-            label: ( localize2(1175, "Show Definition Preview Hover")),
+            label: ( localize2(1186, "Show Definition Preview Hover")),
             precondition: undefined,
             metadata: {
-                description: ( localize2(1176, 'Show the definition preview hover in the editor.')),
+                description: ( localize2(1187, 'Show the definition preview hover in the editor.')),
             },
         });
     }
@@ -129,7 +129,7 @@ class HideContentHoverAction extends EditorAction {
     constructor() {
         super({
             id: HIDE_HOVER_ACTION_ID,
-            label: ( localize2(1177, "Hide Hover")),
+            label: ( localize2(1188, "Hide Hover")),
             alias: 'Hide Content Hover',
             precondition: undefined
         });
@@ -142,7 +142,7 @@ class ScrollUpHoverAction extends EditorAction {
     constructor() {
         super({
             id: SCROLL_UP_HOVER_ACTION_ID,
-            label: ( localize2(1178, "Scroll Up Hover")),
+            label: ( localize2(1189, "Scroll Up Hover")),
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
                 kbExpr: EditorContextKeys.hoverFocused,
@@ -150,7 +150,7 @@ class ScrollUpHoverAction extends EditorAction {
                 weight: KeybindingWeight.EditorContrib
             },
             metadata: {
-                description: ( localize2(1179, 'Scroll up the editor hover.'))
+                description: ( localize2(1190, 'Scroll up the editor hover.'))
             },
         });
     }
@@ -166,7 +166,7 @@ class ScrollDownHoverAction extends EditorAction {
     constructor() {
         super({
             id: SCROLL_DOWN_HOVER_ACTION_ID,
-            label: ( localize2(1180, "Scroll Down Hover")),
+            label: ( localize2(1191, "Scroll Down Hover")),
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
                 kbExpr: EditorContextKeys.hoverFocused,
@@ -174,7 +174,7 @@ class ScrollDownHoverAction extends EditorAction {
                 weight: KeybindingWeight.EditorContrib
             },
             metadata: {
-                description: ( localize2(1181, 'Scroll down the editor hover.')),
+                description: ( localize2(1192, 'Scroll down the editor hover.')),
             },
         });
     }
@@ -190,7 +190,7 @@ class ScrollLeftHoverAction extends EditorAction {
     constructor() {
         super({
             id: SCROLL_LEFT_HOVER_ACTION_ID,
-            label: ( localize2(1182, "Scroll Left Hover")),
+            label: ( localize2(1193, "Scroll Left Hover")),
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
                 kbExpr: EditorContextKeys.hoverFocused,
@@ -198,7 +198,7 @@ class ScrollLeftHoverAction extends EditorAction {
                 weight: KeybindingWeight.EditorContrib
             },
             metadata: {
-                description: ( localize2(1183, 'Scroll left the editor hover.')),
+                description: ( localize2(1194, 'Scroll left the editor hover.')),
             },
         });
     }
@@ -214,7 +214,7 @@ class ScrollRightHoverAction extends EditorAction {
     constructor() {
         super({
             id: SCROLL_RIGHT_HOVER_ACTION_ID,
-            label: ( localize2(1184, "Scroll Right Hover")),
+            label: ( localize2(1195, "Scroll Right Hover")),
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
                 kbExpr: EditorContextKeys.hoverFocused,
@@ -222,7 +222,7 @@ class ScrollRightHoverAction extends EditorAction {
                 weight: KeybindingWeight.EditorContrib
             },
             metadata: {
-                description: ( localize2(1185, 'Scroll right the editor hover.'))
+                description: ( localize2(1196, 'Scroll right the editor hover.'))
             },
         });
     }
@@ -238,7 +238,7 @@ class PageUpHoverAction extends EditorAction {
     constructor() {
         super({
             id: PAGE_UP_HOVER_ACTION_ID,
-            label: ( localize2(1186, "Page Up Hover")),
+            label: ( localize2(1197, "Page Up Hover")),
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
                 kbExpr: EditorContextKeys.hoverFocused,
@@ -247,7 +247,7 @@ class PageUpHoverAction extends EditorAction {
                 weight: KeybindingWeight.EditorContrib
             },
             metadata: {
-                description: ( localize2(1187, 'Page up the editor hover.')),
+                description: ( localize2(1198, 'Page up the editor hover.')),
             },
         });
     }
@@ -263,7 +263,7 @@ class PageDownHoverAction extends EditorAction {
     constructor() {
         super({
             id: PAGE_DOWN_HOVER_ACTION_ID,
-            label: ( localize2(1188, "Page Down Hover")),
+            label: ( localize2(1199, "Page Down Hover")),
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
                 kbExpr: EditorContextKeys.hoverFocused,
@@ -272,7 +272,7 @@ class PageDownHoverAction extends EditorAction {
                 weight: KeybindingWeight.EditorContrib
             },
             metadata: {
-                description: ( localize2(1189, 'Page down the editor hover.')),
+                description: ( localize2(1200, 'Page down the editor hover.')),
             },
         });
     }
@@ -288,7 +288,7 @@ class GoToTopHoverAction extends EditorAction {
     constructor() {
         super({
             id: GO_TO_TOP_HOVER_ACTION_ID,
-            label: ( localize2(1190, "Go To Top Hover")),
+            label: ( localize2(1201, "Go To Top Hover")),
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
                 kbExpr: EditorContextKeys.hoverFocused,
@@ -297,7 +297,7 @@ class GoToTopHoverAction extends EditorAction {
                 weight: KeybindingWeight.EditorContrib
             },
             metadata: {
-                description: ( localize2(1191, 'Go to the top of the editor hover.')),
+                description: ( localize2(1202, 'Go to the top of the editor hover.')),
             },
         });
     }
@@ -313,7 +313,7 @@ class GoToBottomHoverAction extends EditorAction {
     constructor() {
         super({
             id: GO_TO_BOTTOM_HOVER_ACTION_ID,
-            label: ( localize2(1192, "Go To Bottom Hover")),
+            label: ( localize2(1203, "Go To Bottom Hover")),
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
                 kbExpr: EditorContextKeys.hoverFocused,
@@ -322,7 +322,7 @@ class GoToBottomHoverAction extends EditorAction {
                 weight: KeybindingWeight.EditorContrib
             },
             metadata: {
-                description: ( localize2(1193, 'Go to the bottom of the editor hover.'))
+                description: ( localize2(1204, 'Go to the bottom of the editor hover.'))
             },
         });
     }

package/vscode/src/vs/editor/contrib/hover/browser/markdownHoverParticipant.js

@@ -30,8 +30,8 @@ import { getHoverProviderResultsAsAsyncIterable } from './getHover.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
 
 const $ = $$1;
-const increaseHoverVerbosityIcon = registerIcon('hover-increase-verbosity', Codicon.add, ( localize(1194, 'Icon for increaseing hover verbosity.')));
-const decreaseHoverVerbosityIcon = registerIcon('hover-decrease-verbosity', Codicon.remove, ( localize(1195, 'Icon for decreasing hover verbosity.')));
+const increaseHoverVerbosityIcon = registerIcon('hover-increase-verbosity', Codicon.add, ( localize(1205, 'Icon for increaseing hover verbosity.')));
+const decreaseHoverVerbosityIcon = registerIcon('hover-decrease-verbosity', Codicon.remove, ( localize(1206, 'Icon for decreasing hover verbosity.')));
 class MarkdownHover {
     constructor(owner, range, contents, isBeforeContent, ordinal, source = undefined) {
         this.owner = owner;
@@ -78,7 +78,7 @@ let MarkdownHoverParticipant = class MarkdownHoverParticipant {
         return (new MarkdownHover(
             this,
             anchor.range,
-            [( new MarkdownString()).appendText(( localize(1196, "Loading...")))],
+            [( new MarkdownString()).appendText(( localize(1207, "Loading...")))],
             false,
             2000
         ));
@@ -103,7 +103,7 @@ let MarkdownHoverParticipant = class MarkdownHoverParticipant {
             stopRenderingMessage = true;
             result.push(( new MarkdownHover(this, anchor.range, [{
                     value: ( localize(
-                        1197,
+                        1208,
                         "Rendering paused for long line for performance reasons. This can be configured via `editor.stopRenderingLineAfter`."
                     ))
                 }], false, index++)));
@@ -111,7 +111,7 @@ let MarkdownHoverParticipant = class MarkdownHoverParticipant {
         if (!stopRenderingMessage && typeof maxTokenizationLineLength === 'number' && lineLength >= maxTokenizationLineLength) {
             result.push(( new MarkdownHover(this, anchor.range, [{
                     value: ( localize(
-                        1198,
+                        1209,
                         "Tokenization is skipped for long lines for performance reasons. This can be configured via `editor.maxTokenizationLineLength`."
                     ))
                 }], false, index++)));
@@ -462,14 +462,14 @@ function labelForHoverVerbosityAction(keybindingService, action) {
         case HoverVerbosityAction.Increase: {
             const kb = keybindingService.lookupKeybinding(INCREASE_HOVER_VERBOSITY_ACTION_ID);
             return kb ?
-                ( localize(1199, "Increase Hover Verbosity ({0})", kb.getLabel())) :
-                ( localize(1200, "Increase Hover Verbosity"));
+                ( localize(1210, "Increase Hover Verbosity ({0})", kb.getLabel())) :
+                ( localize(1211, "Increase Hover Verbosity"));
         }
         case HoverVerbosityAction.Decrease: {
             const kb = keybindingService.lookupKeybinding(DECREASE_HOVER_VERBOSITY_ACTION_ID);
             return kb ?
-                ( localize(1201, "Decrease Hover Verbosity ({0})", kb.getLabel())) :
-                ( localize(1202, "Decrease Hover Verbosity"));
+                ( localize(1212, "Decrease Hover Verbosity ({0})", kb.getLabel())) :
+                ( localize(1213, "Decrease Hover Verbosity"));
         }
     }
 }

package/vscode/src/vs/editor/contrib/hover/browser/markerHoverParticipant.js

@@ -53,7 +53,11 @@ let MarkerHoverParticipant = class MarkerHoverParticipant {
             return [];
         }
         const model = this._editor.getModel();
-        const lineNumber = anchor.range.startLineNumber;
+        const anchorRange = anchor.range;
+        if (!model.isValidRange(anchor.range)) {
+            return [];
+        }
+        const lineNumber = anchorRange.startLineNumber;
         const maxColumn = model.getLineMaxColumn(lineNumber);
         const result = [];
         for (const d of lineDecorations) {
@@ -162,7 +166,7 @@ let MarkerHoverParticipant = class MarkerHoverParticipant {
             const markerController = MarkerController.get(this._editor);
             if (markerController) {
                 context.statusBar.addAction({
-                    label: ( localize(1203, "View Problem")),
+                    label: ( localize(1214, "View Problem")),
                     commandId: NextMarkerAction.ID,
                     run: () => {
                         context.hide();
@@ -177,14 +181,14 @@ let MarkerHoverParticipant = class MarkerHoverParticipant {
             if (this.recentMarkerCodeActionsInfo) {
                 if (IMarkerData.makeKey(this.recentMarkerCodeActionsInfo.marker) === IMarkerData.makeKey(markerHover.marker)) {
                     if (!this.recentMarkerCodeActionsInfo.hasCodeActions) {
-                        quickfixPlaceholderElement.textContent = ( localize(1204, "No quick fixes available"));
+                        quickfixPlaceholderElement.textContent = ( localize(1215, "No quick fixes available"));
                     }
                 }
                 else {
                     this.recentMarkerCodeActionsInfo = undefined;
                 }
             }
-            const updatePlaceholderDisposable = this.recentMarkerCodeActionsInfo && !this.recentMarkerCodeActionsInfo.hasCodeActions ? Disposable.None : disposableTimeout(() => quickfixPlaceholderElement.textContent = ( localize(1205, "Checking for quick fixes...")), 200, disposables);
+            const updatePlaceholderDisposable = this.recentMarkerCodeActionsInfo && !this.recentMarkerCodeActionsInfo.hasCodeActions ? Disposable.None : disposableTimeout(() => quickfixPlaceholderElement.textContent = ( localize(1216, "Checking for quick fixes...")), 200, disposables);
             if (!quickfixPlaceholderElement.textContent) {
                 quickfixPlaceholderElement.textContent = String.fromCharCode(0xA0);
             }
@@ -195,7 +199,7 @@ let MarkerHoverParticipant = class MarkerHoverParticipant {
                 this.recentMarkerCodeActionsInfo = { marker: markerHover.marker, hasCodeActions: actions.validActions.length > 0 };
                 if (!this.recentMarkerCodeActionsInfo.hasCodeActions) {
                     actions.dispose();
-                    quickfixPlaceholderElement.textContent = ( localize(1204, "No quick fixes available"));
+                    quickfixPlaceholderElement.textContent = ( localize(1215, "No quick fixes available"));
                     return;
                 }
                 quickfixPlaceholderElement.style.display = 'none';
@@ -206,7 +210,7 @@ let MarkerHoverParticipant = class MarkerHoverParticipant {
                     }
                 }));
                 context.statusBar.addAction({
-                    label: ( localize(1206, "Quick Fix...")),
+                    label: ( localize(1217, "Quick Fix...")),
                     commandId: quickFixCommandId,
                     run: (target) => {
                         showing = true;

package/vscode/src/vs/editor/contrib/inPlaceReplace/browser/inPlaceReplace.js

@@ -97,7 +97,7 @@ class InPlaceReplaceUp extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inPlaceReplace.up',
-            label: ( localize2(1207, "Replace with Previous Value")),
+            label: ( localize2(1218, "Replace with Previous Value")),
             precondition: EditorContextKeys.writable,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -118,7 +118,7 @@ class InPlaceReplaceDown extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inPlaceReplace.down',
-            label: ( localize2(1208, "Replace with Next Value")),
+            label: ( localize2(1219, "Replace with Next Value")),
             precondition: EditorContextKeys.writable,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,

package/vscode/src/vs/editor/contrib/indentation/browser/indentation.d.ts

@@ -65,7 +65,6 @@ export declare class AutoIndentOnPaste implements IEditorContribution {
     private update;
     trigger(range: Range): void;
     private rangeContainsOnlyWhitespaceCharacters;
-    private shouldIgnoreLine;
     dispose(): void;
 }
 export declare class IndentationToSpacesCommand implements ICommand {

package/vscode/src/vs/editor/contrib/indentation/browser/indentation.js

@@ -23,10 +23,10 @@ class IndentationToSpacesAction extends EditorAction {
     constructor() {
         super({
             id: IndentationToSpacesAction.ID,
-            label: ( localize2(1209, "Convert Indentation to Spaces")),
+            label: ( localize2(1220, "Convert Indentation to Spaces")),
             precondition: EditorContextKeys.writable,
             metadata: {
-                description: ( localize2(1210, "Convert the tab indentation to spaces.")),
+                description: ( localize2(1221, "Convert the tab indentation to spaces.")),
             }
         });
     }
@@ -54,10 +54,10 @@ class IndentationToTabsAction extends EditorAction {
     constructor() {
         super({
             id: IndentationToTabsAction.ID,
-            label: ( localize2(1211, "Convert Indentation to Tabs")),
+            label: ( localize2(1222, "Convert Indentation to Tabs")),
             precondition: EditorContextKeys.writable,
             metadata: {
-                description: ( localize2(1212, "Convert the spaces indentation to tabs.")),
+                description: ( localize2(1223, "Convert the spaces indentation to tabs.")),
             }
         });
     }
@@ -99,16 +99,16 @@ class ChangeIndentationSizeAction extends EditorAction {
             id: ( n.toString()),
             label: ( n.toString()),
             description: (n === creationOpts.tabSize && n === modelOpts.tabSize
-                ? ( localize(1213, "Configured Tab Size"))
+                ? ( localize(1224, "Configured Tab Size"))
                 : n === creationOpts.tabSize
-                    ? ( localize(1214, "Default Tab Size"))
+                    ? ( localize(1225, "Default Tab Size"))
                     : n === modelOpts.tabSize
-                        ? ( localize(1215, "Current Tab Size"))
+                        ? ( localize(1226, "Current Tab Size"))
                         : undefined)
         })));
         const autoFocusIndex = Math.min(model.getOptions().tabSize - 1, 7);
         setTimeout(() => {
-            quickInputService.pick(picks, { placeHolder: ( localize(1216, "Select Tab Size for Current File")), activeItem: picks[autoFocusIndex] }).then(pick => {
+            quickInputService.pick(picks, { placeHolder: ( localize(1227, "Select Tab Size for Current File")), activeItem: picks[autoFocusIndex] }).then(pick => {
                 if (pick) {
                     if (model && !model.isDisposed()) {
                         const pickedVal = parseInt(pick.label, 10);
@@ -135,10 +135,10 @@ class IndentUsingTabs extends ChangeIndentationSizeAction {
     constructor() {
         super(false, false, {
             id: IndentUsingTabs.ID,
-            label: ( localize2(1217, "Indent Using Tabs")),
+            label: ( localize2(1228, "Indent Using Tabs")),
             precondition: undefined,
             metadata: {
-                description: ( localize2(1218, "Use indentation with tabs.")),
+                description: ( localize2(1229, "Use indentation with tabs.")),
             }
         });
     }
@@ -148,10 +148,10 @@ class IndentUsingSpaces extends ChangeIndentationSizeAction {
     constructor() {
         super(true, false, {
             id: IndentUsingSpaces.ID,
-            label: ( localize2(1219, "Indent Using Spaces")),
+            label: ( localize2(1230, "Indent Using Spaces")),
             precondition: undefined,
             metadata: {
-                description: ( localize2(1220, "Use indentation with spaces.")),
+                description: ( localize2(1231, "Use indentation with spaces.")),
             }
         });
     }
@@ -161,10 +161,10 @@ class ChangeTabDisplaySize extends ChangeIndentationSizeAction {
     constructor() {
         super(true, true, {
             id: ChangeTabDisplaySize.ID,
-            label: ( localize2(1221, "Change Tab Display Size")),
+            label: ( localize2(1232, "Change Tab Display Size")),
             precondition: undefined,
             metadata: {
-                description: ( localize2(1222, "Change the space size equivalent of the tab.")),
+                description: ( localize2(1233, "Change the space size equivalent of the tab.")),
             }
         });
     }
@@ -174,10 +174,10 @@ class DetectIndentation extends EditorAction {
     constructor() {
         super({
             id: DetectIndentation.ID,
-            label: ( localize2(1223, "Detect Indentation from Content")),
+            label: ( localize2(1234, "Detect Indentation from Content")),
             precondition: undefined,
             metadata: {
-                description: ( localize2(1224, "Detect the indentation from content.")),
+                description: ( localize2(1235, "Detect the indentation from content.")),
             }
         });
     }
@@ -195,10 +195,10 @@ class ReindentLinesAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.reindentlines',
-            label: ( localize2(1225, "Reindent Lines")),
+            label: ( localize2(1236, "Reindent Lines")),
             precondition: EditorContextKeys.writable,
             metadata: {
-                description: ( localize2(1226, "Reindent the lines of the editor.")),
+                description: ( localize2(1237, "Reindent the lines of the editor.")),
             }
         });
     }
@@ -220,10 +220,10 @@ class ReindentSelectedLinesAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.reindentselectedlines',
-            label: ( localize2(1227, "Reindent Selected Lines")),
+            label: ( localize2(1238, "Reindent Selected Lines")),
             precondition: EditorContextKeys.writable,
             metadata: {
-                description: ( localize2(1228, "Reindent the selected lines of the editor.")),
+                description: ( localize2(1239, "Reindent the selected lines of the editor.")),
             }
         });
     }
@@ -311,7 +311,7 @@ let AutoIndentOnPaste = class AutoIndentOnPaste {
     }
     update() {
         this.callOnModel.clear();
-        if (this.editor.getOption(EditorOption.autoIndent) < EditorAutoIndentStrategy.Full || !this.editor.getOption(EditorOption.formatOnPaste)) {
+        if (!this.editor.getOption(EditorOption.autoIndentOnPaste) || this.editor.getOption(EditorOption.autoIndent) < EditorAutoIndentStrategy.Full) {
             return;
         }
         if (!this.editor.hasModel()) {
@@ -334,7 +334,7 @@ let AutoIndentOnPaste = class AutoIndentOnPaste {
         if (containsOnlyWhitespace) {
             return;
         }
-        if (isStartOrEndInString(model, range)) {
+        if (!this.editor.getOption(EditorOption.autoIndentOnPasteWithinString) && isStartOrEndInString(model, range)) {
             return;
         }
         if (!model.tokenization.isCheapToTokenize(range.getStartPosition().lineNumber)) {
@@ -352,16 +352,6 @@ let AutoIndentOnPaste = class AutoIndentOnPaste {
             }
         };
         let startLineNumber = range.startLineNumber;
-        while (startLineNumber <= range.endLineNumber) {
-            if (this.shouldIgnoreLine(model, startLineNumber)) {
-                startLineNumber++;
-                continue;
-            }
-            break;
-        }
-        if (startLineNumber > range.endLineNumber) {
-            return;
-        }
         let firstLineText = model.getLineContent(startLineNumber);
         if (!/\S/.test(firstLineText.substring(0, range.startColumn - 1))) {
             const indentOfFirstLine = getGoodIndentForLine(autoIndent, model, model.getLanguageId(), startLineNumber, indentConverter, this._languageConfigurationService);
@@ -475,21 +465,6 @@ let AutoIndentOnPaste = class AutoIndentOnPaste {
         }
         return containsOnlyWhitespace;
     }
-    shouldIgnoreLine(model, lineNumber) {
-        model.tokenization.forceTokenization(lineNumber);
-        const nonWhitespaceColumn = model.getLineFirstNonWhitespaceColumn(lineNumber);
-        if (nonWhitespaceColumn === 0) {
-            return true;
-        }
-        const tokens = model.tokenization.getLineTokens(lineNumber);
-        if (tokens.getCount() > 0) {
-            const firstNonWhitespaceTokenIndex = tokens.findTokenIndexAtOffset(nonWhitespaceColumn);
-            if (firstNonWhitespaceTokenIndex >= 0 && tokens.getStandardTokenType(firstNonWhitespaceTokenIndex) === StandardTokenType.Comment) {
-                return true;
-            }
-        }
-        return false;
-    }
     dispose() {
         this.callOnDispose.dispose();
         this.callOnModel.dispose();

package/vscode/src/vs/editor/contrib/inlayHints/browser/inlayHintsHover.js

@@ -73,7 +73,7 @@ let InlayHintsHover = class InlayHintsHover extends MarkdownHoverParticipant {
                 executor.emitOne(( new MarkdownHover(this, anchor.range, [itemTooltip], false, 0)));
             }
             if (isNonEmptyArray(part.item.hint.textEdits)) {
-                executor.emitOne(( new MarkdownHover(this, anchor.range, [( new MarkdownString()).appendText(( localize(1229, "Double-click to insert")))], false, 10001)));
+                executor.emitOne(( new MarkdownHover(this, anchor.range, [( new MarkdownString()).appendText(( localize(1240, "Double-click to insert")))], false, 10001)));
             }
             let partTooltip;
             if (typeof part.part.tooltip === 'string') {
@@ -90,19 +90,19 @@ let InlayHintsHover = class InlayHintsHover extends MarkdownHoverParticipant {
                 const useMetaKey = this._editor.getOption(EditorOption.multiCursorModifier) === 'altKey';
                 const kb = useMetaKey
                     ? isMacintosh
-                        ? ( localize(1230, "cmd + click"))
-                        : ( localize(1231, "ctrl + click"))
+                        ? ( localize(1241, "cmd + click"))
+                        : ( localize(1242, "ctrl + click"))
                     : isMacintosh
-                        ? ( localize(1232, "option + click"))
-                        : ( localize(1233, "alt + click"));
+                        ? ( localize(1243, "option + click"))
+                        : ( localize(1244, "alt + click"));
                 if (part.part.location && part.part.command) {
-                    linkHint = ( new MarkdownString()).appendText(( localize(1234, 'Go to Definition ({0}), right click for more', kb)));
+                    linkHint = ( new MarkdownString()).appendText(( localize(1245, 'Go to Definition ({0}), right click for more', kb)));
                 }
                 else if (part.part.location) {
-                    linkHint = ( new MarkdownString()).appendText(( localize(1235, 'Go to Definition ({0})', kb)));
+                    linkHint = ( new MarkdownString()).appendText(( localize(1246, 'Go to Definition ({0})', kb)));
                 }
                 else if (part.part.command) {
-                    linkHint = ( new MarkdownString(`[${( localize(1236, "Execute Command"))}](${asCommandLink(part.part.command)} "${part.part.command.title}") (${kb})`, { isTrusted: true }));
+                    linkHint = ( new MarkdownString(`[${( localize(1247, "Execute Command"))}](${asCommandLink(part.part.command)} "${part.part.command.title}") (${kb})`, { isTrusted: true }));
                 }
                 if (linkHint) {
                     executor.emitOne(( new MarkdownHover(this, anchor.range, [linkHint], false, 10000)));