@reqlan/language 1.9.5 → 1.9.6
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 +6 -0
- package/out/file-path-rewrite.d.ts +3 -0
- package/out/file-path-rewrite.js +1 -0
- package/out/file-path-rewrite.js.map +1 -1
- package/out/reqlan-comment-rename.d.ts +1 -0
- package/out/reqlan-comment-rename.js.map +1 -1
- package/out/reqlan-idea-refactor.d.ts +4 -1
- package/out/reqlan-idea-refactor.js +21 -1
- package/out/reqlan-idea-refactor.js.map +1 -1
- package/out/reqlan-path-references.js +8 -2
- package/out/reqlan-path-references.js.map +1 -1
- package/package.json +1 -1
- package/src/file-path-rewrite.ts +3 -0
- package/src/reqlan-comment-rename.ts +1 -0
- package/src/reqlan-idea-refactor.ts +37 -2
- package/src/reqlan-path-references.ts +9 -2
package/README.md
CHANGED
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
* rq:["../../../reqlan rq/language/imports.rq".configuration_import_root_alias]
|
|
6
6
|
* rq:["../../../reqlan rq/extension/features-mutation-hooks.rq".move_file]
|
|
7
7
|
* rq:["../../../reqlan rq/extension/refactor_support.rq".refactor_file_moves]
|
|
8
|
+
* rq:["../../../reqlan rq/extension/refactor_support.rq".comment_reference_refactor_support]
|
|
8
9
|
*/
|
|
9
10
|
import { URI } from 'langium';
|
|
10
11
|
import type { Range } from 'vscode-languageserver';
|
|
@@ -12,6 +13,8 @@ import { type ImportRootMapping } from './reqlan-path-resolve.js';
|
|
|
12
13
|
export interface PathReference {
|
|
13
14
|
path: string;
|
|
14
15
|
range: Range;
|
|
16
|
+
/** Idea name when this path came from `rq:["path".idea]`. */
|
|
17
|
+
idea?: string;
|
|
15
18
|
}
|
|
16
19
|
export interface PathRewriteEdit {
|
|
17
20
|
range: Range;
|
package/out/file-path-rewrite.js
CHANGED
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
* rq:["../../../reqlan rq/language/imports.rq".configuration_import_root_alias]
|
|
6
6
|
* rq:["../../../reqlan rq/extension/features-mutation-hooks.rq".move_file]
|
|
7
7
|
* rq:["../../../reqlan rq/extension/refactor_support.rq".refactor_file_moves]
|
|
8
|
+
* rq:["../../../reqlan rq/extension/refactor_support.rq".comment_reference_refactor_support]
|
|
8
9
|
*/
|
|
9
10
|
import { UriUtils } from 'langium';
|
|
10
11
|
import { importPathWithImplicitExtension } from './reqlan-imports.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-path-rewrite.js","sourceRoot":"","sources":["../src/file-path-rewrite.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"file-path-rewrite.js","sourceRoot":"","sources":["../src/file-path-rewrite.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAAO,QAAQ,EAAE,MAAM,SAAS,CAAC;AAExC,OAAO,EAAE,+BAA+B,EAAE,MAAM,qBAAqB,CAAC;AACtE,OAAO,EACH,yBAAyB,EACzB,sBAAsB,EAEzB,MAAM,0BAA0B,CAAC;AAmBlC,SAAS,kBAAkB,CAAC,OAA4B;IACpD,OAAO,OAAO,EAAE,WAAW,IAAI,CAAC,EAAE,KAAK,EAAE,yBAAyB,EAAE,CAAC,CAAC;AAC1E,CAAC;AAED,SAAS,iBAAiB,CAAC,IAAY;IACnC,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;AACrD,CAAC;AAED,SAAS,mBAAmB,CAAC,GAAQ;IACjC,MAAM,SAAS,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;IACjC,MAAM,GAAG,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAClC,OAAO,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAC/E,CAAC;AAED,SAAS,qBAAqB,CAAC,IAAS,EAAE,KAAU;IAChD,OAAO,IAAI,CAAC,QAAQ,EAAE,KAAK,KAAK,CAAC,QAAQ,EAAE;WACpC,mBAAmB,CAAC,IAAI,CAAC,KAAK,mBAAmB,CAAC,KAAK,CAAC,CAAC;AACpE,CAAC;AAED,SAAS,wBAAwB,CAAC,IAAY;IAC1C,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IACvD,OAAO,QAAQ,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;AACrC,CAAC;AAED,MAAM,UAAU,4BAA4B,CAAC,OAAe,EAAE,SAAc;IACxE,IAAI,YAAY,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,EAAE,mBAAmB,CAAC,SAAS,CAAC,CAAC,CAAC;IAC9E,OAAO,iBAAiB,CAAC,YAAY,CAAC,CAAC;AAC3C,CAAC;AAED,MAAM,UAAU,mBAAmB,CAC/B,IAAY,EACZ,UAAe,EACf,UAAe,EACf,OAA4B;IAE5B,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QACtC,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,IAAI,sBAAsB,CAAC,IAAI,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;QAC1E,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC5C,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC5C,MAAM,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACpD,MAAM,YAAY,GAAG,iBAAiB,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC5E,OAAO,YAAY,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC;AAC5D,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,wBAAwB,CACpC,IAAY,EACZ,kBAAuB,EACvB,YAAiB,EACjB,YAAiB,EACjB,OAA4B;IAE5B,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QACtC,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,IAAI,sBAAsB,CAAC,IAAI,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;QAC1E,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACpD,MAAM,UAAU,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;IACxD,MAAM,OAAO,GAAG,+BAA+B,CAAC,IAAI,CAAC,CAAC;IACtD,IAAI,OAAO,EAAE,CAAC;QACV,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC3D,CAAC;IACD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,qBAAqB,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC,EAAE,CAAC;QAChF,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,aAAa,GAAG,wBAAwB,CAAC,IAAI,CAAC,CAAC;IACrD,MAAM,WAAW,GAAG,aAAa;QAC7B,CAAC,CAAC,iBAAiB,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QAC5D,CAAC,CAAC,4BAA4B,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,YAAY,CAAC,CAAC;IACpE,OAAO,WAAW,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC;AAC1D,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC7B,IAAY,EACZ,UAAe,EACf,UAAe,EACf,OAA4B;IAE5B,MAAM,SAAS,GAAG,mBAAmB,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;IAC7E,OAAO,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;AAC3E,CAAC;AAED,MAAM,UAAU,qBAAqB,CACjC,UAA2B,EAC3B,UAAe,EACf,UAAe,EACf,iBAAsF,EACtF,OAA4B;IAE5B,MAAM,KAAK,GAAsB,EAAE,CAAC;IACpC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACjC,MAAM,OAAO,GAAG,mBAAmB,CAAC,SAAS,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;QACrF,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YACxB,SAAS;QACb,CAAC;QACD,MAAM,OAAO,GAAG,iBAAiB,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;QAC5E,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YACxB,SAAS;QACb,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;IACpD,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,4BAA4B,CACxC,UAA2B,EAC3B,kBAAuB,EACvB,YAAiB,EACjB,YAAiB,EACjB,iBAAsF,EACtF,OAA4B;IAE5B,MAAM,KAAK,GAAsB,EAAE,CAAC;IACpC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACjC,MAAM,OAAO,GAAG,wBAAwB,CACpC,SAAS,CAAC,IAAI,EACd,kBAAkB,EAClB,YAAY,EACZ,YAAY,EACZ,OAAO,CACV,CAAC;QACF,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YACxB,SAAS;QACb,CAAC;QACD,MAAM,OAAO,GAAG,iBAAiB,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;QAC5E,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YACxB,SAAS;QACb,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;IACpD,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Build text edits that rename idea tokens inside `rq:[...]` comment references.
|
|
3
3
|
* rq:["../../../reqlan rq/extension/refactor_support.rq".refactor_symbol_rename]
|
|
4
|
+
* rq:["../../../reqlan rq/extension/refactor_support.rq".comment_reference_refactor_support]
|
|
4
5
|
*/
|
|
5
6
|
import type { Range } from 'vscode-languageserver';
|
|
6
7
|
import { type EmbeddedCommentReference } from './reqlan-comment-resolver.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reqlan-comment-rename.js","sourceRoot":"","sources":["../src/reqlan-comment-rename.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"reqlan-comment-rename.js","sourceRoot":"","sources":["../src/reqlan-comment-rename.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,8 +3,9 @@
|
|
|
3
3
|
* rq:["../../../reqlan rq/extension/refactor_support.rq".refactor_symbol_move]
|
|
4
4
|
* rq:["../../../reqlan rq/extension/refactor_support.rq".refactor_symbol_delete]
|
|
5
5
|
* rq:["../../../reqlan rq/extension/refactor_support.rq".refactor_changes]
|
|
6
|
+
* rq:["../../../reqlan rq/extension/refactor_support.rq".comment_reference_refactor_support]
|
|
6
7
|
*/
|
|
7
|
-
import type
|
|
8
|
+
import { type AstNode, type LangiumDocument, type ReferenceDescription } from 'langium';
|
|
8
9
|
import type { TextEdit } from 'vscode-languageserver';
|
|
9
10
|
import { type Idea, type OneLinerIdea } from './generated/ast.js';
|
|
10
11
|
export type RefactorIdeaDeclaration = Idea | OneLinerIdea;
|
|
@@ -20,4 +21,6 @@ export declare function planIdeaMoveEdits(input: {
|
|
|
20
21
|
sourceDocument: LangiumDocument;
|
|
21
22
|
destinationDocument: LangiumDocument;
|
|
22
23
|
references: readonly ReferenceDescription[];
|
|
24
|
+
/** Extra file texts (code or `.rq`) that may hold `rq:["path".idea]` links. */
|
|
25
|
+
documentsText?: Map<string, string>;
|
|
23
26
|
}): DocumentTextEdits[];
|
|
@@ -1,6 +1,15 @@
|
|
|
1
|
-
|
|
1
|
+
/**
|
|
2
|
+
* Plan workspace edits for moving or deleting idea declarations and their references.
|
|
3
|
+
* rq:["../../../reqlan rq/extension/refactor_support.rq".refactor_symbol_move]
|
|
4
|
+
* rq:["../../../reqlan rq/extension/refactor_support.rq".refactor_symbol_delete]
|
|
5
|
+
* rq:["../../../reqlan rq/extension/refactor_support.rq".refactor_changes]
|
|
6
|
+
* rq:["../../../reqlan rq/extension/refactor_support.rq".comment_reference_refactor_support]
|
|
7
|
+
*/
|
|
8
|
+
import { AstUtils, URI } from 'langium';
|
|
2
9
|
import { isIdea, isModel, isOneLinerIdea } from './generated/ast.js';
|
|
10
|
+
import { buildInboundPathRewriteEdits } from './file-path-rewrite.js';
|
|
3
11
|
import { buildFromImportEdit, findImportInsertPosition, relativeRqImportPath } from './reqlan-import-edits.js';
|
|
12
|
+
import { findCommentPathReferencesInText } from './reqlan-path-references.js';
|
|
4
13
|
export function isRefactorIdeaDeclaration(node) {
|
|
5
14
|
return isIdea(node) || isOneLinerIdea(node);
|
|
6
15
|
}
|
|
@@ -63,8 +72,19 @@ export function planIdeaMoveEdits(input) {
|
|
|
63
72
|
pushEdit(byUri, sourceUri, importEdit);
|
|
64
73
|
}
|
|
65
74
|
}
|
|
75
|
+
if (input.documentsText) {
|
|
76
|
+
for (const [uri, text] of input.documentsText) {
|
|
77
|
+
for (const edit of planCommentPathRewritesForMovedIdea(text, uri, input.sourceDocument.uri, input.destinationDocument.uri, input.idea.name)) {
|
|
78
|
+
pushEdit(byUri, uri, edit);
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
}
|
|
66
82
|
return toDocumentEdits(byUri);
|
|
67
83
|
}
|
|
84
|
+
function planCommentPathRewritesForMovedIdea(text, referencingUri, oldTargetUri, newTargetUri, ideaName) {
|
|
85
|
+
const refs = findCommentPathReferencesInText(text).filter(reference => reference.idea === ideaName);
|
|
86
|
+
return buildInboundPathRewriteEdits(refs, URI.parse(referencingUri), oldTargetUri, newTargetUri, (_path, newPath) => JSON.stringify(newPath));
|
|
87
|
+
}
|
|
68
88
|
function sourceKeepsReferences(references, sourceUri, declarationRange) {
|
|
69
89
|
return references.some(reference => reference.sourceUri.toString() === sourceUri
|
|
70
90
|
&& !rangesOverlap(reference.segment.range, declarationRange));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reqlan-idea-refactor.js","sourceRoot":"","sources":["../src/reqlan-idea-refactor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"reqlan-idea-refactor.js","sourceRoot":"","sources":["../src/reqlan-idea-refactor.ts"],"names":[],"mappings":"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"}
|
|
@@ -70,6 +70,7 @@ export function findCommentPathReferencesInText(text, lineOffset = 0) {
|
|
|
70
70
|
const startPos = offsetToPosition(text, absoluteStart);
|
|
71
71
|
references.push({
|
|
72
72
|
path: commentRef.path,
|
|
73
|
+
idea: commentRef.idea,
|
|
73
74
|
range: {
|
|
74
75
|
start: startPos,
|
|
75
76
|
end: { line: startPos.line, character: startPos.character + quoted.length }
|
|
@@ -79,9 +80,14 @@ export function findCommentPathReferencesInText(text, lineOffset = 0) {
|
|
|
79
80
|
return references;
|
|
80
81
|
}
|
|
81
82
|
export function findPathReferencesInMovedFile(text, isRqFile) {
|
|
83
|
+
const commentPaths = findCommentPathReferencesInText(text);
|
|
82
84
|
const references = isRqFile
|
|
83
|
-
? [
|
|
84
|
-
|
|
85
|
+
? [
|
|
86
|
+
...findImportPathReferencesInText(text),
|
|
87
|
+
...findEmbeddedPathReferencesInText(text),
|
|
88
|
+
...commentPaths
|
|
89
|
+
]
|
|
90
|
+
: commentPaths;
|
|
85
91
|
return dedupePathReferences(references);
|
|
86
92
|
}
|
|
87
93
|
function dedupePathReferences(references) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reqlan-path-references.js","sourceRoot":"","sources":["../src/reqlan-path-references.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"reqlan-path-references.js","sourceRoot":"","sources":["../src/reqlan-path-references.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/file-path-rewrite.ts
CHANGED
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
* rq:["../../../reqlan rq/language/imports.rq".configuration_import_root_alias]
|
|
6
6
|
* rq:["../../../reqlan rq/extension/features-mutation-hooks.rq".move_file]
|
|
7
7
|
* rq:["../../../reqlan rq/extension/refactor_support.rq".refactor_file_moves]
|
|
8
|
+
* rq:["../../../reqlan rq/extension/refactor_support.rq".comment_reference_refactor_support]
|
|
8
9
|
*/
|
|
9
10
|
import { URI, UriUtils } from 'langium';
|
|
10
11
|
import type { Range } from 'vscode-languageserver';
|
|
@@ -18,6 +19,8 @@ import {
|
|
|
18
19
|
export interface PathReference {
|
|
19
20
|
path: string;
|
|
20
21
|
range: Range;
|
|
22
|
+
/** Idea name when this path came from `rq:["path".idea]`. */
|
|
23
|
+
idea?: string;
|
|
21
24
|
}
|
|
22
25
|
|
|
23
26
|
export interface PathRewriteEdit {
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Build text edits that rename idea tokens inside `rq:[...]` comment references.
|
|
3
3
|
* rq:["../../../reqlan rq/extension/refactor_support.rq".refactor_symbol_rename]
|
|
4
|
+
* rq:["../../../reqlan rq/extension/refactor_support.rq".comment_reference_refactor_support]
|
|
4
5
|
*/
|
|
5
6
|
import type { Range } from 'vscode-languageserver';
|
|
6
7
|
import { findCommentReferencesInText, type EmbeddedCommentReference } from './reqlan-comment-resolver.js';
|
|
@@ -3,9 +3,9 @@
|
|
|
3
3
|
* rq:["../../../reqlan rq/extension/refactor_support.rq".refactor_symbol_move]
|
|
4
4
|
* rq:["../../../reqlan rq/extension/refactor_support.rq".refactor_symbol_delete]
|
|
5
5
|
* rq:["../../../reqlan rq/extension/refactor_support.rq".refactor_changes]
|
|
6
|
+
* rq:["../../../reqlan rq/extension/refactor_support.rq".comment_reference_refactor_support]
|
|
6
7
|
*/
|
|
7
|
-
import type
|
|
8
|
-
import { AstUtils } from 'langium';
|
|
8
|
+
import { AstUtils, URI, type AstNode, type LangiumDocument, type ReferenceDescription } from 'langium';
|
|
9
9
|
import type { Range, TextEdit } from 'vscode-languageserver';
|
|
10
10
|
import {
|
|
11
11
|
isIdea,
|
|
@@ -15,11 +15,13 @@ import {
|
|
|
15
15
|
type Model,
|
|
16
16
|
type OneLinerIdea
|
|
17
17
|
} from './generated/ast.js';
|
|
18
|
+
import { buildInboundPathRewriteEdits } from './file-path-rewrite.js';
|
|
18
19
|
import {
|
|
19
20
|
buildFromImportEdit,
|
|
20
21
|
findImportInsertPosition,
|
|
21
22
|
relativeRqImportPath
|
|
22
23
|
} from './reqlan-import-edits.js';
|
|
24
|
+
import { findCommentPathReferencesInText } from './reqlan-path-references.js';
|
|
23
25
|
|
|
24
26
|
export type RefactorIdeaDeclaration = Idea | OneLinerIdea;
|
|
25
27
|
|
|
@@ -81,6 +83,8 @@ export function planIdeaMoveEdits(input: {
|
|
|
81
83
|
sourceDocument: LangiumDocument;
|
|
82
84
|
destinationDocument: LangiumDocument;
|
|
83
85
|
references: readonly ReferenceDescription[];
|
|
86
|
+
/** Extra file texts (code or `.rq`) that may hold `rq:["path".idea]` links. */
|
|
87
|
+
documentsText?: Map<string, string>;
|
|
84
88
|
}): DocumentTextEdits[] {
|
|
85
89
|
const ideaText = ideaDeclarationText(input.sourceDocument, input.idea);
|
|
86
90
|
if (!ideaText) {
|
|
@@ -112,9 +116,40 @@ export function planIdeaMoveEdits(input: {
|
|
|
112
116
|
}
|
|
113
117
|
}
|
|
114
118
|
|
|
119
|
+
if (input.documentsText) {
|
|
120
|
+
for (const [uri, text] of input.documentsText) {
|
|
121
|
+
for (const edit of planCommentPathRewritesForMovedIdea(
|
|
122
|
+
text,
|
|
123
|
+
uri,
|
|
124
|
+
input.sourceDocument.uri,
|
|
125
|
+
input.destinationDocument.uri,
|
|
126
|
+
input.idea.name
|
|
127
|
+
)) {
|
|
128
|
+
pushEdit(byUri, uri, edit);
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
|
|
115
133
|
return toDocumentEdits(byUri);
|
|
116
134
|
}
|
|
117
135
|
|
|
136
|
+
function planCommentPathRewritesForMovedIdea(
|
|
137
|
+
text: string,
|
|
138
|
+
referencingUri: string,
|
|
139
|
+
oldTargetUri: URI,
|
|
140
|
+
newTargetUri: URI,
|
|
141
|
+
ideaName: string
|
|
142
|
+
): TextEdit[] {
|
|
143
|
+
const refs = findCommentPathReferencesInText(text).filter(reference => reference.idea === ideaName);
|
|
144
|
+
return buildInboundPathRewriteEdits(
|
|
145
|
+
refs,
|
|
146
|
+
URI.parse(referencingUri),
|
|
147
|
+
oldTargetUri,
|
|
148
|
+
newTargetUri,
|
|
149
|
+
(_path, newPath) => JSON.stringify(newPath)
|
|
150
|
+
);
|
|
151
|
+
}
|
|
152
|
+
|
|
118
153
|
function sourceKeepsReferences(
|
|
119
154
|
references: readonly ReferenceDescription[],
|
|
120
155
|
sourceUri: string,
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Collects relative file path strings in .rq imports and embedded references, and rq: paths in comments.
|
|
3
3
|
* rq:["../../../reqlan rq/extension/refactor_support.rq".refactor_file_moves]
|
|
4
|
+
* rq:["../../../reqlan rq/extension/refactor_support.rq".comment_reference_refactor_support]
|
|
4
5
|
* rq:["../../../reqlan rq/extension/features-mutation-hooks.rq".move_file]
|
|
5
6
|
*/
|
|
6
7
|
import type { Range } from 'vscode-languageserver';
|
|
@@ -84,6 +85,7 @@ export function findCommentPathReferencesInText(text: string, lineOffset = 0): P
|
|
|
84
85
|
const startPos = offsetToPosition(text, absoluteStart);
|
|
85
86
|
references.push({
|
|
86
87
|
path: commentRef.path,
|
|
88
|
+
idea: commentRef.idea,
|
|
87
89
|
range: {
|
|
88
90
|
start: startPos,
|
|
89
91
|
end: { line: startPos.line, character: startPos.character + quoted.length }
|
|
@@ -94,9 +96,14 @@ export function findCommentPathReferencesInText(text: string, lineOffset = 0): P
|
|
|
94
96
|
}
|
|
95
97
|
|
|
96
98
|
export function findPathReferencesInMovedFile(text: string, isRqFile: boolean): PathReference[] {
|
|
99
|
+
const commentPaths = findCommentPathReferencesInText(text);
|
|
97
100
|
const references = isRqFile
|
|
98
|
-
? [
|
|
99
|
-
|
|
101
|
+
? [
|
|
102
|
+
...findImportPathReferencesInText(text),
|
|
103
|
+
...findEmbeddedPathReferencesInText(text),
|
|
104
|
+
...commentPaths
|
|
105
|
+
]
|
|
106
|
+
: commentPaths;
|
|
100
107
|
return dedupePathReferences(references);
|
|
101
108
|
}
|
|
102
109
|
|