@codingame/monaco-vscode-base-service-override 1.85.6 → 2.0.0-v2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/base.js +3 -3
- package/package.json +3 -4
- package/vscode/src/vs/base/parts/request/browser/request.js +2 -2
- package/vscode/src/vs/platform/download/common/downloadService.js +3 -3
- package/vscode/src/vs/platform/request/browser/requestService.js +2 -2
- package/vscode/src/vs/platform/request/common/requestIpc.js +1 -1
- package/vscode/src/vs/platform/url/common/urlService.js +2 -2
- package/vscode/src/vs/workbench/services/configuration/common/jsonEditingService.js +10 -10
- package/vscode/src/vs/workbench/services/decorations/browser/decorationsService.js +17 -17
- package/vscode/src/vs/workbench/services/request/browser/requestService.js +3 -3
- package/vscode/src/vs/workbench/services/url/browser/urlService.js +4 -4
package/base.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { SyncDescriptor } from '
|
|
1
|
+
import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
|
|
2
2
|
import { IRequestService } from 'vscode/vscode/vs/platform/request/common/request';
|
|
3
3
|
import { IDecorationsService } from 'vscode/vscode/vs/workbench/services/decorations/common/decorations';
|
|
4
4
|
import { IJSONEditingService } from 'vscode/vscode/vs/workbench/services/configuration/common/jsonEditing';
|
|
5
|
-
import { ITreeViewsDnDService } from '
|
|
5
|
+
import { ITreeViewsDnDService } from 'vscode/vscode/vs/editor/common/services/treeViewsDndService';
|
|
6
6
|
import { ITreeViewsService } from 'vscode/vscode/vs/workbench/services/views/browser/treeViewsService';
|
|
7
|
-
import { TreeViewsDnDService } from '
|
|
7
|
+
import { TreeViewsDnDService } from 'vscode/vscode/vs/editor/common/services/treeViewsDnd';
|
|
8
8
|
import { IURLService } from 'vscode/vscode/vs/platform/url/common/url';
|
|
9
9
|
import { JSONEditingService } from './vscode/src/vs/workbench/services/configuration/common/jsonEditingService.js';
|
|
10
10
|
import { DecorationsService } from './vscode/src/vs/workbench/services/decorations/browser/decorationsService.js';
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@codingame/monaco-vscode-base-service-override",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "2.0.0-v2.1",
|
|
4
4
|
"keywords": [],
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "CodinGame",
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
"license": "MIT",
|
|
10
10
|
"repository": {
|
|
11
11
|
"type": "git",
|
|
12
|
-
"url": "git
|
|
12
|
+
"url": "git@github.com:CodinGame/monaco-vscode-api.git"
|
|
13
13
|
},
|
|
14
14
|
"type": "module",
|
|
15
15
|
"private": false,
|
|
@@ -18,7 +18,6 @@
|
|
|
18
18
|
"module": "index.js",
|
|
19
19
|
"types": "index.d.ts",
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"vscode": "npm:@codingame/monaco-vscode-api@
|
|
22
|
-
"monaco-editor": "0.45.0"
|
|
21
|
+
"vscode": "npm:@codingame/monaco-vscode-api@2.0.0-v2.1"
|
|
23
22
|
}
|
|
24
23
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { bufferToStream, VSBuffer } from '
|
|
2
|
-
import { canceled } from '
|
|
1
|
+
import { bufferToStream, VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
|
|
2
|
+
import { canceled } from 'vscode/vscode/vs/base/common/errors';
|
|
3
3
|
import { OfflineError } from 'vscode/vscode/vs/base/parts/request/common/request';
|
|
4
4
|
|
|
5
5
|
function request(options, token) {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
|
|
2
|
-
import { CancellationToken } from '
|
|
3
|
-
import { Schemas } from '
|
|
4
|
-
import { IFileService } from '
|
|
2
|
+
import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
|
|
3
|
+
import { Schemas } from 'vscode/vscode/vs/base/common/network';
|
|
4
|
+
import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
|
|
5
5
|
import { asTextOrError, IRequestService } from 'vscode/vscode/vs/platform/request/common/request';
|
|
6
6
|
|
|
7
7
|
let DownloadService = class DownloadService {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
|
|
2
2
|
import { request } from '../../../base/parts/request/browser/request.js';
|
|
3
|
-
import { IConfigurationService } from '
|
|
4
|
-
import { ILoggerService } from '
|
|
3
|
+
import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
|
|
4
|
+
import { ILoggerService } from 'vscode/vscode/vs/platform/log/common/log';
|
|
5
5
|
import { AbstractRequestService } from 'vscode/vscode/vs/platform/request/common/request';
|
|
6
6
|
|
|
7
7
|
let RequestService = class RequestService extends AbstractRequestService {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { first } from '
|
|
2
|
-
import { Disposable, toDisposable } from '
|
|
1
|
+
import { first } from 'vscode/vscode/vs/base/common/async';
|
|
2
|
+
import { Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
|
|
3
3
|
|
|
4
4
|
class AbstractURLService extends Disposable {
|
|
5
5
|
constructor() {
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
|
|
2
|
-
import
|
|
3
|
-
import
|
|
2
|
+
import { localizeWithPath } from 'vscode/vscode/vs/nls';
|
|
3
|
+
import { parse } from 'vscode/vscode/vs/base/common/json';
|
|
4
4
|
import { setProperty } from 'vscode/vscode/vs/base/common/jsonEdit';
|
|
5
|
-
import { Queue } from '
|
|
6
|
-
import { EditOperation } from '
|
|
7
|
-
import { Range } from '
|
|
8
|
-
import { Selection } from '
|
|
5
|
+
import { Queue } from 'vscode/vscode/vs/base/common/async';
|
|
6
|
+
import { EditOperation } from 'vscode/vscode/vs/editor/common/core/editOperation';
|
|
7
|
+
import { Range } from 'vscode/vscode/vs/editor/common/core/range';
|
|
8
|
+
import { Selection } from 'vscode/vscode/vs/editor/common/core/selection';
|
|
9
9
|
import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles';
|
|
10
|
-
import { IFileService } from '
|
|
11
|
-
import { ITextModelService } from '
|
|
10
|
+
import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
|
|
11
|
+
import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
|
|
12
12
|
import { JSONEditingError } from 'vscode/vscode/vs/workbench/services/configuration/common/jsonEditing';
|
|
13
13
|
|
|
14
14
|
let JSONEditingService = class JSONEditingService {
|
|
@@ -85,7 +85,7 @@ let JSONEditingService = class JSONEditingService {
|
|
|
85
85
|
}
|
|
86
86
|
hasParseErrors(model) {
|
|
87
87
|
const parseErrors = [];
|
|
88
|
-
|
|
88
|
+
parse(model.getValue(), parseErrors, { allowTrailingComma: true, allowEmptyContent: true });
|
|
89
89
|
return parseErrors.length > 0;
|
|
90
90
|
}
|
|
91
91
|
async resolveAndValidate(resource, checkDirty) {
|
|
@@ -104,7 +104,7 @@ let JSONEditingService = class JSONEditingService {
|
|
|
104
104
|
toErrorMessage(error) {
|
|
105
105
|
switch (error) {
|
|
106
106
|
case 0 : {
|
|
107
|
-
return (
|
|
107
|
+
return ( localizeWithPath(
|
|
108
108
|
'vs/workbench/services/configuration/common/jsonEditingService',
|
|
109
109
|
'errorInvalidFile',
|
|
110
110
|
"Unable to write into the file. Please open the file to correct errors/warnings in the file and try again."
|
|
@@ -1,21 +1,21 @@
|
|
|
1
1
|
import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
|
|
2
|
-
import { DebounceEmitter, Emitter } from '
|
|
3
|
-
import { TernarySearchTree } from '
|
|
4
|
-
import { toDisposable, DisposableStore } from '
|
|
5
|
-
import { isThenable } from '
|
|
6
|
-
import { LinkedList } from '
|
|
7
|
-
import { createCSSRule, asCSSPropertyValue, removeCSSRulesContainingSelector, createStyleSheet } from '
|
|
8
|
-
import { IThemeService } from '
|
|
9
|
-
import { ThemeIcon } from '
|
|
10
|
-
import { isFalsyOrWhitespace } from '
|
|
11
|
-
import { localizeWithPath } from '
|
|
12
|
-
import { isCancellationError } from '
|
|
13
|
-
import { CancellationTokenSource } from '
|
|
14
|
-
import { hash } from '
|
|
15
|
-
import { IUriIdentityService } from '
|
|
16
|
-
import { distinct, asArray } from '
|
|
17
|
-
import { asCssVariable } from '
|
|
18
|
-
import { getIconRegistry } from '
|
|
2
|
+
import { DebounceEmitter, Emitter } from 'vscode/vscode/vs/base/common/event';
|
|
3
|
+
import { TernarySearchTree } from 'vscode/vscode/vs/base/common/ternarySearchTree';
|
|
4
|
+
import { toDisposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
|
|
5
|
+
import { isThenable } from 'vscode/vscode/vs/base/common/async';
|
|
6
|
+
import { LinkedList } from 'vscode/vscode/vs/base/common/linkedList';
|
|
7
|
+
import { createCSSRule, asCSSPropertyValue, removeCSSRulesContainingSelector, createStyleSheet } from 'vscode/vscode/vs/base/browser/dom';
|
|
8
|
+
import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
|
|
9
|
+
import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
|
|
10
|
+
import { isFalsyOrWhitespace } from 'vscode/vscode/vs/base/common/strings';
|
|
11
|
+
import { localizeWithPath } from 'vscode/vscode/vs/nls';
|
|
12
|
+
import { isCancellationError } from 'vscode/vscode/vs/base/common/errors';
|
|
13
|
+
import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
|
|
14
|
+
import { hash } from 'vscode/vscode/vs/base/common/hash';
|
|
15
|
+
import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
|
|
16
|
+
import { distinct, asArray } from 'vscode/vscode/vs/base/common/arrays';
|
|
17
|
+
import { asCssVariable } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
|
|
18
|
+
import { getIconRegistry } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
|
|
19
19
|
|
|
20
20
|
class DecorationRule {
|
|
21
21
|
static keyOf(data) {
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
|
|
2
|
-
import { IConfigurationService } from '
|
|
3
|
-
import { ILoggerService } from '
|
|
2
|
+
import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
|
|
3
|
+
import { ILoggerService } from 'vscode/vscode/vs/platform/log/common/log';
|
|
4
4
|
import { RequestChannelClient } from '../../../../platform/request/common/requestIpc.js';
|
|
5
5
|
import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService';
|
|
6
6
|
import { RequestService } from '../../../../platform/request/browser/requestService.js';
|
|
7
|
-
import { CommandsRegistry } from '
|
|
7
|
+
import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
|
|
8
8
|
|
|
9
9
|
let BrowserRequestService = class BrowserRequestService extends RequestService {
|
|
10
10
|
constructor(remoteAgentService, configurationService, loggerService) {
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
|
|
2
|
-
import { URI } from '
|
|
2
|
+
import { URI } from 'vscode/vscode/vs/base/common/uri';
|
|
3
3
|
import { AbstractURLService } from '../../../../platform/url/common/urlService.js';
|
|
4
4
|
import { IBrowserWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/browser/environmentService';
|
|
5
|
-
import { IOpenerService } from '
|
|
6
|
-
import { matchesScheme } from '
|
|
7
|
-
import { IProductService } from '
|
|
5
|
+
import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
|
|
6
|
+
import { matchesScheme } from 'vscode/vscode/vs/base/common/network';
|
|
7
|
+
import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
|
|
8
8
|
|
|
9
9
|
class BrowserURLOpener {
|
|
10
10
|
constructor(urlService, productService) {
|