@opensumi/ide-editor 2.22.2 → 2.22.3-next-1676289627.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/browser/doc-model/saveParticipants.d.ts +14 -0
- package/lib/browser/doc-model/saveParticipants.d.ts.map +1 -1
- package/lib/browser/doc-model/saveParticipants.js +109 -1
- package/lib/browser/doc-model/saveParticipants.js.map +1 -1
- package/lib/browser/monaco-contrib/callHierarchy/callHierarchy.service.d.ts +1 -0
- package/lib/browser/monaco-contrib/callHierarchy/callHierarchy.service.d.ts.map +1 -1
- package/lib/browser/quick-open/workspace-symbol-quickopen.d.ts +1 -0
- package/lib/browser/quick-open/workspace-symbol-quickopen.d.ts.map +1 -1
- package/lib/common/language.d.ts +1 -0
- package/lib/common/language.d.ts.map +1 -1
- package/package.json +13 -13
- package/src/browser/doc-model/saveParticipants.ts +119 -1
|
@@ -14,8 +14,22 @@ export declare class CodeActionOnSaveParticipant extends WithEventBus {
|
|
|
14
14
|
private applyCodeActions;
|
|
15
15
|
private getActionsToRun;
|
|
16
16
|
}
|
|
17
|
+
export declare class TrimFinalNewLinesParticipant extends WithEventBus {
|
|
18
|
+
private readonly preferenceService;
|
|
19
|
+
private readonly docService;
|
|
20
|
+
private readonly logger;
|
|
21
|
+
private readonly injector;
|
|
22
|
+
activate(): void;
|
|
23
|
+
onEditorDocumentModelWillSave(e: EditorDocumentModelWillSaveEvent): Promise<void>;
|
|
24
|
+
/**
|
|
25
|
+
* returns 0 if the entire file is empty
|
|
26
|
+
*/
|
|
27
|
+
private findLastNonEmptyLine;
|
|
28
|
+
private doTrimFinalNewLines;
|
|
29
|
+
}
|
|
17
30
|
export declare class SaveParticipantsContribution implements ClientAppContribution {
|
|
18
31
|
codeActionOnSaveParticipant: CodeActionOnSaveParticipant;
|
|
32
|
+
trimFinalNewLinesParticipant: TrimFinalNewLinesParticipant;
|
|
19
33
|
onStart(): void;
|
|
20
34
|
}
|
|
21
35
|
//# sourceMappingURL=saveParticipants.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"saveParticipants.d.ts","sourceRoot":"","sources":["../../../src/browser/doc-model/saveParticipants.ts"],"names":[],"mappings":"AACA,OAAO,EACL,qBAAqB,EACrB,YAAY,EAYb,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"saveParticipants.d.ts","sourceRoot":"","sources":["../../../src/browser/doc-model/saveParticipants.ts"],"names":[],"mappings":"AACA,OAAO,EACL,qBAAqB,EACrB,YAAY,EAYb,MAAM,4BAA4B,CAAC;AAyBpC,OAAO,EAAE,gCAAgC,EAA+B,MAAM,SAAS,CAAC;AAoBxF,qBACa,2BAA4B,SAAQ,YAAY;IAE3D,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;IAGtD,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAgC;IAGxE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAGhD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA8B;IAGzD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IAGjC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAmB;IAEnD,IAAI,eAAe,IAAI,GAAG,CAEzB;IAED,QAAQ;IAKF,6BAA6B,CAAC,CAAC,EAAE,gCAAgC;YAkFzD,kBAAkB;YAmClB,gBAAgB;YAchB,eAAe;CAoB9B;AAED,qBACa,4BAA6B,SAAQ,YAAY;IAE5D,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;IAGtD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA8B;IAGzD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IAGjC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAW;IAEpC,QAAQ;IAKF,6BAA6B,CAAC,CAAC,EAAE,gCAAgC;IAevE;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAY5B,OAAO,CAAC,mBAAmB;CAuC5B;AAED,qBACa,4BAA6B,YAAW,qBAAqB;IAExE,2BAA2B,EAAE,2BAA2B,CAAC;IAGzD,4BAA4B,EAAE,4BAA4B,CAAC;IAE3D,OAAO;CAIR"}
|
|
@@ -1,18 +1,35 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.SaveParticipantsContribution = exports.CodeActionOnSaveParticipant = void 0;
|
|
3
|
+
exports.SaveParticipantsContribution = exports.TrimFinalNewLinesParticipant = exports.CodeActionOnSaveParticipant = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const di_1 = require("@opensumi/di");
|
|
6
6
|
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
7
7
|
const progress_1 = require("@opensumi/ide-core-browser/lib/progress");
|
|
8
8
|
const monaco_api_1 = require("@opensumi/ide-monaco/lib/browser/monaco-api");
|
|
9
9
|
const languages_1 = require("@opensumi/ide-monaco/lib/browser/monaco-api/languages");
|
|
10
|
+
const editOperation_1 = require("@opensumi/monaco-editor-core/esm/vs/editor/common/core/editOperation");
|
|
11
|
+
const range_1 = require("@opensumi/monaco-editor-core/esm/vs/editor/common/core/range");
|
|
10
12
|
const languages = tslib_1.__importStar(require("@opensumi/monaco-editor-core/esm/vs/editor/common/languages"));
|
|
11
13
|
const codeAction_1 = require("@opensumi/monaco-editor-core/esm/vs/editor/contrib/codeAction/browser/codeAction");
|
|
12
14
|
const types_1 = require("@opensumi/monaco-editor-core/esm/vs/editor/contrib/codeAction/browser/types");
|
|
13
15
|
const monaco = tslib_1.__importStar(require("@opensumi/monaco-editor-core/esm/vs/editor/editor.api"));
|
|
16
|
+
const editor_override_1 = require("../editor.override");
|
|
14
17
|
const types_2 = require("../types");
|
|
15
18
|
const types_3 = require("./types");
|
|
19
|
+
function findEditor(model, codeEditorService) {
|
|
20
|
+
let candidate = null;
|
|
21
|
+
if (model.isAttachedToEditor()) {
|
|
22
|
+
for (const editor of codeEditorService.listCodeEditors()) {
|
|
23
|
+
if (editor.hasModel() && editor.getModel() === model) {
|
|
24
|
+
if (editor.hasTextFocus()) {
|
|
25
|
+
return editor; // favour focused editor if there are multiple
|
|
26
|
+
}
|
|
27
|
+
candidate = editor;
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
return candidate;
|
|
32
|
+
}
|
|
16
33
|
let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant extends ide_core_browser_1.WithEventBus {
|
|
17
34
|
get bulkEditService() {
|
|
18
35
|
return this.overrideServiceRegistry.getRegisteredService(ide_core_browser_1.ServiceNames.BULK_EDIT_SERVICE);
|
|
@@ -157,15 +174,106 @@ CodeActionOnSaveParticipant = tslib_1.__decorate([
|
|
|
157
174
|
(0, di_1.Injectable)()
|
|
158
175
|
], CodeActionOnSaveParticipant);
|
|
159
176
|
exports.CodeActionOnSaveParticipant = CodeActionOnSaveParticipant;
|
|
177
|
+
let TrimFinalNewLinesParticipant = class TrimFinalNewLinesParticipant extends ide_core_browser_1.WithEventBus {
|
|
178
|
+
activate() {
|
|
179
|
+
// noop
|
|
180
|
+
}
|
|
181
|
+
async onEditorDocumentModelWillSave(e) {
|
|
182
|
+
const isTrimFinalNewlines = this.preferenceService.get('files.trimFinalNewlines');
|
|
183
|
+
if (isTrimFinalNewlines) {
|
|
184
|
+
const modelRef = this.docService.getModelReference(e.payload.uri, 'trimFinalNewlines');
|
|
185
|
+
if (!modelRef) {
|
|
186
|
+
return;
|
|
187
|
+
}
|
|
188
|
+
const model = modelRef.instance.getMonacoModel();
|
|
189
|
+
this.doTrimFinalNewLines(model, e.payload.reason !== types_2.SaveReason.Manual);
|
|
190
|
+
}
|
|
191
|
+
}
|
|
192
|
+
/**
|
|
193
|
+
* returns 0 if the entire file is empty
|
|
194
|
+
*/
|
|
195
|
+
findLastNonEmptyLine(model) {
|
|
196
|
+
for (let lineNumber = model.getLineCount(); lineNumber >= 1; lineNumber--) {
|
|
197
|
+
const lineContent = model.getLineContent(lineNumber);
|
|
198
|
+
if (lineContent.length > 0) {
|
|
199
|
+
// this line has content
|
|
200
|
+
return lineNumber;
|
|
201
|
+
}
|
|
202
|
+
}
|
|
203
|
+
// no line has content
|
|
204
|
+
return 0;
|
|
205
|
+
}
|
|
206
|
+
doTrimFinalNewLines(model, isAutoSaved) {
|
|
207
|
+
const lineCount = model.getLineCount();
|
|
208
|
+
// Do not insert new line if file does not end with new line
|
|
209
|
+
if (lineCount === 1) {
|
|
210
|
+
return;
|
|
211
|
+
}
|
|
212
|
+
let prevSelection = [];
|
|
213
|
+
let cannotTouchLineNumber = 0;
|
|
214
|
+
const codeEditorService = this.injector.get(editor_override_1.MonacoCodeService);
|
|
215
|
+
const editor = findEditor(model, codeEditorService);
|
|
216
|
+
if (editor) {
|
|
217
|
+
prevSelection = editor.getSelections();
|
|
218
|
+
if (isAutoSaved) {
|
|
219
|
+
for (let i = 0, len = prevSelection.length; i < len; i++) {
|
|
220
|
+
const positionLineNumber = prevSelection[i].positionLineNumber;
|
|
221
|
+
if (positionLineNumber > cannotTouchLineNumber) {
|
|
222
|
+
cannotTouchLineNumber = positionLineNumber;
|
|
223
|
+
}
|
|
224
|
+
}
|
|
225
|
+
}
|
|
226
|
+
}
|
|
227
|
+
const lastNonEmptyLine = this.findLastNonEmptyLine(model);
|
|
228
|
+
const deleteFromLineNumber = Math.max(lastNonEmptyLine + 1, cannotTouchLineNumber + 1);
|
|
229
|
+
const deletionRange = model.validateRange(new range_1.Range(deleteFromLineNumber, 1, lineCount, model.getLineMaxColumn(lineCount)));
|
|
230
|
+
if (deletionRange.isEmpty()) {
|
|
231
|
+
return;
|
|
232
|
+
}
|
|
233
|
+
model.pushEditOperations(prevSelection, [editOperation_1.EditOperation.delete(deletionRange)], () => prevSelection);
|
|
234
|
+
editor === null || editor === void 0 ? void 0 : editor.setSelections(prevSelection);
|
|
235
|
+
}
|
|
236
|
+
};
|
|
237
|
+
tslib_1.__decorate([
|
|
238
|
+
(0, di_1.Autowired)(ide_core_browser_1.PreferenceService),
|
|
239
|
+
tslib_1.__metadata("design:type", Object)
|
|
240
|
+
], TrimFinalNewLinesParticipant.prototype, "preferenceService", void 0);
|
|
241
|
+
tslib_1.__decorate([
|
|
242
|
+
(0, di_1.Autowired)(types_3.IEditorDocumentModelService),
|
|
243
|
+
tslib_1.__metadata("design:type", Object)
|
|
244
|
+
], TrimFinalNewLinesParticipant.prototype, "docService", void 0);
|
|
245
|
+
tslib_1.__decorate([
|
|
246
|
+
(0, di_1.Autowired)(ide_core_browser_1.ILogger),
|
|
247
|
+
tslib_1.__metadata("design:type", Object)
|
|
248
|
+
], TrimFinalNewLinesParticipant.prototype, "logger", void 0);
|
|
249
|
+
tslib_1.__decorate([
|
|
250
|
+
(0, di_1.Autowired)(di_1.INJECTOR_TOKEN),
|
|
251
|
+
tslib_1.__metadata("design:type", di_1.Injector)
|
|
252
|
+
], TrimFinalNewLinesParticipant.prototype, "injector", void 0);
|
|
253
|
+
tslib_1.__decorate([
|
|
254
|
+
(0, ide_core_browser_1.OnEvent)(types_3.EditorDocumentModelWillSaveEvent),
|
|
255
|
+
tslib_1.__metadata("design:type", Function),
|
|
256
|
+
tslib_1.__metadata("design:paramtypes", [types_3.EditorDocumentModelWillSaveEvent]),
|
|
257
|
+
tslib_1.__metadata("design:returntype", Promise)
|
|
258
|
+
], TrimFinalNewLinesParticipant.prototype, "onEditorDocumentModelWillSave", null);
|
|
259
|
+
TrimFinalNewLinesParticipant = tslib_1.__decorate([
|
|
260
|
+
(0, di_1.Injectable)()
|
|
261
|
+
], TrimFinalNewLinesParticipant);
|
|
262
|
+
exports.TrimFinalNewLinesParticipant = TrimFinalNewLinesParticipant;
|
|
160
263
|
let SaveParticipantsContribution = class SaveParticipantsContribution {
|
|
161
264
|
onStart() {
|
|
162
265
|
this.codeActionOnSaveParticipant.activate();
|
|
266
|
+
this.trimFinalNewLinesParticipant.activate();
|
|
163
267
|
}
|
|
164
268
|
};
|
|
165
269
|
tslib_1.__decorate([
|
|
166
270
|
(0, di_1.Autowired)(),
|
|
167
271
|
tslib_1.__metadata("design:type", CodeActionOnSaveParticipant)
|
|
168
272
|
], SaveParticipantsContribution.prototype, "codeActionOnSaveParticipant", void 0);
|
|
273
|
+
tslib_1.__decorate([
|
|
274
|
+
(0, di_1.Autowired)(),
|
|
275
|
+
tslib_1.__metadata("design:type", TrimFinalNewLinesParticipant)
|
|
276
|
+
], SaveParticipantsContribution.prototype, "trimFinalNewLinesParticipant", void 0);
|
|
169
277
|
SaveParticipantsContribution = tslib_1.__decorate([
|
|
170
278
|
(0, ide_core_browser_1.Domain)(ide_core_browser_1.ClientAppContribution)
|
|
171
279
|
], SaveParticipantsContribution);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"saveParticipants.js","sourceRoot":"","sources":["../../../src/browser/doc-model/saveParticipants.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"saveParticipants.js","sourceRoot":"","sources":["../../../src/browser/doc-model/saveParticipants.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
/// <reference types="vscode" />
|
|
1
2
|
import { CancellationToken, IPosition, RefCountedDisposable, Uri } from '@opensumi/ide-core-common';
|
|
2
3
|
import { CallHierarchyItem, CallHierarchyProvider, ICallHierarchyService, IncomingCall, OutgoingCall } from '@opensumi/ide-monaco/lib/browser/contrib/callHierarchy';
|
|
3
4
|
import { ITextModel, Position } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"callHierarchy.service.d.ts","sourceRoot":"","sources":["../../../../src/browser/monaco-contrib/callHierarchy/callHierarchy.service.ts"],"names":[],"mappings":"AACA,OAAO,EACL,iBAAiB,EAEjB,SAAS,EAET,oBAAoB,EAGpB,GAAG,EACJ,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,iBAAiB,EACjB,qBAAqB,EAErB,qBAAqB,EACrB,YAAY,EACZ,YAAY,EACb,MAAM,wDAAwD,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,mDAAmD,CAAC;AAEzF,OAAO,EAAE,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AAIpE,OAAO,MAAM,cAAc,CAAC,CAAC,IAAI,CAAC,GAAG,SAAS,GAAG,IAAI,GAAG,QAAQ,CAAC,CAAC,GAAG,SAAS,GAAG,IAAI,CAAC,CAAC;AAOvF,qBAAa,kBAAkB;IAyB3B,QAAQ,CAAC,EAAE,EAAE,MAAM;IACnB,QAAQ,CAAC,QAAQ,EAAE,qBAAqB;IACxC,QAAQ,CAAC,KAAK,EAAE,iBAAiB,EAAE;IACnC,QAAQ,CAAC,GAAG,EAAE,oBAAoB;WA3BvB,MAAM,CACjB,KAAK,EAAE,UAAU,EACjB,QAAQ,EAAE,SAAS,EACnB,KAAK,EAAE,iBAAiB,GACvB,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC;IAiB1C,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAC;IAEjC,OAAO;IASP,OAAO,IAAI,IAAI;IAIf,IAAI,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAS3C,oBAAoB,CAAC,IAAI,EAAE,iBAAiB,EAAE,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAYhG,oBAAoB,CAAC,IAAI,EAAE,iBAAiB,EAAE,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;CAWvG;AAED,qBACa,oBAAqB,YAAW,qBAAqB;IAEhE,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,2BAA2B,CAAC;IAE7D,OAAO,CAAC,MAAM,CAA0E;IAExF,6BAA6B,CAAC,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,qBAAqB;IAItE,4BAA4B,CAAC,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ;IA4BpE,oBAAoB,CAAC,IAAI,EAAE,iBAAiB,GAAG,cAAc,CAAC,YAAY,EAAE,CAAC;IAS7E,oBAAoB,CAAC,IAAI,EAAE,iBAAiB,GAAG,cAAc,CAAC,YAAY,EAAE,CAAC;CAQ9E"}
|
|
1
|
+
{"version":3,"file":"callHierarchy.service.d.ts","sourceRoot":"","sources":["../../../../src/browser/monaco-contrib/callHierarchy/callHierarchy.service.ts"],"names":[],"mappings":";AACA,OAAO,EACL,iBAAiB,EAEjB,SAAS,EAET,oBAAoB,EAGpB,GAAG,EACJ,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,iBAAiB,EACjB,qBAAqB,EAErB,qBAAqB,EACrB,YAAY,EACZ,YAAY,EACb,MAAM,wDAAwD,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,mDAAmD,CAAC;AAEzF,OAAO,EAAE,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AAIpE,OAAO,MAAM,cAAc,CAAC,CAAC,IAAI,CAAC,GAAG,SAAS,GAAG,IAAI,GAAG,QAAQ,CAAC,CAAC,GAAG,SAAS,GAAG,IAAI,CAAC,CAAC;AAOvF,qBAAa,kBAAkB;IAyB3B,QAAQ,CAAC,EAAE,EAAE,MAAM;IACnB,QAAQ,CAAC,QAAQ,EAAE,qBAAqB;IACxC,QAAQ,CAAC,KAAK,EAAE,iBAAiB,EAAE;IACnC,QAAQ,CAAC,GAAG,EAAE,oBAAoB;WA3BvB,MAAM,CACjB,KAAK,EAAE,UAAU,EACjB,QAAQ,EAAE,SAAS,EACnB,KAAK,EAAE,iBAAiB,GACvB,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC;IAiB1C,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAC;IAEjC,OAAO;IASP,OAAO,IAAI,IAAI;IAIf,IAAI,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAS3C,oBAAoB,CAAC,IAAI,EAAE,iBAAiB,EAAE,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAYhG,oBAAoB,CAAC,IAAI,EAAE,iBAAiB,EAAE,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;CAWvG;AAED,qBACa,oBAAqB,YAAW,qBAAqB;IAEhE,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,2BAA2B,CAAC;IAE7D,OAAO,CAAC,MAAM,CAA0E;IAExF,6BAA6B,CAAC,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,qBAAqB;IAItE,4BAA4B,CAAC,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ;IA4BpE,oBAAoB,CAAC,IAAI,EAAE,iBAAiB,GAAG,cAAc,CAAC,YAAY,EAAE,CAAC;IAS7E,oBAAoB,CAAC,IAAI,EAAE,iBAAiB,GAAG,cAAc,CAAC,YAAY,EAAE,CAAC;CAQ9E"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
/// <reference types="vscode" />
|
|
1
2
|
import type { SymbolInformation } from 'vscode-languageserver-types';
|
|
2
3
|
import { QuickOpenHandler, QuickOpenModel, QuickOpenItem, CancellationToken, URI, QuickOpenMode } from '@opensumi/ide-core-browser';
|
|
3
4
|
import { IReporterService } from '@opensumi/ide-core-common';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-symbol-quickopen.d.ts","sourceRoot":"","sources":["../../../src/browser/quick-open/workspace-symbol-quickopen.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAS,MAAM,6BAA6B,CAAC;AAG5E,OAAO,EACL,gBAAgB,EAChB,cAAc,EAEd,aAAa,EACb,iBAAiB,EACjB,GAAG,EACH,aAAa,EAGd,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAqB,gBAAgB,EAAe,MAAM,2BAA2B,CAAC;AAK7F,OAAO,EACL,uBAAuB,EAGvB,sBAAsB,EAEvB,MAAM,cAAc,CAAC;AA+BtB,qBACa,+BAAgC,YAAW,gBAAgB;IAEtE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAmB;IAGnD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAoB;IAGrD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IAGjC,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAyB;IAGhE,OAAO,CAAC,QAAQ,CAAC,6BAA6B,CAAgC;IAG9E,eAAe,EAAE,gBAAgB,CAAC;IAElC,MAAM,SAAO;IAEb,IAAI,WAAW,WAEd;IAED,OAAO,CAAC,kBAAkB,CAAiC;IAE3D,QAAQ,IAAI,cAAc;IA4F1B,UAAU;;;;;;sCAQwB,MAAM,iBAAiB,MAAM;;IAU/D,OAAO;IAIP,QAAQ;CAGT;AAED,qBAAa,8BAA+B,SAAQ,aAAa;IAE7D,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,iBAAiB;IAC5C,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,sBAAsB;IACvC,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,YAAY;gBAJD,MAAM,EAAE,iBAAiB,EAC3B,QAAQ,EAAE,uBAAuB,EACjC,sBAAsB,EAAE,sBAAsB,EAC9C,KAAK,EAAE,iBAAiB,EACjC,YAAY,EAAE,MAAM;IAK9B,QAAQ,IAAI,MAAM;IAIlB,MAAM;IAIN,YAAY;IAIZ,cAAc;IAKd,OAAO,CAAC,SAAS;IAajB,OAAO,CAAC,IAAI;IAMZ,GAAG,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO;IAcjC,QAAQ;CAWT"}
|
|
1
|
+
{"version":3,"file":"workspace-symbol-quickopen.d.ts","sourceRoot":"","sources":["../../../src/browser/quick-open/workspace-symbol-quickopen.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAS,MAAM,6BAA6B,CAAC;AAG5E,OAAO,EACL,gBAAgB,EAChB,cAAc,EAEd,aAAa,EACb,iBAAiB,EACjB,GAAG,EACH,aAAa,EAGd,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAqB,gBAAgB,EAAe,MAAM,2BAA2B,CAAC;AAK7F,OAAO,EACL,uBAAuB,EAGvB,sBAAsB,EAEvB,MAAM,cAAc,CAAC;AA+BtB,qBACa,+BAAgC,YAAW,gBAAgB;IAEtE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAmB;IAGnD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAoB;IAGrD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IAGjC,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAyB;IAGhE,OAAO,CAAC,QAAQ,CAAC,6BAA6B,CAAgC;IAG9E,eAAe,EAAE,gBAAgB,CAAC;IAElC,MAAM,SAAO;IAEb,IAAI,WAAW,WAEd;IAED,OAAO,CAAC,kBAAkB,CAAiC;IAE3D,QAAQ,IAAI,cAAc;IA4F1B,UAAU;;;;;;sCAQwB,MAAM,iBAAiB,MAAM;;IAU/D,OAAO;IAIP,QAAQ;CAGT;AAED,qBAAa,8BAA+B,SAAQ,aAAa;IAE7D,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,iBAAiB;IAC5C,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,sBAAsB;IACvC,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,YAAY;gBAJD,MAAM,EAAE,iBAAiB,EAC3B,QAAQ,EAAE,uBAAuB,EACjC,sBAAsB,EAAE,sBAAsB,EAC9C,KAAK,EAAE,iBAAiB,EACjC,YAAY,EAAE,MAAM;IAK9B,QAAQ,IAAI,MAAM;IAIlB,MAAM;IAIN,YAAY;IAIZ,cAAc;IAKd,OAAO,CAAC,SAAS;IAajB,OAAO,CAAC,IAAI;IAMZ,GAAG,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO;IAcjC,QAAQ;CAWT"}
|
package/lib/common/language.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"language.d.ts","sourceRoot":"","sources":["../../src/common/language.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"language.d.ts","sourceRoot":"","sources":["../../src/common/language.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opensumi/ide-editor",
|
|
3
|
-
"version": "2.22.
|
|
3
|
+
"version": "2.22.3-next-1676289627.0",
|
|
4
4
|
"files": [
|
|
5
5
|
"lib",
|
|
6
6
|
"src"
|
|
@@ -17,21 +17,21 @@
|
|
|
17
17
|
"url": "git@github.com:opensumi/core.git"
|
|
18
18
|
},
|
|
19
19
|
"dependencies": {
|
|
20
|
-
"@opensumi/ide-core-common": "2.22.
|
|
21
|
-
"@opensumi/ide-core-node": "2.22.
|
|
22
|
-
"@opensumi/ide-file-service": "2.22.
|
|
23
|
-
"@opensumi/ide-monaco": "2.22.
|
|
24
|
-
"@opensumi/ide-utils": "2.22.
|
|
20
|
+
"@opensumi/ide-core-common": "2.22.3-next-1676289627.0",
|
|
21
|
+
"@opensumi/ide-core-node": "2.22.3-next-1676289627.0",
|
|
22
|
+
"@opensumi/ide-file-service": "2.22.3-next-1676289627.0",
|
|
23
|
+
"@opensumi/ide-monaco": "2.22.3-next-1676289627.0",
|
|
24
|
+
"@opensumi/ide-utils": "2.22.3-next-1676289627.0",
|
|
25
25
|
"vscode-oniguruma": "1.5.1"
|
|
26
26
|
},
|
|
27
27
|
"devDependencies": {
|
|
28
|
-
"@opensumi/ide-components": "2.22.
|
|
29
|
-
"@opensumi/ide-core-browser": "2.22.
|
|
28
|
+
"@opensumi/ide-components": "2.22.3-next-1676289627.0",
|
|
29
|
+
"@opensumi/ide-core-browser": "2.22.3-next-1676289627.0",
|
|
30
30
|
"@opensumi/ide-dev-tool": "1.3.1",
|
|
31
|
-
"@opensumi/ide-overlay": "2.22.
|
|
32
|
-
"@opensumi/ide-quick-open": "2.22.
|
|
33
|
-
"@opensumi/ide-theme": "2.22.
|
|
34
|
-
"@opensumi/ide-workspace": "2.22.
|
|
31
|
+
"@opensumi/ide-overlay": "2.22.3-next-1676289627.0",
|
|
32
|
+
"@opensumi/ide-quick-open": "2.22.3-next-1676289627.0",
|
|
33
|
+
"@opensumi/ide-theme": "2.22.3-next-1676289627.0",
|
|
34
|
+
"@opensumi/ide-workspace": "2.22.3-next-1676289627.0"
|
|
35
35
|
},
|
|
36
|
-
"gitHead": "
|
|
36
|
+
"gitHead": "a5a5e319bebbb0c5dbf440bac64410b440a299e1"
|
|
37
37
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Injectable, Autowired } from '@opensumi/di';
|
|
1
|
+
import { Injectable, Autowired, Injector, INJECTOR_TOKEN } from '@opensumi/di';
|
|
2
2
|
import {
|
|
3
3
|
ClientAppContribution,
|
|
4
4
|
WithEventBus,
|
|
@@ -18,6 +18,11 @@ import { IProgressService } from '@opensumi/ide-core-browser/lib/progress';
|
|
|
18
18
|
import { ResourceEdit } from '@opensumi/ide-monaco/lib/browser/monaco-api';
|
|
19
19
|
import { languageFeaturesService } from '@opensumi/ide-monaco/lib/browser/monaco-api/languages';
|
|
20
20
|
import { ITextModel } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
|
|
21
|
+
import { Selection } from '@opensumi/monaco-editor-core';
|
|
22
|
+
import { IActiveCodeEditor } from '@opensumi/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
|
|
23
|
+
import { ICodeEditorService } from '@opensumi/monaco-editor-core/esm/vs/editor/browser/services/codeEditorService';
|
|
24
|
+
import { EditOperation } from '@opensumi/monaco-editor-core/esm/vs/editor/common/core/editOperation';
|
|
25
|
+
import { Range } from '@opensumi/monaco-editor-core/esm/vs/editor/common/core/range';
|
|
21
26
|
import * as languages from '@opensumi/monaco-editor-core/esm/vs/editor/common/languages';
|
|
22
27
|
import { CodeActionProvider } from '@opensumi/monaco-editor-core/esm/vs/editor/common/languages';
|
|
23
28
|
import {
|
|
@@ -30,10 +35,29 @@ import {
|
|
|
30
35
|
} from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/codeAction/browser/types';
|
|
31
36
|
import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
|
|
32
37
|
|
|
38
|
+
import { MonacoCodeService } from '../editor.override';
|
|
33
39
|
import { SaveReason } from '../types';
|
|
34
40
|
|
|
35
41
|
import { EditorDocumentModelWillSaveEvent, IEditorDocumentModelService } from './types';
|
|
36
42
|
|
|
43
|
+
function findEditor(model: ITextModel, codeEditorService: ICodeEditorService): IActiveCodeEditor | null {
|
|
44
|
+
let candidate: IActiveCodeEditor | null = null;
|
|
45
|
+
|
|
46
|
+
if (model.isAttachedToEditor()) {
|
|
47
|
+
for (const editor of codeEditorService.listCodeEditors()) {
|
|
48
|
+
if (editor.hasModel() && editor.getModel() === model) {
|
|
49
|
+
if (editor.hasTextFocus()) {
|
|
50
|
+
return editor; // favour focused editor if there are multiple
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
candidate = editor;
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
return candidate;
|
|
59
|
+
}
|
|
60
|
+
|
|
37
61
|
@Injectable()
|
|
38
62
|
export class CodeActionOnSaveParticipant extends WithEventBus {
|
|
39
63
|
@Autowired(PreferenceService)
|
|
@@ -216,12 +240,106 @@ export class CodeActionOnSaveParticipant extends WithEventBus {
|
|
|
216
240
|
}
|
|
217
241
|
}
|
|
218
242
|
|
|
243
|
+
@Injectable()
|
|
244
|
+
export class TrimFinalNewLinesParticipant extends WithEventBus {
|
|
245
|
+
@Autowired(PreferenceService)
|
|
246
|
+
private readonly preferenceService: PreferenceService;
|
|
247
|
+
|
|
248
|
+
@Autowired(IEditorDocumentModelService)
|
|
249
|
+
private readonly docService: IEditorDocumentModelService;
|
|
250
|
+
|
|
251
|
+
@Autowired(ILogger)
|
|
252
|
+
private readonly logger: ILogger;
|
|
253
|
+
|
|
254
|
+
@Autowired(INJECTOR_TOKEN)
|
|
255
|
+
private readonly injector: Injector;
|
|
256
|
+
|
|
257
|
+
activate() {
|
|
258
|
+
// noop
|
|
259
|
+
}
|
|
260
|
+
|
|
261
|
+
@OnEvent(EditorDocumentModelWillSaveEvent)
|
|
262
|
+
async onEditorDocumentModelWillSave(e: EditorDocumentModelWillSaveEvent) {
|
|
263
|
+
const isTrimFinalNewlines = this.preferenceService.get('files.trimFinalNewlines');
|
|
264
|
+
|
|
265
|
+
if (isTrimFinalNewlines) {
|
|
266
|
+
const modelRef = this.docService.getModelReference(e.payload.uri, 'trimFinalNewlines');
|
|
267
|
+
|
|
268
|
+
if (!modelRef) {
|
|
269
|
+
return;
|
|
270
|
+
}
|
|
271
|
+
|
|
272
|
+
const model = modelRef.instance.getMonacoModel();
|
|
273
|
+
this.doTrimFinalNewLines(model, e.payload.reason !== SaveReason.Manual);
|
|
274
|
+
}
|
|
275
|
+
}
|
|
276
|
+
|
|
277
|
+
/**
|
|
278
|
+
* returns 0 if the entire file is empty
|
|
279
|
+
*/
|
|
280
|
+
private findLastNonEmptyLine(model: ITextModel): number {
|
|
281
|
+
for (let lineNumber = model.getLineCount(); lineNumber >= 1; lineNumber--) {
|
|
282
|
+
const lineContent = model.getLineContent(lineNumber);
|
|
283
|
+
if (lineContent.length > 0) {
|
|
284
|
+
// this line has content
|
|
285
|
+
return lineNumber;
|
|
286
|
+
}
|
|
287
|
+
}
|
|
288
|
+
// no line has content
|
|
289
|
+
return 0;
|
|
290
|
+
}
|
|
291
|
+
|
|
292
|
+
private doTrimFinalNewLines(model: ITextModel, isAutoSaved: boolean): void {
|
|
293
|
+
const lineCount = model.getLineCount();
|
|
294
|
+
|
|
295
|
+
// Do not insert new line if file does not end with new line
|
|
296
|
+
if (lineCount === 1) {
|
|
297
|
+
return;
|
|
298
|
+
}
|
|
299
|
+
|
|
300
|
+
let prevSelection: Selection[] = [];
|
|
301
|
+
let cannotTouchLineNumber = 0;
|
|
302
|
+
|
|
303
|
+
const codeEditorService = this.injector.get(MonacoCodeService);
|
|
304
|
+
const editor = findEditor(model, codeEditorService);
|
|
305
|
+
if (editor) {
|
|
306
|
+
prevSelection = editor.getSelections();
|
|
307
|
+
if (isAutoSaved) {
|
|
308
|
+
for (let i = 0, len = prevSelection.length; i < len; i++) {
|
|
309
|
+
const positionLineNumber = prevSelection[i].positionLineNumber;
|
|
310
|
+
if (positionLineNumber > cannotTouchLineNumber) {
|
|
311
|
+
cannotTouchLineNumber = positionLineNumber;
|
|
312
|
+
}
|
|
313
|
+
}
|
|
314
|
+
}
|
|
315
|
+
}
|
|
316
|
+
|
|
317
|
+
const lastNonEmptyLine = this.findLastNonEmptyLine(model);
|
|
318
|
+
const deleteFromLineNumber = Math.max(lastNonEmptyLine + 1, cannotTouchLineNumber + 1);
|
|
319
|
+
const deletionRange = model.validateRange(
|
|
320
|
+
new Range(deleteFromLineNumber, 1, lineCount, model.getLineMaxColumn(lineCount)),
|
|
321
|
+
);
|
|
322
|
+
|
|
323
|
+
if (deletionRange.isEmpty()) {
|
|
324
|
+
return;
|
|
325
|
+
}
|
|
326
|
+
|
|
327
|
+
model.pushEditOperations(prevSelection, [EditOperation.delete(deletionRange)], () => prevSelection);
|
|
328
|
+
|
|
329
|
+
editor?.setSelections(prevSelection);
|
|
330
|
+
}
|
|
331
|
+
}
|
|
332
|
+
|
|
219
333
|
@Domain(ClientAppContribution)
|
|
220
334
|
export class SaveParticipantsContribution implements ClientAppContribution {
|
|
221
335
|
@Autowired()
|
|
222
336
|
codeActionOnSaveParticipant: CodeActionOnSaveParticipant;
|
|
223
337
|
|
|
338
|
+
@Autowired()
|
|
339
|
+
trimFinalNewLinesParticipant: TrimFinalNewLinesParticipant;
|
|
340
|
+
|
|
224
341
|
onStart() {
|
|
225
342
|
this.codeActionOnSaveParticipant.activate();
|
|
343
|
+
this.trimFinalNewLinesParticipant.activate();
|
|
226
344
|
}
|
|
227
345
|
}
|