@reqlan/language 1.9.6 → 1.9.7
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/README.md +8 -0
- package/README.template.md +2 -0
- package/out/index.d.ts +2 -1
- package/out/index.js +2 -1
- package/out/index.js.map +1 -1
- package/out/reqlan-code-action-provider.d.ts +1 -0
- package/out/reqlan-code-action-provider.js +12 -21
- package/out/reqlan-code-action-provider.js.map +1 -1
- package/out/reqlan-comment-diagnostics.d.ts +11 -0
- package/out/reqlan-comment-diagnostics.js +81 -11
- package/out/reqlan-comment-diagnostics.js.map +1 -1
- package/out/reqlan-document-builder.d.ts +9 -0
- package/out/reqlan-document-builder.js +26 -0
- package/out/reqlan-document-builder.js.map +1 -0
- package/out/reqlan-document-link-provider.d.ts +3 -1
- package/out/reqlan-document-link-provider.js +6 -1
- package/out/reqlan-document-link-provider.js.map +1 -1
- package/out/reqlan-idea-move-imports.d.ts +24 -0
- package/out/reqlan-idea-move-imports.js +309 -0
- package/out/reqlan-idea-move-imports.js.map +1 -0
- package/out/reqlan-idea-refactor.d.ts +12 -4
- package/out/reqlan-idea-refactor.js +85 -13
- package/out/reqlan-idea-refactor.js.map +1 -1
- package/out/reqlan-import-edits.d.ts +1 -0
- package/out/reqlan-import-edits.js +8 -0
- package/out/reqlan-import-edits.js.map +1 -1
- package/out/reqlan-module.js +3 -1
- package/out/reqlan-module.js.map +1 -1
- package/out/reqlan-validator.d.ts +5 -0
- package/out/reqlan-validator.js +17 -0
- package/out/reqlan-validator.js.map +1 -1
- package/package.json +1 -1
- package/src/index.ts +4 -0
- package/src/reqlan-code-action-provider.ts +12 -24
- package/src/reqlan-comment-diagnostics.ts +108 -11
- package/src/reqlan-document-builder.ts +35 -0
- package/src/reqlan-document-link-provider.ts +18 -3
- package/src/reqlan-idea-move-imports.ts +398 -0
- package/src/reqlan-idea-refactor.ts +116 -14
- package/src/reqlan-import-edits.ts +9 -0
- package/src/reqlan-module.ts +3 -1
- package/src/reqlan-validator.ts +23 -0
|
@@ -0,0 +1,309 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Import rewrites for moving an idea between `.rq` files: drop unused source
|
|
3
|
+
* imports and copy required imports onto the destination.
|
|
4
|
+
* rq:["../../../reqlan rq/extension/refactor_support.rq".refactor_symbol_move]
|
|
5
|
+
*/
|
|
6
|
+
import { AstUtils } from 'langium';
|
|
7
|
+
import { isFromImport, isIdeaSet, isLocalReference, isModel, isNamespaceImport, isQualifiedImport, isQualifiedReference } from './generated/ast.js';
|
|
8
|
+
import { findExistingFromImport, findImportInsertPosition, hasNamespaceImport, relativeRqImportPath } from './reqlan-import-edits.js';
|
|
9
|
+
import { importBindings, specifierBindingName } from './reqlan-import-bindings.js';
|
|
10
|
+
import { resolveDocumentPathUri } from './reqlan-path-resolve.js';
|
|
11
|
+
import { unquoteReqlanString } from './reqlan-quoted-strings.js';
|
|
12
|
+
export function collectUsedBindingNames(root, skip) {
|
|
13
|
+
const names = new Set();
|
|
14
|
+
for (const node of AstUtils.streamAst(root)) {
|
|
15
|
+
if (skip && isAstInside(node, skip)) {
|
|
16
|
+
continue;
|
|
17
|
+
}
|
|
18
|
+
if (isLocalReference(node)) {
|
|
19
|
+
const name = node.idea.$refText;
|
|
20
|
+
if (name) {
|
|
21
|
+
names.add(name);
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
if (isQualifiedReference(node)) {
|
|
25
|
+
const qualifier = node.qualifier?.$refText;
|
|
26
|
+
if (qualifier) {
|
|
27
|
+
names.add(qualifier);
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
if (isIdeaSet(node)) {
|
|
31
|
+
for (const member of node.members) {
|
|
32
|
+
if (member.$refText) {
|
|
33
|
+
names.add(member.$refText);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
return names;
|
|
39
|
+
}
|
|
40
|
+
export function topLevelDeclaredNames(model) {
|
|
41
|
+
const names = new Set();
|
|
42
|
+
for (const element of model.elements) {
|
|
43
|
+
if ('name' in element && typeof element.name === 'string' && element.name.length > 0) {
|
|
44
|
+
names.add(element.name);
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
return names;
|
|
48
|
+
}
|
|
49
|
+
export function sourceBoundNames(model) {
|
|
50
|
+
const names = topLevelDeclaredNames(model);
|
|
51
|
+
for (const importDecl of model.imports) {
|
|
52
|
+
for (const binding of importBindings(importDecl)) {
|
|
53
|
+
names.add(binding.name);
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
return names;
|
|
57
|
+
}
|
|
58
|
+
export function planUnusedImportEdits(document, usedNames) {
|
|
59
|
+
const model = document.parseResult.value;
|
|
60
|
+
if (!isModel(model)) {
|
|
61
|
+
return [];
|
|
62
|
+
}
|
|
63
|
+
const edits = [];
|
|
64
|
+
for (const importDecl of model.imports) {
|
|
65
|
+
edits.push(...planUnusedEditsForImport(document, importDecl, usedNames));
|
|
66
|
+
}
|
|
67
|
+
return edits;
|
|
68
|
+
}
|
|
69
|
+
export function planDestRequiredImportEdits(input) {
|
|
70
|
+
const sourceModel = input.sourceDocument.parseResult.value;
|
|
71
|
+
const destModel = input.destinationDocument.parseResult.value;
|
|
72
|
+
if (!isModel(sourceModel) || !isModel(destModel)) {
|
|
73
|
+
return [];
|
|
74
|
+
}
|
|
75
|
+
const usedInIdea = collectUsedBindingNames(input.idea);
|
|
76
|
+
usedInIdea.delete(input.idea.name);
|
|
77
|
+
const destLocals = topLevelDeclaredNames(destModel);
|
|
78
|
+
const sourceSiblings = topLevelDeclaredNames(sourceModel);
|
|
79
|
+
sourceSiblings.delete(input.idea.name);
|
|
80
|
+
const fromNeeds = new Map();
|
|
81
|
+
const nsNeeds = new Map();
|
|
82
|
+
const pushFrom = (path, specifier) => {
|
|
83
|
+
const list = fromNeeds.get(path) ?? [];
|
|
84
|
+
if (list.some(entry => entry.ideaName === specifier.ideaName && entry.alias === specifier.alias)) {
|
|
85
|
+
fromNeeds.set(path, list);
|
|
86
|
+
return;
|
|
87
|
+
}
|
|
88
|
+
list.push(specifier);
|
|
89
|
+
fromNeeds.set(path, list);
|
|
90
|
+
};
|
|
91
|
+
for (const name of usedInIdea) {
|
|
92
|
+
if (destLocals.has(name)) {
|
|
93
|
+
continue;
|
|
94
|
+
}
|
|
95
|
+
if (sourceSiblings.has(name)) {
|
|
96
|
+
const path = relativeRqImportPath(input.destinationDocument.uri, input.sourceDocument.uri);
|
|
97
|
+
pushFrom(path, { ideaName: name });
|
|
98
|
+
continue;
|
|
99
|
+
}
|
|
100
|
+
const binding = findImportBinding(sourceModel, name);
|
|
101
|
+
if (!binding) {
|
|
102
|
+
continue;
|
|
103
|
+
}
|
|
104
|
+
const rewritten = rewriteImportPathForDocument(binding.path, input.sourceDocument, input.destinationDocument);
|
|
105
|
+
if (!rewritten) {
|
|
106
|
+
continue;
|
|
107
|
+
}
|
|
108
|
+
if (binding.kind === 'namespace') {
|
|
109
|
+
nsNeeds.set(rewritten, binding.alias ?? name);
|
|
110
|
+
continue;
|
|
111
|
+
}
|
|
112
|
+
pushFrom(rewritten, {
|
|
113
|
+
ideaName: binding.ideaName ?? name,
|
|
114
|
+
alias: binding.alias
|
|
115
|
+
});
|
|
116
|
+
}
|
|
117
|
+
return buildDestImportEdits(input.destinationDocument, destModel, fromNeeds, nsNeeds);
|
|
118
|
+
}
|
|
119
|
+
export function uniqueImportAlias(base, taken) {
|
|
120
|
+
const cleaned = base.replace(/[^A-Za-z0-9_]+/g, '_').replace(/^(\d)/, '_$1') || 'imported';
|
|
121
|
+
if (!taken.has(cleaned)) {
|
|
122
|
+
return cleaned;
|
|
123
|
+
}
|
|
124
|
+
let suffix = 2;
|
|
125
|
+
while (taken.has(`${cleaned}_${suffix}`)) {
|
|
126
|
+
suffix += 1;
|
|
127
|
+
}
|
|
128
|
+
return `${cleaned}_${suffix}`;
|
|
129
|
+
}
|
|
130
|
+
export function rewriteImportPathForDocument(quotedOrRawPath, fromDocument, toDocument) {
|
|
131
|
+
const path = unquoteReqlanString(quotedOrRawPath);
|
|
132
|
+
if (path.startsWith('@/')) {
|
|
133
|
+
return path;
|
|
134
|
+
}
|
|
135
|
+
const target = resolveDocumentPathUri(path, fromDocument, { config: null });
|
|
136
|
+
if (target.toString() === toDocument.uri.toString()) {
|
|
137
|
+
return undefined;
|
|
138
|
+
}
|
|
139
|
+
return relativeRqImportPath(toDocument.uri, target);
|
|
140
|
+
}
|
|
141
|
+
export function positionsEqual(left, right) {
|
|
142
|
+
return left.line === right.line && left.character === right.character;
|
|
143
|
+
}
|
|
144
|
+
function planUnusedEditsForImport(document, importDecl, usedNames) {
|
|
145
|
+
if (isFromImport(importDecl)) {
|
|
146
|
+
const unused = importDecl.specifiers.filter(specifier => {
|
|
147
|
+
const binding = specifierBindingName(specifier);
|
|
148
|
+
return !binding || !usedNames.has(binding);
|
|
149
|
+
});
|
|
150
|
+
if (unused.length === 0) {
|
|
151
|
+
return [];
|
|
152
|
+
}
|
|
153
|
+
if (unused.length === importDecl.specifiers.length) {
|
|
154
|
+
const range = expandLineRange(importDecl.$cstNode?.range);
|
|
155
|
+
return range ? [{ range, newText: '' }] : [];
|
|
156
|
+
}
|
|
157
|
+
return unused.flatMap(specifier => {
|
|
158
|
+
const edit = planSpecifierRemoval(document, specifier);
|
|
159
|
+
return edit ? [edit] : [];
|
|
160
|
+
});
|
|
161
|
+
}
|
|
162
|
+
const bindings = importBindings(importDecl);
|
|
163
|
+
const stillUsed = bindings.some(binding => usedNames.has(binding.name));
|
|
164
|
+
if (stillUsed) {
|
|
165
|
+
return [];
|
|
166
|
+
}
|
|
167
|
+
if (isNamespaceImport(importDecl) || isQualifiedImport(importDecl)) {
|
|
168
|
+
const range = expandLineRange(importDecl.$cstNode?.range);
|
|
169
|
+
return range ? [{ range, newText: '' }] : [];
|
|
170
|
+
}
|
|
171
|
+
return [];
|
|
172
|
+
}
|
|
173
|
+
function planSpecifierRemoval(document, specifier) {
|
|
174
|
+
const node = specifier.$cstNode;
|
|
175
|
+
if (!node) {
|
|
176
|
+
return undefined;
|
|
177
|
+
}
|
|
178
|
+
const text = document.textDocument.getText();
|
|
179
|
+
const start = document.textDocument.offsetAt(node.range.start);
|
|
180
|
+
const end = document.textDocument.offsetAt(node.range.end);
|
|
181
|
+
let rangeStart = start;
|
|
182
|
+
let rangeEnd = end;
|
|
183
|
+
const commaAfter = text.slice(end).match(/^,\s*/);
|
|
184
|
+
if (commaAfter) {
|
|
185
|
+
rangeEnd = end + commaAfter[0].length;
|
|
186
|
+
}
|
|
187
|
+
else {
|
|
188
|
+
const commaBefore = text.slice(0, start).match(/,\s*$/);
|
|
189
|
+
if (commaBefore) {
|
|
190
|
+
rangeStart = start - commaBefore[0].length;
|
|
191
|
+
}
|
|
192
|
+
}
|
|
193
|
+
return {
|
|
194
|
+
range: {
|
|
195
|
+
start: document.textDocument.positionAt(rangeStart),
|
|
196
|
+
end: document.textDocument.positionAt(rangeEnd)
|
|
197
|
+
},
|
|
198
|
+
newText: ''
|
|
199
|
+
};
|
|
200
|
+
}
|
|
201
|
+
function buildDestImportEdits(destDocument, destModel, fromNeeds, nsNeeds) {
|
|
202
|
+
const edits = [];
|
|
203
|
+
const newLines = [];
|
|
204
|
+
for (const [path, alias] of nsNeeds) {
|
|
205
|
+
if (hasNamespaceImport(destModel, path)) {
|
|
206
|
+
continue;
|
|
207
|
+
}
|
|
208
|
+
newLines.push(`import "${path}" as ${alias}`);
|
|
209
|
+
}
|
|
210
|
+
for (const [path, specifiers] of fromNeeds) {
|
|
211
|
+
const existing = findExistingFromImport(destModel, path);
|
|
212
|
+
const toAdd = specifiers.filter(specifier => !fromImportHasSpecifier(existing, specifier));
|
|
213
|
+
if (toAdd.length === 0) {
|
|
214
|
+
continue;
|
|
215
|
+
}
|
|
216
|
+
if (existing && existing.specifiers.length > 0) {
|
|
217
|
+
const last = existing.specifiers[existing.specifiers.length - 1];
|
|
218
|
+
const insertAt = last?.$cstNode?.range.end;
|
|
219
|
+
if (insertAt) {
|
|
220
|
+
edits.push({
|
|
221
|
+
range: { start: insertAt, end: insertAt },
|
|
222
|
+
newText: `, ${toAdd.map(formatSpecifier).join(', ')}`
|
|
223
|
+
});
|
|
224
|
+
continue;
|
|
225
|
+
}
|
|
226
|
+
}
|
|
227
|
+
newLines.push(`from "${path}" import ${toAdd.map(formatSpecifier).join(', ')}`);
|
|
228
|
+
}
|
|
229
|
+
if (newLines.length > 0) {
|
|
230
|
+
const insert = findImportInsertPosition(destModel);
|
|
231
|
+
const block = `${newLines.join('\n')}\n`;
|
|
232
|
+
edits.push({
|
|
233
|
+
range: { start: insert.position, end: insert.position },
|
|
234
|
+
newText: insert.trailingNewline ? `${block}\n` : block
|
|
235
|
+
});
|
|
236
|
+
}
|
|
237
|
+
return edits;
|
|
238
|
+
}
|
|
239
|
+
function fromImportHasSpecifier(existing, specifier) {
|
|
240
|
+
if (!existing) {
|
|
241
|
+
return false;
|
|
242
|
+
}
|
|
243
|
+
return existing.specifiers.some(entry => {
|
|
244
|
+
const binding = specifierBindingName(entry);
|
|
245
|
+
if (specifier.alias) {
|
|
246
|
+
return entry.alias === specifier.alias;
|
|
247
|
+
}
|
|
248
|
+
return binding === specifier.ideaName || entry.idea.$refText === specifier.ideaName;
|
|
249
|
+
});
|
|
250
|
+
}
|
|
251
|
+
function formatSpecifier(specifier) {
|
|
252
|
+
return specifier.alias
|
|
253
|
+
? `${specifier.ideaName} as ${specifier.alias}`
|
|
254
|
+
: specifier.ideaName;
|
|
255
|
+
}
|
|
256
|
+
function findImportBinding(model, name) {
|
|
257
|
+
for (const importDecl of model.imports) {
|
|
258
|
+
if (isFromImport(importDecl)) {
|
|
259
|
+
const specifier = importDecl.specifiers.find(entry => specifierBindingName(entry) === name);
|
|
260
|
+
if (specifier) {
|
|
261
|
+
return {
|
|
262
|
+
kind: 'from',
|
|
263
|
+
path: importDecl.path,
|
|
264
|
+
ideaName: specifier.idea.$refText || name,
|
|
265
|
+
alias: specifier.alias
|
|
266
|
+
};
|
|
267
|
+
}
|
|
268
|
+
}
|
|
269
|
+
if (isNamespaceImport(importDecl) && importDecl.alias === name) {
|
|
270
|
+
return {
|
|
271
|
+
kind: 'namespace',
|
|
272
|
+
path: importDecl.path,
|
|
273
|
+
alias: importDecl.alias
|
|
274
|
+
};
|
|
275
|
+
}
|
|
276
|
+
if (isQualifiedImport(importDecl)) {
|
|
277
|
+
const binding = importDecl.alias ?? importDecl.idea.$refText;
|
|
278
|
+
if (binding === name) {
|
|
279
|
+
return {
|
|
280
|
+
kind: 'qualified',
|
|
281
|
+
path: importDecl.path,
|
|
282
|
+
ideaName: importDecl.idea.$refText || name,
|
|
283
|
+
alias: importDecl.alias
|
|
284
|
+
};
|
|
285
|
+
}
|
|
286
|
+
}
|
|
287
|
+
}
|
|
288
|
+
return undefined;
|
|
289
|
+
}
|
|
290
|
+
function expandLineRange(range) {
|
|
291
|
+
if (!range) {
|
|
292
|
+
return undefined;
|
|
293
|
+
}
|
|
294
|
+
return {
|
|
295
|
+
start: { line: range.start.line, character: 0 },
|
|
296
|
+
end: { line: range.end.line + 1, character: 0 }
|
|
297
|
+
};
|
|
298
|
+
}
|
|
299
|
+
function isAstInside(node, root) {
|
|
300
|
+
let current = node;
|
|
301
|
+
while (current) {
|
|
302
|
+
if (current === root) {
|
|
303
|
+
return true;
|
|
304
|
+
}
|
|
305
|
+
current = current.$container;
|
|
306
|
+
}
|
|
307
|
+
return false;
|
|
308
|
+
}
|
|
309
|
+
//# sourceMappingURL=reqlan-idea-move-imports.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"reqlan-idea-move-imports.js","sourceRoot":"","sources":["../src/reqlan-idea-move-imports.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* rq:["../../../reqlan rq/extension/refactor_support.rq".comment_reference_refactor_support]
|
|
7
7
|
*/
|
|
8
8
|
import { type AstNode, type LangiumDocument, type ReferenceDescription } from 'langium';
|
|
9
|
-
import type { TextEdit } from 'vscode-languageserver';
|
|
9
|
+
import type { Range, TextEdit } from 'vscode-languageserver';
|
|
10
10
|
import { type Idea, type OneLinerIdea } from './generated/ast.js';
|
|
11
11
|
export type RefactorIdeaDeclaration = Idea | OneLinerIdea;
|
|
12
12
|
export interface DocumentTextEdits {
|
|
@@ -16,11 +16,19 @@ export interface DocumentTextEdits {
|
|
|
16
16
|
export declare function isRefactorIdeaDeclaration(node: AstNode): node is RefactorIdeaDeclaration;
|
|
17
17
|
export declare function ideaDeclarationText(document: LangiumDocument, idea: RefactorIdeaDeclaration): string | undefined;
|
|
18
18
|
export declare function planIdeaDeleteEdits(idea: RefactorIdeaDeclaration, references: readonly ReferenceDescription[], documentsText?: Map<string, string>): DocumentTextEdits[];
|
|
19
|
-
export
|
|
19
|
+
export interface PlanIdeaMoveInput {
|
|
20
20
|
idea: RefactorIdeaDeclaration;
|
|
21
21
|
sourceDocument: LangiumDocument;
|
|
22
22
|
destinationDocument: LangiumDocument;
|
|
23
23
|
references: readonly ReferenceDescription[];
|
|
24
|
-
/** Extra file texts (code or `.rq`) that may hold
|
|
24
|
+
/** Extra file texts (code or `.rq`) that may hold qualified comment idea links. */
|
|
25
25
|
documentsText?: Map<string, string>;
|
|
26
|
-
|
|
26
|
+
/**
|
|
27
|
+
* Leave a one-liner stub in the source that refers to the moved idea, and always
|
|
28
|
+
* import the destination file. Used by "Move idea content".
|
|
29
|
+
*/
|
|
30
|
+
leaveSourceStub?: boolean;
|
|
31
|
+
}
|
|
32
|
+
export declare function planIdeaMoveEdits(input: PlanIdeaMoveInput): DocumentTextEdits[];
|
|
33
|
+
export declare function findIdeaDeclarationAtRange(document: LangiumDocument, range: Range): RefactorIdeaDeclaration | undefined;
|
|
34
|
+
export declare function listRefactorIdeaDeclarations(document: LangiumDocument): RefactorIdeaDeclaration[];
|
|
@@ -8,7 +8,8 @@
|
|
|
8
8
|
import { AstUtils, URI } from 'langium';
|
|
9
9
|
import { isIdea, isModel, isOneLinerIdea } from './generated/ast.js';
|
|
10
10
|
import { buildInboundPathRewriteEdits } from './file-path-rewrite.js';
|
|
11
|
-
import { buildFromImportEdit, findImportInsertPosition, relativeRqImportPath } from './reqlan-import-edits.js';
|
|
11
|
+
import { buildFromImportEdit, buildNamespaceImportEdit, fileBasenameAlias, findImportInsertPosition, namespaceAliasForPath, relativeRqImportPath } from './reqlan-import-edits.js';
|
|
12
|
+
import { collectUsedBindingNames, planDestRequiredImportEdits, planUnusedImportEdits, positionsEqual, sourceBoundNames, uniqueImportAlias } from './reqlan-idea-move-imports.js';
|
|
12
13
|
import { findCommentPathReferencesInText } from './reqlan-path-references.js';
|
|
13
14
|
export function isRefactorIdeaDeclaration(node) {
|
|
14
15
|
return isIdea(node) || isOneLinerIdea(node);
|
|
@@ -54,20 +55,66 @@ export function planIdeaMoveEdits(input) {
|
|
|
54
55
|
const sourceUri = input.sourceDocument.uri.toString();
|
|
55
56
|
const destUri = input.destinationDocument.uri.toString();
|
|
56
57
|
const declarationRange = expandDeclarationRange(input.idea);
|
|
58
|
+
const sourceModel = input.sourceDocument.parseResult.value;
|
|
59
|
+
const destModel = input.destinationDocument.parseResult.value;
|
|
60
|
+
const destImportPath = relativeRqImportPath(input.sourceDocument.uri, input.destinationDocument.uri);
|
|
61
|
+
const existingDestAlias = isModel(sourceModel)
|
|
62
|
+
? namespaceAliasForPath(sourceModel, destImportPath)
|
|
63
|
+
: undefined;
|
|
64
|
+
const stubAlias = input.leaveSourceStub && isModel(sourceModel)
|
|
65
|
+
? (existingDestAlias ?? uniqueImportAlias(fileBasenameAlias(input.destinationDocument.uri), sourceBoundNames(sourceModel)))
|
|
66
|
+
: undefined;
|
|
57
67
|
if (declarationRange) {
|
|
58
|
-
|
|
68
|
+
const stubText = stubAlias
|
|
69
|
+
? `${input.idea.name} [${stubAlias}.${input.idea.name}]\n`
|
|
70
|
+
: '';
|
|
71
|
+
pushEdit(byUri, sourceUri, { range: declarationRange, newText: stubText });
|
|
59
72
|
}
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
73
|
+
if (isModel(sourceModel)) {
|
|
74
|
+
const usedAfterMove = collectUsedBindingNames(sourceModel, input.idea);
|
|
75
|
+
if (stubAlias) {
|
|
76
|
+
usedAfterMove.add(stubAlias);
|
|
77
|
+
}
|
|
78
|
+
for (const edit of planUnusedImportEdits(input.sourceDocument, usedAfterMove)) {
|
|
79
|
+
pushEdit(byUri, sourceUri, edit);
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
const destImportEdits = planDestRequiredImportEdits({
|
|
83
|
+
idea: input.idea,
|
|
84
|
+
sourceDocument: input.sourceDocument,
|
|
85
|
+
destinationDocument: input.destinationDocument
|
|
86
|
+
});
|
|
87
|
+
const ideaInsert = isModel(destModel) ? findIdeaInsertPosition(destModel) : undefined;
|
|
88
|
+
let insertedIdea = false;
|
|
89
|
+
if (ideaInsert) {
|
|
90
|
+
for (const edit of destImportEdits) {
|
|
91
|
+
if (positionsEqual(edit.range.start, ideaInsert)
|
|
92
|
+
&& positionsEqual(edit.range.end, ideaInsert)) {
|
|
93
|
+
edit.newText = `${edit.newText}${ideaText}\n`;
|
|
94
|
+
insertedIdea = true;
|
|
95
|
+
break;
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
if (!insertedIdea) {
|
|
99
|
+
pushEdit(byUri, destUri, {
|
|
100
|
+
range: { start: ideaInsert, end: ideaInsert },
|
|
101
|
+
newText: `${ideaText}\n`
|
|
102
|
+
});
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
for (const edit of destImportEdits) {
|
|
106
|
+
pushEdit(byUri, destUri, edit);
|
|
107
|
+
}
|
|
108
|
+
if (stubAlias) {
|
|
109
|
+
if (!existingDestAlias) {
|
|
110
|
+
const nsEdit = buildNamespaceImportEdit(input.sourceDocument, destImportPath, stubAlias);
|
|
111
|
+
if (nsEdit) {
|
|
112
|
+
pushEdit(byUri, sourceUri, nsEdit);
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
else if (sourceKeepsReferences(input.references, sourceUri, declarationRange)) {
|
|
117
|
+
const importEdit = buildFromImportEdit(input.sourceDocument, destImportPath, input.idea.name);
|
|
71
118
|
if (importEdit) {
|
|
72
119
|
pushEdit(byUri, sourceUri, importEdit);
|
|
73
120
|
}
|
|
@@ -81,6 +128,31 @@ export function planIdeaMoveEdits(input) {
|
|
|
81
128
|
}
|
|
82
129
|
return toDocumentEdits(byUri);
|
|
83
130
|
}
|
|
131
|
+
export function findIdeaDeclarationAtRange(document, range) {
|
|
132
|
+
const offset = document.textDocument.offsetAt(range.start);
|
|
133
|
+
for (const node of AstUtils.streamAst(document.parseResult.value)) {
|
|
134
|
+
if (!isRefactorIdeaDeclaration(node) || !node.$cstNode) {
|
|
135
|
+
continue;
|
|
136
|
+
}
|
|
137
|
+
const start = document.textDocument.offsetAt(node.$cstNode.range.start);
|
|
138
|
+
const end = document.textDocument.offsetAt(node.$cstNode.range.end);
|
|
139
|
+
if (offset >= start && offset <= end) {
|
|
140
|
+
return node;
|
|
141
|
+
}
|
|
142
|
+
if (range.start.line === node.$cstNode.range.start.line
|
|
143
|
+
&& range.start.character <= (node.name?.length ?? 0) + 1) {
|
|
144
|
+
return node;
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
return undefined;
|
|
148
|
+
}
|
|
149
|
+
export function listRefactorIdeaDeclarations(document) {
|
|
150
|
+
const model = document.parseResult.value;
|
|
151
|
+
if (!isModel(model)) {
|
|
152
|
+
return [];
|
|
153
|
+
}
|
|
154
|
+
return model.elements.filter(isRefactorIdeaDeclaration);
|
|
155
|
+
}
|
|
84
156
|
function planCommentPathRewritesForMovedIdea(text, referencingUri, oldTargetUri, newTargetUri, ideaName) {
|
|
85
157
|
const refs = findCommentPathReferencesInText(text).filter(reference => reference.idea === ideaName);
|
|
86
158
|
return buildInboundPathRewriteEdits(refs, URI.parse(referencingUri), oldTargetUri, newTargetUri, (_path, newPath) => JSON.stringify(newPath));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reqlan-idea-refactor.js","sourceRoot":"","sources":["../src/reqlan-idea-refactor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"reqlan-idea-refactor.js","sourceRoot":"","sources":["../src/reqlan-idea-refactor.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,7 @@ export declare function findImportInsertPosition(model: Model): {
|
|
|
14
14
|
};
|
|
15
15
|
export declare function findExistingFromImport(model: Model, importPath: string): FromImport | undefined;
|
|
16
16
|
export declare function hasNamespaceImport(model: Model, importPath: string): boolean;
|
|
17
|
+
export declare function namespaceAliasForPath(model: Model, importPath: string): string | undefined;
|
|
17
18
|
export declare function buildFromImportEdit(document: LangiumDocument, importPath: string, symbolName: string): TextEdit | undefined;
|
|
18
19
|
export declare function buildNamespaceImportEdit(document: LangiumDocument, importPath: string, alias: string): TextEdit | undefined;
|
|
19
20
|
export declare function fileBasenameAlias(fileUri: string | URI): string;
|
|
@@ -40,6 +40,14 @@ export function findExistingFromImport(model, importPath) {
|
|
|
40
40
|
export function hasNamespaceImport(model, importPath) {
|
|
41
41
|
return model.imports.some(decl => isNamespaceImport(decl) && unquoteReqlanString(decl.path) === importPath);
|
|
42
42
|
}
|
|
43
|
+
export function namespaceAliasForPath(model, importPath) {
|
|
44
|
+
for (const decl of model.imports) {
|
|
45
|
+
if (isNamespaceImport(decl) && unquoteReqlanString(decl.path) === importPath && decl.alias) {
|
|
46
|
+
return decl.alias;
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
return undefined;
|
|
50
|
+
}
|
|
43
51
|
export function buildFromImportEdit(document, importPath, symbolName) {
|
|
44
52
|
const model = document.parseResult.value;
|
|
45
53
|
if (!isModel(model)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reqlan-import-edits.js","sourceRoot":"","sources":["../src/reqlan-import-edits.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"reqlan-import-edits.js","sourceRoot":"","sources":["../src/reqlan-import-edits.ts"],"names":[],"mappings":"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"}
|
package/out/reqlan-module.js
CHANGED
|
@@ -21,6 +21,7 @@ import { ReqlanValidator, registerValidationChecks } from './reqlan-validator.js
|
|
|
21
21
|
import { ReqlanWorkspaceManager } from './reqlan-workspace-manager.js';
|
|
22
22
|
import { ReqlanAsyncParser } from './reqlan-async-parser.js';
|
|
23
23
|
import { ReqlanLangiumDocumentFactory } from './reqlan-document-factory.js';
|
|
24
|
+
import { ReqlanDocumentBuilder } from './reqlan-document-builder.js';
|
|
24
25
|
/**
|
|
25
26
|
* Dependency injection module that overrides Langium default services and contributes the
|
|
26
27
|
* declared custom services. The Langium defaults can be partially specified to override only
|
|
@@ -29,7 +30,8 @@ import { ReqlanLangiumDocumentFactory } from './reqlan-document-factory.js';
|
|
|
29
30
|
export const ReqlanSharedModule = {
|
|
30
31
|
workspace: {
|
|
31
32
|
WorkspaceManager: services => new ReqlanWorkspaceManager(services),
|
|
32
|
-
LangiumDocumentFactory: services => new ReqlanLangiumDocumentFactory(services)
|
|
33
|
+
LangiumDocumentFactory: services => new ReqlanLangiumDocumentFactory(services),
|
|
34
|
+
DocumentBuilder: services => new ReqlanDocumentBuilder(services)
|
|
33
35
|
}
|
|
34
36
|
};
|
|
35
37
|
export const ReqlanModule = {
|
package/out/reqlan-module.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reqlan-module.js","sourceRoot":"","sources":["../src/reqlan-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,MAAM,EAAyC,MAAM,SAAS,CAAC;AACrF,OAAO,EAAE,mBAAmB,EAAE,yBAAyB,EAAkH,MAAM,aAAa,CAAC;AAC7L,OAAO,EAAE,qBAAqB,EAAE,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AAC3F,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAC3E,OAAO,EAAE,+BAA+B,EAAE,MAAM,yCAAyC,CAAC;AAC1F,OAAO,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAChF,OAAO,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAChF,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAC3E,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,2BAA2B,EAAE,MAAM,qCAAqC,CAAC;AAClF,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,8BAA8B,EAAE,MAAM,0BAA0B,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAClF,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,4BAA4B,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"reqlan-module.js","sourceRoot":"","sources":["../src/reqlan-module.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,8 @@ import type { ReqlanServices } from './reqlan-module.js';
|
|
|
7
7
|
* rq:["../../../reqlan rq/language/imports.rq".import_error_recovery]
|
|
8
8
|
* rq:["../../../reqlan rq/language/imports.rq".import_tokenisation]
|
|
9
9
|
* rq:["../../../reqlan rq/language/syntax.rq".no_name_idea_safe_warning]
|
|
10
|
+
* rq:["../../../reqlan rq/language/syntax.rq".comment_reference_resolution_error]
|
|
11
|
+
* rq:["../../../reqlan rq/extension/features-non-rq-code-comment/functional-code-comment-references.rq".comment_reference_resolution_error_state]
|
|
10
12
|
*/
|
|
11
13
|
export declare function registerValidationChecks(services: ReqlanServices): void;
|
|
12
14
|
/**
|
|
@@ -15,6 +17,8 @@ export declare function registerValidationChecks(services: ReqlanServices): void
|
|
|
15
17
|
* rq:["../../../reqlan rq/language/imports.rq".import_error_recovery]
|
|
16
18
|
* rq:["../../../reqlan rq/language/imports.rq".import_tokenisation]
|
|
17
19
|
* rq:["../../../reqlan rq/language/syntax.rq".no_name_idea_safe_warning]
|
|
20
|
+
* rq:["../../../reqlan rq/language/syntax.rq".comment_reference_resolution_error]
|
|
21
|
+
* rq:["../../../reqlan rq/extension/features-non-rq-code-comment/functional-code-comment-references.rq".comment_reference_resolution_error_state]
|
|
18
22
|
*/
|
|
19
23
|
export declare class ReqlanValidator {
|
|
20
24
|
private readonly services;
|
|
@@ -43,5 +47,6 @@ export declare class ReqlanValidator {
|
|
|
43
47
|
*/
|
|
44
48
|
checkImportTargets(model: Model, accept: ValidationAcceptor): void;
|
|
45
49
|
checkFileReferenceTargets(model: Model, accept: ValidationAcceptor): void;
|
|
50
|
+
checkCommentReferences(model: Model, accept: ValidationAcceptor): void;
|
|
46
51
|
checkWildcardReferences(model: Model, accept: ValidationAcceptor): void;
|
|
47
52
|
}
|