@herb-tools/language-server 0.8.10 → 0.9.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/dist/action_view_helpers.js +19 -0
- package/dist/action_view_helpers.js.map +1 -0
- package/dist/autofix_service.js +1 -1
- package/dist/autofix_service.js.map +1 -1
- package/dist/code_action_service.js +3 -6
- package/dist/code_action_service.js.map +1 -1
- package/dist/comment_ast_utils.js +206 -0
- package/dist/comment_ast_utils.js.map +1 -0
- package/dist/comment_service.js +175 -0
- package/dist/comment_service.js.map +1 -0
- package/dist/diagnostics.js +15 -27
- package/dist/diagnostics.js.map +1 -1
- package/dist/document_highlight_service.js +196 -0
- package/dist/document_highlight_service.js.map +1 -0
- package/dist/document_save_service.js +16 -6
- package/dist/document_save_service.js.map +1 -1
- package/dist/folding_range_service.js +209 -0
- package/dist/folding_range_service.js.map +1 -0
- package/dist/formatting_service.js +4 -4
- package/dist/formatting_service.js.map +1 -1
- package/dist/herb-language-server.js +150189 -41260
- package/dist/herb-language-server.js.map +1 -1
- package/dist/hover_service.js +70 -0
- package/dist/hover_service.js.map +1 -0
- package/dist/index.cjs +1227 -63
- package/dist/index.cjs.map +1 -1
- package/dist/index.js +4 -0
- package/dist/index.js.map +1 -1
- package/dist/line_context_collector.js +73 -0
- package/dist/line_context_collector.js.map +1 -0
- package/dist/linter_service.js +20 -4
- package/dist/linter_service.js.map +1 -1
- package/dist/parser_service.js +6 -5
- package/dist/parser_service.js.map +1 -1
- package/dist/range_utils.js +65 -0
- package/dist/range_utils.js.map +1 -0
- package/dist/rewrite_code_action_service.js +135 -0
- package/dist/rewrite_code_action_service.js.map +1 -0
- package/dist/server.js +36 -2
- package/dist/server.js.map +1 -1
- package/dist/service.js +10 -0
- package/dist/service.js.map +1 -1
- package/dist/types/action_view_helpers.d.ts +5 -0
- package/dist/types/comment_ast_utils.d.ts +20 -0
- package/dist/types/comment_service.d.ts +14 -0
- package/dist/types/diagnostics.d.ts +0 -1
- package/dist/types/document_highlight_service.d.ts +28 -0
- package/dist/types/document_save_service.d.ts +8 -0
- package/dist/types/folding_range_service.d.ts +35 -0
- package/dist/types/formatting_service.d.ts +1 -1
- package/dist/types/hover_service.d.ts +8 -0
- package/dist/types/index.d.ts +4 -0
- package/dist/types/line_context_collector.d.ts +19 -0
- package/dist/types/linter_service.d.ts +1 -0
- package/dist/types/parser_service.d.ts +2 -1
- package/dist/types/range_utils.d.ts +16 -0
- package/dist/types/rewrite_code_action_service.d.ts +11 -0
- package/dist/types/service.d.ts +10 -0
- package/dist/types/utils.d.ts +0 -6
- package/dist/utils.js +0 -16
- package/dist/utils.js.map +1 -1
- package/package.json +10 -5
- package/src/action_view_helpers.ts +23 -0
- package/src/autofix_service.ts +1 -1
- package/src/code_action_service.ts +3 -6
- package/src/comment_ast_utils.ts +282 -0
- package/src/comment_service.ts +228 -0
- package/src/diagnostics.ts +24 -38
- package/src/document_highlight_service.ts +267 -0
- package/src/document_save_service.ts +19 -7
- package/src/folding_range_service.ts +287 -0
- package/src/formatting_service.ts +4 -4
- package/src/hover_service.ts +90 -0
- package/src/index.ts +4 -0
- package/src/line_context_collector.ts +97 -0
- package/src/linter_service.ts +25 -7
- package/src/parser_service.ts +9 -10
- package/src/range_utils.ts +90 -0
- package/src/rewrite_code_action_service.ts +165 -0
- package/src/server.ts +51 -2
- package/src/service.ts +15 -0
- package/src/utils.ts +0 -22
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
export const ACTION_VIEW_HELPERS = {
|
|
2
|
+
"ActionView::Helpers::TagHelper#tag": {
|
|
3
|
+
signature: "tag.<tag name>(optional content, options)",
|
|
4
|
+
documentationURL: "https://api.rubyonrails.org/classes/ActionView/Helpers/TagHelper.html#method-i-tag",
|
|
5
|
+
},
|
|
6
|
+
"ActionView::Helpers::TagHelper#content_tag": {
|
|
7
|
+
signature: "content_tag(name, content_or_options_with_block = nil, options = nil, escape = true, &block)",
|
|
8
|
+
documentationURL: "https://api.rubyonrails.org/classes/ActionView/Helpers/TagHelper.html#method-i-content_tag",
|
|
9
|
+
},
|
|
10
|
+
"ActionView::Helpers::UrlHelper#link_to": {
|
|
11
|
+
signature: "link_to(name = nil, options = nil, html_options = nil, &block)",
|
|
12
|
+
documentationURL: "https://api.rubyonrails.org/classes/ActionView/Helpers/UrlHelper.html#method-i-link_to",
|
|
13
|
+
},
|
|
14
|
+
"Turbo::FramesHelper#turbo_frame_tag": {
|
|
15
|
+
signature: "turbo_frame_tag(*ids, src: nil, target: nil, **attributes, &block)",
|
|
16
|
+
documentationURL: "https://www.rubydoc.info/github/hotwired/turbo-rails/Turbo/FramesHelper:turbo_frame_tag",
|
|
17
|
+
},
|
|
18
|
+
};
|
|
19
|
+
//# sourceMappingURL=action_view_helpers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"action_view_helpers.js","sourceRoot":"","sources":["../src/action_view_helpers.ts"],"names":[],"mappings":"AAKA,MAAM,CAAC,MAAM,mBAAmB,GAAyC;IACvE,oCAAoC,EAAE;QACpC,SAAS,EAAE,2CAA2C;QACtD,gBAAgB,EAAE,oFAAoF;KACvG;IACD,4CAA4C,EAAE;QAC5C,SAAS,EAAE,8FAA8F;QACzG,gBAAgB,EAAE,4FAA4F;KAC/G;IACD,wCAAwC,EAAE;QACxC,SAAS,EAAE,gEAAgE;QAC3E,gBAAgB,EAAE,wFAAwF;KAC3G;IACD,qCAAqC,EAAE;QACrC,SAAS,EAAE,oEAAoE;QAC/E,gBAAgB,EAAE,yFAAyF;KAC5G;CACF,CAAA"}
|
package/dist/autofix_service.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Herb } from "@herb-tools/node-wasm";
|
|
2
2
|
import { Linter } from "@herb-tools/linter";
|
|
3
|
-
import { getFullDocumentRange } from "./
|
|
3
|
+
import { getFullDocumentRange } from "./range_utils";
|
|
4
4
|
export class AutofixService {
|
|
5
5
|
constructor(connection, config) {
|
|
6
6
|
this.connection = connection;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"autofix_service.js","sourceRoot":"","sources":["../src/autofix_service.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAA;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAG3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"autofix_service.js","sourceRoot":"","sources":["../src/autofix_service.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAA;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAG3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAA;AAEpD,MAAM,OAAO,cAAc;IAIzB,YAAY,UAAsB,EAAE,MAAe;QACjD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;IACxC,CAAC;IAED,SAAS,CAAC,MAAc;QACtB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;IACxC,CAAC;IAEO,WAAW,CAAC,MAAe;QACjC,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IAClC,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,QAAsB;QAClC,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,EAAE,CAAA;YAC/B,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAA;YACrE,MAAM,aAAa,GAAG,UAAU,CAAC,QAAQ,CAAA;YAEzC,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO,EAAE,CAAA;YAEzC,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,QAAQ,CAAC,GAAG,EAAE,EAAE,aAAa,CAAC,CAAA;YAE1F,IAAI,aAAa,CAAC,MAAM,KAAK,IAAI;gBAAE,OAAO,EAAE,CAAA;YAE5C,OAAO,CAAC,EAAE,KAAK,EAAE,oBAAoB,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,aAAa,CAAC,MAAM,EAAE,CAAC,CAAA;QACnF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,qBAAqB,KAAK,EAAE,CAAC,CAAA;YAE3D,OAAO,EAAE,CAAA;QACX,CAAC;IACH,CAAC;CACF"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { CodeActionKind, Range,
|
|
1
|
+
import { CodeActionKind, Range, TextEdit, OptionalVersionedTextDocumentIdentifier } from "vscode-languageserver/node";
|
|
2
2
|
import { Config } from "@herb-tools/config";
|
|
3
3
|
import { Herb } from "@herb-tools/node-wasm";
|
|
4
4
|
import { Linter } from "@herb-tools/linter";
|
|
5
|
-
import { getFullDocumentRange } from "./
|
|
5
|
+
import { getFullDocumentRange, lspRangeFromLocation } from "./range_utils";
|
|
6
6
|
export class CodeActionService {
|
|
7
7
|
constructor(project, config) {
|
|
8
8
|
this.project = project;
|
|
@@ -265,10 +265,7 @@ export class CodeActionService {
|
|
|
265
265
|
};
|
|
266
266
|
}
|
|
267
267
|
offenseToRange(offense) {
|
|
268
|
-
return
|
|
269
|
-
start: Position.create(offense.location.start.line - 1, offense.location.start.column),
|
|
270
|
-
end: Position.create(offense.location.end.line - 1, offense.location.end.column)
|
|
271
|
-
};
|
|
268
|
+
return lspRangeFromLocation(offense.location);
|
|
272
269
|
}
|
|
273
270
|
rangesEqual(r1, r2) {
|
|
274
271
|
return (r1.start.line === r2.start.line &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"code_action_service.js","sourceRoot":"","sources":["../src/code_action_service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"code_action_service.js","sourceRoot":"","sources":["../src/code_action_service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,206 @@
|
|
|
1
|
+
import { LineContextCollector } from "./line_context_collector";
|
|
2
|
+
import { HTMLCommentNode, Location, createSyntheticToken } from "@herb-tools/core";
|
|
3
|
+
import { IdentityPrinter } from "@herb-tools/printer";
|
|
4
|
+
import { isERBCommentNode, isLiteralNode, createLiteral } from "@herb-tools/core";
|
|
5
|
+
import { asMutable } from "@herb-tools/rewriter";
|
|
6
|
+
export function commentERBNode(node) {
|
|
7
|
+
const mutable = asMutable(node);
|
|
8
|
+
if (mutable.tag_opening) {
|
|
9
|
+
const currentValue = mutable.tag_opening.value;
|
|
10
|
+
mutable.tag_opening = createSyntheticToken(currentValue.substring(0, 2) + "#" + currentValue.substring(2), mutable.tag_opening.type);
|
|
11
|
+
}
|
|
12
|
+
}
|
|
13
|
+
export function uncommentERBNode(node) {
|
|
14
|
+
var _a;
|
|
15
|
+
const mutable = asMutable(node);
|
|
16
|
+
if (mutable.tag_opening && mutable.tag_opening.value === "<%#") {
|
|
17
|
+
const contentValue = ((_a = mutable.content) === null || _a === void 0 ? void 0 : _a.value) || "";
|
|
18
|
+
if (contentValue.startsWith(" graphql ") ||
|
|
19
|
+
contentValue.startsWith(" %= ") ||
|
|
20
|
+
contentValue.startsWith(" == ") ||
|
|
21
|
+
contentValue.startsWith(" % ") ||
|
|
22
|
+
contentValue.startsWith(" = ") ||
|
|
23
|
+
contentValue.startsWith(" - ")) {
|
|
24
|
+
mutable.tag_opening = createSyntheticToken("<%", mutable.tag_opening.type);
|
|
25
|
+
mutable.content = createSyntheticToken(contentValue.substring(1), mutable.content.type);
|
|
26
|
+
}
|
|
27
|
+
else {
|
|
28
|
+
mutable.tag_opening = createSyntheticToken("<%", mutable.tag_opening.type);
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
export function determineStrategy(erbNodes, lineText) {
|
|
33
|
+
if (erbNodes.length === 0) {
|
|
34
|
+
return "html-only";
|
|
35
|
+
}
|
|
36
|
+
if (erbNodes.length === 1) {
|
|
37
|
+
const node = erbNodes[0];
|
|
38
|
+
if (!node.tag_opening || !node.tag_closing)
|
|
39
|
+
return "html-only";
|
|
40
|
+
const nodeStart = node.tag_opening.location.start.column;
|
|
41
|
+
const nodeEnd = node.tag_closing.location.end.column;
|
|
42
|
+
const isSoleContent = lineText.substring(0, nodeStart).trim() === "" && lineText.substring(nodeEnd).trim() === "";
|
|
43
|
+
if (isSoleContent) {
|
|
44
|
+
return "single-erb";
|
|
45
|
+
}
|
|
46
|
+
return "whole-line";
|
|
47
|
+
}
|
|
48
|
+
const segments = getLineSegments(lineText, erbNodes);
|
|
49
|
+
const hasHTML = segments.some(segment => !segment.isERB && segment.text.trim() !== "");
|
|
50
|
+
if (!hasHTML) {
|
|
51
|
+
return "all-erb";
|
|
52
|
+
}
|
|
53
|
+
const allControlTags = erbNodes.every(node => { var _a; return ((_a = node.tag_opening) === null || _a === void 0 ? void 0 : _a.value) === "<%"; });
|
|
54
|
+
if (allControlTags) {
|
|
55
|
+
return "per-segment";
|
|
56
|
+
}
|
|
57
|
+
return "whole-line";
|
|
58
|
+
}
|
|
59
|
+
function getLineSegments(lineText, erbNodes) {
|
|
60
|
+
const segments = [];
|
|
61
|
+
const sorted = [...erbNodes].sort((a, b) => a.tag_opening.location.start.column - b.tag_opening.location.start.column);
|
|
62
|
+
let position = 0;
|
|
63
|
+
for (const node of sorted) {
|
|
64
|
+
const nodeStart = node.tag_opening.location.start.column;
|
|
65
|
+
const nodeEnd = node.tag_closing.location.end.column;
|
|
66
|
+
if (nodeStart > position) {
|
|
67
|
+
segments.push({ text: lineText.substring(position, nodeStart), isERB: false });
|
|
68
|
+
}
|
|
69
|
+
segments.push({ text: lineText.substring(nodeStart, nodeEnd), isERB: true, node });
|
|
70
|
+
position = nodeEnd;
|
|
71
|
+
}
|
|
72
|
+
if (position < lineText.length) {
|
|
73
|
+
segments.push({ text: lineText.substring(position), isERB: false });
|
|
74
|
+
}
|
|
75
|
+
return segments;
|
|
76
|
+
}
|
|
77
|
+
/**
|
|
78
|
+
* Comment a line using AST mutation for strategies where the parser produces flat children,
|
|
79
|
+
* and text-segment manipulation for per-segment (where the parser nests nodes).
|
|
80
|
+
*/
|
|
81
|
+
export function commentLineContent(content, erbNodes, strategy, parserService) {
|
|
82
|
+
if (strategy === "per-segment") {
|
|
83
|
+
return commentPerSegment(content, erbNodes);
|
|
84
|
+
}
|
|
85
|
+
const parseResult = parserService.parseContent(content, { track_whitespace: true });
|
|
86
|
+
const lineCollector = new LineContextCollector();
|
|
87
|
+
parseResult.visit(lineCollector);
|
|
88
|
+
const lineERBNodes = lineCollector.erbNodesPerLine.get(0) || [];
|
|
89
|
+
const document = parseResult.value;
|
|
90
|
+
const children = asMutable(document).children;
|
|
91
|
+
switch (strategy) {
|
|
92
|
+
case "all-erb":
|
|
93
|
+
for (const node of lineERBNodes) {
|
|
94
|
+
commentERBNode(node);
|
|
95
|
+
}
|
|
96
|
+
break;
|
|
97
|
+
case "whole-line": {
|
|
98
|
+
for (const node of lineERBNodes) {
|
|
99
|
+
commentERBNode(node);
|
|
100
|
+
}
|
|
101
|
+
const commentNode = new HTMLCommentNode({
|
|
102
|
+
type: "AST_HTML_COMMENT_NODE",
|
|
103
|
+
location: Location.zero,
|
|
104
|
+
errors: [],
|
|
105
|
+
comment_start: createSyntheticToken("<!--", "TOKEN_HTML_COMMENT_START"),
|
|
106
|
+
children: [createLiteral(" "), ...children.slice(), createLiteral(" ")],
|
|
107
|
+
comment_end: createSyntheticToken("-->", "TOKEN_HTML_COMMENT_END"),
|
|
108
|
+
});
|
|
109
|
+
children.length = 0;
|
|
110
|
+
children.push(commentNode);
|
|
111
|
+
break;
|
|
112
|
+
}
|
|
113
|
+
case "html-only": {
|
|
114
|
+
const commentNode = new HTMLCommentNode({
|
|
115
|
+
type: "AST_HTML_COMMENT_NODE",
|
|
116
|
+
location: Location.zero,
|
|
117
|
+
errors: [],
|
|
118
|
+
comment_start: createSyntheticToken("<!--", "TOKEN_HTML_COMMENT_START"),
|
|
119
|
+
children: [createLiteral(" "), ...children.slice(), createLiteral(" ")],
|
|
120
|
+
comment_end: createSyntheticToken("-->", "TOKEN_HTML_COMMENT_END"),
|
|
121
|
+
});
|
|
122
|
+
children.length = 0;
|
|
123
|
+
children.push(commentNode);
|
|
124
|
+
break;
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
return IdentityPrinter.print(document, { ignoreErrors: true });
|
|
128
|
+
}
|
|
129
|
+
/**
|
|
130
|
+
* Per-segment commenting uses text segments because the parser creates nested
|
|
131
|
+
* structures (e.g., ERBIfNode) that don't allow flat child iteration.
|
|
132
|
+
*/
|
|
133
|
+
function commentPerSegment(content, erbNodes) {
|
|
134
|
+
const segments = getLineSegments(content, erbNodes);
|
|
135
|
+
return segments.map(segment => {
|
|
136
|
+
if (segment.isERB) {
|
|
137
|
+
return segment.text.substring(0, 2) + "#" + segment.text.substring(2);
|
|
138
|
+
}
|
|
139
|
+
else if (segment.text.trim() !== "") {
|
|
140
|
+
return `<!-- ${segment.text} -->`;
|
|
141
|
+
}
|
|
142
|
+
return segment.text;
|
|
143
|
+
}).join("");
|
|
144
|
+
}
|
|
145
|
+
export function uncommentLineContent(content, parserService) {
|
|
146
|
+
const parseResult = parserService.parseContent(content, { track_whitespace: true });
|
|
147
|
+
const lineCollector = new LineContextCollector();
|
|
148
|
+
parseResult.visit(lineCollector);
|
|
149
|
+
const lineERBNodes = lineCollector.erbNodesPerLine.get(0) || [];
|
|
150
|
+
const document = parseResult.value;
|
|
151
|
+
const children = asMutable(document).children;
|
|
152
|
+
for (const node of lineERBNodes) {
|
|
153
|
+
if (isERBCommentNode(node)) {
|
|
154
|
+
uncommentERBNode(node);
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
let index = 0;
|
|
158
|
+
while (index < children.length) {
|
|
159
|
+
const child = children[index];
|
|
160
|
+
if (child.type === "AST_HTML_COMMENT_NODE") {
|
|
161
|
+
const commentNode = child;
|
|
162
|
+
const innerChildren = [...commentNode.children];
|
|
163
|
+
if (innerChildren.length > 0) {
|
|
164
|
+
const first = innerChildren[0];
|
|
165
|
+
if (isLiteralNode(first) && first.content.startsWith(" ")) {
|
|
166
|
+
const trimmed = first.content.substring(1);
|
|
167
|
+
if (trimmed === "") {
|
|
168
|
+
innerChildren.shift();
|
|
169
|
+
}
|
|
170
|
+
else {
|
|
171
|
+
innerChildren[0] = createLiteral(trimmed);
|
|
172
|
+
}
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
if (innerChildren.length > 0) {
|
|
176
|
+
const last = innerChildren[innerChildren.length - 1];
|
|
177
|
+
if (isLiteralNode(last) && last.content.endsWith(" ")) {
|
|
178
|
+
const trimmed = last.content.substring(0, last.content.length - 1);
|
|
179
|
+
if (trimmed === "") {
|
|
180
|
+
innerChildren.pop();
|
|
181
|
+
}
|
|
182
|
+
else {
|
|
183
|
+
innerChildren[innerChildren.length - 1] = createLiteral(trimmed);
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
}
|
|
187
|
+
const innerERBNodes = [];
|
|
188
|
+
const innerCollector = new LineContextCollector();
|
|
189
|
+
for (const innerChild of innerChildren) {
|
|
190
|
+
innerCollector.visit(innerChild);
|
|
191
|
+
}
|
|
192
|
+
innerERBNodes.push(...(innerCollector.erbNodesPerLine.get(0) || []));
|
|
193
|
+
for (const erbNode of innerERBNodes) {
|
|
194
|
+
if (isERBCommentNode(erbNode)) {
|
|
195
|
+
uncommentERBNode(erbNode);
|
|
196
|
+
}
|
|
197
|
+
}
|
|
198
|
+
children.splice(index, 1, ...innerChildren);
|
|
199
|
+
index += innerChildren.length;
|
|
200
|
+
continue;
|
|
201
|
+
}
|
|
202
|
+
index++;
|
|
203
|
+
}
|
|
204
|
+
return IdentityPrinter.print(document, { ignoreErrors: true });
|
|
205
|
+
}
|
|
206
|
+
//# sourceMappingURL=comment_ast_utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"comment_ast_utils.js","sourceRoot":"","sources":["../src/comment_ast_utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,175 @@
|
|
|
1
|
+
import { TextEdit, Range, Position } from "vscode-languageserver/node";
|
|
2
|
+
import { LineContextCollector } from "./line_context_collector";
|
|
3
|
+
import { lspLine } from "./range_utils";
|
|
4
|
+
import { determineStrategy, commentLineContent, uncommentLineContent } from "./comment_ast_utils";
|
|
5
|
+
export class CommentService {
|
|
6
|
+
constructor(parserService) {
|
|
7
|
+
this.parserService = parserService;
|
|
8
|
+
}
|
|
9
|
+
toggleLineComment(document, range) {
|
|
10
|
+
const parseResult = this.parserService.parseDocument(document);
|
|
11
|
+
const collector = new LineContextCollector();
|
|
12
|
+
collector.visit(parseResult.document);
|
|
13
|
+
const startLine = range.start.line;
|
|
14
|
+
const endLine = range.end.line;
|
|
15
|
+
const lineInfos = [];
|
|
16
|
+
for (let line = startLine; line <= endLine; line++) {
|
|
17
|
+
const lineText = document.getText(Range.create(line, 0, line + 1, 0)).replace(/\n$/, "");
|
|
18
|
+
if (lineText.trim() === "") {
|
|
19
|
+
continue;
|
|
20
|
+
}
|
|
21
|
+
if (this.lineIsIfFalseWrapped(lineText) !== null) {
|
|
22
|
+
lineInfos.push({ line, context: "erb-comment", node: null });
|
|
23
|
+
continue;
|
|
24
|
+
}
|
|
25
|
+
const htmlCommentNode = collector.htmlCommentNodesPerLine.get(line);
|
|
26
|
+
const info = collector.lineMap.get(line);
|
|
27
|
+
if (htmlCommentNode && this.htmlCommentSpansLine(htmlCommentNode, lineText)) {
|
|
28
|
+
lineInfos.push({ line, context: "html-comment", node: htmlCommentNode });
|
|
29
|
+
}
|
|
30
|
+
else if (info) {
|
|
31
|
+
if (info.context === "html-comment") {
|
|
32
|
+
lineInfos.push({ line, context: "html-content", node: null });
|
|
33
|
+
}
|
|
34
|
+
else {
|
|
35
|
+
lineInfos.push(info);
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
else {
|
|
39
|
+
lineInfos.push({ line, context: "html-content", node: null });
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
if (lineInfos.length === 0)
|
|
43
|
+
return [];
|
|
44
|
+
const allCommented = lineInfos.every(info => info.context === "erb-comment" || info.context === "html-comment");
|
|
45
|
+
const edits = [];
|
|
46
|
+
if (allCommented) {
|
|
47
|
+
for (const info of lineInfos) {
|
|
48
|
+
const lineText = document.getText(Range.create(info.line, 0, info.line + 1, 0)).replace(/\n$/, "");
|
|
49
|
+
const edit = this.uncommentLine(info, lineText, collector);
|
|
50
|
+
if (edit)
|
|
51
|
+
edits.push(edit);
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
else {
|
|
55
|
+
for (const info of lineInfos) {
|
|
56
|
+
if (info.context === "erb-comment" || info.context === "html-comment")
|
|
57
|
+
continue;
|
|
58
|
+
const lineText = document.getText(Range.create(info.line, 0, info.line + 1, 0)).replace(/\n$/, "");
|
|
59
|
+
const erbNodes = collector.erbNodesPerLine.get(info.line) || [];
|
|
60
|
+
const edit = this.commentLine(info, lineText, erbNodes, collector);
|
|
61
|
+
if (edit)
|
|
62
|
+
edits.push(edit);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
return edits;
|
|
66
|
+
}
|
|
67
|
+
toggleBlockComment(document, range) {
|
|
68
|
+
const startLine = range.start.line;
|
|
69
|
+
const endLine = range.end.line;
|
|
70
|
+
const firstLineText = document.getText(Range.create(startLine, 0, startLine + 1, 0)).replace(/\n$/, "");
|
|
71
|
+
const lastLineText = document.getText(Range.create(endLine, 0, endLine + 1, 0)).replace(/\n$/, "");
|
|
72
|
+
const isWrapped = firstLineText.trim() === "<% if false %>" && lastLineText.trim() === "<% end %>";
|
|
73
|
+
if (isWrapped) {
|
|
74
|
+
return [
|
|
75
|
+
TextEdit.del(Range.create(endLine, 0, endLine + 1, 0)),
|
|
76
|
+
TextEdit.del(Range.create(startLine, 0, startLine + 1, 0)),
|
|
77
|
+
];
|
|
78
|
+
}
|
|
79
|
+
else {
|
|
80
|
+
const firstLineIndent = this.getIndentation(firstLineText);
|
|
81
|
+
return [
|
|
82
|
+
TextEdit.insert(Position.create(endLine + 1, 0), `${firstLineIndent}<% end %>\n`),
|
|
83
|
+
TextEdit.insert(Position.create(startLine, 0), `${firstLineIndent}<% if false %>\n`),
|
|
84
|
+
];
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
commentLine(info, lineText, erbNodes, collector) {
|
|
88
|
+
const lineRange = Range.create(info.line, 0, info.line, lineText.length);
|
|
89
|
+
const indent = this.getIndentation(lineText);
|
|
90
|
+
const content = lineText.trimStart();
|
|
91
|
+
const htmlCommentNode = collector.htmlCommentNodesPerLine.get(info.line);
|
|
92
|
+
if (htmlCommentNode) {
|
|
93
|
+
return TextEdit.replace(lineRange, `${indent}<% if false %>${content}<% end %>`);
|
|
94
|
+
}
|
|
95
|
+
const strategy = determineStrategy(erbNodes, lineText);
|
|
96
|
+
if (strategy === "single-erb") {
|
|
97
|
+
const node = erbNodes[0];
|
|
98
|
+
const insertColumn = node.tag_opening.location.start.column + 2;
|
|
99
|
+
return TextEdit.insert(Position.create(info.line, insertColumn), "#");
|
|
100
|
+
}
|
|
101
|
+
const result = commentLineContent(content, erbNodes, strategy, this.parserService);
|
|
102
|
+
return TextEdit.replace(lineRange, indent + result);
|
|
103
|
+
}
|
|
104
|
+
lineIsIfFalseWrapped(lineText) {
|
|
105
|
+
const trimmed = lineText.trimStart();
|
|
106
|
+
const indent = this.getIndentation(lineText);
|
|
107
|
+
if (trimmed.startsWith("<% if false %>") && trimmed.endsWith("<% end %>")) {
|
|
108
|
+
const inner = trimmed.slice("<% if false %>".length, -"<% end %>".length);
|
|
109
|
+
return indent + inner;
|
|
110
|
+
}
|
|
111
|
+
return null;
|
|
112
|
+
}
|
|
113
|
+
uncommentLine(info, lineText, collector) {
|
|
114
|
+
var _a;
|
|
115
|
+
const lineRange = Range.create(info.line, 0, info.line, lineText.length);
|
|
116
|
+
const indent = this.getIndentation(lineText);
|
|
117
|
+
const ifFalseContent = this.lineIsIfFalseWrapped(lineText);
|
|
118
|
+
if (ifFalseContent !== null) {
|
|
119
|
+
return TextEdit.replace(lineRange, ifFalseContent);
|
|
120
|
+
}
|
|
121
|
+
if (info.context === "erb-comment") {
|
|
122
|
+
const node = info.node;
|
|
123
|
+
if (!(node === null || node === void 0 ? void 0 : node.tag_opening) || !(node === null || node === void 0 ? void 0 : node.tag_closing))
|
|
124
|
+
return null;
|
|
125
|
+
const contentValue = (_a = node.content) === null || _a === void 0 ? void 0 : _a.value;
|
|
126
|
+
const trimmedContent = (contentValue === null || contentValue === void 0 ? void 0 : contentValue.trim()) || "";
|
|
127
|
+
if (trimmedContent.startsWith("<") && !trimmedContent.startsWith("<%")) {
|
|
128
|
+
return TextEdit.replace(lineRange, `${indent}${trimmedContent}`);
|
|
129
|
+
}
|
|
130
|
+
if (lspLine(node.tag_opening.location.start) !== info.line)
|
|
131
|
+
return null;
|
|
132
|
+
const erbNodes = collector.erbNodesPerLine.get(info.line) || [];
|
|
133
|
+
if (erbNodes.length > 1) {
|
|
134
|
+
const content = lineText.trimStart();
|
|
135
|
+
const result = uncommentLineContent(content, this.parserService);
|
|
136
|
+
return TextEdit.replace(lineRange, indent + result);
|
|
137
|
+
}
|
|
138
|
+
const hashColumn = node.tag_opening.location.start.column + 2;
|
|
139
|
+
if ((contentValue === null || contentValue === void 0 ? void 0 : contentValue.startsWith(" graphql ")) ||
|
|
140
|
+
(contentValue === null || contentValue === void 0 ? void 0 : contentValue.startsWith(" %= ")) ||
|
|
141
|
+
(contentValue === null || contentValue === void 0 ? void 0 : contentValue.startsWith(" == ")) ||
|
|
142
|
+
(contentValue === null || contentValue === void 0 ? void 0 : contentValue.startsWith(" % ")) ||
|
|
143
|
+
(contentValue === null || contentValue === void 0 ? void 0 : contentValue.startsWith(" = ")) ||
|
|
144
|
+
(contentValue === null || contentValue === void 0 ? void 0 : contentValue.startsWith(" - "))) {
|
|
145
|
+
return TextEdit.del(Range.create(info.line, hashColumn, info.line, hashColumn + 2));
|
|
146
|
+
}
|
|
147
|
+
return TextEdit.del(Range.create(info.line, hashColumn, info.line, hashColumn + 1));
|
|
148
|
+
}
|
|
149
|
+
if (info.context === "html-comment") {
|
|
150
|
+
const commentNode = info.node;
|
|
151
|
+
if ((commentNode === null || commentNode === void 0 ? void 0 : commentNode.comment_start) && (commentNode === null || commentNode === void 0 ? void 0 : commentNode.comment_end)) {
|
|
152
|
+
const contentStart = commentNode.comment_start.location.end.column;
|
|
153
|
+
const contentEnd = commentNode.comment_end.location.start.column;
|
|
154
|
+
const innerContent = lineText.substring(contentStart, contentEnd).trim();
|
|
155
|
+
const result = uncommentLineContent(innerContent, this.parserService);
|
|
156
|
+
return TextEdit.replace(lineRange, `${indent}${result}`);
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
return null;
|
|
160
|
+
}
|
|
161
|
+
htmlCommentSpansLine(node, lineText) {
|
|
162
|
+
if (!node.comment_start || !node.comment_end)
|
|
163
|
+
return false;
|
|
164
|
+
const commentStart = node.comment_start.location.start.column;
|
|
165
|
+
const commentEnd = node.comment_end.location.end.column;
|
|
166
|
+
const contentBefore = lineText.substring(0, commentStart).trim();
|
|
167
|
+
const contentAfter = lineText.substring(commentEnd).trim();
|
|
168
|
+
return contentBefore === "" && contentAfter === "";
|
|
169
|
+
}
|
|
170
|
+
getIndentation(lineText) {
|
|
171
|
+
const match = lineText.match(/^(\s*)/);
|
|
172
|
+
return match ? match[1] : "";
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
//# sourceMappingURL=comment_service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"comment_service.js","sourceRoot":"","sources":["../src/comment_service.ts"],"names":[],"mappings":"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"}
|
package/dist/diagnostics.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { DiagnosticSeverity, DiagnosticTag } from "vscode-languageserver/node";
|
|
2
2
|
import { Visitor } from "@herb-tools/core";
|
|
3
|
-
import { isHTMLTextNode } from "@herb-tools/core";
|
|
3
|
+
import { isHTMLTextNode, isERBIfNode, isERBElseNode } from "@herb-tools/core";
|
|
4
|
+
import { lspRangeFromLocation } from "./range_utils";
|
|
4
5
|
export class Diagnostics {
|
|
5
6
|
constructor(connection, documentService, parserService, linterService, configService) {
|
|
6
7
|
this.diagnostics = new Map();
|
|
@@ -172,16 +173,7 @@ export class UnreachableCodeCollector extends Visitor {
|
|
|
172
173
|
}
|
|
173
174
|
addDiagnostic(location, message) {
|
|
174
175
|
const diagnostic = {
|
|
175
|
-
range:
|
|
176
|
-
start: {
|
|
177
|
-
line: this.toZeroBased(location.start.line),
|
|
178
|
-
character: location.start.column
|
|
179
|
-
},
|
|
180
|
-
end: {
|
|
181
|
-
line: this.toZeroBased(location.end.line),
|
|
182
|
-
character: location.end.column
|
|
183
|
-
}
|
|
184
|
-
},
|
|
176
|
+
range: lspRangeFromLocation(location),
|
|
185
177
|
message,
|
|
186
178
|
severity: DiagnosticSeverity.Hint,
|
|
187
179
|
tags: [DiagnosticTag.Unnecessary],
|
|
@@ -209,14 +201,14 @@ export class UnreachableCodeCollector extends Visitor {
|
|
|
209
201
|
markIfChainAsProcessed(node) {
|
|
210
202
|
this.processedIfNodes.add(node);
|
|
211
203
|
this.traverseSubsequentNodes(node.subsequent, (current) => {
|
|
212
|
-
if (current
|
|
204
|
+
if (isERBIfNode(current)) {
|
|
213
205
|
this.processedIfNodes.add(current);
|
|
214
206
|
}
|
|
215
207
|
});
|
|
216
208
|
}
|
|
217
209
|
markElseNodesInIfChain(node) {
|
|
218
210
|
this.traverseSubsequentNodes(node.subsequent, (current) => {
|
|
219
|
-
if (current
|
|
211
|
+
if (isERBElseNode(current)) {
|
|
220
212
|
this.processedElseNodes.add(current);
|
|
221
213
|
}
|
|
222
214
|
});
|
|
@@ -224,10 +216,14 @@ export class UnreachableCodeCollector extends Visitor {
|
|
|
224
216
|
traverseSubsequentNodes(startNode, callback) {
|
|
225
217
|
let current = startNode;
|
|
226
218
|
while (current) {
|
|
227
|
-
|
|
228
|
-
|
|
219
|
+
if (isERBIfNode(current)) {
|
|
220
|
+
callback(current);
|
|
229
221
|
current = current.subsequent;
|
|
230
222
|
}
|
|
223
|
+
else if (isERBElseNode(current)) {
|
|
224
|
+
callback(current);
|
|
225
|
+
break;
|
|
226
|
+
}
|
|
231
227
|
else {
|
|
232
228
|
break;
|
|
233
229
|
}
|
|
@@ -238,14 +234,11 @@ export class UnreachableCodeCollector extends Visitor {
|
|
|
238
234
|
this.checkEmptyStatementsWithEndLocation(node, node.statements, "if", node.subsequent);
|
|
239
235
|
}
|
|
240
236
|
this.traverseSubsequentNodes(node.subsequent, (current) => {
|
|
241
|
-
if (!('statements' in current) || !Array.isArray(current.statements)) {
|
|
242
|
-
return;
|
|
243
|
-
}
|
|
244
237
|
if (this.statementsHaveContent(current.statements)) {
|
|
245
238
|
return;
|
|
246
239
|
}
|
|
247
|
-
const blockType = current
|
|
248
|
-
const nextSubsequent =
|
|
240
|
+
const blockType = isERBIfNode(current) ? 'elsif' : 'else';
|
|
241
|
+
const nextSubsequent = isERBIfNode(current) ? current.subsequent : null;
|
|
249
242
|
if (nextSubsequent) {
|
|
250
243
|
this.checkEmptyStatementsWithEndLocation(current, current.statements, blockType, nextSubsequent);
|
|
251
244
|
}
|
|
@@ -260,16 +253,11 @@ export class UnreachableCodeCollector extends Visitor {
|
|
|
260
253
|
}
|
|
261
254
|
let hasContent = false;
|
|
262
255
|
this.traverseSubsequentNodes(node.subsequent, (current) => {
|
|
263
|
-
if (
|
|
264
|
-
|
|
265
|
-
hasContent = true;
|
|
266
|
-
}
|
|
256
|
+
if (this.statementsHaveContent(current.statements)) {
|
|
257
|
+
hasContent = true;
|
|
267
258
|
}
|
|
268
259
|
});
|
|
269
260
|
return !hasContent;
|
|
270
261
|
}
|
|
271
|
-
toZeroBased(line) {
|
|
272
|
-
return line - 1;
|
|
273
|
-
}
|
|
274
262
|
}
|
|
275
263
|
//# sourceMappingURL=diagnostics.js.map
|