@codingame/monaco-vscode-api 1.83.1 → 1.83.3-next.0
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/extensions.d.ts +3 -3
- package/extensions.js +31 -33
- package/l10n.d.ts +4 -0
- package/l10n.js +10 -0
- package/missing-services.js +4 -2
- package/monaco-editor-treemending.patch +12268 -1070
- package/monaco-treemending.js +8 -2
- package/package.json +8 -1
- package/service-override/extensions.js +2 -2
- package/service-override/layout.js +2 -2
- package/tools/l10n.js +177 -0
- package/tools.js +22 -1
- package/vscode/src/vs/base/browser/ui/menu/menubar.js +1 -1
- package/vscode/src/vs/base/browser/ui/splitview/paneview.js +2 -2
- package/vscode/src/vs/base/common/date.js +55 -55
- package/vscode/src/vs/base/common/jsonErrorMessages.js +10 -10
- package/vscode/src/vs/base/common/tfIdf.js +137 -0
- package/vscode/src/vs/editor/contrib/quickAccess/browser/commandsQuickAccess.js +23 -0
- package/vscode/src/vs/editor/contrib/quickAccess/browser/editorNavigationQuickAccess.js +115 -0
- package/vscode/src/vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess.js +112 -0
- package/vscode/src/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.js +334 -0
- package/vscode/src/vs/platform/dialogs/common/dialogs.js +10 -14
- package/vscode/src/vs/platform/extensionManagement/common/extensionManagement.js +3 -0
- package/vscode/src/vs/platform/extensionManagement/common/extensionNls.js +2 -2
- package/vscode/src/vs/platform/files/common/fileService.js +28 -37
- package/vscode/src/vs/platform/files/common/files.js +6 -6
- package/vscode/src/vs/platform/files/common/io.js +2 -2
- package/vscode/src/vs/platform/keyboardLayout/common/keyboardConfig.js +3 -9
- package/vscode/src/vs/platform/quickinput/browser/commandsQuickAccess.js +300 -0
- package/vscode/src/vs/platform/quickinput/browser/helpQuickAccess.js +59 -0
- package/vscode/src/vs/platform/quickinput/browser/pickerQuickAccess.js +212 -0
- package/vscode/src/vs/platform/request/common/request.js +2 -2
- package/vscode/src/vs/platform/theme/common/tokenClassificationRegistry.js +42 -63
- package/vscode/src/vs/platform/workspaces/common/workspaces.js +15 -15
- package/vscode/src/vs/workbench/api/browser/mainThreadAuthentication.js +13 -32
- package/vscode/src/vs/workbench/api/browser/mainThreadComments.js +2 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadCustomEditors.js +50 -52
- package/vscode/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.js +58 -69
- package/vscode/src/vs/workbench/api/browser/mainThreadEditSessionIdentityParticipant.js +4 -5
- package/vscode/src/vs/workbench/api/browser/mainThreadExtensionService.js +38 -50
- package/vscode/src/vs/workbench/api/browser/mainThreadFileSystem.js +23 -23
- package/vscode/src/vs/workbench/api/browser/mainThreadFileSystemEventService.js +21 -53
- package/vscode/src/vs/workbench/api/browser/mainThreadMessageService.js +4 -4
- package/vscode/src/vs/workbench/api/browser/mainThreadNotebookSaveParticipant.js +4 -5
- package/vscode/src/vs/workbench/api/browser/mainThreadProgress.js +6 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadSaveParticipant.js +4 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadTask.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadTunnelService.js +2 -12
- package/vscode/src/vs/workbench/api/browser/mainThreadUriOpeners.js +15 -9
- package/vscode/src/vs/workbench/api/browser/mainThreadWebviews.js +16 -20
- package/vscode/src/vs/workbench/api/browser/mainThreadWorkspace.js +6 -28
- package/vscode/src/vs/workbench/api/browser/statusBarExtensionPoint.js +60 -0
- package/vscode/src/vs/workbench/api/common/extHostChat.js +3 -3
- package/vscode/src/vs/workbench/api/common/extHostCommands.js +59 -65
- package/vscode/src/vs/workbench/api/common/extHostConsoleForwarder.js +8 -8
- package/vscode/src/vs/workbench/api/common/extHostDiagnostics.js +2 -6
- package/vscode/src/vs/workbench/api/common/extHostExtensionService.js +2 -2
- package/vscode/src/vs/workbench/api/common/extHostLanguageFeatures.js +150 -222
- package/vscode/src/vs/workbench/api/common/extHostLogService.js +2 -2
- package/vscode/src/vs/workbench/api/common/extHostNotebook.js +3 -3
- package/vscode/src/vs/workbench/api/common/extHostProgress.js +2 -6
- package/vscode/src/vs/workbench/api/common/extHostSCM.js +54 -58
- package/vscode/src/vs/workbench/api/common/extHostStatusBar.js +3 -7
- package/vscode/src/vs/workbench/api/common/extHostTelemetry.js +2 -6
- package/vscode/src/vs/workbench/api/common/extHostTerminalService.js +2 -6
- package/vscode/src/vs/workbench/api/common/extHostTreeViews.js +55 -57
- package/vscode/src/vs/workbench/api/common/extHostTunnelService.js +28 -28
- package/vscode/src/vs/workbench/api/common/extHostTypeConverters.js +265 -277
- package/vscode/src/vs/workbench/api/common/extHostWorkspace.js +2 -7
- package/vscode/src/vs/workbench/api/common/extensionHostMain.js +17 -19
- package/vscode/src/vs/workbench/api/common/jsonValidationExtensionPoint.js +9 -34
- package/vscode/src/vs/workbench/api/worker/extHostExtensionService.js +5 -5
- package/vscode/src/vs/workbench/browser/actions/layoutActions.js +898 -68
- package/vscode/src/vs/workbench/browser/actions/quickAccessActions.js +7 -7
- package/vscode/src/vs/workbench/browser/actions/windowActions.js +32 -38
- package/vscode/src/vs/workbench/browser/actions/workspaceActions.js +103 -13
- package/vscode/src/vs/workbench/browser/actions/workspaceCommands.js +2 -2
- package/vscode/src/vs/workbench/browser/editor.js +3 -3
- package/vscode/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.js +12 -27
- package/vscode/src/vs/workbench/browser/parts/compositeBarActions.js +12 -12
- package/vscode/src/vs/workbench/browser/parts/editor/binaryDiffEditor.js +2 -7
- package/vscode/src/vs/workbench/browser/parts/editor/binaryEditor.js +4 -7
- package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbs.js +42 -90
- package/vscode/src/vs/workbench/browser/parts/editor/editor.contribution.js +140 -272
- package/vscode/src/vs/workbench/browser/parts/editor/editorActions.js +115 -148
- package/vscode/src/vs/workbench/browser/parts/editor/editorCommands.js +21 -33
- package/vscode/src/vs/workbench/browser/parts/editor/editorConfiguration.js +7 -19
- package/vscode/src/vs/workbench/browser/parts/editor/editorPlaceholder.js +10 -26
- package/vscode/src/vs/workbench/browser/parts/editor/editorQuickAccess.js +7 -17
- package/vscode/src/vs/workbench/browser/parts/editor/editorStatus.js +60 -81
- package/vscode/src/vs/workbench/browser/parts/editor/sideBySideEditor.js +27 -33
- package/vscode/src/vs/workbench/browser/parts/editor/textCodeEditor.js +2 -2
- package/vscode/src/vs/workbench/browser/parts/editor/textDiffEditor.js +19 -32
- package/vscode/src/vs/workbench/browser/parts/editor/textEditor.js +2 -2
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsCommands.js +8 -8
- package/vscode/src/vs/workbench/browser/parts/panel/panelActions.js +69 -34
- package/vscode/src/vs/workbench/browser/parts/titlebar/menubarControl.js +58 -34
- package/vscode/src/vs/workbench/browser/parts/views/viewFilter.js +2 -2
- package/vscode/src/vs/workbench/browser/parts/views/viewPane.js +3 -9
- package/vscode/src/vs/workbench/browser/parts/views/viewPaneContainer.js +6 -6
- package/vscode/src/vs/workbench/browser/parts/views/viewsService.js +7 -11
- package/vscode/src/vs/workbench/browser/quickaccess.js +7 -3
- package/vscode/src/vs/workbench/browser/workbench.contribution.js +186 -683
- package/vscode/src/vs/workbench/common/configuration.js +12 -15
- package/vscode/src/vs/workbench/common/contextkeys.js +272 -90
- package/vscode/src/vs/workbench/common/editor/diffEditorInput.js +2 -2
- package/vscode/src/vs/workbench/common/editor/sideBySideEditorInput.js +2 -7
- package/vscode/src/vs/workbench/common/editor/textEditorModel.js +2 -6
- package/vscode/src/vs/workbench/common/editor.js +5 -5
- package/vscode/src/vs/workbench/common/theme.js +137 -527
- package/vscode/src/vs/workbench/common/views.js +4 -8
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.js +15 -55
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibilityContributions.js +3 -8
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibleView.js +22 -60
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibleViewActions.js +9 -15
- package/vscode/src/vs/workbench/contrib/bulkEdit/browser/bulkEditService.js +18 -48
- package/vscode/src/vs/workbench/contrib/bulkEdit/browser/bulkFileEdits.js +58 -74
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatActions.js +2 -0
- package/vscode/src/vs/workbench/contrib/chat/common/chatAgents.js +5 -10
- package/vscode/src/vs/workbench/contrib/chat/common/chatSlashCommands.js +5 -13
- package/vscode/src/vs/workbench/contrib/codeActions/browser/codeActionsContribution.js +8 -27
- package/vscode/src/vs/workbench/contrib/codeActions/common/codeActionsExtensionPoint.js +5 -17
- package/vscode/src/vs/workbench/contrib/codeActions/common/documentationExtensionPoint.js +6 -15
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/diffEditorHelper.js +7 -20
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.js +2 -2
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/languageConfigurationExtensionPoint.js +63 -216
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/largeFileOptimizations.js +4 -7
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess.js +5 -8
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.js +8 -11
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/saveParticipants.js +5 -15
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleMinimap.js +3 -3
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleMultiCursorModifier.js +5 -5
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleRenderControlCharacter.js +3 -6
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleRenderWhitespace.js +3 -6
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleWordWrap.js +10 -9
- package/vscode/src/vs/workbench/contrib/comments/browser/commentColors.js +6 -15
- package/vscode/src/vs/workbench/contrib/comments/browser/commentGlyphWidget.js +5 -20
- package/vscode/src/vs/workbench/contrib/comments/browser/commentNode.js +3 -10
- package/vscode/src/vs/workbench/contrib/comments/browser/commentReply.js +4 -4
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadBody.js +3 -20
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadHeader.js +9 -3
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadWidget.js +4 -13
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.js +19 -19
- package/vscode/src/vs/workbench/contrib/comments/browser/comments.contribution.js +26 -77
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsController.js +5 -17
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.js +31 -40
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsView.js +10 -29
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsViewActions.js +10 -10
- package/vscode/src/vs/workbench/contrib/comments/browser/reactionsAction.js +8 -8
- package/vscode/src/vs/workbench/contrib/comments/common/commentContextKeys.js +25 -21
- package/vscode/src/vs/workbench/contrib/comments/common/commentModel.js +2 -2
- package/vscode/src/vs/workbench/contrib/customEditor/common/customEditor.js +1 -4
- package/vscode/src/vs/workbench/contrib/debug/browser/debugColors.js +20 -20
- package/vscode/src/vs/workbench/contrib/debug/browser/debugIcons.js +56 -98
- package/vscode/src/vs/workbench/contrib/debug/common/abstractDebugAdapter.js +2 -2
- package/vscode/src/vs/workbench/contrib/debug/common/debug.js +96 -180
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsIcons.js +25 -79
- package/vscode/src/vs/workbench/contrib/externalUriOpener/common/configuration.js +4 -15
- package/vscode/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService.js +4 -8
- package/vscode/src/vs/workbench/contrib/files/browser/explorerViewlet.js +56 -19
- package/vscode/src/vs/workbench/contrib/files/browser/fileActions.js +76 -230
- package/vscode/src/vs/workbench/contrib/files/browser/fileConstants.js +6 -5
- package/vscode/src/vs/workbench/contrib/files/browser/fileImportExport.js +33 -103
- package/vscode/src/vs/workbench/contrib/files/browser/files.contribution.js +228 -99
- package/vscode/src/vs/workbench/contrib/files/browser/views/emptyView.js +1 -1
- package/vscode/src/vs/workbench/contrib/files/browser/views/explorerDecorationsProvider.js +5 -9
- package/vscode/src/vs/workbench/contrib/files/browser/views/explorerView.js +5 -5
- package/vscode/src/vs/workbench/contrib/files/browser/views/explorerViewer.js +15 -35
- package/vscode/src/vs/workbench/contrib/files/browser/views/openEditorsView.js +5 -8
- package/vscode/src/vs/workbench/contrib/files/common/files.js +27 -48
- package/vscode/src/vs/workbench/contrib/folding/browser/folding.contribution.js +3 -6
- package/vscode/src/vs/workbench/contrib/format/browser/formatModified.js +1 -1
- package/vscode/src/vs/workbench/contrib/inlayHints/browser/inlayHintsAccessibilty.js +5 -8
- package/vscode/src/vs/workbench/contrib/inlineChat/common/inlineChat.js +112 -52
- package/vscode/src/vs/workbench/contrib/keybindings/browser/keybindings.contribution.js +1 -1
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.js +2 -2
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.js +30 -96
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/mapping.js +73 -126
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.js +3 -3
- package/vscode/src/vs/workbench/contrib/mergeEditor/common/mergeEditor.js +42 -0
- package/vscode/src/vs/workbench/contrib/output/browser/output.contribution.js +23 -29
- package/vscode/src/vs/workbench/contrib/output/browser/outputView.js +3 -3
- package/vscode/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.js +13 -16
- package/vscode/src/vs/workbench/contrib/quickaccess/browser/quickAccess.contribution.js +15 -34
- package/vscode/src/vs/workbench/contrib/quickaccess/browser/viewQuickAccess.js +12 -17
- package/vscode/src/vs/workbench/contrib/scm/browser/dirtyDiffSwitcher.js +2 -2
- package/vscode/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.js +26 -75
- package/vscode/src/vs/workbench/contrib/snippets/browser/snippetCompletionProvider.js +4 -19
- package/vscode/src/vs/workbench/contrib/snippets/browser/snippetsFile.js +4 -4
- package/vscode/src/vs/workbench/contrib/snippets/browser/snippetsService.js +60 -99
- package/vscode/src/vs/workbench/contrib/tasks/common/taskDefinitionRegistry.js +5 -14
- package/vscode/src/vs/workbench/contrib/tasks/common/taskService.js +26 -13
- package/vscode/src/vs/workbench/contrib/tasks/common/tasks.js +88 -96
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalEditorInput.js +5 -17
- package/vscode/src/vs/workbench/contrib/terminal/common/terminal.js +7 -28
- package/vscode/src/vs/workbench/contrib/terminal/common/terminalColorRegistry.js +21 -78
- package/vscode/src/vs/workbench/contrib/terminal/common/terminalContextKey.js +21 -53
- package/vscode/src/vs/workbench/contrib/testing/common/testResult.js +2 -2
- package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewEditor.js +2 -5
- package/vscode/src/vs/workbench/services/actions/common/menusExtensionPoint.js +113 -348
- package/vscode/src/vs/workbench/services/assignment/common/assignmentService.js +2 -5
- package/vscode/src/vs/workbench/services/authentication/browser/authenticationService.js +31 -1
- package/vscode/src/vs/workbench/services/configuration/common/jsonEditingService.js +1 -4
- package/vscode/src/vs/workbench/services/configurationResolver/common/variableResolver.js +16 -16
- package/vscode/src/vs/workbench/services/decorations/browser/decorationsService.js +2 -2
- package/vscode/src/vs/workbench/services/editor/common/editorResolverService.js +2 -5
- package/vscode/src/vs/workbench/services/extensions/browser/extensionUrlHandler.js +4 -4
- package/vscode/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.js +27 -29
- package/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.js +104 -141
- package/vscode/src/vs/workbench/services/extensions/common/extensionHostManager.js +35 -39
- package/vscode/src/vs/workbench/services/extensions/common/extensionRunningLocationTracker.js +25 -25
- package/vscode/src/vs/workbench/services/extensions/common/extensionsRegistry.js +80 -296
- package/vscode/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.js +6 -21
- package/vscode/src/vs/workbench/services/host/browser/browserHostService.js +3 -6
- package/vscode/src/vs/workbench/services/keybinding/browser/keybindingService.js +24 -81
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.js +2 -2
- package/vscode/src/vs/workbench/services/keybinding/common/keybindingEditing.js +11 -17
- package/vscode/src/vs/workbench/services/keybinding/common/macLinuxKeyboardMapper.js +30 -32
- package/vscode/src/vs/workbench/services/language/common/languageService.js +23 -98
- package/vscode/src/vs/workbench/services/remote/common/tunnelModel.js +83 -95
- package/vscode/src/vs/workbench/services/search/common/queryBuilder.js +1 -5
- package/vscode/src/vs/workbench/services/textfile/browser/textFileService.js +11 -23
- package/vscode/src/vs/workbench/services/textfile/common/textFileEditorModel.js +32 -32
- package/vscode/src/vs/workbench/services/textfile/common/textFileEditorModelManager.js +2 -7
- package/vscode/src/vs/workbench/services/textfile/common/textFileSaveParticipant.js +2 -2
- package/vscode/src/vs/workbench/services/themes/common/colorExtensionPoint.js +16 -53
- package/vscode/src/vs/workbench/services/themes/common/iconExtensionPoint.js +50 -1
- package/vscode/src/vs/workbench/services/themes/common/tokenClassificationExtensionPoint.js +25 -99
- package/vscode/src/vs/workbench/services/untitled/common/untitledTextEditorService.js +16 -16
- package/vscode/src/vs/workbench/services/userDataProfile/common/userDataProfile.js +6 -3
- package/vscode/src/vs/workbench/services/userDataSync/common/userDataSync.js +15 -3
- package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopySaveParticipant.js +2 -2
- package/vscode/src/vs/workbench/services/workingCopy/common/workingCopyBackupService.js +32 -42
|
@@ -8,7 +8,7 @@ import { ResourceMap } from 'monaco-editor/esm/vs/base/common/map.js';
|
|
|
8
8
|
import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
|
|
9
9
|
import { Disposable, DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
|
|
10
10
|
var UntitledTextEditorService_1;
|
|
11
|
-
const IUntitledTextEditorService = (
|
|
11
|
+
const IUntitledTextEditorService = ( createDecorator('untitledTextEditorService'));
|
|
12
12
|
let UntitledTextEditorService = class UntitledTextEditorService extends Disposable {
|
|
13
13
|
static { UntitledTextEditorService_1 = this; }
|
|
14
14
|
static { this.UNTITLED_WITHOUT_ASSOCIATED_RESOURCE_REGEX = /Untitled-\d+/; }
|
|
@@ -16,15 +16,15 @@ let UntitledTextEditorService = class UntitledTextEditorService extends Disposab
|
|
|
16
16
|
super();
|
|
17
17
|
this.instantiationService = instantiationService;
|
|
18
18
|
this.configurationService = configurationService;
|
|
19
|
-
this._onDidChangeDirty = this._register((
|
|
19
|
+
this._onDidChangeDirty = this._register(( new Emitter()));
|
|
20
20
|
this.onDidChangeDirty = this._onDidChangeDirty.event;
|
|
21
|
-
this._onDidChangeEncoding = this._register((
|
|
21
|
+
this._onDidChangeEncoding = this._register(( new Emitter()));
|
|
22
22
|
this.onDidChangeEncoding = this._onDidChangeEncoding.event;
|
|
23
|
-
this._onWillDispose = this._register((
|
|
23
|
+
this._onWillDispose = this._register(( new Emitter()));
|
|
24
24
|
this.onWillDispose = this._onWillDispose.event;
|
|
25
|
-
this._onDidChangeLabel = this._register((
|
|
25
|
+
this._onDidChangeLabel = this._register(( new Emitter()));
|
|
26
26
|
this.onDidChangeLabel = this._onDidChangeLabel.event;
|
|
27
|
-
this.mapResourceToModel = (
|
|
27
|
+
this.mapResourceToModel = ( new ResourceMap());
|
|
28
28
|
}
|
|
29
29
|
get(resource) {
|
|
30
30
|
return this.mapResourceToModel.get(resource);
|
|
@@ -42,7 +42,7 @@ let UntitledTextEditorService = class UntitledTextEditorService extends Disposab
|
|
|
42
42
|
}
|
|
43
43
|
doCreateOrGet(options = Object.create(null)) {
|
|
44
44
|
const massagedOptions = this.massageOptions(options);
|
|
45
|
-
if (massagedOptions.untitledResource && (
|
|
45
|
+
if (massagedOptions.untitledResource && ( this.mapResourceToModel.has(massagedOptions.untitledResource))) {
|
|
46
46
|
return this.mapResourceToModel.get(massagedOptions.untitledResource);
|
|
47
47
|
}
|
|
48
48
|
return this.doCreate(massagedOptions);
|
|
@@ -50,13 +50,13 @@ let UntitledTextEditorService = class UntitledTextEditorService extends Disposab
|
|
|
50
50
|
massageOptions(options) {
|
|
51
51
|
const massagedOptions = Object.create(null);
|
|
52
52
|
if (options.associatedResource) {
|
|
53
|
-
massagedOptions.untitledResource = (
|
|
53
|
+
massagedOptions.untitledResource = ( URI.from({
|
|
54
54
|
scheme: Schemas.untitled,
|
|
55
55
|
authority: options.associatedResource.authority,
|
|
56
56
|
fragment: options.associatedResource.fragment,
|
|
57
57
|
path: options.associatedResource.path,
|
|
58
58
|
query: options.associatedResource.query
|
|
59
|
-
}))
|
|
59
|
+
}));
|
|
60
60
|
massagedOptions.associatedResource = options.associatedResource;
|
|
61
61
|
}
|
|
62
62
|
else {
|
|
@@ -82,16 +82,16 @@ let UntitledTextEditorService = class UntitledTextEditorService extends Disposab
|
|
|
82
82
|
if (!untitledResource) {
|
|
83
83
|
let counter = 1;
|
|
84
84
|
do {
|
|
85
|
-
untitledResource = (
|
|
85
|
+
untitledResource = ( URI.from({ scheme: Schemas.untitled, path: `Untitled-${counter}` }));
|
|
86
86
|
counter++;
|
|
87
|
-
} while ((
|
|
87
|
+
} while (( this.mapResourceToModel.has(untitledResource)));
|
|
88
88
|
}
|
|
89
89
|
const model = this._register(this.instantiationService.createInstance(UntitledTextEditorModel, untitledResource, !!options.associatedResource, options.initialValue, options.languageId, options.encoding));
|
|
90
90
|
this.registerModel(model);
|
|
91
91
|
return model;
|
|
92
92
|
}
|
|
93
93
|
registerModel(model) {
|
|
94
|
-
const modelListeners = (
|
|
94
|
+
const modelListeners = ( new DisposableStore());
|
|
95
95
|
modelListeners.add(model.onDidChangeDirty(() => this._onDidChangeDirty.fire(model)));
|
|
96
96
|
modelListeners.add(model.onDidChangeName(() => this._onDidChangeLabel.fire(model)));
|
|
97
97
|
modelListeners.add(model.onDidChangeEncoding(() => this._onDidChangeEncoding.fire(model)));
|
|
@@ -109,8 +109,8 @@ let UntitledTextEditorService = class UntitledTextEditorService extends Disposab
|
|
|
109
109
|
return resource.scheme === Schemas.untitled && resource.path.length > 1 && !UntitledTextEditorService_1.UNTITLED_WITHOUT_ASSOCIATED_RESOURCE_REGEX.test(resource.path);
|
|
110
110
|
}
|
|
111
111
|
};
|
|
112
|
-
UntitledTextEditorService = UntitledTextEditorService_1 = (
|
|
113
|
-
(
|
|
114
|
-
(
|
|
115
|
-
], UntitledTextEditorService))
|
|
112
|
+
UntitledTextEditorService = UntitledTextEditorService_1 = ( __decorate([
|
|
113
|
+
( __param(0, IInstantiationService)),
|
|
114
|
+
( __param(1, IConfigurationService))
|
|
115
|
+
], UntitledTextEditorService));
|
|
116
116
|
export { IUntitledTextEditorService, UntitledTextEditorService };
|
|
@@ -1,10 +1,13 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
|
|
2
2
|
import { createDecorator } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
|
|
3
3
|
import { RawContextKey } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
|
|
4
4
|
import { registerIcon } from 'monaco-editor/esm/vs/platform/theme/common/iconRegistry.js';
|
|
5
5
|
import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
|
|
6
6
|
const IUserDataProfileService = ( createDecorator('IUserDataProfileService'));
|
|
7
7
|
const IUserDataProfileImportExportService = ( createDecorator('IUserDataProfileImportExportService'));
|
|
8
|
-
const defaultUserDataProfileIcon = registerIcon('defaultProfile-icon', Codicon.settings, (
|
|
8
|
+
const defaultUserDataProfileIcon = registerIcon('defaultProfile-icon', Codicon.settings, localizeWithPath('vs/workbench/services/userDataProfile/common/userDataProfile', 'defaultProfileIcon', 'Icon for Default Profile.'));
|
|
9
|
+
({ value: localizeWithPath('vs/workbench/services/userDataProfile/common/userDataProfile', 'profiles', "Profiles"), original: 'Profiles' });
|
|
10
|
+
const PROFILE_EXTENSION = 'code-profile';
|
|
11
|
+
[{ name: localizeWithPath('vs/workbench/services/userDataProfile/common/userDataProfile', 'profile', "Profile"), extensions: [PROFILE_EXTENSION] }];
|
|
9
12
|
const CURRENT_PROFILE_CONTEXT = ( new RawContextKey('currentProfile', ''));
|
|
10
|
-
export { CURRENT_PROFILE_CONTEXT, IUserDataProfileImportExportService, IUserDataProfileService, defaultUserDataProfileIcon };
|
|
13
|
+
export { CURRENT_PROFILE_CONTEXT, IUserDataProfileImportExportService, IUserDataProfileService, PROFILE_EXTENSION, defaultUserDataProfileIcon };
|
|
@@ -1,7 +1,19 @@
|
|
|
1
1
|
import { createDecorator } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
|
|
2
|
-
import {
|
|
2
|
+
import { ContextKeyExpr, RawContextKey } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
|
|
3
|
+
import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
|
|
3
4
|
import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
|
|
4
5
|
import { registerIcon } from 'monaco-editor/esm/vs/platform/theme/common/iconRegistry.js';
|
|
6
|
+
import { Categories } from 'monaco-editor/esm/vs/platform/action/common/actionCommonCategories.js';
|
|
5
7
|
const IUserDataSyncWorkbenchService = ( createDecorator('IUserDataSyncWorkbenchService'));
|
|
6
|
-
|
|
7
|
-
|
|
8
|
+
localizeWithPath('vs/workbench/services/userDataSync/common/userDataSync', 'sync category', "Settings Sync");
|
|
9
|
+
registerIcon('settings-sync-view-icon', Codicon.sync, localizeWithPath('vs/workbench/services/userDataSync/common/userDataSync', 'syncViewIcon', 'View icon of the Settings Sync view.'));
|
|
10
|
+
const CONTEXT_SYNC_STATE = ( new RawContextKey('syncStatus', "uninitialized" ));
|
|
11
|
+
const CONTEXT_ACCOUNT_STATE = ( new RawContextKey('userDataSyncAccountStatus', "unavailable" ));
|
|
12
|
+
({
|
|
13
|
+
id: 'workbench.userDataSync.actions.downloadSyncActivity',
|
|
14
|
+
title: { original: 'Download Settings Sync Activity', value: localizeWithPath('vs/workbench/services/userDataSync/common/userDataSync', 'download sync activity title', "Download Settings Sync Activity") },
|
|
15
|
+
category: Categories.Developer,
|
|
16
|
+
f1: true,
|
|
17
|
+
precondition: ( ContextKeyExpr.and(( CONTEXT_ACCOUNT_STATE.isEqualTo("available" )), ( CONTEXT_SYNC_STATE.notEqualsTo("uninitialized" ))))
|
|
18
|
+
});
|
|
19
|
+
export { CONTEXT_ACCOUNT_STATE, CONTEXT_SYNC_STATE, IUserDataSyncWorkbenchService };
|
package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopySaveParticipant.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
|
|
2
|
-
import {
|
|
2
|
+
import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
|
|
3
3
|
import { raceCancellation } from 'monaco-editor/esm/vs/base/common/async.js';
|
|
4
4
|
import { CancellationTokenSource } from 'monaco-editor/esm/vs/base/common/cancellation.js';
|
|
5
5
|
import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
|
|
@@ -21,7 +21,7 @@ let StoredFileWorkingCopySaveParticipant = class StoredFileWorkingCopySavePartic
|
|
|
21
21
|
participate(workingCopy, context, token) {
|
|
22
22
|
const cts = ( new CancellationTokenSource(token));
|
|
23
23
|
return this.progressService.withProgress({
|
|
24
|
-
title: (
|
|
24
|
+
title: localizeWithPath('vs/workbench/services/workingCopy/common/storedFileWorkingCopySaveParticipant', 'saveParticipants', "Saving '{0}'", workingCopy.name),
|
|
25
25
|
location: 15 ,
|
|
26
26
|
cancellable: true,
|
|
27
27
|
delay: workingCopy.isDirty() ? 3000 : 5000
|
|
@@ -17,20 +17,20 @@ import { NO_TYPE_ID } from './workingCopy.js';
|
|
|
17
17
|
var WorkingCopyBackupServiceImpl_1;
|
|
18
18
|
class WorkingCopyBackupsModel {
|
|
19
19
|
static async create(backupRoot, fileService) {
|
|
20
|
-
const model = (
|
|
20
|
+
const model = ( new WorkingCopyBackupsModel(backupRoot, fileService));
|
|
21
21
|
await model.resolve();
|
|
22
22
|
return model;
|
|
23
23
|
}
|
|
24
24
|
constructor(backupRoot, fileService) {
|
|
25
25
|
this.backupRoot = backupRoot;
|
|
26
26
|
this.fileService = fileService;
|
|
27
|
-
this.cache = (
|
|
27
|
+
this.cache = ( new ResourceMap());
|
|
28
28
|
}
|
|
29
29
|
async resolve() {
|
|
30
30
|
try {
|
|
31
31
|
const backupRootStat = await this.fileService.resolve(this.backupRoot);
|
|
32
32
|
if (backupRootStat.children) {
|
|
33
|
-
await Promises.settled((
|
|
33
|
+
await Promises.settled(( backupRootStat.children
|
|
34
34
|
.filter(child => child.isDirectory)
|
|
35
35
|
.map(async (backupSchemaFolder) => {
|
|
36
36
|
const backupSchemaFolderStat = await this.fileService.resolve(backupSchemaFolder.resource);
|
|
@@ -41,7 +41,7 @@ class WorkingCopyBackupsModel {
|
|
|
41
41
|
}
|
|
42
42
|
}
|
|
43
43
|
}
|
|
44
|
-
})))
|
|
44
|
+
})));
|
|
45
45
|
}
|
|
46
46
|
}
|
|
47
47
|
catch (error) {
|
|
@@ -76,7 +76,7 @@ class WorkingCopyBackupsModel {
|
|
|
76
76
|
return true;
|
|
77
77
|
}
|
|
78
78
|
get() {
|
|
79
|
-
return Array.from((
|
|
79
|
+
return Array.from(( this.cache.keys()));
|
|
80
80
|
}
|
|
81
81
|
remove(resource) {
|
|
82
82
|
this.cache.delete(resource);
|
|
@@ -96,7 +96,7 @@ let WorkingCopyBackupServiceImpl = class WorkingCopyBackupServiceImpl extends Di
|
|
|
96
96
|
this.backupWorkspaceHome = backupWorkspaceHome;
|
|
97
97
|
this.fileService = fileService;
|
|
98
98
|
this.logService = logService;
|
|
99
|
-
this.ioOperationQueues = this._register((
|
|
99
|
+
this.ioOperationQueues = this._register(( new ResourceQueue()));
|
|
100
100
|
this.model = undefined;
|
|
101
101
|
this.initialize(backupWorkspaceHome);
|
|
102
102
|
}
|
|
@@ -118,9 +118,7 @@ let WorkingCopyBackupServiceImpl = class WorkingCopyBackupServiceImpl extends Di
|
|
|
118
118
|
return false;
|
|
119
119
|
}
|
|
120
120
|
const backupResource = this.toBackupResource(identifier);
|
|
121
|
-
return (
|
|
122
|
-
(this.model.has(backupResource, versionId, meta))
|
|
123
|
-
);
|
|
121
|
+
return ( this.model.has(backupResource, versionId, meta));
|
|
124
122
|
}
|
|
125
123
|
async backup(identifier, content, versionId, meta, token) {
|
|
126
124
|
const model = await this.ready;
|
|
@@ -128,14 +126,14 @@ let WorkingCopyBackupServiceImpl = class WorkingCopyBackupServiceImpl extends Di
|
|
|
128
126
|
return;
|
|
129
127
|
}
|
|
130
128
|
const backupResource = this.toBackupResource(identifier);
|
|
131
|
-
if ((
|
|
129
|
+
if (( model.has(backupResource, versionId, meta))) {
|
|
132
130
|
return;
|
|
133
131
|
}
|
|
134
132
|
return this.ioOperationQueues.queueFor(backupResource).queue(async () => {
|
|
135
133
|
if (token?.isCancellationRequested) {
|
|
136
134
|
return;
|
|
137
135
|
}
|
|
138
|
-
if ((
|
|
136
|
+
if (( model.has(backupResource, versionId, meta))) {
|
|
139
137
|
return;
|
|
140
138
|
}
|
|
141
139
|
let preamble = this.createPreamble(identifier, meta);
|
|
@@ -158,21 +156,21 @@ let WorkingCopyBackupServiceImpl = class WorkingCopyBackupServiceImpl extends Di
|
|
|
158
156
|
});
|
|
159
157
|
}
|
|
160
158
|
createPreamble(identifier, meta) {
|
|
161
|
-
return `${(
|
|
159
|
+
return `${( identifier.resource.toString())}${WorkingCopyBackupServiceImpl_1.PREAMBLE_META_SEPARATOR}${JSON.stringify({ ...meta, typeId: identifier.typeId })}${WorkingCopyBackupServiceImpl_1.PREAMBLE_END_MARKER}`;
|
|
162
160
|
}
|
|
163
161
|
async discardBackups(filter) {
|
|
164
162
|
const model = await this.ready;
|
|
165
163
|
const except = filter?.except;
|
|
166
164
|
if (Array.isArray(except) && except.length > 0) {
|
|
167
|
-
const exceptMap = (
|
|
165
|
+
const exceptMap = ( new ResourceMap());
|
|
168
166
|
for (const exceptWorkingCopy of except) {
|
|
169
167
|
exceptMap.set(this.toBackupResource(exceptWorkingCopy), true);
|
|
170
168
|
}
|
|
171
|
-
await Promises.settled((
|
|
172
|
-
if (!(
|
|
169
|
+
await Promises.settled(( model.get().map(async (backupResource) => {
|
|
170
|
+
if (!( exceptMap.has(backupResource))) {
|
|
173
171
|
await this.doDiscardBackup(backupResource);
|
|
174
172
|
}
|
|
175
|
-
})))
|
|
173
|
+
})));
|
|
176
174
|
}
|
|
177
175
|
else {
|
|
178
176
|
await this.deleteIgnoreFileNotFound(this.backupWorkspaceHome);
|
|
@@ -209,13 +207,13 @@ let WorkingCopyBackupServiceImpl = class WorkingCopyBackupServiceImpl extends Di
|
|
|
209
207
|
async getBackups() {
|
|
210
208
|
const model = await this.ready;
|
|
211
209
|
await this.joinBackups();
|
|
212
|
-
const backups = await Promise.all((
|
|
210
|
+
const backups = await Promise.all(( model.get().map(backupResource => this.resolveIdentifier(backupResource, model))));
|
|
213
211
|
return coalesce(backups);
|
|
214
212
|
}
|
|
215
213
|
async resolveIdentifier(backupResource, model) {
|
|
216
214
|
let res = undefined;
|
|
217
215
|
await this.ioOperationQueues.queueFor(backupResource).queue(async () => {
|
|
218
|
-
if (!(
|
|
216
|
+
if (!( model.has(backupResource))) {
|
|
219
217
|
return;
|
|
220
218
|
}
|
|
221
219
|
const backupPreamble = await this.readToMatchingString(backupResource, WorkingCopyBackupServiceImpl_1.PREAMBLE_END_MARKER, WorkingCopyBackupServiceImpl_1.PREAMBLE_MAX_LENGTH);
|
|
@@ -237,13 +235,13 @@ let WorkingCopyBackupServiceImpl = class WorkingCopyBackupServiceImpl extends Di
|
|
|
237
235
|
model.update(backupResource, meta);
|
|
238
236
|
res = {
|
|
239
237
|
typeId: typeId ?? NO_TYPE_ID,
|
|
240
|
-
resource: (
|
|
238
|
+
resource: ( URI.parse(resourcePreamble))
|
|
241
239
|
};
|
|
242
240
|
});
|
|
243
241
|
return res;
|
|
244
242
|
}
|
|
245
243
|
async readToMatchingString(backupResource, matchingString, maximumBytesToRead) {
|
|
246
|
-
const contents = ( (
|
|
244
|
+
const contents = ( (await this.fileService.readFile(backupResource, { length: maximumBytesToRead })).value.toString());
|
|
247
245
|
const matchingStringIndex = contents.indexOf(matchingString);
|
|
248
246
|
if (matchingStringIndex >= 0) {
|
|
249
247
|
return contents.substr(0, matchingStringIndex);
|
|
@@ -255,7 +253,7 @@ let WorkingCopyBackupServiceImpl = class WorkingCopyBackupServiceImpl extends Di
|
|
|
255
253
|
const model = await this.ready;
|
|
256
254
|
let res = undefined;
|
|
257
255
|
await this.ioOperationQueues.queueFor(backupResource).queue(async () => {
|
|
258
|
-
if (!(
|
|
256
|
+
if (!( model.has(backupResource))) {
|
|
259
257
|
return;
|
|
260
258
|
}
|
|
261
259
|
const backupStream = await this.fileService.readFileStream(backupResource);
|
|
@@ -266,7 +264,7 @@ let WorkingCopyBackupServiceImpl = class WorkingCopyBackupServiceImpl extends Di
|
|
|
266
264
|
this.logService.trace(`Backup: Could not find meta end marker in ${backupResource}. The file is probably corrupt (filesize: ${backupStream.size}).`);
|
|
267
265
|
return undefined;
|
|
268
266
|
}
|
|
269
|
-
const preambelRaw = (
|
|
267
|
+
const preambelRaw = ( firstBackupChunk.slice(0, preambleEndIndex).toString());
|
|
270
268
|
let meta;
|
|
271
269
|
const metaStartIndex = preambelRaw.indexOf(WorkingCopyBackupServiceImpl_1.PREAMBLE_META_SEPARATOR);
|
|
272
270
|
if (metaStartIndex !== -1) {
|
|
@@ -311,23 +309,21 @@ let WorkingCopyBackupServiceImpl = class WorkingCopyBackupServiceImpl extends Di
|
|
|
311
309
|
return this.ioOperationQueues.whenDrained();
|
|
312
310
|
}
|
|
313
311
|
};
|
|
314
|
-
WorkingCopyBackupServiceImpl = WorkingCopyBackupServiceImpl_1 = (
|
|
315
|
-
(
|
|
316
|
-
(
|
|
317
|
-
], WorkingCopyBackupServiceImpl))
|
|
312
|
+
WorkingCopyBackupServiceImpl = WorkingCopyBackupServiceImpl_1 = ( __decorate([
|
|
313
|
+
( __param(1, IFileService)),
|
|
314
|
+
( __param(2, ILogService))
|
|
315
|
+
], WorkingCopyBackupServiceImpl));
|
|
318
316
|
class InMemoryWorkingCopyBackupService extends Disposable {
|
|
319
317
|
constructor() {
|
|
320
318
|
super();
|
|
321
|
-
this.backups = (
|
|
319
|
+
this.backups = ( new ResourceMap());
|
|
322
320
|
}
|
|
323
321
|
async hasBackups() {
|
|
324
322
|
return this.backups.size > 0;
|
|
325
323
|
}
|
|
326
324
|
hasBackupSync(identifier, versionId) {
|
|
327
325
|
const backupResource = this.toBackupResource(identifier);
|
|
328
|
-
return (
|
|
329
|
-
(this.backups.has(backupResource))
|
|
330
|
-
);
|
|
326
|
+
return ( this.backups.has(backupResource));
|
|
331
327
|
}
|
|
332
328
|
async backup(identifier, content, versionId, meta, token) {
|
|
333
329
|
const backupResource = this.toBackupResource(identifier);
|
|
@@ -346,9 +342,7 @@ class InMemoryWorkingCopyBackupService extends Disposable {
|
|
|
346
342
|
return undefined;
|
|
347
343
|
}
|
|
348
344
|
async getBackups() {
|
|
349
|
-
return (
|
|
350
|
-
(Array.from(this.backups.entries()).map(([resource, backup]) => ({ typeId: backup.typeId, resource })))
|
|
351
|
-
);
|
|
345
|
+
return ( Array.from(this.backups.entries()).map(([resource, backup]) => ({ typeId: backup.typeId, resource })));
|
|
352
346
|
}
|
|
353
347
|
async discardBackup(identifier) {
|
|
354
348
|
this.backups.delete(this.toBackupResource(identifier));
|
|
@@ -356,12 +350,12 @@ class InMemoryWorkingCopyBackupService extends Disposable {
|
|
|
356
350
|
async discardBackups(filter) {
|
|
357
351
|
const except = filter?.except;
|
|
358
352
|
if (Array.isArray(except) && except.length > 0) {
|
|
359
|
-
const exceptMap = (
|
|
353
|
+
const exceptMap = ( new ResourceMap());
|
|
360
354
|
for (const exceptWorkingCopy of except) {
|
|
361
355
|
exceptMap.set(this.toBackupResource(exceptWorkingCopy), true);
|
|
362
356
|
}
|
|
363
357
|
for (const backup of await this.getBackups()) {
|
|
364
|
-
if (!(
|
|
358
|
+
if (!( exceptMap.has(this.toBackupResource(backup)))) {
|
|
365
359
|
await this.discardBackup(backup);
|
|
366
360
|
}
|
|
367
361
|
}
|
|
@@ -371,9 +365,7 @@ class InMemoryWorkingCopyBackupService extends Disposable {
|
|
|
371
365
|
}
|
|
372
366
|
}
|
|
373
367
|
toBackupResource(identifier) {
|
|
374
|
-
return (
|
|
375
|
-
(URI.from({ scheme: Schemas.inMemory, path: hashIdentifier(identifier) }))
|
|
376
|
-
);
|
|
368
|
+
return ( URI.from({ scheme: Schemas.inMemory, path: hashIdentifier(identifier) }));
|
|
377
369
|
}
|
|
378
370
|
async joinBackups() {
|
|
379
371
|
return;
|
|
@@ -396,12 +388,10 @@ function hashIdentifier(identifier) {
|
|
|
396
388
|
return hashPath(resource);
|
|
397
389
|
}
|
|
398
390
|
function hashPath(resource) {
|
|
399
|
-
const str = resource.scheme === Schemas.file || resource.scheme === Schemas.untitled ? resource.fsPath : (
|
|
391
|
+
const str = resource.scheme === Schemas.file || resource.scheme === Schemas.untitled ? resource.fsPath : ( resource.toString());
|
|
400
392
|
return hashString(str);
|
|
401
393
|
}
|
|
402
394
|
function hashString(str) {
|
|
403
|
-
return (
|
|
404
|
-
(hash(str).toString(16))
|
|
405
|
-
);
|
|
395
|
+
return ( hash(str).toString(16));
|
|
406
396
|
}
|
|
407
397
|
export { InMemoryWorkingCopyBackupService, WorkingCopyBackupsModel, hashIdentifier };
|