@codingame/monaco-vscode-notebook-service-override 14.0.6 → 15.0.0

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookMulticursor.js

@@ -18,11 +18,10 @@ import { DeleteOperations } from '@codingame/monaco-vscode-api/vscode/vs/editor/
 import { CursorConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/cursorCommon';
 import { CursorChangeReason } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/cursorEvents';
 import { Handler } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorCommon';
-import { ILanguageConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/languageConfigurationRegistry';
+import { ILanguageConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/languageConfigurationRegistry.service';
 import { indentOfLine } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/textModel';
-import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService';
+import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
 import { ViewModelEventsCollector } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/viewModelEventDispatcher';
-import { WordHighlighterContribution } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/wordHighlighter/browser/wordHighlighter';
 import { IAccessibilityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility.service';
 import { MenuId, registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
@@ -33,13 +32,13 @@ import { UndoRedoElementType } from '@codingame/monaco-vscode-api/vscode/vs/plat
 import { IUndoRedoService } from '@codingame/monaco-vscode-api/vscode/vs/platform/undoRedo/common/undoRedo.service';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
-import { NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_CELL_EDITOR_FOCUSED, KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED } from '@codingame/monaco-vscode-771c2e6d-0284-5ac1-be73-7176085eedc5-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
-import { NotebookAction } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { registerNotebookContribution } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
-import { CellEditorOptions } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions';
+import { NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_CELL_EDITOR_FOCUSED, KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED } from '@codingame/monaco-vscode-52bb4d5b-ba1a-57fd-9bee-b28824214eac-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { NotebookAction } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { registerNotebookContribution } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
+import { CellEditorOptions } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions';
 import { NotebookFindContrib } from '@codingame/monaco-vscode-1ae7d696-d960-5ac6-97a3-9fe7c8c3a793-common/vscode/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget';
-import { NotebookCellTextModel } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
+import { NotebookCellTextModel } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
 
 const NOTEBOOK_ADD_FIND_MATCH_TO_SELECTION_ID = 'notebook.addFindMatchToSelection';
 const NOTEBOOK_SELECT_ALL_FIND_MATCHES_ID = 'notebook.selectAllFindMatches';
@@ -629,6 +628,7 @@ let NotebookMultiCursorController = class NotebookMultiCursorController extends
             this.configurationService
         ));
         const options = cellEditorOptions.getUpdatedValue(cell.internalMetadata, cell.uri);
+        cellEditorOptions.dispose();
         return ( new EditorConfiguration(
             false,
             MenuId.EditorContent,
@@ -686,10 +686,6 @@ let NotebookMultiCursorController = class NotebookMultiCursorController extends
                 });
             });
             cell.decorationIds = cell.cellViewModel.deltaModelDecorations(cell.decorationIds, newDecorations);
-            const matchingEditor = this.notebookEditor.codeEditors.find(cellEditor => cellEditor[0] === cell.cellViewModel);
-            if (matchingEditor) {
-                WordHighlighterContribution.get(matchingEditor[1])?.wordHighlighter?.trigger();
-            }
         });
     }
     clearDecorations(cell) {
@@ -776,7 +772,7 @@ class NotebookSelectAllFindMatches extends NotebookAction {
     constructor() {
         super({
             id: NOTEBOOK_SELECT_ALL_FIND_MATCHES_ID,
-            title: ( localize(7520, "Select All Occurrences of Find Match")),
+            title: ( localize(7605, "Select All Occurrences of Find Match")),
             precondition: ( ContextKeyExpr.and(( ContextKeyExpr.equals('config.notebook.multiCursor.enabled', true)))),
             keybinding: {
                 when: ( ContextKeyExpr.or(( ContextKeyExpr.and(( ContextKeyExpr.equals('config.notebook.multiCursor.enabled', true)), NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_CELL_EDITOR_FOCUSED)), ( ContextKeyExpr.and(( ContextKeyExpr.equals('config.notebook.multiCursor.enabled', true)), KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED)))),
@@ -809,7 +805,7 @@ class NotebookAddMatchToMultiSelectionAction extends NotebookAction {
     constructor() {
         super({
             id: NOTEBOOK_ADD_FIND_MATCH_TO_SELECTION_ID,
-            title: ( localize(7521, "Add Selection To Next Find Match")),
+            title: ( localize(7606, "Add Selection To Next Find Match")),
             precondition: ( ContextKeyExpr.and(( ContextKeyExpr.equals('config.notebook.multiCursor.enabled', true)), NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_CELL_EDITOR_FOCUSED)),
             keybinding: {
                 when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('config.notebook.multiCursor.enabled', true)), NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_CELL_EDITOR_FOCUSED)),
@@ -835,7 +831,7 @@ class NotebookExitMultiSelectionAction extends NotebookAction {
     constructor() {
         super({
             id: 'noteMultiCursor.exit',
-            title: ( localize(7522, "Exit Multi Cursor Mode")),
+            title: ( localize(7607, "Exit Multi Cursor Mode")),
             precondition: ( ContextKeyExpr.and(( ContextKeyExpr.equals('config.notebook.multiCursor.enabled', true)), NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_MULTI_CURSOR_CONTEXT.IsNotebookMultiCursor)),
             keybinding: {
                 when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('config.notebook.multiCursor.enabled', true)), NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_MULTI_CURSOR_CONTEXT.IsNotebookMultiCursor)),
@@ -858,7 +854,7 @@ class NotebookDeleteLeftMultiSelectionAction extends NotebookAction {
     constructor() {
         super({
             id: 'noteMultiCursor.deleteLeft',
-            title: ( localize(7523, "Delete Left")),
+            title: ( localize(7608, "Delete Left")),
             precondition: ( ContextKeyExpr.and(( ContextKeyExpr.equals('config.notebook.multiCursor.enabled', true)), NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_MULTI_CURSOR_CONTEXT.IsNotebookMultiCursor, ( ContextKeyExpr.or(( NOTEBOOK_MULTI_CURSOR_CONTEXT.NotebookMultiSelectCursorState.isEqualTo(NotebookMultiCursorState.Selecting)), ( NOTEBOOK_MULTI_CURSOR_CONTEXT.NotebookMultiSelectCursorState.isEqualTo(NotebookMultiCursorState.Editing)))))),
             keybinding: {
                 when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('config.notebook.multiCursor.enabled', true)), NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_MULTI_CURSOR_CONTEXT.IsNotebookMultiCursor, ( ContextKeyExpr.or(( NOTEBOOK_MULTI_CURSOR_CONTEXT.NotebookMultiSelectCursorState.isEqualTo(NotebookMultiCursorState.Selecting)), ( NOTEBOOK_MULTI_CURSOR_CONTEXT.NotebookMultiSelectCursorState.isEqualTo(NotebookMultiCursorState.Editing)))))),
@@ -881,7 +877,7 @@ class NotebookDeleteRightMultiSelectionAction extends NotebookAction {
     constructor() {
         super({
             id: 'noteMultiCursor.deleteRight',
-            title: ( localize(7524, "Delete Right")),
+            title: ( localize(7609, "Delete Right")),
             precondition: ( ContextKeyExpr.and(( ContextKeyExpr.equals('config.notebook.multiCursor.enabled', true)), NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_MULTI_CURSOR_CONTEXT.IsNotebookMultiCursor, ( ContextKeyExpr.or(( NOTEBOOK_MULTI_CURSOR_CONTEXT.NotebookMultiSelectCursorState.isEqualTo(NotebookMultiCursorState.Selecting)), ( NOTEBOOK_MULTI_CURSOR_CONTEXT.NotebookMultiSelectCursorState.isEqualTo(NotebookMultiCursorState.Editing)))))),
             keybinding: {
                 when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('config.notebook.multiCursor.enabled', true)), NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_MULTI_CURSOR_CONTEXT.IsNotebookMultiCursor, ( ContextKeyExpr.or(( NOTEBOOK_MULTI_CURSOR_CONTEXT.NotebookMultiSelectCursorState.isEqualTo(NotebookMultiCursorState.Selecting)), ( NOTEBOOK_MULTI_CURSOR_CONTEXT.NotebookMultiSelectCursorState.isEqualTo(NotebookMultiCursorState.Editing)))))),

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookSelectionHighlight.js

@@ -5,7 +5,7 @@ import { Disposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode
 import { Selection, SelectionDirection } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/selection';
 import { CursorChangeReason } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/cursorEvents';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
-import { registerNotebookContribution } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
+import { registerNotebookContribution } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
 
 let NotebookSelectionHighlighter = class NotebookSelectionHighlighter extends Disposable {
     static { this.id = 'notebook.selectionHighlighter'; }

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/navigation/arrow.js

@@ -11,12 +11,12 @@ import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/
 import { InputFocusedContextKey, IsWindowsContext } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkeys';
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
-import { InlineChatController } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext';
-import { NotebookCellAction, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, findTargetCellEditor, NotebookAction } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { CellEditState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { InlineChatController } from '@codingame/monaco-vscode-29bc1406-2925-5b8f-b25e-d04a7772d896-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext';
+import { NotebookCellAction, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, findTargetCellEditor, NotebookAction } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+import { CellEditState } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { NOTEBOOK_EDITOR_CURSOR_BOUNDARY, CellKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { NOTEBOOK_OUTPUT_INPUT_FOCUSED, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_CELL_TYPE, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CURSOR_NAVIGATION_MODE, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_CELL_EDITOR_FOCUSED, NOTEBOOK_CELL_HAS_OUTPUTS, IS_COMPOSITE_NOTEBOOK } from '@codingame/monaco-vscode-771c2e6d-0284-5ac1-be73-7176085eedc5-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { NOTEBOOK_OUTPUT_INPUT_FOCUSED, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_CELL_TYPE, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CURSOR_NAVIGATION_MODE, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_CELL_EDITOR_FOCUSED, NOTEBOOK_CELL_HAS_OUTPUTS, IS_COMPOSITE_NOTEBOOK } from '@codingame/monaco-vscode-52bb4d5b-ba1a-57fd-9bee-b28824214eac-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 
 const NOTEBOOK_FOCUS_TOP = 'notebook.focusTop';
 const NOTEBOOK_FOCUS_BOTTOM = 'notebook.focusBottom';
@@ -34,7 +34,7 @@ registerAction2(class extends Action2 {
         super({
             id: 'notebook.cell.nullAction',
             title: ( localize(
-                7525,
+                7610,
                 "Keypresses that should be handled by the focused element in the cell output."
             )),
             keybinding: [{
@@ -57,7 +57,7 @@ registerAction2(class FocusNextCellAction extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_FOCUS_NEXT_EDITOR,
-            title: ( localize(7526, 'Focus Next Cell Editor')),
+            title: ( localize(7611, 'Focus Next Cell Editor')),
             keybinding: [
                 {
                     when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()), ( ContextKeyExpr.equals('config.notebook.navigation.allowNavigateToSurroundingCells', true)), ( ContextKeyExpr.and(( ContextKeyExpr.has(InputFocusedContextKey)), EditorContextKeys.editorTextFocus, ( NOTEBOOK_EDITOR_CURSOR_BOUNDARY.notEqualsTo('top')), ( NOTEBOOK_EDITOR_CURSOR_BOUNDARY.notEqualsTo('none')))), ( EditorContextKeys.isEmbeddedDiffEditor.negate()))),
@@ -111,7 +111,7 @@ registerAction2(class FocusPreviousCellAction extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_FOCUS_PREVIOUS_EDITOR,
-            title: ( localize(7527, 'Focus Previous Cell Editor')),
+            title: ( localize(7612, 'Focus Previous Cell Editor')),
             keybinding: [
                 {
                     when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()), ( ContextKeyExpr.equals('config.notebook.navigation.allowNavigateToSurroundingCells', true)), ( ContextKeyExpr.and(( ContextKeyExpr.has(InputFocusedContextKey)), EditorContextKeys.editorTextFocus, ( NOTEBOOK_EDITOR_CURSOR_BOUNDARY.notEqualsTo('bottom')), ( NOTEBOOK_EDITOR_CURSOR_BOUNDARY.notEqualsTo('none')))), ( EditorContextKeys.isEmbeddedDiffEditor.negate()))),
@@ -156,7 +156,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: NOTEBOOK_FOCUS_TOP,
-            title: ( localize(7528, 'Focus First Cell')),
+            title: ( localize(7613, 'Focus First Cell')),
             keybinding: [
                 {
                     when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey))),
@@ -188,7 +188,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: NOTEBOOK_FOCUS_BOTTOM,
-            title: ( localize(7529, 'Focus Last Cell')),
+            title: ( localize(7614, 'Focus Last Cell')),
             keybinding: [
                 {
                     when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey))),
@@ -225,7 +225,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: FOCUS_IN_OUTPUT_COMMAND_ID,
-            title: ( localize(7530, 'Focus In Active Cell Output')),
+            title: ( localize(7615, 'Focus In Active Cell Output')),
             keybinding: [{
                     when: ( ContextKeyExpr.and(( IS_COMPOSITE_NOTEBOOK.negate()), IsWindowsContext)),
                     primary: KeyMod.CtrlCmd | KeyCode.DownArrow,
@@ -248,7 +248,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: FOCUS_OUT_OUTPUT_COMMAND_ID,
-            title: ( localize(7531, 'Focus Out Active Cell Output')),
+            title: ( localize(7616, 'Focus Out Active Cell Output')),
             keybinding: {
                 primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.UpArrow,
                 mac: { primary: KeyMod.WinCtrl | KeyMod.CtrlCmd | KeyCode.UpArrow, },
@@ -267,7 +267,7 @@ registerAction2(class CenterActiveCellAction extends NotebookCellAction {
     constructor() {
         super({
             id: CENTER_ACTIVE_CELL,
-            title: ( localize(7532, "Center Active Cell")),
+            title: ( localize(7617, "Center Active Cell")),
             keybinding: {
                 when: NOTEBOOK_EDITOR_FOCUSED,
                 primary: KeyMod.CtrlCmd | KeyCode.KeyL,
@@ -286,7 +286,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_CURSOR_PAGEUP_COMMAND_ID,
-            title: ( localize(7533, "Cell Cursor Page Up")),
+            title: ( localize(7618, "Cell Cursor Page Up")),
             keybinding: [
                 {
                     when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( ContextKeyExpr.has(InputFocusedContextKey)), EditorContextKeys.editorTextFocus)),
@@ -304,7 +304,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_CURSOR_PAGEUP_SELECT_COMMAND_ID,
-            title: ( localize(7534, "Cell Cursor Page Up Select")),
+            title: ( localize(7619, "Cell Cursor Page Up Select")),
             keybinding: [
                 {
                     when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( ContextKeyExpr.has(InputFocusedContextKey)), EditorContextKeys.editorTextFocus, ( NOTEBOOK_OUTPUT_FOCUSED.negate()))),
@@ -322,7 +322,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_CURSOR_PAGEDOWN_COMMAND_ID,
-            title: ( localize(7535, "Cell Cursor Page Down")),
+            title: ( localize(7620, "Cell Cursor Page Down")),
             keybinding: [
                 {
                     when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( ContextKeyExpr.has(InputFocusedContextKey)), EditorContextKeys.editorTextFocus)),
@@ -340,7 +340,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_CURSOR_PAGEDOWN_SELECT_COMMAND_ID,
-            title: ( localize(7536, "Cell Cursor Page Down Select")),
+            title: ( localize(7621, "Cell Cursor Page Down Select")),
             keybinding: [
                 {
                     when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( ContextKeyExpr.has(InputFocusedContextKey)), EditorContextKeys.editorTextFocus, ( NOTEBOOK_OUTPUT_FOCUSED.negate()))),
@@ -369,7 +369,7 @@ function getPageSize(context) {
             type: 'boolean',
             default: true,
             markdownDescription: ( localize(
-                7537,
+                7622,
                 "When enabled cursor can navigate to the next/previous cell when the current cursor in the cell editor is at the first/last line."
             ))
         }

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookInlineVariables.d.ts

@@ -1,10 +1,10 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { ILanguageFeaturesService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/languageFeatures";
+import { ILanguageFeaturesService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/languageFeatures.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IDebugService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug.service";
 import { INotebookExecutionStateService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service";
 import { INotebookKernelService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service";
-import { INotebookEditor, INotebookEditorContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { INotebookEditor, INotebookEditorContribution } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
 export declare class NotebookInlineVariablesController extends Disposable implements INotebookEditorContribution {
     private readonly notebookEditor;
     private readonly notebookKernelService;
@@ -16,14 +16,21 @@ export declare class NotebookInlineVariablesController extends Disposable implem
     private cellDecorationIds;
     private cellContentListeners;
     private currentCancellationTokenSources;
+    private static readonly MAX_CELL_LINES;
     constructor(notebookEditor: INotebookEditor, notebookKernelService: INotebookKernelService, notebookExecutionStateService: INotebookExecutionStateService, languageFeaturesService: ILanguageFeaturesService, configurationService: IConfigurationService, debugService: IDebugService);
     private updateInlineVariables;
+    private getFunctionRanges;
+    private getPythonFunctionRanges;
+    private getBracedFunctionRanges;
+    private getCommentedRanges;
+    private _getCommentedRanges;
+    private getCommentedRangesByAccurateTokenization;
+    private getCommentedRangesByManualParsing;
+    private isPositionInRanges;
     private updateCellInlineDecorations;
     private initCellContentListener;
     private clearCellInlineDecorations;
     private _clearNotebookInlineDecorations;
     clearNotebookInlineDecorations(): void;
-    private createNotebookInlineValueDecoration;
-    private replaceWsWithNoBreakWs;
     dispose(): void;
 }