@codingame/monaco-vscode-notebook-service-override 14.0.6 → 15.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +26 -29
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint.js +8 -8
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands.js +29 -28
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnosticEditorContrib.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnosticEditorContrib.js +3 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnosticsActions.js +9 -9
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/diagnosticCellStatusBarContrib.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/diagnosticCellStatusBarContrib.js +5 -9
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/contributedStatusBarItemController.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/contributedStatusBarItemController.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/statusBarProviders.js +5 -5
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/contribution.d.ts +1 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/contribution.js +10 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookCellDecorators.d.ts +4 -40
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookCellDecorators.js +13 -217
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatActionsOverlay.d.ts +3 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatActionsOverlay.js +22 -33
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatEditController.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatEditController.js +17 -20
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookOriginalCellModelFactory.d.ts +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookOriginalCellModelFactory.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookOriginalModelRefFactory.d.ts +3 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookOriginalModelRefFactory.js +8 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizer.d.ts +6 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizer.js +47 -29
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizerService.d.ts +5 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizerService.js +28 -17
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/clipboard/notebookClipboard.d.ts +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/clipboard/notebookClipboard.js +10 -10
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/debug/notebookBreakpoints.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/debug/notebookDebugDecorations.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/debug/notebookDebugDecorations.js +4 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/editorHint/emptyCellEditorHint.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/editorStatusBar/editorStatusBar.js +13 -13
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/execute/executionEditorProgress.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/execute/executionEditorProgress.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFind.js +7 -7
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/format/formatting.js +12 -11
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/gettingStarted/notebookGettingStarted.js +4 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/layout/layoutActions.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/marker/markerProvider.js +4 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookMulticursor.d.ts +3 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookMulticursor.js +14 -18
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookSelectionHighlight.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/navigation/arrow.js +18 -18
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookInlineVariables.d.ts +11 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookInlineVariables.js +328 -116
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariables.js +3 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesDataSource.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesTree.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesView.d.ts +1 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesView.js +8 -10
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.d.ts +5 -5
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.js +16 -16
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/profile/notebookProfile.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/saveParticipants/saveParticipants.d.ts +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/saveParticipants/saveParticipants.js +19 -18
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/troubleshoot/layout.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/troubleshoot/layout.js +5 -5
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/undoRedo/notebookUndoRedo.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/viewportWarmup/viewportWarmup.js +4 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions.d.ts +3 -5
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions.js +39 -37
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/notebook.chat.contribution.js +99 -8
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/editActions.js +40 -35
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/executeActions.js +31 -31
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/insertCellActions.d.ts +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/insertCellActions.js +37 -33
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/layoutActions.js +22 -25
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/notebookIndentationActions.js +11 -10
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/sectionActions.d.ts +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/sectionActions.js +17 -17
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/variablesActions.js +4 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffActions.js +58 -25
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebook.contribution.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebook.contribution.js +99 -87
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookAccessibilityHelp.js +12 -12
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookAccessibleView.js +3 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookExtensionPoint.js +33 -33
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookEditorServiceImpl.d.ts +6 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookEditorServiceImpl.js +7 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookExecutionServiceImpl.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookExecutionServiceImpl.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookExecutionStateServiceImpl.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookExecutionStateServiceImpl.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookKernelHistoryServiceImpl.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookKeymapServiceImpl.js +4 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookLoggingServiceImpl.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.d.ts +3 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.js +8 -5
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookWorkerServiceImpl.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookWorkerServiceImpl.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineEntryFactory.d.ts +5 -5
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineEntryFactory.js +2 -3
- package/vscode/src/vs/workbench/contrib/notebook/common/model/cellEdit.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.d.ts +3 -3
- package/vscode/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.js +5 -5
- package/vscode/src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverServiceImpl.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/common/notebookProvider.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/common/notebookProvider.js +3 -1
- package/vscode/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.js +20 -16
- package/vscode/src/vs/workbench/services/workingCopy/common/abstractFileWorkingCopyManager.d.ts +1 -1
- package/vscode/src/vs/workbench/services/workingCopy/common/fileWorkingCopyManager.d.ts +2 -2
- package/vscode/src/vs/workbench/services/workingCopy/common/fileWorkingCopyManager.js +14 -14
- package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopyManager.d.ts +1 -1
- package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopyManager.js +3 -3
- package/vscode/src/vs/workbench/services/workingCopy/common/untitledFileWorkingCopy.d.ts +2 -2
- package/vscode/src/vs/workbench/services/workingCopy/common/untitledFileWorkingCopy.js +2 -2
package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/execute/executionEditorProgress.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
|
|
3
3
|
import { throttle } from '@codingame/monaco-vscode-api/vscode/vs/base/common/decorators';
|
|
4
4
|
import { Disposable, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
|
|
5
|
-
import { registerNotebookContribution } from '@codingame/monaco-vscode-
|
|
5
|
+
import { registerNotebookContribution } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
|
|
6
6
|
import { NotebookCellExecutionState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
|
|
7
7
|
import { INotebookExecutionStateService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
|
|
8
8
|
import { IUserActivityService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userActivity/common/userActivityService.service';
|
|
@@ -3,7 +3,7 @@ import './media/notebookFind.css.js';
|
|
|
3
3
|
import { KeyCode, KeyMod } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
|
|
4
4
|
import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
|
|
5
5
|
import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
|
|
6
|
-
import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService';
|
|
6
|
+
import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service';
|
|
7
7
|
import { EditorOption } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/config/editorOptions';
|
|
8
8
|
import { EditorContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorContextKeys';
|
|
9
9
|
import { getSelectionSearchString, StartFindAction, StartFindReplaceAction } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/find/browser/findController';
|
|
@@ -12,11 +12,11 @@ import { registerAction2, Action2 } from '@codingame/monaco-vscode-api/vscode/vs
|
|
|
12
12
|
import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
|
|
13
13
|
import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
|
|
14
14
|
import { NotebookFindContrib } from '@codingame/monaco-vscode-1ae7d696-d960-5ac6-97a3-9fe7c8c3a793-common/vscode/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget';
|
|
15
|
-
import { NotebookMultiCellAction } from '@codingame/monaco-vscode-
|
|
16
|
-
import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-
|
|
17
|
-
import { registerNotebookContribution } from '@codingame/monaco-vscode-
|
|
15
|
+
import { NotebookMultiCellAction } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
|
|
16
|
+
import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
|
|
17
|
+
import { registerNotebookContribution } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
|
|
18
18
|
import { NotebookFindScopeType, CellUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
|
|
19
|
-
import { NOTEBOOK_EDITOR_FOCUSED, KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED, NOTEBOOK_IS_ACTIVE_EDITOR, INTERACTIVE_WINDOW_IS_ACTIVE_EDITOR } from '@codingame/monaco-vscode-
|
|
19
|
+
import { NOTEBOOK_EDITOR_FOCUSED, KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED, NOTEBOOK_IS_ACTIVE_EDITOR, INTERACTIVE_WINDOW_IS_ACTIVE_EDITOR } from '@codingame/monaco-vscode-52bb4d5b-ba1a-57fd-9bee-b28824214eac-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
|
|
20
20
|
import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
|
|
21
21
|
|
|
22
22
|
registerNotebookContribution(NotebookFindContrib.id, NotebookFindContrib);
|
|
@@ -24,7 +24,7 @@ registerAction2(class extends Action2 {
|
|
|
24
24
|
constructor() {
|
|
25
25
|
super({
|
|
26
26
|
id: 'notebook.hideFind',
|
|
27
|
-
title: ( localize2(
|
|
27
|
+
title: ( localize2(7591, 'Hide Find in Notebook')),
|
|
28
28
|
keybinding: {
|
|
29
29
|
when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED)),
|
|
30
30
|
primary: KeyCode.Escape,
|
|
@@ -47,7 +47,7 @@ registerAction2(class extends NotebookMultiCellAction {
|
|
|
47
47
|
constructor() {
|
|
48
48
|
super({
|
|
49
49
|
id: 'notebook.find',
|
|
50
|
-
title: ( localize2(
|
|
50
|
+
title: ( localize2(7592, 'Find in Notebook')),
|
|
51
51
|
keybinding: {
|
|
52
52
|
when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( ContextKeyExpr.or(NOTEBOOK_IS_ACTIVE_EDITOR, INTERACTIVE_WINDOW_IS_ACTIVE_EDITOR)), ( EditorContextKeys.focus.toNegated()))),
|
|
53
53
|
primary: KeyCode.KeyF | KeyMod.CtrlCmd,
|
|
@@ -5,20 +5,21 @@ import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/c
|
|
|
5
5
|
import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
|
|
6
6
|
import { DisposableStore, Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
|
|
7
7
|
import { registerEditorAction, EditorAction } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions';
|
|
8
|
-
import {
|
|
8
|
+
import { ResourceTextEdit } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService';
|
|
9
|
+
import { IBulkEditService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService.service';
|
|
9
10
|
import { EditorContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorContextKeys';
|
|
10
|
-
import { IEditorWorkerService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/editorWorker';
|
|
11
|
-
import { ILanguageFeaturesService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/languageFeatures';
|
|
12
|
-
import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService';
|
|
11
|
+
import { IEditorWorkerService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/editorWorker.service';
|
|
12
|
+
import { ILanguageFeaturesService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/languageFeatures.service';
|
|
13
|
+
import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
|
|
13
14
|
import { getDocumentFormattingEditsWithSelectedProvider, FormattingMode, formatDocumentWithSelectedProvider } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/format/browser/format';
|
|
14
15
|
import { registerAction2, Action2, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
|
|
15
16
|
import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
|
|
16
17
|
import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
|
|
17
18
|
import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
|
|
18
19
|
import { Progress } from '@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress';
|
|
19
|
-
import { NOTEBOOK_ACTIONS_CATEGORY } from '@codingame/monaco-vscode-
|
|
20
|
-
import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-
|
|
21
|
-
import { NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_EDITOR_EDITABLE } from '@codingame/monaco-vscode-
|
|
20
|
+
import { NOTEBOOK_ACTIONS_CATEGORY } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
|
|
21
|
+
import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
|
|
22
|
+
import { NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_EDITOR_EDITABLE } from '@codingame/monaco-vscode-52bb4d5b-ba1a-57fd-9bee-b28824214eac-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
|
|
22
23
|
import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
|
|
23
24
|
import { INotebookExecutionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionService.service';
|
|
24
25
|
import { NotebookSetting } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
|
|
@@ -33,7 +34,7 @@ registerAction2(class extends Action2 {
|
|
|
33
34
|
constructor() {
|
|
34
35
|
super({
|
|
35
36
|
id: 'notebook.format',
|
|
36
|
-
title: ( localize2(
|
|
37
|
+
title: ( localize2(7613, 'Format Notebook')),
|
|
37
38
|
category: NOTEBOOK_ACTIONS_CATEGORY,
|
|
38
39
|
precondition: ( ContextKeyExpr.and(NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_EDITOR_EDITABLE)),
|
|
39
40
|
keybinding: {
|
|
@@ -84,7 +85,7 @@ registerAction2(class extends Action2 {
|
|
|
84
85
|
}
|
|
85
86
|
return [];
|
|
86
87
|
})));
|
|
87
|
-
await bulkEditService.apply( allCellEdits.flat(), { label: ( localize(
|
|
88
|
+
await bulkEditService.apply( allCellEdits.flat(), { label: ( localize(7614, "Format Notebook")), code: 'undoredo.formatNotebook', });
|
|
88
89
|
}
|
|
89
90
|
}
|
|
90
91
|
finally {
|
|
@@ -96,7 +97,7 @@ registerEditorAction(class FormatCellAction extends EditorAction {
|
|
|
96
97
|
constructor() {
|
|
97
98
|
super({
|
|
98
99
|
id: 'notebook.formatCell',
|
|
99
|
-
label: ( localize2(
|
|
100
|
+
label: ( localize2(7615, "Format Cell")),
|
|
100
101
|
precondition: ( ContextKeyExpr.and(
|
|
101
102
|
NOTEBOOK_IS_ACTIVE_EDITOR,
|
|
102
103
|
NOTEBOOK_EDITOR_EDITABLE,
|
|
@@ -165,7 +166,7 @@ let FormatOnCellExecutionParticipant = class FormatOnCellExecutionParticipant {
|
|
|
165
166
|
}
|
|
166
167
|
return [];
|
|
167
168
|
})));
|
|
168
|
-
await this.bulkEditService.apply( allCellEdits.flat(), { label: ( localize(
|
|
169
|
+
await this.bulkEditService.apply( allCellEdits.flat(), { label: ( localize(7616, "Format Cells")), code: 'undoredo.notebooks.onWillExecuteFormat', });
|
|
169
170
|
}
|
|
170
171
|
finally {
|
|
171
172
|
disposable.dispose();
|
|
@@ -12,10 +12,10 @@ import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/regist
|
|
|
12
12
|
import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
|
|
13
13
|
import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
|
|
14
14
|
import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
|
|
15
|
-
import { Memento } from '@codingame/monaco-vscode-
|
|
15
|
+
import { Memento } from '@codingame/monaco-vscode-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-common/vscode/vs/workbench/common/memento';
|
|
16
16
|
import { NotebookSetting } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
|
|
17
|
-
import { HAS_OPENED_NOTEBOOK } from '@codingame/monaco-vscode-
|
|
18
|
-
import { NotebookEditorInput } from '@codingame/monaco-vscode-
|
|
17
|
+
import { HAS_OPENED_NOTEBOOK } from '@codingame/monaco-vscode-52bb4d5b-ba1a-57fd-9bee-b28824214eac-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
|
|
18
|
+
import { NotebookEditorInput } from '@codingame/monaco-vscode-9b5a5e82-d649-5455-b4bf-ef90d6afd294-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
|
|
19
19
|
import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
|
|
20
20
|
import { LifecyclePhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle';
|
|
21
21
|
|
|
@@ -66,7 +66,7 @@ registerAction2(class NotebookClearNotebookLayoutAction extends Action2 {
|
|
|
66
66
|
constructor() {
|
|
67
67
|
super({
|
|
68
68
|
id: 'workbench.notebook.layout.gettingStarted',
|
|
69
|
-
title: ( localize2(
|
|
69
|
+
title: ( localize2(7617, "Reset notebook getting started")),
|
|
70
70
|
f1: true,
|
|
71
71
|
precondition: ( ContextKeyExpr.equals(`config.${NotebookSetting.openGettingStarted}`, true)),
|
|
72
72
|
category: Categories.Developer,
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import { localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
|
|
3
3
|
import { Action2, MenuId, registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
|
|
4
4
|
import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
|
|
5
|
-
import { NOTEBOOK_ACTIONS_CATEGORY } from '@codingame/monaco-vscode-
|
|
5
|
+
import { NOTEBOOK_ACTIONS_CATEGORY } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
|
|
6
6
|
import { NotebookSetting } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
|
|
7
7
|
|
|
8
8
|
const TOGGLE_CELL_TOOLBAR_POSITION = 'notebook.toggleCellToolbarPosition';
|
|
@@ -10,7 +10,7 @@ class ToggleCellToolbarPositionAction extends Action2 {
|
|
|
10
10
|
constructor() {
|
|
11
11
|
super({
|
|
12
12
|
id: TOGGLE_CELL_TOOLBAR_POSITION,
|
|
13
|
-
title: ( localize2(
|
|
13
|
+
title: ( localize2(7618, 'Toggle Cell Toolbar Position')),
|
|
14
14
|
menu: [{
|
|
15
15
|
id: MenuId.NotebookCellTitle,
|
|
16
16
|
group: 'View',
|
|
@@ -1,14 +1,15 @@
|
|
|
1
1
|
|
|
2
2
|
import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
|
|
3
3
|
import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
|
|
4
|
-
import { MarkerList
|
|
4
|
+
import { MarkerList } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/gotoError/browser/markerNavigationService';
|
|
5
|
+
import { IMarkerNavigationService } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/gotoError/browser/markerNavigationService.service';
|
|
5
6
|
import { CellUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
|
|
6
7
|
import { MarkerSeverity } from '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers';
|
|
7
8
|
import { IMarkerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers.service';
|
|
8
9
|
import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
|
|
9
10
|
import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
|
|
10
|
-
import { NotebookOverviewRulerLane } from '@codingame/monaco-vscode-
|
|
11
|
-
import { registerNotebookContribution } from '@codingame/monaco-vscode-
|
|
11
|
+
import { NotebookOverviewRulerLane } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
|
|
12
|
+
import { registerNotebookContribution } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
|
|
12
13
|
import { throttle } from '@codingame/monaco-vscode-api/vscode/vs/base/common/decorators';
|
|
13
14
|
import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
|
|
14
15
|
import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/baseColors';
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
|
|
2
2
|
import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
|
|
3
|
-
import { ILanguageConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/languageConfigurationRegistry";
|
|
4
|
-
import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService";
|
|
3
|
+
import { ILanguageConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/languageConfigurationRegistry.service";
|
|
4
|
+
import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
|
|
5
5
|
import { IAccessibilityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility.service";
|
|
6
6
|
import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
|
|
7
7
|
import { RawContextKey } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey";
|
|
8
8
|
import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
|
|
9
9
|
import { IUndoRedoService } from "@codingame/monaco-vscode-api/vscode/vs/platform/undoRedo/common/undoRedo.service";
|
|
10
|
-
import { CellFindMatchWithIndex, ICellViewModel, INotebookEditor, INotebookEditorContribution } from "@codingame/monaco-vscode-
|
|
10
|
+
import { CellFindMatchWithIndex, ICellViewModel, INotebookEditor, INotebookEditorContribution } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
|
|
11
11
|
export declare enum NotebookMultiCursorState {
|
|
12
12
|
Idle = 0,
|
|
13
13
|
Selecting = 1,
|
package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookMulticursor.js
CHANGED
|
@@ -18,11 +18,10 @@ import { DeleteOperations } from '@codingame/monaco-vscode-api/vscode/vs/editor/
|
|
|
18
18
|
import { CursorConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/cursorCommon';
|
|
19
19
|
import { CursorChangeReason } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/cursorEvents';
|
|
20
20
|
import { Handler } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorCommon';
|
|
21
|
-
import { ILanguageConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/languageConfigurationRegistry';
|
|
21
|
+
import { ILanguageConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/languageConfigurationRegistry.service';
|
|
22
22
|
import { indentOfLine } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/textModel';
|
|
23
|
-
import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService';
|
|
23
|
+
import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
|
|
24
24
|
import { ViewModelEventsCollector } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/viewModelEventDispatcher';
|
|
25
|
-
import { WordHighlighterContribution } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/wordHighlighter/browser/wordHighlighter';
|
|
26
25
|
import { IAccessibilityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility.service';
|
|
27
26
|
import { MenuId, registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
|
|
28
27
|
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
|
|
|
33
32
|
import { IUndoRedoService } from '@codingame/monaco-vscode-api/vscode/vs/platform/undoRedo/common/undoRedo.service';
|
|
34
33
|
import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
|
|
35
34
|
import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
|
|
36
|
-
import { NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_CELL_EDITOR_FOCUSED, KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED } from '@codingame/monaco-vscode-
|
|
37
|
-
import { NotebookAction } from '@codingame/monaco-vscode-
|
|
38
|
-
import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-
|
|
39
|
-
import { registerNotebookContribution } from '@codingame/monaco-vscode-
|
|
40
|
-
import { CellEditorOptions } from '@codingame/monaco-vscode-
|
|
35
|
+
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';
|
|
36
|
+
import { NotebookAction } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
|
|
37
|
+
import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
|
|
38
|
+
import { registerNotebookContribution } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
|
|
39
|
+
import { CellEditorOptions } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions';
|
|
41
40
|
import { NotebookFindContrib } from '@codingame/monaco-vscode-1ae7d696-d960-5ac6-97a3-9fe7c8c3a793-common/vscode/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget';
|
|
42
|
-
import { NotebookCellTextModel } from '@codingame/monaco-vscode-
|
|
41
|
+
import { NotebookCellTextModel } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
|
|
43
42
|
|
|
44
43
|
const NOTEBOOK_ADD_FIND_MATCH_TO_SELECTION_ID = 'notebook.addFindMatchToSelection';
|
|
45
44
|
const NOTEBOOK_SELECT_ALL_FIND_MATCHES_ID = 'notebook.selectAllFindMatches';
|
|
@@ -629,6 +628,7 @@ let NotebookMultiCursorController = class NotebookMultiCursorController extends
|
|
|
629
628
|
this.configurationService
|
|
630
629
|
));
|
|
631
630
|
const options = cellEditorOptions.getUpdatedValue(cell.internalMetadata, cell.uri);
|
|
631
|
+
cellEditorOptions.dispose();
|
|
632
632
|
return ( new EditorConfiguration(
|
|
633
633
|
false,
|
|
634
634
|
MenuId.EditorContent,
|
|
@@ -686,10 +686,6 @@ let NotebookMultiCursorController = class NotebookMultiCursorController extends
|
|
|
686
686
|
});
|
|
687
687
|
});
|
|
688
688
|
cell.decorationIds = cell.cellViewModel.deltaModelDecorations(cell.decorationIds, newDecorations);
|
|
689
|
-
const matchingEditor = this.notebookEditor.codeEditors.find(cellEditor => cellEditor[0] === cell.cellViewModel);
|
|
690
|
-
if (matchingEditor) {
|
|
691
|
-
WordHighlighterContribution.get(matchingEditor[1])?.wordHighlighter?.trigger();
|
|
692
|
-
}
|
|
693
689
|
});
|
|
694
690
|
}
|
|
695
691
|
clearDecorations(cell) {
|
|
@@ -776,7 +772,7 @@ class NotebookSelectAllFindMatches extends NotebookAction {
|
|
|
776
772
|
constructor() {
|
|
777
773
|
super({
|
|
778
774
|
id: NOTEBOOK_SELECT_ALL_FIND_MATCHES_ID,
|
|
779
|
-
title: ( localize(
|
|
775
|
+
title: ( localize(7619, "Select All Occurrences of Find Match")),
|
|
780
776
|
precondition: ( ContextKeyExpr.and(( ContextKeyExpr.equals('config.notebook.multiCursor.enabled', true)))),
|
|
781
777
|
keybinding: {
|
|
782
778
|
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 {
|
|
|
809
805
|
constructor() {
|
|
810
806
|
super({
|
|
811
807
|
id: NOTEBOOK_ADD_FIND_MATCH_TO_SELECTION_ID,
|
|
812
|
-
title: ( localize(
|
|
808
|
+
title: ( localize(7620, "Add Selection To Next Find Match")),
|
|
813
809
|
precondition: ( ContextKeyExpr.and(( ContextKeyExpr.equals('config.notebook.multiCursor.enabled', true)), NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_CELL_EDITOR_FOCUSED)),
|
|
814
810
|
keybinding: {
|
|
815
811
|
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 {
|
|
|
835
831
|
constructor() {
|
|
836
832
|
super({
|
|
837
833
|
id: 'noteMultiCursor.exit',
|
|
838
|
-
title: ( localize(
|
|
834
|
+
title: ( localize(7621, "Exit Multi Cursor Mode")),
|
|
839
835
|
precondition: ( ContextKeyExpr.and(( ContextKeyExpr.equals('config.notebook.multiCursor.enabled', true)), NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_MULTI_CURSOR_CONTEXT.IsNotebookMultiCursor)),
|
|
840
836
|
keybinding: {
|
|
841
837
|
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 {
|
|
|
858
854
|
constructor() {
|
|
859
855
|
super({
|
|
860
856
|
id: 'noteMultiCursor.deleteLeft',
|
|
861
|
-
title: ( localize(
|
|
857
|
+
title: ( localize(7622, "Delete Left")),
|
|
862
858
|
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)))))),
|
|
863
859
|
keybinding: {
|
|
864
860
|
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 {
|
|
|
881
877
|
constructor() {
|
|
882
878
|
super({
|
|
883
879
|
id: 'noteMultiCursor.deleteRight',
|
|
884
|
-
title: ( localize(
|
|
880
|
+
title: ( localize(7623, "Delete Right")),
|
|
885
881
|
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)))))),
|
|
886
882
|
keybinding: {
|
|
887
883
|
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)))))),
|
|
@@ -5,7 +5,7 @@ import { Disposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode
|
|
|
5
5
|
import { Selection, SelectionDirection } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/selection';
|
|
6
6
|
import { CursorChangeReason } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/cursorEvents';
|
|
7
7
|
import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
|
|
8
|
-
import { registerNotebookContribution } from '@codingame/monaco-vscode-
|
|
8
|
+
import { registerNotebookContribution } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
|
|
9
9
|
|
|
10
10
|
let NotebookSelectionHighlighter = class NotebookSelectionHighlighter extends Disposable {
|
|
11
11
|
static { this.id = 'notebook.selectionHighlighter'; }
|
|
@@ -11,12 +11,12 @@ import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/
|
|
|
11
11
|
import { InputFocusedContextKey, IsWindowsContext } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkeys';
|
|
12
12
|
import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
|
|
13
13
|
import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
|
|
14
|
-
import { InlineChatController } from '@codingame/monaco-vscode-
|
|
15
|
-
import { CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION } from '@codingame/monaco-vscode-
|
|
16
|
-
import { NotebookCellAction, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, findTargetCellEditor, NotebookAction } from '@codingame/monaco-vscode-
|
|
17
|
-
import { CellEditState } from '@codingame/monaco-vscode-
|
|
14
|
+
import { InlineChatController } from '@codingame/monaco-vscode-29bc1406-2925-5b8f-b25e-d04a7772d896-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
|
|
15
|
+
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';
|
|
16
|
+
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';
|
|
17
|
+
import { CellEditState } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
|
|
18
18
|
import { NOTEBOOK_EDITOR_CURSOR_BOUNDARY, CellKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
|
|
19
|
-
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-
|
|
19
|
+
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';
|
|
20
20
|
|
|
21
21
|
const NOTEBOOK_FOCUS_TOP = 'notebook.focusTop';
|
|
22
22
|
const NOTEBOOK_FOCUS_BOTTOM = 'notebook.focusBottom';
|
|
@@ -34,7 +34,7 @@ registerAction2(class extends Action2 {
|
|
|
34
34
|
super({
|
|
35
35
|
id: 'notebook.cell.nullAction',
|
|
36
36
|
title: ( localize(
|
|
37
|
-
|
|
37
|
+
7624,
|
|
38
38
|
"Keypresses that should be handled by the focused element in the cell output."
|
|
39
39
|
)),
|
|
40
40
|
keybinding: [{
|
|
@@ -57,7 +57,7 @@ registerAction2(class FocusNextCellAction extends NotebookCellAction {
|
|
|
57
57
|
constructor() {
|
|
58
58
|
super({
|
|
59
59
|
id: NOTEBOOK_FOCUS_NEXT_EDITOR,
|
|
60
|
-
title: ( localize(
|
|
60
|
+
title: ( localize(7625, 'Focus Next Cell Editor')),
|
|
61
61
|
keybinding: [
|
|
62
62
|
{
|
|
63
63
|
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 {
|
|
|
111
111
|
constructor() {
|
|
112
112
|
super({
|
|
113
113
|
id: NOTEBOOK_FOCUS_PREVIOUS_EDITOR,
|
|
114
|
-
title: ( localize(
|
|
114
|
+
title: ( localize(7626, 'Focus Previous Cell Editor')),
|
|
115
115
|
keybinding: [
|
|
116
116
|
{
|
|
117
117
|
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 {
|
|
|
156
156
|
constructor() {
|
|
157
157
|
super({
|
|
158
158
|
id: NOTEBOOK_FOCUS_TOP,
|
|
159
|
-
title: ( localize(
|
|
159
|
+
title: ( localize(7627, 'Focus First Cell')),
|
|
160
160
|
keybinding: [
|
|
161
161
|
{
|
|
162
162
|
when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey))),
|
|
@@ -188,7 +188,7 @@ registerAction2(class extends NotebookAction {
|
|
|
188
188
|
constructor() {
|
|
189
189
|
super({
|
|
190
190
|
id: NOTEBOOK_FOCUS_BOTTOM,
|
|
191
|
-
title: ( localize(
|
|
191
|
+
title: ( localize(7628, 'Focus Last Cell')),
|
|
192
192
|
keybinding: [
|
|
193
193
|
{
|
|
194
194
|
when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey))),
|
|
@@ -225,7 +225,7 @@ registerAction2(class extends NotebookCellAction {
|
|
|
225
225
|
constructor() {
|
|
226
226
|
super({
|
|
227
227
|
id: FOCUS_IN_OUTPUT_COMMAND_ID,
|
|
228
|
-
title: ( localize(
|
|
228
|
+
title: ( localize(7629, 'Focus In Active Cell Output')),
|
|
229
229
|
keybinding: [{
|
|
230
230
|
when: ( ContextKeyExpr.and(( IS_COMPOSITE_NOTEBOOK.negate()), IsWindowsContext)),
|
|
231
231
|
primary: KeyMod.CtrlCmd | KeyCode.DownArrow,
|
|
@@ -248,7 +248,7 @@ registerAction2(class extends NotebookCellAction {
|
|
|
248
248
|
constructor() {
|
|
249
249
|
super({
|
|
250
250
|
id: FOCUS_OUT_OUTPUT_COMMAND_ID,
|
|
251
|
-
title: ( localize(
|
|
251
|
+
title: ( localize(7630, 'Focus Out Active Cell Output')),
|
|
252
252
|
keybinding: {
|
|
253
253
|
primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.UpArrow,
|
|
254
254
|
mac: { primary: KeyMod.WinCtrl | KeyMod.CtrlCmd | KeyCode.UpArrow, },
|
|
@@ -267,7 +267,7 @@ registerAction2(class CenterActiveCellAction extends NotebookCellAction {
|
|
|
267
267
|
constructor() {
|
|
268
268
|
super({
|
|
269
269
|
id: CENTER_ACTIVE_CELL,
|
|
270
|
-
title: ( localize(
|
|
270
|
+
title: ( localize(7631, "Center Active Cell")),
|
|
271
271
|
keybinding: {
|
|
272
272
|
when: NOTEBOOK_EDITOR_FOCUSED,
|
|
273
273
|
primary: KeyMod.CtrlCmd | KeyCode.KeyL,
|
|
@@ -286,7 +286,7 @@ registerAction2(class extends NotebookCellAction {
|
|
|
286
286
|
constructor() {
|
|
287
287
|
super({
|
|
288
288
|
id: NOTEBOOK_CURSOR_PAGEUP_COMMAND_ID,
|
|
289
|
-
title: ( localize(
|
|
289
|
+
title: ( localize(7632, "Cell Cursor Page Up")),
|
|
290
290
|
keybinding: [
|
|
291
291
|
{
|
|
292
292
|
when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( ContextKeyExpr.has(InputFocusedContextKey)), EditorContextKeys.editorTextFocus)),
|
|
@@ -304,7 +304,7 @@ registerAction2(class extends NotebookCellAction {
|
|
|
304
304
|
constructor() {
|
|
305
305
|
super({
|
|
306
306
|
id: NOTEBOOK_CURSOR_PAGEUP_SELECT_COMMAND_ID,
|
|
307
|
-
title: ( localize(
|
|
307
|
+
title: ( localize(7633, "Cell Cursor Page Up Select")),
|
|
308
308
|
keybinding: [
|
|
309
309
|
{
|
|
310
310
|
when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( ContextKeyExpr.has(InputFocusedContextKey)), EditorContextKeys.editorTextFocus, ( NOTEBOOK_OUTPUT_FOCUSED.negate()))),
|
|
@@ -322,7 +322,7 @@ registerAction2(class extends NotebookCellAction {
|
|
|
322
322
|
constructor() {
|
|
323
323
|
super({
|
|
324
324
|
id: NOTEBOOK_CURSOR_PAGEDOWN_COMMAND_ID,
|
|
325
|
-
title: ( localize(
|
|
325
|
+
title: ( localize(7634, "Cell Cursor Page Down")),
|
|
326
326
|
keybinding: [
|
|
327
327
|
{
|
|
328
328
|
when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( ContextKeyExpr.has(InputFocusedContextKey)), EditorContextKeys.editorTextFocus)),
|
|
@@ -340,7 +340,7 @@ registerAction2(class extends NotebookCellAction {
|
|
|
340
340
|
constructor() {
|
|
341
341
|
super({
|
|
342
342
|
id: NOTEBOOK_CURSOR_PAGEDOWN_SELECT_COMMAND_ID,
|
|
343
|
-
title: ( localize(
|
|
343
|
+
title: ( localize(7635, "Cell Cursor Page Down Select")),
|
|
344
344
|
keybinding: [
|
|
345
345
|
{
|
|
346
346
|
when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( ContextKeyExpr.has(InputFocusedContextKey)), EditorContextKeys.editorTextFocus, ( NOTEBOOK_OUTPUT_FOCUSED.negate()))),
|
|
@@ -369,7 +369,7 @@ function getPageSize(context) {
|
|
|
369
369
|
type: 'boolean',
|
|
370
370
|
default: true,
|
|
371
371
|
markdownDescription: ( localize(
|
|
372
|
-
|
|
372
|
+
7636,
|
|
373
373
|
"When enabled cursor can navigate to the next/previous cell when the current cursor in the cell editor is at the first/last line."
|
|
374
374
|
))
|
|
375
375
|
}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
|
|
2
|
-
import { ILanguageFeaturesService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/languageFeatures";
|
|
2
|
+
import { ILanguageFeaturesService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/languageFeatures.service";
|
|
3
3
|
import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
|
|
4
4
|
import { IDebugService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug.service";
|
|
5
5
|
import { INotebookExecutionStateService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service";
|
|
6
6
|
import { INotebookKernelService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service";
|
|
7
|
-
import { INotebookEditor, INotebookEditorContribution } from "@codingame/monaco-vscode-
|
|
7
|
+
import { INotebookEditor, INotebookEditorContribution } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
|
|
8
8
|
export declare class NotebookInlineVariablesController extends Disposable implements INotebookEditorContribution {
|
|
9
9
|
private readonly notebookEditor;
|
|
10
10
|
private readonly notebookKernelService;
|
|
@@ -16,14 +16,21 @@ export declare class NotebookInlineVariablesController extends Disposable implem
|
|
|
16
16
|
private cellDecorationIds;
|
|
17
17
|
private cellContentListeners;
|
|
18
18
|
private currentCancellationTokenSources;
|
|
19
|
+
private static readonly MAX_CELL_LINES;
|
|
19
20
|
constructor(notebookEditor: INotebookEditor, notebookKernelService: INotebookKernelService, notebookExecutionStateService: INotebookExecutionStateService, languageFeaturesService: ILanguageFeaturesService, configurationService: IConfigurationService, debugService: IDebugService);
|
|
20
21
|
private updateInlineVariables;
|
|
22
|
+
private getFunctionRanges;
|
|
23
|
+
private getPythonFunctionRanges;
|
|
24
|
+
private getBracedFunctionRanges;
|
|
25
|
+
private getCommentedRanges;
|
|
26
|
+
private _getCommentedRanges;
|
|
27
|
+
private getCommentedRangesByAccurateTokenization;
|
|
28
|
+
private getCommentedRangesByManualParsing;
|
|
29
|
+
private isPositionInRanges;
|
|
21
30
|
private updateCellInlineDecorations;
|
|
22
31
|
private initCellContentListener;
|
|
23
32
|
private clearCellInlineDecorations;
|
|
24
33
|
private _clearNotebookInlineDecorations;
|
|
25
34
|
clearNotebookInlineDecorations(): void;
|
|
26
|
-
private createNotebookInlineValueDecoration;
|
|
27
|
-
private replaceWsWithNoBreakWs;
|
|
28
35
|
dispose(): void;
|
|
29
36
|
}
|