@codingame/monaco-vscode-model-service-override 25.1.2 → 26.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@codingame/monaco-vscode-model-service-override",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "26.0.1",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "VSCode public API plugged on the monaco editor - model service-override",
|
|
6
6
|
"keywords": [],
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
},
|
|
16
16
|
"type": "module",
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@codingame/monaco-vscode-api": "
|
|
18
|
+
"@codingame/monaco-vscode-api": "26.0.1"
|
|
19
19
|
},
|
|
20
20
|
"main": "index.js",
|
|
21
21
|
"module": "index.js",
|
|
@@ -12,7 +12,7 @@ let ModelUndoRedoParticipant = class ModelUndoRedoParticipant extends Disposable
|
|
|
12
12
|
this._modelService = _modelService;
|
|
13
13
|
this._textModelService = _textModelService;
|
|
14
14
|
this._undoRedoService = _undoRedoService;
|
|
15
|
-
this._register(this._modelService.onModelRemoved(
|
|
15
|
+
this._register(this._modelService.onModelRemoved(model => {
|
|
16
16
|
const elements = this._undoRedoService.getElements(model.uri);
|
|
17
17
|
if (elements.past.length === 0 && elements.future.length === 0) {
|
|
18
18
|
return;
|
|
@@ -34,12 +34,11 @@ let ModelUndoRedoParticipant = class ModelUndoRedoParticipant extends Disposable
|
|
|
34
34
|
if (missingModels.length === 0) {
|
|
35
35
|
return Disposable.None;
|
|
36
36
|
}
|
|
37
|
-
const disposablesPromises = ( missingModels.map(async
|
|
37
|
+
const disposablesPromises = ( missingModels.map(async uri => {
|
|
38
38
|
try {
|
|
39
39
|
const reference = await this._textModelService.createModelReference(uri);
|
|
40
40
|
return reference;
|
|
41
|
-
}
|
|
42
|
-
catch (err) {
|
|
41
|
+
} catch (err) {
|
|
43
42
|
return Disposable.None;
|
|
44
43
|
}
|
|
45
44
|
}));
|
|
@@ -50,10 +49,6 @@ let ModelUndoRedoParticipant = class ModelUndoRedoParticipant extends Disposable
|
|
|
50
49
|
});
|
|
51
50
|
}
|
|
52
51
|
};
|
|
53
|
-
ModelUndoRedoParticipant = ( __decorate([
|
|
54
|
-
( __param(0, IModelService)),
|
|
55
|
-
( __param(1, ITextModelService)),
|
|
56
|
-
( __param(2, IUndoRedoService))
|
|
57
|
-
], ModelUndoRedoParticipant));
|
|
52
|
+
ModelUndoRedoParticipant = ( __decorate([( __param(0, IModelService)), ( __param(1, ITextModelService)), ( __param(2, IUndoRedoService))], ModelUndoRedoParticipant));
|
|
58
53
|
|
|
59
54
|
export { ModelUndoRedoParticipant };
|
package/vscode/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.js
CHANGED
|
@@ -44,13 +44,17 @@ let ResourceModelCollection = class ResourceModelCollection extends ReferenceCol
|
|
|
44
44
|
}
|
|
45
45
|
}
|
|
46
46
|
if (resource.scheme === Schemas.untitled) {
|
|
47
|
-
const model = await this.textFileService.untitled.resolve({
|
|
47
|
+
const model = await this.textFileService.untitled.resolve({
|
|
48
|
+
untitledResource: resource
|
|
49
|
+
});
|
|
48
50
|
if (this.ensureResolvedModel(model, key)) {
|
|
49
51
|
return model;
|
|
50
52
|
}
|
|
51
53
|
}
|
|
52
54
|
if (this.fileService.hasProvider(resource)) {
|
|
53
|
-
const model = await this.textFileService.files.resolve(resource, {
|
|
55
|
+
const model = await this.textFileService.files.resolve(resource, {
|
|
56
|
+
reason: TextFileResolveReason.REFERENCE
|
|
57
|
+
});
|
|
54
58
|
if (this.ensureResolvedModel(model, key)) {
|
|
55
59
|
return model;
|
|
56
60
|
}
|
|
@@ -88,18 +92,14 @@ let ResourceModelCollection = class ResourceModelCollection extends ReferenceCol
|
|
|
88
92
|
}
|
|
89
93
|
if (model instanceof TextFileEditorModel) {
|
|
90
94
|
await this.textFileService.files.canDispose(model);
|
|
91
|
-
}
|
|
92
|
-
else if (model instanceof UntitledTextEditorModel) {
|
|
95
|
+
} else if (model instanceof UntitledTextEditorModel) {
|
|
93
96
|
await this.textFileService.untitled.canDispose(model);
|
|
94
97
|
}
|
|
95
98
|
if (!( this.modelsToDispose.has(key))) {
|
|
96
99
|
return;
|
|
97
100
|
}
|
|
98
101
|
model.dispose();
|
|
99
|
-
}
|
|
100
|
-
catch (error) {
|
|
101
|
-
}
|
|
102
|
-
finally {
|
|
102
|
+
} catch (error) {} finally {
|
|
103
103
|
this.modelsToDispose.delete(key);
|
|
104
104
|
}
|
|
105
105
|
})();
|
|
@@ -141,12 +141,7 @@ let ResourceModelCollection = class ResourceModelCollection extends ReferenceCol
|
|
|
141
141
|
throw ( new Error(`Unable to resolve text model content for resource ${key}`));
|
|
142
142
|
}
|
|
143
143
|
};
|
|
144
|
-
ResourceModelCollection = ( __decorate([
|
|
145
|
-
( __param(0, IInstantiationService)),
|
|
146
|
-
( __param(1, ITextFileService)),
|
|
147
|
-
( __param(2, IFileService)),
|
|
148
|
-
( __param(3, IModelService))
|
|
149
|
-
], ResourceModelCollection));
|
|
144
|
+
ResourceModelCollection = ( __decorate([( __param(0, IInstantiationService)), ( __param(1, ITextFileService)), ( __param(2, IFileService)), ( __param(3, IModelService))], ResourceModelCollection));
|
|
150
145
|
let TextModelResolverService = class TextModelResolverService extends Disposable {
|
|
151
146
|
get resourceModelCollection() {
|
|
152
147
|
if (!this._resourceModelCollection) {
|
|
@@ -160,7 +155,13 @@ let TextModelResolverService = class TextModelResolverService extends Disposable
|
|
|
160
155
|
}
|
|
161
156
|
return this._asyncModelCollection;
|
|
162
157
|
}
|
|
163
|
-
constructor(
|
|
158
|
+
constructor(
|
|
159
|
+
instantiationService,
|
|
160
|
+
fileService,
|
|
161
|
+
undoRedoService,
|
|
162
|
+
modelService,
|
|
163
|
+
uriIdentityService
|
|
164
|
+
) {
|
|
164
165
|
super();
|
|
165
166
|
this.instantiationService = instantiationService;
|
|
166
167
|
this.fileService = fileService;
|
|
@@ -185,12 +186,6 @@ let TextModelResolverService = class TextModelResolverService extends Disposable
|
|
|
185
186
|
return this.resourceModelCollection.hasTextModelContentProvider(resource.scheme);
|
|
186
187
|
}
|
|
187
188
|
};
|
|
188
|
-
TextModelResolverService = ( __decorate([
|
|
189
|
-
( __param(0, IInstantiationService)),
|
|
190
|
-
( __param(1, IFileService)),
|
|
191
|
-
( __param(2, IUndoRedoService)),
|
|
192
|
-
( __param(3, IModelService)),
|
|
193
|
-
( __param(4, IUriIdentityService))
|
|
194
|
-
], TextModelResolverService));
|
|
189
|
+
TextModelResolverService = ( __decorate([( __param(0, IInstantiationService)), ( __param(1, IFileService)), ( __param(2, IUndoRedoService)), ( __param(3, IModelService)), ( __param(4, IUriIdentityService))], TextModelResolverService));
|
|
195
190
|
|
|
196
191
|
export { TextModelResolverService };
|