@codingame/monaco-vscode-api 1.78.5-next.0 → 1.78.5
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/dist/json.js +1 -1
- package/dist/service-override/configuration.js +2 -2
- package/dist/service-override/keybindings.js +1 -1
- package/dist/services.js +2 -2
- package/dist/vscode/vs/base/common/jsonEdit.js +1 -1
- package/dist/vscode/vs/base/common/jsonFormatter.js +1 -1
- package/dist/vscode/vs/platform/extensionResourceLoader/common/extensionResourceLoader.js +1 -1
- package/dist/vscode/vs/platform/files/common/fileService.js +2 -2
- package/dist/vscode/vs/platform/telemetry/common/telemetryUtils.js +1 -1
- package/dist/vscode/vs/platform/userDataSync/common/settingsMerge.js +1 -1
- package/dist/vscode/vs/platform/workspaces/common/workspaces.js +3 -3
- package/dist/vscode/vs/workbench/api/browser/mainThreadBulkEdits.js +1 -1
- package/dist/vscode/vs/workbench/api/browser/mainThreadDiagnostics.js +1 -1
- package/dist/vscode/vs/workbench/api/browser/mainThreadDocuments.js +1 -1
- package/dist/vscode/vs/workbench/api/browser/mainThreadDocumentsAndEditors.js +1 -1
- package/dist/vscode/vs/workbench/api/browser/mainThreadFileSystemEventService.js +1 -1
- package/dist/vscode/vs/workbench/api/browser/mainThreadLanguageFeatures.js +1 -1
- package/dist/vscode/vs/workbench/api/browser/mainThreadTelemetry.js +1 -1
- package/dist/vscode/vs/workbench/api/common/extHostExtensionService.js +8 -8
- package/dist/vscode/vs/workbench/api/common/extHostTelemetry.js +1 -1
- package/dist/vscode/vs/workbench/browser/parts/dialogs/dialog.web.contribution.js +1 -1
- package/dist/vscode/vs/workbench/browser/parts/dialogs/dialogHandler.js +1 -1
- package/dist/vscode/vs/workbench/common/contributions.js +1 -1
- package/dist/vscode/vs/workbench/contrib/codeEditor/browser/languageConfigurationExtensionPoint.js +1 -1
- package/dist/vscode/vs/workbench/contrib/debug/browser/callStackEditorContribution.js +1 -1
- package/dist/vscode/vs/workbench/contrib/debug/browser/debugConfigurationManager.js +3 -3
- package/dist/vscode/vs/workbench/contrib/debug/browser/debugEditorContribution.js +2 -2
- package/dist/vscode/vs/workbench/contrib/debug/browser/debugService.js +1 -1
- package/dist/vscode/vs/workbench/contrib/debug/browser/debugSession.js +2 -2
- package/dist/vscode/vs/workbench/contrib/debug/common/debugModel.js +1 -1
- package/dist/vscode/vs/workbench/contrib/debug/common/debugStorage.js +1 -1
- package/dist/vscode/vs/workbench/contrib/files/browser/explorerService.js +1 -1
- package/dist/vscode/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.js +1 -1
- package/dist/vscode/vs/workbench/contrib/snippets/browser/snippetsFile.js +1 -1
- package/dist/vscode/vs/workbench/services/configuration/browser/configurationService.js +1 -1
- package/dist/vscode/vs/workbench/services/configuration/common/configurationEditing.js +4 -4
- package/dist/vscode/vs/workbench/services/configuration/common/jsonEditingService.js +2 -2
- package/dist/vscode/vs/workbench/services/decorations/browser/decorationsService.js +1 -1
- package/dist/vscode/vs/workbench/services/extensions/common/extensionsRegistry.js +1 -1
- package/dist/vscode/vs/workbench/services/keybinding/browser/keybindingService.js +1 -1
- package/dist/vscode/vs/workbench/services/keybinding/browser/keyboardLayoutService.js +1 -1
- package/dist/vscode/vs/workbench/services/lifecycle/common/lifecycleService.js +1 -1
- package/dist/vscode/vs/workbench/services/preferences/browser/preferencesService.js +2 -2
- package/dist/vscode/vs/workbench/services/preferences/common/preferencesModels.js +1 -1
- package/dist/vscode/vs/workbench/services/search/common/searchService.js +1 -1
- package/dist/vscode/vs/workbench/services/textfile/browser/browserTextFileService.js +1 -1
- package/dist/vscode/vs/workbench/services/textfile/browser/textFileService.js +2 -2
- package/dist/vscode/vs/workbench/services/textfile/common/encoding.js +1 -1
- package/dist/vscode/vs/workbench/services/textfile/common/textEditorService.js +1 -1
- package/dist/vscode/vs/workbench/services/textfile/common/textFileEditorModel.js +1 -1
- package/dist/vscode/vs/workbench/services/textfile/common/textFileEditorModelManager.js +1 -1
- package/dist/vscode/vs/workbench/services/textmodelResolver/common/textModelResolverService.js +1 -1
- package/dist/vscode/vs/workbench/services/themes/browser/fileIconThemeData.js +3 -3
- package/dist/vscode/vs/workbench/services/themes/browser/productIconThemeData.js +3 -3
- package/dist/vscode/vs/workbench/services/themes/browser/workbenchThemeService.js +1 -1
- package/dist/vscode/vs/workbench/services/themes/common/colorThemeData.js +5 -5
- package/dist/vscode/vs/workbench/services/userDataProfile/common/userDataProfileService.js +1 -1
- package/dist/vscode/vs/workbench/services/workingCopy/common/workingCopyBackupService.js +1 -1
- package/dist/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService.js +1 -1
- package/dist/vscode/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.js +2 -2
- package/dist/vscode/vs/workbench/services/workspaces/browser/workspacesService.js +1 -1
- package/dist/vscode-services/missing-services.js +3 -3
- package/monaco-editor-treemending.patch +819 -819
- package/package.json +3 -2
- package/dist/vscode/vs/base/common/json.js +0 -713
- package/dist/vscode/vs/base/common/performance.js +0 -18
- package/dist/vscode/vs/base/common/stream.js +0 -300
- package/dist/vscode/vs/platform/product/common/productService.js +0 -4
- package/dist/vscode/vs/platform/remote/common/remoteHosts.js +0 -18
- package/dist/vscode/vs/platform/uriIdentity/common/uriIdentity.js +0 -3
- package/dist/vscode/vs/platform/userDataProfile/common/userDataProfile.js +0 -427
package/dist/json.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { StandaloneServices } from 'monaco-editor/esm/vs/editor/standalone/browser/standaloneServices.js';
|
|
2
2
|
import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
|
|
3
3
|
import * as monaco from 'monaco-editor/esm/vs/editor/editor.api.js';
|
|
4
|
-
import { IUserDataProfilesService } from '
|
|
4
|
+
import { IUserDataProfilesService } from 'monaco-editor/esm/vs/platform/userDataProfile/common/userDataProfile.js';
|
|
5
5
|
import { Extensions } from 'monaco-editor/esm/vs/platform/jsonschemas/common/jsonContributionRegistry.js';
|
|
6
6
|
import { Emitter, Event } from 'monaco-editor/esm/vs/base/common/event.js';
|
|
7
7
|
import { Disposable, extensions } from './api.js';
|
|
@@ -11,12 +11,12 @@ import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform
|
|
|
11
11
|
import { VSBuffer } from 'monaco-editor/esm/vs/base/common/buffer.js';
|
|
12
12
|
import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
|
|
13
13
|
import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
|
|
14
|
-
import { IUserDataProfilesService } from '
|
|
14
|
+
import { IUserDataProfilesService } from 'monaco-editor/esm/vs/platform/userDataProfile/common/userDataProfile.js';
|
|
15
15
|
import { IPolicyService } from 'monaco-editor/esm/vs/platform/policy/common/policy.js';
|
|
16
16
|
import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
|
|
17
17
|
import { IUserDataProfileService } from '../vscode/vs/workbench/services/userDataProfile/common/userDataProfile.js';
|
|
18
18
|
import { IRemoteAgentService } from '../vscode/vs/workbench/services/remote/common/remoteAgentService.js';
|
|
19
|
-
import { IUriIdentityService } from '
|
|
19
|
+
import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
|
|
20
20
|
import { ConfigurationCache } from '../vscode/vs/workbench/services/configuration/common/configurationCache.js';
|
|
21
21
|
import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
|
|
22
22
|
import { IWorkbenchEnvironmentService } from '../vscode/vs/workbench/services/environment/common/environmentService.js';
|
|
@@ -11,7 +11,7 @@ import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform
|
|
|
11
11
|
import { Extensions } from 'monaco-editor/esm/vs/platform/quickinput/common/quickAccess.js';
|
|
12
12
|
import { StandaloneCommandsQuickAccessProvider } from 'monaco-editor/esm/vs/editor/standalone/browser/quickAccess/standaloneCommandsQuickAccess.js';
|
|
13
13
|
import { CommandsQuickAccessProvider } from '../vscode/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.js';
|
|
14
|
-
import { IUserDataProfilesService } from '
|
|
14
|
+
import { IUserDataProfilesService } from 'monaco-editor/esm/vs/platform/userDataProfile/common/userDataProfile.js';
|
|
15
15
|
import { IKeyboardLayoutService } from '../vscode/vs/platform/keyboardLayout/common/keyboardLayout.js';
|
|
16
16
|
import { BrowserKeyboardLayoutService } from '../vscode/vs/workbench/services/keybinding/browser/keyboardLayoutService.js';
|
|
17
17
|
import { localize } from 'monaco-editor/esm/vs/nls.js';
|
package/dist/services.js
CHANGED
|
@@ -24,10 +24,10 @@ export { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.j
|
|
|
24
24
|
export { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
|
|
25
25
|
export { IMarkerService } from 'monaco-editor/esm/vs/platform/markers/common/markers.js';
|
|
26
26
|
export { IOpenerService } from 'monaco-editor/esm/vs/platform/opener/common/opener.js';
|
|
27
|
-
export { IProductService } from '
|
|
27
|
+
export { IProductService } from 'monaco-editor/esm/vs/platform/product/common/productService.js';
|
|
28
28
|
export { IQuickInputService } from 'monaco-editor/esm/vs/platform/quickinput/common/quickInput.js';
|
|
29
29
|
export { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
|
|
30
|
-
export { IUriIdentityService } from '
|
|
30
|
+
export { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
|
|
31
31
|
export { IEditorGroupsService } from './vscode/vs/workbench/services/editor/common/editorGroupsService.js';
|
|
32
32
|
export { IEditorService } from './vscode/vs/workbench/services/editor/common/editorService.js';
|
|
33
33
|
export { IWorkbenchEnvironmentService } from './vscode/vs/workbench/services/environment/common/environmentService.js';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { parseTree, findNodeAtLocation } from '
|
|
1
|
+
import { parseTree, findNodeAtLocation } from 'monaco-editor/esm/vs/base/common/json.js';
|
|
2
2
|
import { isEOL, format } from './jsonFormatter.js';
|
|
3
3
|
function removeProperty(text, path, formattingOptions) {
|
|
4
4
|
return setProperty(text, path, undefined, formattingOptions);
|
|
@@ -5,7 +5,7 @@ import { createDecorator } from 'monaco-editor/esm/vs/platform/instantiation/com
|
|
|
5
5
|
import { getServiceMachineId } from '../../externalServices/common/serviceMachineId.js';
|
|
6
6
|
import { supportsTelemetry, getTelemetryLevel } from '../../telemetry/common/telemetryUtils.js';
|
|
7
7
|
import { RemoteAuthorities } from 'monaco-editor/esm/vs/base/common/network.js';
|
|
8
|
-
import { getRemoteServerRootPath } from '
|
|
8
|
+
import { getRemoteServerRootPath } from 'monaco-editor/esm/vs/platform/remote/common/remoteHosts.js';
|
|
9
9
|
const WEB_EXTENSION_RESOURCE_END_POINT = 'web-extension-resource';
|
|
10
10
|
const IExtensionResourceLoaderService = ( createDecorator('extensionResourceLoaderService'));
|
|
11
11
|
class AbstractExtensionResourceLoaderService {
|
|
@@ -9,9 +9,9 @@ import { Iterable } from 'monaco-editor/esm/vs/base/common/iterator.js';
|
|
|
9
9
|
import { Disposable, toDisposable, dispose, DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
|
|
10
10
|
import { TernarySearchTree } from 'monaco-editor/esm/vs/base/common/ternarySearchTree.js';
|
|
11
11
|
import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
|
|
12
|
-
import { mark } from '
|
|
12
|
+
import { mark } from 'monaco-editor/esm/vs/base/common/performance.js';
|
|
13
13
|
import { isAbsolutePath, extUri, extUriIgnorePathCase } from 'monaco-editor/esm/vs/base/common/resources.js';
|
|
14
|
-
import { isReadableStream, peekStream, peekReadable, consumeStream, transform, isReadableBufferedStream, listenStream
|
|
14
|
+
import { isReadableStream, peekStream, peekReadable, consumeStream, transform, newWriteableStream, isReadableBufferedStream, listenStream } from 'monaco-editor/esm/vs/base/common/stream.js';
|
|
15
15
|
import { localize } from 'monaco-editor/esm/vs/nls.js';
|
|
16
16
|
import { FileChangesEvent, FileOperationError, hasOpenReadWriteCloseCapability, hasReadWriteCapability, hasFileReadStreamCapability, toFileSystemProviderErrorCode, FileSystemProviderErrorCode, ensureFileSystemProviderError, FileType, FilePermission, etag, FileOperationEvent, toFileOperationResult, ETAG_DISABLED, hasFileAtomicReadCapability, NotModifiedSinceFileOperationError, TooLargeFileOperationError, hasFileFolderCopyCapability, hasFileCloneCapability } from 'monaco-editor/esm/vs/platform/files/common/files.js';
|
|
17
17
|
import { readFileIntoStream } from './io.js';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { cloneAndChange } from 'monaco-editor/esm/vs/base/common/objects.js';
|
|
2
|
-
import { getRemoteName } from '
|
|
2
|
+
import { getRemoteName } from 'monaco-editor/esm/vs/platform/remote/common/remoteHosts.js';
|
|
3
3
|
import { TELEMETRY_SETTING_ID, TELEMETRY_CRASH_REPORTER_SETTING_ID, TELEMETRY_OLD_SETTING_ID } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
|
|
4
4
|
class TelemetryTrustedValue {
|
|
5
5
|
constructor(value) {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { parse, visit } from '
|
|
1
|
+
import { parse, visit } from 'monaco-editor/esm/vs/base/common/json.js';
|
|
2
2
|
import { setProperty, applyEdits, withFormatting } from '../../../base/common/jsonEdit.js';
|
|
3
3
|
import { getEOL } from '../../../base/common/jsonFormatter.js';
|
|
4
4
|
import { edit } from './content.js';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { isUNC, toSlashes } from 'monaco-editor/esm/vs/base/common/extpath.js';
|
|
2
|
-
import
|
|
2
|
+
import * as Json from 'monaco-editor/esm/vs/base/common/json.js';
|
|
3
3
|
import { setProperty, applyEdits, removeProperty } from '../../../base/common/jsonEdit.js';
|
|
4
4
|
import { normalizeDriveLetter } from 'monaco-editor/esm/vs/base/common/labels.js';
|
|
5
5
|
import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
|
|
@@ -8,7 +8,7 @@ import { isWindows, isLinux, isMacintosh } from 'monaco-editor/esm/vs/base/commo
|
|
|
8
8
|
import { isEqualAuthority } from 'monaco-editor/esm/vs/base/common/resources.js';
|
|
9
9
|
import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
|
|
10
10
|
import { createDecorator } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
|
|
11
|
-
import { getRemoteAuthority } from '
|
|
11
|
+
import { getRemoteAuthority } from 'monaco-editor/esm/vs/platform/remote/common/remoteHosts.js';
|
|
12
12
|
import { WorkspaceFolder } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
|
|
13
13
|
const IWorkspacesService = ( (createDecorator('workspacesService')));
|
|
14
14
|
function isRecentWorkspace(curr) {
|
|
@@ -127,7 +127,7 @@ function rewriteWorkspaceFileForNewLocation(rawWorkspaceContents, configPathURI,
|
|
|
127
127
|
return newContent;
|
|
128
128
|
}
|
|
129
129
|
function doParseStoredWorkspace(path, contents) {
|
|
130
|
-
const storedWorkspace = parse(contents);
|
|
130
|
+
const storedWorkspace = Json.parse(contents);
|
|
131
131
|
if (storedWorkspace && Array.isArray(storedWorkspace.folders)) {
|
|
132
132
|
storedWorkspace.folders = storedWorkspace.folders.filter(folder => isStoredWorkspaceFolder(folder));
|
|
133
133
|
}
|
|
@@ -2,7 +2,7 @@ import { __decorate, __param } from '../../../../../node_modules/tslib/tslib.es6
|
|
|
2
2
|
import { revive } from 'monaco-editor/esm/vs/base/common/marshalling.js';
|
|
3
3
|
import { IBulkEditService, ResourceTextEdit, ResourceFileEdit } from 'monaco-editor/esm/vs/editor/browser/services/bulkEditService.js';
|
|
4
4
|
import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
|
|
5
|
-
import { IUriIdentityService } from '
|
|
5
|
+
import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
|
|
6
6
|
import { MainContext } from '../common/extHost.protocol.js';
|
|
7
7
|
import { ResourceNotebookCellEdit } from '../../contrib/bulkEdit/browser/bulkCellEdits.js';
|
|
8
8
|
import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
|
|
@@ -3,7 +3,7 @@ import { IMarkerService } from 'monaco-editor/esm/vs/platform/markers/common/mar
|
|
|
3
3
|
import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
|
|
4
4
|
import { ExtHostContext, MainContext } from '../common/extHost.protocol.js';
|
|
5
5
|
import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
|
|
6
|
-
import { IUriIdentityService } from '
|
|
6
|
+
import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
|
|
7
7
|
let MainThreadDiagnostics = class MainThreadDiagnostics {
|
|
8
8
|
constructor(extHostContext, _markerService, _uriIdentService) {
|
|
9
9
|
this._markerService = _markerService;
|
|
@@ -12,7 +12,7 @@ import { ITextFileService } from '../../services/textfile/common/textfiles.js';
|
|
|
12
12
|
import { IWorkbenchEnvironmentService } from '../../services/environment/common/environmentService.js';
|
|
13
13
|
import { extUri, toLocalResource } from 'monaco-editor/esm/vs/base/common/resources.js';
|
|
14
14
|
import { IWorkingCopyFileService } from '../../services/workingCopy/common/workingCopyFileService.js';
|
|
15
|
-
import { IUriIdentityService } from '
|
|
15
|
+
import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
|
|
16
16
|
import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
|
|
17
17
|
import { IPathService } from '../../services/path/common/pathService.js';
|
|
18
18
|
import { ResourceMap } from 'monaco-editor/esm/vs/base/common/map.js';
|
|
@@ -19,7 +19,7 @@ import { IEditorGroupsService } from '../../services/editor/common/editorGroupsS
|
|
|
19
19
|
import { ITextFileService } from '../../services/textfile/common/textfiles.js';
|
|
20
20
|
import { IWorkbenchEnvironmentService } from '../../services/environment/common/environmentService.js';
|
|
21
21
|
import { IWorkingCopyFileService } from '../../services/workingCopy/common/workingCopyFileService.js';
|
|
22
|
-
import { IUriIdentityService } from '
|
|
22
|
+
import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
|
|
23
23
|
import { IClipboardService } from 'monaco-editor/esm/vs/platform/clipboard/common/clipboardService.js';
|
|
24
24
|
import { IPathService } from '../../services/path/common/pathService.js';
|
|
25
25
|
import { diffSets, diffMaps } from 'monaco-editor/esm/vs/base/common/collections.js';
|
|
@@ -15,7 +15,7 @@ import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/st
|
|
|
15
15
|
import { registerAction2, Action2 } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
|
|
16
16
|
import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
|
|
17
17
|
import { IEnvironmentService } from 'monaco-editor/esm/vs/platform/environment/common/environment.js';
|
|
18
|
-
import { IUriIdentityService } from '
|
|
18
|
+
import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
|
|
19
19
|
import { reviveWorkspaceEditDto } from './mainThreadBulkEdits.js';
|
|
20
20
|
var MainThreadFileSystemEventService_1;
|
|
21
21
|
let MainThreadFileSystemEventService = MainThreadFileSystemEventService_1 = class MainThreadFileSystemEventService {
|
|
@@ -10,7 +10,7 @@ import { ILanguageService } from 'monaco-editor/esm/vs/editor/common/languages/l
|
|
|
10
10
|
import { ILanguageConfigurationService } from 'monaco-editor/esm/vs/editor/common/languages/languageConfigurationRegistry.js';
|
|
11
11
|
import { ILanguageFeaturesService } from 'monaco-editor/esm/vs/editor/common/services/languageFeatures.js';
|
|
12
12
|
import { decodeSemanticTokensDto } from 'monaco-editor/esm/vs/editor/common/services/semanticTokensDto.js';
|
|
13
|
-
import { IUriIdentityService } from '
|
|
13
|
+
import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
|
|
14
14
|
import { reviveWorkspaceEditDto } from './mainThreadBulkEdits.js';
|
|
15
15
|
import { DataTransfer } from '../common/extHostTypeConverters.js';
|
|
16
16
|
import { DataTransferCache } from '../common/shared/dataTransferCache.js';
|
|
@@ -2,7 +2,7 @@ import { __decorate, __param } from '../../../../../node_modules/tslib/tslib.es6
|
|
|
2
2
|
import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
|
|
3
3
|
import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
|
|
4
4
|
import { IEnvironmentService } from 'monaco-editor/esm/vs/platform/environment/common/environment.js';
|
|
5
|
-
import { IProductService } from '
|
|
5
|
+
import { IProductService } from 'monaco-editor/esm/vs/platform/product/common/productService.js';
|
|
6
6
|
import { TELEMETRY_SETTING_ID, TELEMETRY_OLD_SETTING_ID, ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
|
|
7
7
|
import { supportsTelemetry } from '../../../platform/telemetry/common/telemetryUtils.js';
|
|
8
8
|
import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { __decorate, __param, __classPrivateFieldSet, __classPrivateFieldGet } from '../../../../../node_modules/tslib/tslib.es6.js';
|
|
2
2
|
import * as nls from 'monaco-editor/esm/vs/nls.js';
|
|
3
3
|
import * as paths from 'monaco-editor/esm/vs/base/common/path.js';
|
|
4
|
-
import
|
|
4
|
+
import * as performance from 'monaco-editor/esm/vs/base/common/performance.js';
|
|
5
5
|
import { extUriBiasedIgnorePathCase, joinPath, originalFSPath } from 'monaco-editor/esm/vs/base/common/resources.js';
|
|
6
6
|
import { Barrier, timeout, asPromise, IntervalTimer } from 'monaco-editor/esm/vs/base/common/async.js';
|
|
7
7
|
import { Disposable, dispose, toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
|
|
@@ -97,7 +97,7 @@ let AbstractExtHostExtensionService = class AbstractExtHostExtensionService exte
|
|
|
97
97
|
await this._beforeAlmostReadyToRunExtensions();
|
|
98
98
|
this._almostReadyToRunExtensions.open();
|
|
99
99
|
await this._extHostWorkspace.waitForInitializeCall();
|
|
100
|
-
mark('code/extHost/ready');
|
|
100
|
+
performance.mark('code/extHost/ready');
|
|
101
101
|
this._readyToStartExtensionHost.open();
|
|
102
102
|
if (this._initData.autoStart) {
|
|
103
103
|
this._startExtensionHost();
|
|
@@ -287,10 +287,10 @@ let AbstractExtHostExtensionService = class AbstractExtHostExtensionService exte
|
|
|
287
287
|
this._loadCommonJSModule(extensionDescription, joinPath(extensionDescription.extensionLocation, entryPoint), activationTimesBuilder),
|
|
288
288
|
this._loadExtensionContext(extensionDescription)
|
|
289
289
|
]).then(values => {
|
|
290
|
-
mark(`code/extHost/willActivateExtension/${extensionDescription.identifier.value}`);
|
|
290
|
+
performance.mark(`code/extHost/willActivateExtension/${extensionDescription.identifier.value}`);
|
|
291
291
|
return AbstractExtHostExtensionService._callActivate(this._logService, extensionDescription.identifier, values[0], values[1], activationTimesBuilder);
|
|
292
292
|
}).then((activatedExtension) => {
|
|
293
|
-
mark(`code/extHost/didActivateExtension/${extensionDescription.identifier.value}`);
|
|
293
|
+
performance.mark(`code/extHost/didActivateExtension/${extensionDescription.identifier.value}`);
|
|
294
294
|
return activatedExtension;
|
|
295
295
|
});
|
|
296
296
|
}
|
|
@@ -431,7 +431,7 @@ let AbstractExtHostExtensionService = class AbstractExtHostExtensionService exte
|
|
|
431
431
|
});
|
|
432
432
|
}
|
|
433
433
|
_activateAllStartupFinished() {
|
|
434
|
-
this._mainThreadExtensionsProxy.$setPerformanceMarks(getMarks());
|
|
434
|
+
this._mainThreadExtensionsProxy.$setPerformanceMarks(performance.getMarks());
|
|
435
435
|
this._extHostConfiguration.getConfigProvider().then((configProvider) => {
|
|
436
436
|
const shouldDeferActivation = configProvider.getConfiguration('extensions.experimental').get('deferredStartupFinishedActivation');
|
|
437
437
|
const allExtensionDescriptions = this._myRegistry.getAllExtensionDescriptions();
|
|
@@ -594,9 +594,9 @@ let AbstractExtHostExtensionService = class AbstractExtHostExtensionService exte
|
|
|
594
594
|
this._register(await this._extHostTunnelService.setTunnelFactory(resolver));
|
|
595
595
|
intervalLogger.cancelAndSet(() => logInfo('waiting...'), 1000);
|
|
596
596
|
logInfo(`invoking resolve()...`);
|
|
597
|
-
mark(`code/extHost/willResolveAuthority/${authorityPrefix}`);
|
|
597
|
+
performance.mark(`code/extHost/willResolveAuthority/${authorityPrefix}`);
|
|
598
598
|
const result = await resolver.resolve(remoteAuthority, { resolveAttempt });
|
|
599
|
-
mark(`code/extHost/didResolveAuthorityOK/${authorityPrefix}`);
|
|
599
|
+
performance.mark(`code/extHost/didResolveAuthorityOK/${authorityPrefix}`);
|
|
600
600
|
intervalLogger.dispose();
|
|
601
601
|
logInfo(`returned ${result.host}:${result.port}`);
|
|
602
602
|
const authority = {
|
|
@@ -623,7 +623,7 @@ let AbstractExtHostExtensionService = class AbstractExtHostExtensionService exte
|
|
|
623
623
|
};
|
|
624
624
|
}
|
|
625
625
|
catch (err) {
|
|
626
|
-
mark(`code/extHost/didResolveAuthorityError/${authorityPrefix}`);
|
|
626
|
+
performance.mark(`code/extHost/didResolveAuthorityError/${authorityPrefix}`);
|
|
627
627
|
intervalLogger.dispose();
|
|
628
628
|
logError(`returned an error`, err);
|
|
629
629
|
if (err instanceof RemoteAuthorityResolverError) {
|
|
@@ -4,7 +4,7 @@ import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
|
|
|
4
4
|
import { isLogLevel, LogLevel, ILoggerService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
|
|
5
5
|
import { IExtHostInitDataService } from './extHostInitDataService.js';
|
|
6
6
|
import { UIKind } from '../../services/extensions/common/extensionHostProtocol.js';
|
|
7
|
-
import { getRemoteName } from '
|
|
7
|
+
import { getRemoteName } from 'monaco-editor/esm/vs/platform/remote/common/remoteHosts.js';
|
|
8
8
|
import { extensionTelemetryLogChannelId, cleanRemoteAuthority, cleanData } from '../../../platform/telemetry/common/telemetryUtils.js';
|
|
9
9
|
import { mixin } from 'monaco-editor/esm/vs/base/common/objects.js';
|
|
10
10
|
import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
|
|
@@ -4,7 +4,7 @@ import { IDialogService } from 'monaco-editor/esm/vs/platform/dialogs/common/dia
|
|
|
4
4
|
import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/common/keybinding.js';
|
|
5
5
|
import { ILayoutService } from 'monaco-editor/esm/vs/platform/layout/browser/layoutService.js';
|
|
6
6
|
import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
|
|
7
|
-
import { IProductService } from '
|
|
7
|
+
import { IProductService } from 'monaco-editor/esm/vs/platform/product/common/productService.js';
|
|
8
8
|
import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
|
|
9
9
|
import { Extensions } from '../../../common/contributions.js';
|
|
10
10
|
import { BrowserDialogHandler } from './dialogHandler.js';
|
|
@@ -8,7 +8,7 @@ import { Dialog } from 'monaco-editor/esm/vs/base/browser/ui/dialog/dialog.js';
|
|
|
8
8
|
import { DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
|
|
9
9
|
import { EventHelper } from 'monaco-editor/esm/vs/base/browser/dom.js';
|
|
10
10
|
import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/common/keybinding.js';
|
|
11
|
-
import { IProductService } from '
|
|
11
|
+
import { IProductService } from 'monaco-editor/esm/vs/platform/product/common/productService.js';
|
|
12
12
|
import { IClipboardService } from 'monaco-editor/esm/vs/platform/clipboard/common/clipboardService.js';
|
|
13
13
|
import { fromNow } from '../../../../base/common/date.js';
|
|
14
14
|
import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
|
|
@@ -2,7 +2,7 @@ import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiati
|
|
|
2
2
|
import { ILifecycleService } from '../services/lifecycle/common/lifecycle.js';
|
|
3
3
|
import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
|
|
4
4
|
import { DeferredPromise, runWhenIdle } from 'monaco-editor/esm/vs/base/common/async.js';
|
|
5
|
-
import { mark } from '
|
|
5
|
+
import { mark } from 'monaco-editor/esm/vs/base/common/performance.js';
|
|
6
6
|
import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
|
|
7
7
|
import { IEnvironmentService } from 'monaco-editor/esm/vs/platform/environment/common/environment.js';
|
|
8
8
|
var Extensions;
|
package/dist/vscode/vs/workbench/contrib/codeEditor/browser/languageConfigurationExtensionPoint.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { __decorate, __param } from '../../../../../../node_modules/tslib/tslib.es6.js';
|
|
2
2
|
import * as nls from 'monaco-editor/esm/vs/nls.js';
|
|
3
|
-
import { parse, getNodeType } from '
|
|
3
|
+
import { parse, getNodeType } from 'monaco-editor/esm/vs/base/common/json.js';
|
|
4
4
|
import * as types from 'monaco-editor/esm/vs/base/common/types.js';
|
|
5
5
|
import { IndentAction } from 'monaco-editor/esm/vs/editor/common/languages/languageConfiguration.js';
|
|
6
6
|
import { ILanguageConfigurationService } from 'monaco-editor/esm/vs/editor/common/languages/languageConfigurationRegistry.js';
|
|
@@ -9,7 +9,7 @@ import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
|
|
|
9
9
|
import { registerColor } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
|
|
10
10
|
import { themeColorFromId } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
|
|
11
11
|
import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
|
|
12
|
-
import { IUriIdentityService } from '
|
|
12
|
+
import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
|
|
13
13
|
import { debugStackframe, debugStackframeFocused } from './debugIcons.js';
|
|
14
14
|
import { IDebugService } from '../common/debug.js';
|
|
15
15
|
import "../../../../../../assets/callStackEditorContribution.css";
|
|
@@ -3,7 +3,7 @@ import { flatten, distinct } from 'monaco-editor/esm/vs/base/common/arrays.js';
|
|
|
3
3
|
import { sequence } from 'monaco-editor/esm/vs/base/common/async.js';
|
|
4
4
|
import { CancellationTokenSource, CancellationToken } from 'monaco-editor/esm/vs/base/common/cancellation.js';
|
|
5
5
|
import { Emitter, Event } from 'monaco-editor/esm/vs/base/common/event.js';
|
|
6
|
-
import
|
|
6
|
+
import * as Json from 'monaco-editor/esm/vs/base/common/json.js';
|
|
7
7
|
import { dispose, DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
|
|
8
8
|
import * as objects from 'monaco-editor/esm/vs/base/common/objects.js';
|
|
9
9
|
import * as resources from 'monaco-editor/esm/vs/base/common/resources.js';
|
|
@@ -19,7 +19,7 @@ import { IQuickInputService } from 'monaco-editor/esm/vs/platform/quickinput/com
|
|
|
19
19
|
import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
|
|
20
20
|
import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
|
|
21
21
|
import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
|
|
22
|
-
import { IUriIdentityService } from '
|
|
22
|
+
import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
|
|
23
23
|
import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
|
|
24
24
|
import { debugConfigure } from './debugIcons.js';
|
|
25
25
|
import { CONTEXT_DEBUG_CONFIGURATION_TYPE, DebugConfigurationProviderTriggerKind } from '../common/debug.js';
|
|
@@ -562,7 +562,7 @@ let WorkspaceLaunch = class WorkspaceLaunch extends AbstractLaunch {
|
|
|
562
562
|
if (!launchExistInFile) {
|
|
563
563
|
const content = await this.getInitialConfigurationContent(undefined, type, useInitialConfigs, token);
|
|
564
564
|
if (content) {
|
|
565
|
-
await this.configurationService.updateValue('launch', parse(content), 5 );
|
|
565
|
+
await this.configurationService.updateValue('launch', Json.parse(content), 5 );
|
|
566
566
|
}
|
|
567
567
|
else {
|
|
568
568
|
return { editor: null, created: false };
|
|
@@ -8,7 +8,7 @@ import { CancellationTokenSource } from 'monaco-editor/esm/vs/base/common/cancel
|
|
|
8
8
|
import { memoize } from 'monaco-editor/esm/vs/base/common/decorators.js';
|
|
9
9
|
import { onUnexpectedExternalError } from 'monaco-editor/esm/vs/base/common/errors.js';
|
|
10
10
|
import { Event } from 'monaco-editor/esm/vs/base/common/event.js';
|
|
11
|
-
import { visit } from '
|
|
11
|
+
import { visit } from 'monaco-editor/esm/vs/base/common/json.js';
|
|
12
12
|
import { setProperty } from '../../../../base/common/jsonEdit.js';
|
|
13
13
|
import { dispose } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
|
|
14
14
|
import { basename } from 'monaco-editor/esm/vs/base/common/path.js';
|
|
@@ -29,7 +29,7 @@ import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configurati
|
|
|
29
29
|
import { IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
|
|
30
30
|
import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
|
|
31
31
|
import { registerColor } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
|
|
32
|
-
import { IUriIdentityService } from '
|
|
32
|
+
import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
|
|
33
33
|
import { DebugHoverWidget } from './debugHover.js';
|
|
34
34
|
import { ExceptionWidget } from './exceptionWidget.js';
|
|
35
35
|
import { CONTEXT_EXCEPTION_WIDGET_VISIBLE, IDebugService } from '../common/debug.js';
|
|
@@ -22,7 +22,7 @@ import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.j
|
|
|
22
22
|
import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
|
|
23
23
|
import { INotificationService } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
|
|
24
24
|
import { IQuickInputService } from 'monaco-editor/esm/vs/platform/quickinput/common/quickInput.js';
|
|
25
|
-
import { IUriIdentityService } from '
|
|
25
|
+
import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
|
|
26
26
|
import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
|
|
27
27
|
import { IWorkspaceTrustRequestService } from 'monaco-editor/esm/vs/platform/workspace/common/workspaceTrust.js';
|
|
28
28
|
import { IViewsService, IViewDescriptorService } from '../../../common/views.js';
|
|
@@ -17,9 +17,9 @@ import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configurati
|
|
|
17
17
|
import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
|
|
18
18
|
import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
|
|
19
19
|
import { INotificationService } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
|
|
20
|
-
import { IProductService } from '
|
|
20
|
+
import { IProductService } from 'monaco-editor/esm/vs/platform/product/common/productService.js';
|
|
21
21
|
import { ITelemetryService, ICustomEndpointTelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
|
|
22
|
-
import { IUriIdentityService } from '
|
|
22
|
+
import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
|
|
23
23
|
import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
|
|
24
24
|
import { RawDebugSession } from './rawDebugSession.js';
|
|
25
25
|
import { IDebugService, VIEWLET_ID } from '../common/debug.js';
|
|
@@ -13,7 +13,7 @@ import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
|
|
|
13
13
|
import { generateUuid } from 'monaco-editor/esm/vs/base/common/uuid.js';
|
|
14
14
|
import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
|
|
15
15
|
import * as nls from 'monaco-editor/esm/vs/nls.js';
|
|
16
|
-
import { IUriIdentityService } from '
|
|
16
|
+
import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
|
|
17
17
|
import { DEBUG_MEMORY_SCHEME } from './debug.js';
|
|
18
18
|
import { getUriFromSource, UNKNOWN_SOURCE_LABEL } from './debugSource.js';
|
|
19
19
|
import { DisassemblyViewInput } from './disassemblyViewInput.js';
|
|
@@ -3,7 +3,7 @@ import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
|
|
|
3
3
|
import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
|
|
4
4
|
import { Breakpoint, FunctionBreakpoint, ExceptionBreakpoint, DataBreakpoint, Expression } from './debugModel.js';
|
|
5
5
|
import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
|
|
6
|
-
import { IUriIdentityService } from '
|
|
6
|
+
import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
|
|
7
7
|
import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
|
|
8
8
|
const DEBUG_BREAKPOINTS_KEY = 'debug.breakpoint';
|
|
9
9
|
const DEBUG_FUNCTION_BREAKPOINTS_KEY = 'debug.functionbreakpoint';
|
|
@@ -8,7 +8,7 @@ import { dirname, basename } from 'monaco-editor/esm/vs/base/common/resources.js
|
|
|
8
8
|
import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
|
|
9
9
|
import { IClipboardService } from 'monaco-editor/esm/vs/platform/clipboard/common/clipboardService.js';
|
|
10
10
|
import { IEditorService } from '../../../services/editor/common/editorService.js';
|
|
11
|
-
import { IUriIdentityService } from '
|
|
11
|
+
import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
|
|
12
12
|
import { IBulkEditService } from 'monaco-editor/esm/vs/editor/browser/services/bulkEditService.js';
|
|
13
13
|
import { UndoRedoSource } from 'monaco-editor/esm/vs/platform/undoRedo/common/undoRedo.js';
|
|
14
14
|
import { IProgressService } from 'monaco-editor/esm/vs/platform/progress/common/progress.js';
|
|
@@ -21,7 +21,7 @@ import { TriggerAction } from 'monaco-editor/esm/vs/platform/quickinput/browser/
|
|
|
21
21
|
import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
|
|
22
22
|
import { stripIcons } from 'monaco-editor/esm/vs/base/common/iconLabels.js';
|
|
23
23
|
import { isFirefox } from 'monaco-editor/esm/vs/base/browser/browser.js';
|
|
24
|
-
import { IProductService } from '
|
|
24
|
+
import { IProductService } from 'monaco-editor/esm/vs/platform/product/common/productService.js';
|
|
25
25
|
let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends AbstractEditorCommandsQuickAccessProvider {
|
|
26
26
|
get activeTextEditorControl() { return this.editorService.activeTextEditorControl; }
|
|
27
27
|
get defaultFilterValue() {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { parse, getNodeType } from '
|
|
1
|
+
import { parse, getNodeType } from 'monaco-editor/esm/vs/base/common/json.js';
|
|
2
2
|
import { localize } from 'monaco-editor/esm/vs/nls.js';
|
|
3
3
|
import { extname, basename } from 'monaco-editor/esm/vs/base/common/path.js';
|
|
4
4
|
import { SnippetParser, Placeholder, Variable, Text } from 'monaco-editor/esm/vs/editor/contrib/snippet/browser/snippetParser.js';
|
|
@@ -17,7 +17,7 @@ import { applicationSettings, windowSettings, resourceSettings, allSettings, mac
|
|
|
17
17
|
import { isStoredWorkspaceFolder, toWorkspaceFolders, getStoredWorkspaceFolder } from '../../../../platform/workspaces/common/workspaces.js';
|
|
18
18
|
import { ConfigurationEditing } from '../common/configurationEditing.js';
|
|
19
19
|
import { DefaultConfiguration, UserConfiguration, RemoteUserConfiguration, WorkspaceConfiguration, FolderConfiguration } from './configuration.js';
|
|
20
|
-
import { mark } from '
|
|
20
|
+
import { mark } from 'monaco-editor/esm/vs/base/common/performance.js';
|
|
21
21
|
import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
|
|
22
22
|
import { Extensions } from '../../../common/contributions.js';
|
|
23
23
|
import { ILifecycleService } from '../../lifecycle/common/lifecycle.js';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { __decorate, __param } from '../../../../../../node_modules/tslib/tslib.es6.js';
|
|
2
2
|
import * as nls from 'monaco-editor/esm/vs/nls.js';
|
|
3
|
-
import
|
|
3
|
+
import * as Json from 'monaco-editor/esm/vs/base/common/json.js';
|
|
4
4
|
import { setProperty } from '../../../../base/common/jsonEdit.js';
|
|
5
5
|
import { Queue } from 'monaco-editor/esm/vs/base/common/async.js';
|
|
6
6
|
import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
|
|
@@ -15,12 +15,12 @@ import { IEditorService } from '../../editor/common/editorService.js';
|
|
|
15
15
|
import { Severity, INotificationService } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
|
|
16
16
|
import { IPreferencesService } from '../../preferences/common/preferences.js';
|
|
17
17
|
import { withNullAsUndefined, withUndefinedAsNull } from 'monaco-editor/esm/vs/base/common/types.js';
|
|
18
|
-
import { IUriIdentityService } from '
|
|
18
|
+
import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
|
|
19
19
|
import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
|
|
20
20
|
import { EditOperation } from 'monaco-editor/esm/vs/editor/common/core/editOperation.js';
|
|
21
21
|
import { Selection } from 'monaco-editor/esm/vs/editor/common/core/selection.js';
|
|
22
22
|
import { IUserDataProfileService } from '../../userDataProfile/common/userDataProfile.js';
|
|
23
|
-
import { IUserDataProfilesService } from '
|
|
23
|
+
import { IUserDataProfilesService } from 'monaco-editor/esm/vs/platform/userDataProfile/common/userDataProfile.js';
|
|
24
24
|
class ConfigurationEditingError extends Error {
|
|
25
25
|
constructor(message, code) {
|
|
26
26
|
super(message);
|
|
@@ -447,7 +447,7 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
447
447
|
return false;
|
|
448
448
|
}
|
|
449
449
|
const parseErrors = [];
|
|
450
|
-
parse(content, parseErrors, { allowTrailingComma: true, allowEmptyContent: true });
|
|
450
|
+
Json.parse(content, parseErrors, { allowTrailingComma: true, allowEmptyContent: true });
|
|
451
451
|
return parseErrors.length > 0;
|
|
452
452
|
}
|
|
453
453
|
async validate(target, operation, checkDirty, overrides) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { __decorate, __param } from '../../../../../../node_modules/tslib/tslib.es6.js';
|
|
2
2
|
import * as nls from 'monaco-editor/esm/vs/nls.js';
|
|
3
|
-
import
|
|
3
|
+
import * as Json from 'monaco-editor/esm/vs/base/common/json.js';
|
|
4
4
|
import { setProperty } from '../../../../base/common/jsonEdit.js';
|
|
5
5
|
import { Queue } from 'monaco-editor/esm/vs/base/common/async.js';
|
|
6
6
|
import { EditOperation } from 'monaco-editor/esm/vs/editor/common/core/editOperation.js';
|
|
@@ -84,7 +84,7 @@ let JSONEditingService = class JSONEditingService {
|
|
|
84
84
|
}
|
|
85
85
|
hasParseErrors(model) {
|
|
86
86
|
const parseErrors = [];
|
|
87
|
-
parse(model.getValue(), parseErrors, { allowTrailingComma: true, allowEmptyContent: true });
|
|
87
|
+
Json.parse(model.getValue(), parseErrors, { allowTrailingComma: true, allowEmptyContent: true });
|
|
88
88
|
return parseErrors.length > 0;
|
|
89
89
|
}
|
|
90
90
|
async resolveAndValidate(resource, checkDirty) {
|
|
@@ -12,7 +12,7 @@ import { localize } from 'monaco-editor/esm/vs/nls.js';
|
|
|
12
12
|
import { isCancellationError } from 'monaco-editor/esm/vs/base/common/errors.js';
|
|
13
13
|
import { CancellationTokenSource } from 'monaco-editor/esm/vs/base/common/cancellation.js';
|
|
14
14
|
import { hash } from 'monaco-editor/esm/vs/base/common/hash.js';
|
|
15
|
-
import { IUriIdentityService } from '
|
|
15
|
+
import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
|
|
16
16
|
import { distinct, asArray } from 'monaco-editor/esm/vs/base/common/arrays.js';
|
|
17
17
|
import { asCssVariable } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
|
|
18
18
|
import { getIconRegistry } from 'monaco-editor/esm/vs/platform/theme/common/iconRegistry.js';
|
|
@@ -6,7 +6,7 @@ import { Extensions } from 'monaco-editor/esm/vs/platform/jsonschemas/common/jso
|
|
|
6
6
|
import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
|
|
7
7
|
import { EXTENSION_CATEGORIES, ExtensionIdentifierSet } from 'monaco-editor/esm/vs/platform/extensions/common/extensions.js';
|
|
8
8
|
import { allApiProposals } from './extensionsApiProposals.js';
|
|
9
|
-
import { productSchemaId } from '
|
|
9
|
+
import { productSchemaId } from 'monaco-editor/esm/vs/platform/product/common/productService.js';
|
|
10
10
|
import { ImplicitActivationEvents } from '../../../../platform/extensionManagement/common/implicitActivationEvents.js';
|
|
11
11
|
const schemaRegistry = ( Registry.as(Extensions.JSONContribution));
|
|
12
12
|
class ExtensionMessageCollector {
|
|
@@ -6,7 +6,7 @@ import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
|
|
|
6
6
|
import { printKeyboardEvent, printStandardKeyboardEvent, StandardKeyboardEvent } from 'monaco-editor/esm/vs/base/browser/keyboardEvent.js';
|
|
7
7
|
import { RunOnceScheduler } from 'monaco-editor/esm/vs/base/common/async.js';
|
|
8
8
|
import { Emitter, Event } from 'monaco-editor/esm/vs/base/common/event.js';
|
|
9
|
-
import { parse } from '
|
|
9
|
+
import { parse } from 'monaco-editor/esm/vs/base/common/json.js';
|
|
10
10
|
import { UserSettingsLabelProvider } from 'monaco-editor/esm/vs/base/common/keybindingLabels.js';
|
|
11
11
|
import { KeybindingParser } from '../../../../base/common/keybindingParser.js';
|
|
12
12
|
import { KeyCodeChord, ScanCodeChord } from 'monaco-editor/esm/vs/base/common/keybindings.js';
|
|
@@ -11,7 +11,7 @@ import { FallbackKeyboardMapper } from '../common/fallbackKeyboardMapper.js';
|
|
|
11
11
|
import { MacLinuxKeyboardMapper } from '../common/macLinuxKeyboardMapper.js';
|
|
12
12
|
import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
|
|
13
13
|
import { RunOnceScheduler } from 'monaco-editor/esm/vs/base/common/async.js';
|
|
14
|
-
import { parse, getNodeType } from '
|
|
14
|
+
import { parse, getNodeType } from 'monaco-editor/esm/vs/base/common/json.js';
|
|
15
15
|
import * as objects from 'monaco-editor/esm/vs/base/common/objects.js';
|
|
16
16
|
import { IEnvironmentService } from 'monaco-editor/esm/vs/platform/environment/common/environment.js';
|
|
17
17
|
import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
|
|
@@ -4,7 +4,7 @@ import { Barrier } from 'monaco-editor/esm/vs/base/common/async.js';
|
|
|
4
4
|
import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
|
|
5
5
|
import { LifecyclePhaseToString } from './lifecycle.js';
|
|
6
6
|
import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
|
|
7
|
-
import { mark } from '
|
|
7
|
+
import { mark } from 'monaco-editor/esm/vs/base/common/performance.js';
|
|
8
8
|
import { WillSaveStateReason, IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
|
|
9
9
|
let AbstractLifecycleService = class AbstractLifecycleService extends Disposable {
|
|
10
10
|
get startupKind() { return this._startupKind; }
|