@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
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { __decorate, __param } from '../../../../../../node_modules/tslib/tslib.es6.js';
|
|
2
2
|
import { getErrorMessage } from 'monaco-editor/esm/vs/base/common/errors.js';
|
|
3
3
|
import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
|
|
4
|
-
import { parse } from '
|
|
4
|
+
import { parse } from 'monaco-editor/esm/vs/base/common/json.js';
|
|
5
5
|
import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
|
|
6
6
|
import * as network from 'monaco-editor/esm/vs/base/common/network.js';
|
|
7
7
|
import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
|
|
@@ -35,7 +35,7 @@ import { ITextFileService } from '../../textfile/common/textfiles.js';
|
|
|
35
35
|
import { isObject } from 'monaco-editor/esm/vs/base/common/types.js';
|
|
36
36
|
import { SuggestController } from 'monaco-editor/esm/vs/editor/contrib/suggest/browser/suggestController.js';
|
|
37
37
|
import { IUserDataProfileService } from '../../userDataProfile/common/userDataProfile.js';
|
|
38
|
-
import { IUserDataProfilesService } from '
|
|
38
|
+
import { IUserDataProfilesService } from 'monaco-editor/esm/vs/platform/userDataProfile/common/userDataProfile.js';
|
|
39
39
|
const emptyEditableSettingsContent = '{\n}';
|
|
40
40
|
let PreferencesService = class PreferencesService extends Disposable {
|
|
41
41
|
constructor(editorService, editorGroupService, textFileService, configurationService, notificationService, contextService, instantiationService, userDataProfileService, userDataProfilesService, textModelResolverService, keybindingService, modelService, jsonEditingService, languageService, labelService, remoteAgentService, textEditorService) {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { __decorate, __param } from '../../../../../../node_modules/tslib/tslib.es6.js';
|
|
2
2
|
import { coalesce, tail, flatten } from 'monaco-editor/esm/vs/base/common/arrays.js';
|
|
3
3
|
import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
|
|
4
|
-
import { visit } from '
|
|
4
|
+
import { visit } from 'monaco-editor/esm/vs/base/common/json.js';
|
|
5
5
|
import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
|
|
6
6
|
import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
|
|
7
7
|
import { Selection } from 'monaco-editor/esm/vs/editor/common/core/selection.js';
|
|
@@ -11,7 +11,7 @@ import { IModelService } from 'monaco-editor/esm/vs/editor/common/services/model
|
|
|
11
11
|
import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
|
|
12
12
|
import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
|
|
13
13
|
import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
|
|
14
|
-
import { IUriIdentityService } from '
|
|
14
|
+
import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
|
|
15
15
|
import { EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
|
|
16
16
|
import { IEditorService } from '../../editor/common/editorService.js';
|
|
17
17
|
import { IExtensionService } from '../../extensions/common/extensions.js';
|
|
@@ -14,7 +14,7 @@ import { IFilesConfigurationService } from '../../filesConfiguration/common/file
|
|
|
14
14
|
import { ILifecycleService } from '../../lifecycle/common/lifecycle.js';
|
|
15
15
|
import { IPathService } from '../../path/common/pathService.js';
|
|
16
16
|
import { IUntitledTextEditorService } from '../../untitled/common/untitledTextEditorService.js';
|
|
17
|
-
import { IUriIdentityService } from '
|
|
17
|
+
import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
|
|
18
18
|
import { IWorkingCopyFileService } from '../../workingCopy/common/workingCopyFileService.js';
|
|
19
19
|
import { IDecorationsService } from '../../decorations/common/decorations.js';
|
|
20
20
|
let BrowserTextFileService = class BrowserTextFileService extends AbstractTextFileService {
|
|
@@ -24,10 +24,10 @@ import { BaseTextEditorModel } from '../../../common/editor/textEditorModel.js';
|
|
|
24
24
|
import { ICodeEditorService } from 'monaco-editor/esm/vs/editor/browser/services/codeEditorService.js';
|
|
25
25
|
import { IPathService } from '../../path/common/pathService.js';
|
|
26
26
|
import { IWorkingCopyFileService } from '../../workingCopy/common/workingCopyFileService.js';
|
|
27
|
-
import { IUriIdentityService } from '
|
|
27
|
+
import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
|
|
28
28
|
import { WORKSPACE_EXTENSION, IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
|
|
29
29
|
import { UTF8, toEncodeReadable, toDecodeStream, UTF16be, UTF16le, UTF8_with_bom, encodingExists } from '../common/encoding.js';
|
|
30
|
-
import { consumeStream } from '
|
|
30
|
+
import { consumeStream } from 'monaco-editor/esm/vs/base/common/stream.js';
|
|
31
31
|
import { ILanguageService } from 'monaco-editor/esm/vs/editor/common/languages/language.js';
|
|
32
32
|
import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
|
|
33
33
|
import { CancellationToken, CancellationTokenSource } from 'monaco-editor/esm/vs/base/common/cancellation.js';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { newWriteableStream, listenStream } from 'monaco-editor/esm/vs/base/common/stream.js';
|
|
2
2
|
import { VSBuffer } from 'monaco-editor/esm/vs/base/common/buffer.js';
|
|
3
3
|
const UTF8 = 'utf8';
|
|
4
4
|
const UTF8_with_bom = 'utf8bom';
|
|
@@ -12,7 +12,7 @@ import { TextResourceEditorInput } from '../../../common/editor/textResourceEdit
|
|
|
12
12
|
import { UntitledTextEditorInput } from '../../untitled/common/untitledTextEditorInput.js';
|
|
13
13
|
import { basename } from 'monaco-editor/esm/vs/base/common/resources.js';
|
|
14
14
|
import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
|
|
15
|
-
import { IUriIdentityService } from '
|
|
15
|
+
import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
|
|
16
16
|
import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
|
|
17
17
|
import { RegisteredEditorPriority, IEditorResolverService } from '../../editor/common/editorResolverService.js';
|
|
18
18
|
import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { __decorate, __param } from '../../../../../../node_modules/tslib/tslib.es6.js';
|
|
2
2
|
import { localize } from 'monaco-editor/esm/vs/nls.js';
|
|
3
3
|
import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
|
|
4
|
-
import { mark } from '
|
|
4
|
+
import { mark } from 'monaco-editor/esm/vs/base/common/performance.js';
|
|
5
5
|
import { withNullAsUndefined, assertIsDefined } from 'monaco-editor/esm/vs/base/common/types.js';
|
|
6
6
|
import { ITextFileService } from './textfiles.js';
|
|
7
7
|
import { SaveSourceRegistry } from '../../../common/editor.js';
|
|
@@ -16,7 +16,7 @@ import { IWorkingCopyFileService } from '../../workingCopy/common/workingCopyFil
|
|
|
16
16
|
import { joinPath, extname } from 'monaco-editor/esm/vs/base/common/resources.js';
|
|
17
17
|
import { createTextBufferFactoryFromSnapshot } from 'monaco-editor/esm/vs/editor/common/model/textModel.js';
|
|
18
18
|
import { PLAINTEXT_LANGUAGE_ID, PLAINTEXT_EXTENSION } from 'monaco-editor/esm/vs/editor/common/languages/modesRegistry.js';
|
|
19
|
-
import { IUriIdentityService } from '
|
|
19
|
+
import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
|
|
20
20
|
let TextFileEditorModelManager = class TextFileEditorModelManager extends Disposable {
|
|
21
21
|
get models() {
|
|
22
22
|
return [...( this.mapResourceToModel.values())];
|
package/dist/vscode/vs/workbench/services/textmodelResolver/common/textModelResolverService.js
CHANGED
|
@@ -11,7 +11,7 @@ import { TextFileEditorModel } from '../../textfile/common/textFileEditorModel.j
|
|
|
11
11
|
import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
|
|
12
12
|
import { IUndoRedoService } from 'monaco-editor/esm/vs/platform/undoRedo/common/undoRedo.js';
|
|
13
13
|
import { ModelUndoRedoParticipant } from '../../../../editor/common/services/modelUndoRedoParticipant.js';
|
|
14
|
-
import { IUriIdentityService } from '
|
|
14
|
+
import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
|
|
15
15
|
let ResourceModelCollection = class ResourceModelCollection extends ReferenceCollection {
|
|
16
16
|
constructor(instantiationService, textFileService, fileService, modelService) {
|
|
17
17
|
super();
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as nls from 'monaco-editor/esm/vs/nls.js';
|
|
2
2
|
import * as paths from 'monaco-editor/esm/vs/base/common/path.js';
|
|
3
3
|
import * as resources from 'monaco-editor/esm/vs/base/common/resources.js';
|
|
4
|
-
import
|
|
4
|
+
import * as Json from 'monaco-editor/esm/vs/base/common/json.js';
|
|
5
5
|
import { ExtensionData } from '../common/workbenchThemeService.js';
|
|
6
6
|
import { getParseErrorMessage } from '../../../../base/common/jsonErrorMessages.js';
|
|
7
7
|
import { asCSSUrl } from 'monaco-editor/esm/vs/base/browser/dom.js';
|
|
@@ -133,7 +133,7 @@ class FileIconThemeLoader {
|
|
|
133
133
|
loadIconThemeDocument(location) {
|
|
134
134
|
return this.fileService.readExtensionResource(location).then((content) => {
|
|
135
135
|
const errors = [];
|
|
136
|
-
const contentValue = parse(content, errors);
|
|
136
|
+
const contentValue = Json.parse(content, errors);
|
|
137
137
|
if (errors.length > 0) {
|
|
138
138
|
return Promise.reject(( new Error(( nls.localize(
|
|
139
139
|
'error.cannotparseicontheme',
|
|
@@ -141,7 +141,7 @@ class FileIconThemeLoader {
|
|
|
141
141
|
( errors.map(e => getParseErrorMessage(e.error))).join(', ')
|
|
142
142
|
)))));
|
|
143
143
|
}
|
|
144
|
-
else if (getNodeType(contentValue) !== 'object') {
|
|
144
|
+
else if (Json.getNodeType(contentValue) !== 'object') {
|
|
145
145
|
return Promise.reject(( new Error(( nls.localize(
|
|
146
146
|
'error.invalidformat',
|
|
147
147
|
"Invalid format for file icons theme file: Object expected."
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as nls from 'monaco-editor/esm/vs/nls.js';
|
|
2
2
|
import * as paths from 'monaco-editor/esm/vs/base/common/path.js';
|
|
3
3
|
import * as resources from 'monaco-editor/esm/vs/base/common/resources.js';
|
|
4
|
-
import
|
|
4
|
+
import * as Json from 'monaco-editor/esm/vs/base/common/json.js';
|
|
5
5
|
import { ExtensionData } from '../common/workbenchThemeService.js';
|
|
6
6
|
import { getParseErrorMessage } from '../../../../base/common/jsonErrorMessages.js';
|
|
7
7
|
import { DEFAULT_PRODUCT_ICON_THEME_SETTING_VALUE } from '../common/themeConfiguration.js';
|
|
@@ -153,7 +153,7 @@ ProductIconThemeData._defaultProductIconTheme = null;
|
|
|
153
153
|
function _loadProductIconThemeDocument(fileService, location, warnings) {
|
|
154
154
|
return fileService.readExtensionResource(location).then((content) => {
|
|
155
155
|
const parseErrors = [];
|
|
156
|
-
const contentValue = parse(content, parseErrors);
|
|
156
|
+
const contentValue = Json.parse(content, parseErrors);
|
|
157
157
|
if (parseErrors.length > 0) {
|
|
158
158
|
return Promise.reject(( new Error(( nls.localize(
|
|
159
159
|
'error.cannotparseicontheme',
|
|
@@ -161,7 +161,7 @@ function _loadProductIconThemeDocument(fileService, location, warnings) {
|
|
|
161
161
|
( parseErrors.map(e => getParseErrorMessage(e.error))).join(', ')
|
|
162
162
|
)))));
|
|
163
163
|
}
|
|
164
|
-
else if (getNodeType(contentValue) !== 'object') {
|
|
164
|
+
else if (Json.getNodeType(contentValue) !== 'object') {
|
|
165
165
|
return Promise.reject(( new Error(( nls.localize(
|
|
166
166
|
'error.invalidformat',
|
|
167
167
|
"Invalid format for product icons theme file: Object expected."
|
|
@@ -19,7 +19,7 @@ import { IBrowserWorkbenchEnvironmentService } from '../../environment/browser/e
|
|
|
19
19
|
import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
|
|
20
20
|
import * as resources from 'monaco-editor/esm/vs/base/common/resources.js';
|
|
21
21
|
import { registerColorThemeSchemas } from '../common/colorThemeSchema.js';
|
|
22
|
-
import { getRemoteAuthority } from '
|
|
22
|
+
import { getRemoteAuthority } from 'monaco-editor/esm/vs/platform/remote/common/remoteHosts.js';
|
|
23
23
|
import { IWorkbenchLayoutService } from '../../layout/browser/layoutService.js';
|
|
24
24
|
import { IExtensionResourceLoaderService } from '../../../../platform/extensionResourceLoader/common/extensionResourceLoader.js';
|
|
25
25
|
import { ThemeRegistry, registerColorThemeExtensionPoint, registerFileIconThemeExtensionPoint, registerProductIconThemeExtensionPoint } from '../common/themeExtensionPoints.js';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { basename } from 'monaco-editor/esm/vs/base/common/path.js';
|
|
2
|
-
import
|
|
2
|
+
import * as Json from 'monaco-editor/esm/vs/base/common/json.js';
|
|
3
3
|
import { Color } from 'monaco-editor/esm/vs/base/common/color.js';
|
|
4
4
|
import { THEME_SCOPE_OPEN_PAREN, THEME_SCOPE_CLOSE_PAREN, THEME_SCOPE_WILDCARD, themeScopeRegex, ExtensionData, VS_HC_LIGHT_THEME, VS_HC_THEME, VS_LIGHT_THEME } from './workbenchThemeService.js';
|
|
5
5
|
import { convertSettings } from './themeCompatibility.js';
|
|
@@ -10,7 +10,7 @@ import { editorForeground, editorBackground, Extensions } from 'monaco-editor/es
|
|
|
10
10
|
import { getThemeTypeSelector } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
|
|
11
11
|
import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
|
|
12
12
|
import { getParseErrorMessage } from '../../../../base/common/jsonErrorMessages.js';
|
|
13
|
-
import { parse
|
|
13
|
+
import { parse } from './plistParser.js';
|
|
14
14
|
import { TokenStyle, parseClassifierString, SemanticTokenRule, getTokenClassificationRegistry } from '../../../../platform/theme/common/tokenClassificationRegistry.js';
|
|
15
15
|
import { createMatchers } from './textMateScopeMatcher.js';
|
|
16
16
|
import { ColorScheme } from 'monaco-editor/esm/vs/platform/theme/common/theme.js';
|
|
@@ -580,7 +580,7 @@ async function _loadColorTheme(extensionResourceLoaderService, themeLocation, re
|
|
|
580
580
|
if (resources.extname(themeLocation) === '.json') {
|
|
581
581
|
const content = await extensionResourceLoaderService.readExtensionResource(themeLocation);
|
|
582
582
|
const errors = [];
|
|
583
|
-
const contentValue = parse(content, errors);
|
|
583
|
+
const contentValue = Json.parse(content, errors);
|
|
584
584
|
if (errors.length > 0) {
|
|
585
585
|
return Promise.reject(( new Error(( nls.localize(
|
|
586
586
|
'error.cannotparsejson',
|
|
@@ -588,7 +588,7 @@ async function _loadColorTheme(extensionResourceLoaderService, themeLocation, re
|
|
|
588
588
|
( errors.map(e => getParseErrorMessage(e.error))).join(', ')
|
|
589
589
|
)))));
|
|
590
590
|
}
|
|
591
|
-
else if (getNodeType(contentValue) !== 'object') {
|
|
591
|
+
else if (Json.getNodeType(contentValue) !== 'object') {
|
|
592
592
|
return Promise.reject(( new Error(( nls.localize(
|
|
593
593
|
'error.invalidformat',
|
|
594
594
|
"Invalid format for JSON theme file: Object expected."
|
|
@@ -660,7 +660,7 @@ async function _loadColorTheme(extensionResourceLoaderService, themeLocation, re
|
|
|
660
660
|
function _loadSyntaxTokens(extensionResourceLoaderService, themeLocation, result) {
|
|
661
661
|
return extensionResourceLoaderService.readExtensionResource(themeLocation).then(content => {
|
|
662
662
|
try {
|
|
663
|
-
const contentValue = parse
|
|
663
|
+
const contentValue = parse(content);
|
|
664
664
|
const settings = contentValue.settings;
|
|
665
665
|
if (!Array.isArray(settings)) {
|
|
666
666
|
return Promise.reject(( new Error(( nls.localize(
|
|
@@ -3,7 +3,7 @@ import { Promises } from 'monaco-editor/esm/vs/base/common/async.js';
|
|
|
3
3
|
import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
|
|
4
4
|
import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
|
|
5
5
|
import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
|
|
6
|
-
import { IUserDataProfilesService } from '
|
|
6
|
+
import { IUserDataProfilesService } from 'monaco-editor/esm/vs/platform/userDataProfile/common/userDataProfile.js';
|
|
7
7
|
import { defaultUserDataProfileIcon } from './userDataProfile.js';
|
|
8
8
|
let UserDataProfileService = class UserDataProfileService extends Disposable {
|
|
9
9
|
get currentProfile() { return this._currentProfile; }
|
|
@@ -6,7 +6,7 @@ import { deepClone, equals } from 'monaco-editor/esm/vs/base/common/objects.js';
|
|
|
6
6
|
import { ResourceQueue, Promises } from 'monaco-editor/esm/vs/base/common/async.js';
|
|
7
7
|
import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
|
|
8
8
|
import { ResourceMap } from 'monaco-editor/esm/vs/base/common/map.js';
|
|
9
|
-
import { isReadableStream, peekStream } from '
|
|
9
|
+
import { isReadableStream, peekStream } from 'monaco-editor/esm/vs/base/common/stream.js';
|
|
10
10
|
import { VSBuffer, prefixedBufferStream, prefixedBufferReadable, bufferToStream, streamToBuffer, readableToBuffer } from 'monaco-editor/esm/vs/base/common/buffer.js';
|
|
11
11
|
import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
|
|
12
12
|
import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
|
|
@@ -7,7 +7,7 @@ import { Disposable, toDisposable } from 'monaco-editor/esm/vs/base/common/lifec
|
|
|
7
7
|
import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
|
|
8
8
|
import { CancellationToken } from 'monaco-editor/esm/vs/base/common/cancellation.js';
|
|
9
9
|
import { IWorkingCopyService } from './workingCopyService.js';
|
|
10
|
-
import { IUriIdentityService } from '
|
|
10
|
+
import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
|
|
11
11
|
import { WorkingCopyFileOperationParticipant } from './workingCopyFileOperationParticipant.js';
|
|
12
12
|
import { StoredFileWorkingCopySaveParticipant } from './storedFileWorkingCopySaveParticipant.js';
|
|
13
13
|
const IWorkingCopyFileService = ( createDecorator('workingCopyFileService'));
|
package/dist/vscode/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.js
CHANGED
|
@@ -16,10 +16,10 @@ import { mnemonicButtonLabel } from 'monaco-editor/esm/vs/base/common/labels.js'
|
|
|
16
16
|
import { ITextFileService } from '../../textfile/common/textfiles.js';
|
|
17
17
|
import { IHostService } from '../../host/browser/host.js';
|
|
18
18
|
import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
|
|
19
|
-
import { IUriIdentityService } from '
|
|
19
|
+
import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
|
|
20
20
|
import { IWorkspaceTrustManagementService } from 'monaco-editor/esm/vs/platform/workspace/common/workspaceTrust.js';
|
|
21
21
|
import { IWorkbenchConfigurationService } from '../../configuration/common/configuration.js';
|
|
22
|
-
import { IUserDataProfilesService } from '
|
|
22
|
+
import { IUserDataProfilesService } from 'monaco-editor/esm/vs/platform/userDataProfile/common/userDataProfile.js';
|
|
23
23
|
import { IUserDataProfileService } from '../../userDataProfile/common/userDataProfile.js';
|
|
24
24
|
let AbstractWorkspaceEditingService = class AbstractWorkspaceEditingService {
|
|
25
25
|
constructor(jsonEditingService, contextService, configurationService, notificationService, commandService, fileService, textFileService, workspacesService, environmentService, fileDialogService, dialogService, hostService, uriIdentityService, workspaceTrustManagementService, userDataProfilesService, userDataProfileService) {
|
|
@@ -10,7 +10,7 @@ import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.j
|
|
|
10
10
|
import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
|
|
11
11
|
import { joinPath } from 'monaco-editor/esm/vs/base/common/resources.js';
|
|
12
12
|
import { VSBuffer } from 'monaco-editor/esm/vs/base/common/buffer.js';
|
|
13
|
-
import { IUriIdentityService } from '
|
|
13
|
+
import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
|
|
14
14
|
import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
|
|
15
15
|
let BrowserWorkspacesService = class BrowserWorkspacesService extends Disposable {
|
|
16
16
|
constructor(storageService, contextService, logService, fileService, environmentService, uriIdentityService) {
|
|
@@ -5,7 +5,7 @@ import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
|
|
|
5
5
|
import { trackFocus } from 'monaco-editor/esm/vs/base/browser/dom.js';
|
|
6
6
|
import { IEditorService } from '../vscode/vs/workbench/services/editor/common/editorService.js';
|
|
7
7
|
import { IPaneCompositePartService } from '../vscode/vs/workbench/services/panecomposite/browser/panecomposite.js';
|
|
8
|
-
import { IUriIdentityService } from '
|
|
8
|
+
import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
|
|
9
9
|
import { ITextFileService } from '../vscode/vs/workbench/services/textfile/common/textfiles.js';
|
|
10
10
|
import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
|
|
11
11
|
import { IEditorGroupsService } from '../vscode/vs/workbench/services/editor/common/editorGroupsService.js';
|
|
@@ -13,7 +13,7 @@ import { IWorkbenchEnvironmentService } from '../vscode/vs/workbench/services/en
|
|
|
13
13
|
import { IWorkingCopyFileService, WorkingCopyFileService } from '../vscode/vs/workbench/services/workingCopy/common/workingCopyFileService.js';
|
|
14
14
|
import { IPathService } from '../vscode/vs/workbench/services/path/common/pathService.js';
|
|
15
15
|
import { registerSingleton } from 'monaco-editor/esm/vs/platform/instantiation/common/extensions.js';
|
|
16
|
-
import { IProductService } from '
|
|
16
|
+
import { IProductService } from 'monaco-editor/esm/vs/platform/product/common/productService.js';
|
|
17
17
|
import { ILanguageStatusService } from '../vscode/vs/workbench/services/languageStatus/common/languageStatusService.js';
|
|
18
18
|
import { LanguageFeatureRegistry } from 'monaco-editor/esm/vs/editor/common/languageFeatureRegistry.js';
|
|
19
19
|
import { compare } from 'monaco-editor/esm/vs/base/common/strings.js';
|
|
@@ -32,7 +32,7 @@ import { IPreferencesService } from '../vscode/vs/workbench/services/preferences
|
|
|
32
32
|
import { IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
|
|
33
33
|
import { StandaloneServices } from 'monaco-editor/esm/vs/editor/standalone/browser/standaloneServices.js';
|
|
34
34
|
import { ICodeEditorService } from 'monaco-editor/esm/vs/editor/browser/services/codeEditorService.js';
|
|
35
|
-
import { IUserDataProfilesService } from '
|
|
35
|
+
import { IUserDataProfilesService } from 'monaco-editor/esm/vs/platform/userDataProfile/common/userDataProfile.js';
|
|
36
36
|
import { IPolicyService } from 'monaco-editor/esm/vs/platform/policy/common/policy.js';
|
|
37
37
|
import { IUserDataProfileService } from '../vscode/vs/workbench/services/userDataProfile/common/userDataProfile.js';
|
|
38
38
|
import { UserDataProfileService } from '../vscode/vs/workbench/services/userDataProfile/common/userDataProfileService.js';
|