@marko/language-server 0.7.5 → 0.10.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/index.js +29 -24
- package/dist/index.js.map +1 -1
- package/dist/utils/compiler.js +4 -4
- package/dist/utils/compiler.js.map +1 -1
- package/dist/utils/completions/index.js +6 -6
- package/dist/utils/completions/index.js.map +1 -1
- package/dist/utils/completions/types/attributeName.js +1 -1
- package/dist/utils/completions/types/attributeName.js.map +1 -1
- package/dist/utils/completions/types/closeTag.js +1 -1
- package/dist/utils/completions/types/closeTag.js.map +1 -1
- package/dist/utils/completions/types/openTagName.js +3 -3
- package/dist/utils/completions/types/openTagName.js.map +1 -1
- package/dist/utils/completions/types/styleContent.js +2 -2
- package/dist/utils/completions/types/styleContent.js.map +1 -1
- package/dist/utils/definitions/index.js +2 -2
- package/dist/utils/definitions/index.js.map +1 -1
- package/dist/utils/definitions/types/attributeName.js +4 -4
- package/dist/utils/definitions/types/attributeName.js.map +1 -1
- package/dist/utils/definitions/types/openTagName.js +5 -5
- package/dist/utils/definitions/types/openTagName.js.map +1 -1
- package/dist/utils/htmljs-parser.js +1 -1
- package/dist/utils/htmljs-parser.js.map +1 -1
- package/dist/utils/utils.js +1 -1
- package/dist/utils/utils.js.map +1 -1
- package/package.json +9 -10
package/dist/index.js
CHANGED
|
@@ -4,12 +4,12 @@ const tslib_1 = require("tslib");
|
|
|
4
4
|
const node_1 = require("vscode-languageserver/node");
|
|
5
5
|
const vscode_uri_1 = require("vscode-uri");
|
|
6
6
|
const vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
|
|
7
|
-
const
|
|
7
|
+
const prettier = (0, tslib_1.__importStar)(require("prettier"));
|
|
8
8
|
const util_1 = require("util");
|
|
9
9
|
const compiler_1 = require("./utils/compiler");
|
|
10
10
|
const htmljs_parser_1 = require("./utils/htmljs-parser");
|
|
11
|
-
const completionTypes = tslib_1.__importStar(require("./utils/completions"));
|
|
12
|
-
const definitionTypes = tslib_1.__importStar(require("./utils/definitions"));
|
|
11
|
+
const completionTypes = (0, tslib_1.__importStar)(require("./utils/completions"));
|
|
12
|
+
const definitionTypes = (0, tslib_1.__importStar)(require("./utils/definitions"));
|
|
13
13
|
if (typeof require !== "undefined" &&
|
|
14
14
|
require.extensions &&
|
|
15
15
|
!(".ts" in require.extensions)) {
|
|
@@ -17,7 +17,7 @@ if (typeof require !== "undefined" &&
|
|
|
17
17
|
require.extensions[".ts"] = undefined;
|
|
18
18
|
}
|
|
19
19
|
const cacheForCompiler = new WeakMap();
|
|
20
|
-
const connection = node_1.createConnection(node_1.ProposedFeatures.all);
|
|
20
|
+
const connection = (0, node_1.createConnection)(node_1.ProposedFeatures.all);
|
|
21
21
|
const prevDiagnostics = new WeakMap();
|
|
22
22
|
const diagnosticTimeouts = new WeakMap();
|
|
23
23
|
const documents = new node_1.TextDocuments(vscode_languageserver_textdocument_1.TextDocument);
|
|
@@ -26,7 +26,7 @@ console.log = (...args) => {
|
|
|
26
26
|
connection.console.log(args.join(" "));
|
|
27
27
|
};
|
|
28
28
|
console.error = (...args) => {
|
|
29
|
-
connection.console.error(args.map(arg => arg.stack || arg).join("\n"));
|
|
29
|
+
connection.console.error(args.map((arg) => arg.stack || arg).join("\n"));
|
|
30
30
|
};
|
|
31
31
|
process.on("uncaughtException", console.error);
|
|
32
32
|
process.on("unhandledRejection", console.error);
|
|
@@ -47,10 +47,10 @@ connection.onInitialized(() => {
|
|
|
47
47
|
});
|
|
48
48
|
connection.onCompletion((params) => {
|
|
49
49
|
const doc = documents.get(params.textDocument.uri);
|
|
50
|
-
const taglib = compiler_1.getTagLibLookup(doc);
|
|
50
|
+
const taglib = (0, compiler_1.getTagLibLookup)(doc);
|
|
51
51
|
if (!taglib)
|
|
52
52
|
return node_1.CompletionList.create([], true);
|
|
53
|
-
const event = htmljs_parser_1.parseUntilOffset({
|
|
53
|
+
const event = (0, htmljs_parser_1.parseUntilOffset)({
|
|
54
54
|
taglib,
|
|
55
55
|
offset: doc.offsetAt(params.position),
|
|
56
56
|
text: doc.getText(),
|
|
@@ -61,10 +61,10 @@ connection.onCompletion((params) => {
|
|
|
61
61
|
});
|
|
62
62
|
connection.onDefinition((params) => {
|
|
63
63
|
const doc = documents.get(params.textDocument.uri);
|
|
64
|
-
const taglib = compiler_1.getTagLibLookup(doc);
|
|
64
|
+
const taglib = (0, compiler_1.getTagLibLookup)(doc);
|
|
65
65
|
if (!taglib)
|
|
66
66
|
return;
|
|
67
|
-
const event = htmljs_parser_1.parseUntilOffset({
|
|
67
|
+
const event = (0, htmljs_parser_1.parseUntilOffset)({
|
|
68
68
|
taglib,
|
|
69
69
|
offset: doc.offsetAt(params.position),
|
|
70
70
|
text: doc.getText(),
|
|
@@ -72,28 +72,31 @@ connection.onDefinition((params) => {
|
|
|
72
72
|
const handler = event && definitionTypes[event.type];
|
|
73
73
|
return handler && handler(taglib, doc, params, event);
|
|
74
74
|
});
|
|
75
|
-
connection.onDocumentFormatting(({ textDocument, options }) => {
|
|
76
|
-
const doc = documents.get(textDocument.uri);
|
|
77
|
-
const { fsPath } = vscode_uri_1.URI.parse(textDocument.uri);
|
|
75
|
+
connection.onDocumentFormatting(async ({ textDocument, options, }) => {
|
|
78
76
|
try {
|
|
77
|
+
const doc = documents.get(textDocument.uri);
|
|
78
|
+
const { fsPath, scheme } = vscode_uri_1.URI.parse(textDocument.uri);
|
|
79
79
|
const text = doc.getText();
|
|
80
|
-
const formatted =
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
})
|
|
80
|
+
const formatted = prettier.format(text, Object.assign({ parser: "marko", filepath: fsPath, tabWidth: options.tabSize, useTabs: options.insertSpaces === false }, (scheme === "file" ? await prettier
|
|
81
|
+
.resolveConfig(fsPath, {
|
|
82
|
+
editorconfig: true,
|
|
83
|
+
})
|
|
84
|
+
.catch(() => null) : null)));
|
|
84
85
|
return [
|
|
85
86
|
node_1.TextEdit.replace(node_1.Range.create(doc.positionAt(0), doc.positionAt(text.length)), formatted),
|
|
86
87
|
];
|
|
87
88
|
}
|
|
88
89
|
catch (e) {
|
|
89
|
-
displayMessage("
|
|
90
|
+
displayMessage("Error", (0, util_1.inspect)(e, { colors: false }));
|
|
90
91
|
}
|
|
91
|
-
return [
|
|
92
|
+
return [
|
|
93
|
+
node_1.TextEdit.replace(node_1.Range.create(node_1.Position.create(0, 0), node_1.Position.create(0, 0)), ""),
|
|
94
|
+
];
|
|
92
95
|
});
|
|
93
96
|
connection.onDidChangeWatchedFiles(() => {
|
|
94
97
|
const clearedCompilers = new Set();
|
|
95
98
|
for (const doc of documents.all()) {
|
|
96
|
-
const compiler = compiler_1.getCompilerForDoc(doc);
|
|
99
|
+
const compiler = (0, compiler_1.getCompilerForDoc)(doc);
|
|
97
100
|
if (!clearedCompilers.has(compiler)) {
|
|
98
101
|
clearCaches(compiler);
|
|
99
102
|
clearedCompilers.add(compiler);
|
|
@@ -103,7 +106,7 @@ connection.onDidChangeWatchedFiles(() => {
|
|
|
103
106
|
documents.onDidChangeContent((change) => {
|
|
104
107
|
queueValidation(change.document);
|
|
105
108
|
if (change.document.version > 1) {
|
|
106
|
-
clearCaches(compiler_1.getCompilerForDoc(change.document));
|
|
109
|
+
clearCaches((0, compiler_1.getCompilerForDoc)(change.document));
|
|
107
110
|
}
|
|
108
111
|
});
|
|
109
112
|
function queueValidation(doc) {
|
|
@@ -111,7 +114,7 @@ function queueValidation(doc) {
|
|
|
111
114
|
diagnosticTimeouts.set(doc, setTimeout(() => {
|
|
112
115
|
const prevDiag = prevDiagnostics.get(doc);
|
|
113
116
|
const nextDiag = doValidate(doc);
|
|
114
|
-
if (prevDiag && util_1.isDeepStrictEqual(prevDiag, nextDiag)) {
|
|
117
|
+
if (prevDiag && (0, util_1.isDeepStrictEqual)(prevDiag, nextDiag)) {
|
|
115
118
|
return;
|
|
116
119
|
}
|
|
117
120
|
prevDiagnostics.set(doc, nextDiag);
|
|
@@ -126,7 +129,7 @@ function doValidate(doc) {
|
|
|
126
129
|
if (scheme !== "file") {
|
|
127
130
|
return [];
|
|
128
131
|
}
|
|
129
|
-
const compiler = compiler_1.getCompilerForDoc(doc);
|
|
132
|
+
const compiler = (0, compiler_1.getCompilerForDoc)(doc);
|
|
130
133
|
const diagnostics = [];
|
|
131
134
|
try {
|
|
132
135
|
compiler.compileSync(doc.getText(), fsPath, {
|
|
@@ -154,12 +157,14 @@ function clearCaches(compiler) {
|
|
|
154
157
|
function getCacheForCompiler(compiler) {
|
|
155
158
|
let cache = cacheForCompiler.get(compiler);
|
|
156
159
|
if (!cache) {
|
|
157
|
-
cacheForCompiler.set(compiler, cache = new Map());
|
|
160
|
+
cacheForCompiler.set(compiler, (cache = new Map()));
|
|
158
161
|
}
|
|
159
162
|
return cache;
|
|
160
163
|
}
|
|
161
164
|
function displayMessage(type, msg) {
|
|
162
|
-
|
|
165
|
+
setImmediate(() => {
|
|
166
|
+
connection.sendNotification(`show${type}`, msg);
|
|
167
|
+
});
|
|
163
168
|
}
|
|
164
169
|
documents.listen(connection);
|
|
165
170
|
connection.listen();
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/compiler.js
CHANGED
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getTagLibLookup = exports.getCompilerForDoc = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const path_1 = tslib_1.__importDefault(require("path"));
|
|
5
|
+
const path_1 = (0, tslib_1.__importDefault)(require("path"));
|
|
6
6
|
const vscode_uri_1 = require("vscode-uri");
|
|
7
|
-
const resolve_from_1 = tslib_1.__importDefault(require("resolve-from"));
|
|
8
|
-
const lasso_package_root_1 = tslib_1.__importDefault(require("lasso-package-root"));
|
|
7
|
+
const resolve_from_1 = (0, tslib_1.__importDefault)(require("resolve-from"));
|
|
8
|
+
const lasso_package_root_1 = (0, tslib_1.__importDefault)(require("lasso-package-root"));
|
|
9
9
|
const compilerForDoc = new WeakMap();
|
|
10
10
|
function getCompilerForDoc(doc) {
|
|
11
11
|
let compiler = compilerForDoc.get(doc);
|
|
@@ -21,7 +21,7 @@ function getTagLibLookup(document) {
|
|
|
21
21
|
exports.getTagLibLookup = getTagLibLookup;
|
|
22
22
|
function loadCompiler(dir) {
|
|
23
23
|
return require(isCompatibleCompilerInstalled(dir)
|
|
24
|
-
? resolve_from_1.default(dir, "@marko/compiler")
|
|
24
|
+
? (0, resolve_from_1.default)(dir, "@marko/compiler")
|
|
25
25
|
: "@marko/compiler");
|
|
26
26
|
}
|
|
27
27
|
function isCompatibleCompilerInstalled(dir) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compiler.js","sourceRoot":"","sources":["../../src/utils/compiler.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"compiler.js","sourceRoot":"","sources":["../../src/utils/compiler.ts"],"names":[],"mappings":";;;;AAAA,6DAAwB;AACxB,2CAAiC;AACjC,6EAAuC;AACvC,yFAAkD;AAkElD,MAAM,cAAc,GAAG,IAAI,OAAO,EAA0B,CAAC;AAE7D,SAAgB,iBAAiB,CAAC,GAAiB;IACjD,IAAI,QAAQ,GAAG,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACvC,IAAI,CAAC,QAAQ,EAAE;QACb,cAAc,CAAC,GAAG,CAChB,GAAG,EACH,CAAC,QAAQ,GAAG,YAAY,CAAC,cAAI,CAAC,OAAO,CAAC,gBAAG,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CACnE,CAAC;KACH;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAVD,8CAUC;AAED,SAAgB,eAAe,CAC7B,QAAsB;IAEtB,OAAO,iBAAiB,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,WAAW,CACnD,gBAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAM,CAC/B,CAAC;AACJ,CAAC;AAND,0CAMC;AAED,SAAS,YAAY,CAAC,GAAW;IAC/B,OAAO,OAAO,CAAC,6BAA6B,CAAC,GAAG,CAAC;QAC/C,CAAC,CAAC,IAAA,sBAAW,EAAC,GAAG,EAAE,iBAAiB,CAAC;QACrC,CAAC,CAAC,iBAAiB,CAAa,CAAC;AACrC,CAAC;AAED,SAAS,6BAA6B,CAAC,GAAW;IAChD,MAAM,OAAO,GAAG,4BAAgB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IACjD,MAAM,WAAW,GACf,OAAO,IAAI,sBAAW,CAAC,MAAM,CAAC,OAAO,EAAE,8BAA8B,CAAC,CAAC;IACzE,OAAO,OAAO,CAAC,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;AAC3E,CAAC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
|
-
tslib_1.__exportStar(require("./types/attributeModifier"), exports);
|
|
5
|
-
tslib_1.__exportStar(require("./types/attributeName"), exports);
|
|
6
|
-
tslib_1.__exportStar(require("./types/closeTag"), exports);
|
|
7
|
-
tslib_1.__exportStar(require("./types/openTag"), exports);
|
|
8
|
-
tslib_1.__exportStar(require("./types/openTagName"), exports);
|
|
9
|
-
tslib_1.__exportStar(require("./types/styleContent"), exports);
|
|
4
|
+
(0, tslib_1.__exportStar)(require("./types/attributeModifier"), exports);
|
|
5
|
+
(0, tslib_1.__exportStar)(require("./types/attributeName"), exports);
|
|
6
|
+
(0, tslib_1.__exportStar)(require("./types/closeTag"), exports);
|
|
7
|
+
(0, tslib_1.__exportStar)(require("./types/openTag"), exports);
|
|
8
|
+
(0, tslib_1.__exportStar)(require("./types/openTagName"), exports);
|
|
9
|
+
(0, tslib_1.__exportStar)(require("./types/styleContent"), exports);
|
|
10
10
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/completions/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/completions/index.ts"],"names":[],"mappings":";;;AAAA,yEAA0C;AAC1C,qEAAsC;AACtC,gEAAiC;AACjC,+DAAgC;AAChC,mEAAoC;AACpC,oEAAqC"}
|
|
@@ -5,7 +5,7 @@ const vscode_languageserver_1 = require("vscode-languageserver");
|
|
|
5
5
|
const utils_1 = require("../../utils");
|
|
6
6
|
function attributeName(taglib, document, params, event) {
|
|
7
7
|
const completions = [];
|
|
8
|
-
const attrNameRange = utils_1.rangeFromEvent(document, event);
|
|
8
|
+
const attrNameRange = (0, utils_1.rangeFromEvent)(document, event);
|
|
9
9
|
const tagDef = !event.tag.tagNameExpression && taglib.getTag(event.tag.tagName);
|
|
10
10
|
const tagName = (tagDef && tagDef.name) || "*";
|
|
11
11
|
const nestedTagAttrs = {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attributeName.js","sourceRoot":"","sources":["../../../../src/utils/completions/types/attributeName.ts"],"names":[],"mappings":";;;AAAA,iEAS+B;AAI/B,uCAA6C;AAE7C,SAAgB,aAAa,CAC3B,MAAoB,EACpB,QAAsB,EACtB,MAAwB,EACxB,KAAiC;IAEjC,MAAM,WAAW,GAAqB,EAAE,CAAC;IACzC,MAAM,aAAa,GAAG,sBAAc,
|
|
1
|
+
{"version":3,"file":"attributeName.js","sourceRoot":"","sources":["../../../../src/utils/completions/types/attributeName.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ function closeTag(taglib, document, params, event) {
|
|
|
13
13
|
label: closingTagStr,
|
|
14
14
|
kind: vscode_languageserver_1.CompletionItemKind.Class,
|
|
15
15
|
insertTextFormat: vscode_languageserver_1.InsertTextFormat.Snippet,
|
|
16
|
-
textEdit: vscode_languageserver_1.TextEdit.replace(utils_1.rangeFromEvent(document, event), closingTagStr),
|
|
16
|
+
textEdit: vscode_languageserver_1.TextEdit.replace((0, utils_1.rangeFromEvent)(document, event), closingTagStr),
|
|
17
17
|
},
|
|
18
18
|
], true);
|
|
19
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"closeTag.js","sourceRoot":"","sources":["../../../../src/utils/completions/types/closeTag.ts"],"names":[],"mappings":";;;AAAA,iEAM+B;AAI/B,uCAA6C;AAE7C,SAAgB,QAAQ,CACtB,MAAoB,EACpB,QAAsB,EACtB,MAAwB,EACxB,KAA4B;IAE5B,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;QAC5B,OAAO;KACR;IAED,MAAM,aAAa,GAAG,KAAK,KAAK,CAAC,OAAO,GAAG,CAAC;IAE5C,OAAO,sCAAc,CAAC,MAAM,CAC1B;QACE;YACE,KAAK,EAAE,aAAa;YACpB,IAAI,EAAE,0CAAkB,CAAC,KAAK;YAC9B,gBAAgB,EAAE,wCAAgB,CAAC,OAAO;YAC1C,QAAQ,EAAE,gCAAQ,CAAC,OAAO,CACxB,sBAAc,
|
|
1
|
+
{"version":3,"file":"closeTag.js","sourceRoot":"","sources":["../../../../src/utils/completions/types/closeTag.ts"],"names":[],"mappings":";;;AAAA,iEAM+B;AAI/B,uCAA6C;AAE7C,SAAgB,QAAQ,CACtB,MAAoB,EACpB,QAAsB,EACtB,MAAwB,EACxB,KAA4B;IAE5B,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;QAC5B,OAAO;KACR;IAED,MAAM,aAAa,GAAG,KAAK,KAAK,CAAC,OAAO,GAAG,CAAC;IAE5C,OAAO,sCAAc,CAAC,MAAM,CAC1B;QACE;YACE,KAAK,EAAE,aAAa;YACpB,IAAI,EAAE,0CAAkB,CAAC,KAAK;YAC9B,gBAAgB,EAAE,wCAAgB,CAAC,OAAO;YAC1C,QAAQ,EAAE,gCAAQ,CAAC,OAAO,CACxB,IAAA,sBAAc,EAAC,QAAQ,EAAE,KAAK,CAAC,EAC/B,aAAa,CACd;SACF;KACF,EACD,IAAI,CACL,CAAC;AACJ,CAAC;AA1BD,4BA0BC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.openTagName = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const path_1 = tslib_1.__importDefault(require("path"));
|
|
5
|
+
const path_1 = (0, tslib_1.__importDefault)(require("path"));
|
|
6
6
|
const vscode_uri_1 = require("vscode-uri");
|
|
7
7
|
const vscode_languageserver_1 = require("vscode-languageserver");
|
|
8
8
|
const utils_1 = require("../../utils");
|
|
@@ -11,9 +11,9 @@ function openTagName(taglib, document, params, event) {
|
|
|
11
11
|
let tags;
|
|
12
12
|
const triggerCharacter = (params.context && params.context.triggerCharacter) || event.tagName[0];
|
|
13
13
|
const isAttributeTag = triggerCharacter === "@";
|
|
14
|
-
const tagNameRange = utils_1.rangeFromEvent(document, event);
|
|
14
|
+
const tagNameRange = (0, utils_1.rangeFromEvent)(document, event);
|
|
15
15
|
if (isAttributeTag) {
|
|
16
|
-
const parentTag = utils_1.findNonControlFlowParent(event);
|
|
16
|
+
const parentTag = (0, utils_1.findNonControlFlowParent)(event);
|
|
17
17
|
const parentTagDef = parentTag &&
|
|
18
18
|
!parentTag.tagNameExpression &&
|
|
19
19
|
taglib.getTag(parentTag.tagName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openTagName.js","sourceRoot":"","sources":["../../../../src/utils/completions/types/openTagName.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"openTagName.js","sourceRoot":"","sources":["../../../../src/utils/completions/types/openTagName.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,10 +13,10 @@ const services = {
|
|
|
13
13
|
function styleContent(taglib, document, params, event) {
|
|
14
14
|
const service = services[event.language]();
|
|
15
15
|
const startPos = document.positionAt(event.pos);
|
|
16
|
-
const relativePos = utils_1.shiftPosition(params.position, vscode_languageserver_1.Position.create(startPos.line * -1, startPos.character * -1));
|
|
16
|
+
const relativePos = (0, utils_1.shiftPosition)(params.position, vscode_languageserver_1.Position.create(startPos.line * -1, startPos.character * -1));
|
|
17
17
|
const contentDocument = vscode_languageserver_textdocument_1.TextDocument.create(document.uri, event.language, document.version, event.content);
|
|
18
18
|
const completions = service.doComplete(contentDocument, relativePos, service.parseStylesheet(contentDocument));
|
|
19
|
-
return utils_1.shiftCompletionRanges(completions, startPos);
|
|
19
|
+
return (0, utils_1.shiftCompletionRanges)(completions, startPos);
|
|
20
20
|
}
|
|
21
21
|
exports.styleContent = styleContent;
|
|
22
22
|
//# sourceMappingURL=styleContent.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"styleContent.js","sourceRoot":"","sources":["../../../../src/utils/completions/types/styleContent.ts"],"names":[],"mappings":";;;AAAA,iEAAmE;AACnE,2FAAkE;AAClE,2EAIoC;AAIpC,uCAAmE;AAEnE,MAAM,QAAQ,GAAG;IACf,GAAG,EAAE,kDAAqB;IAC1B,IAAI,EAAE,mDAAsB;IAC5B,IAAI,EAAE,mDAAsB;CAC7B,CAAC;AAEF,SAAgB,YAAY,CAC1B,MAAoB,EACpB,QAAsB,EACtB,MAAwB,EACxB,KAAgC;IAEhC,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;IAC3C,MAAM,QAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAChD,MAAM,WAAW,GAAG,qBAAa,
|
|
1
|
+
{"version":3,"file":"styleContent.js","sourceRoot":"","sources":["../../../../src/utils/completions/types/styleContent.ts"],"names":[],"mappings":";;;AAAA,iEAAmE;AACnE,2FAAkE;AAClE,2EAIoC;AAIpC,uCAAmE;AAEnE,MAAM,QAAQ,GAAG;IACf,GAAG,EAAE,kDAAqB;IAC1B,IAAI,EAAE,mDAAsB;IAC5B,IAAI,EAAE,mDAAsB;CAC7B,CAAC;AAEF,SAAgB,YAAY,CAC1B,MAAoB,EACpB,QAAsB,EACtB,MAAwB,EACxB,KAAgC;IAEhC,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;IAC3C,MAAM,QAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAChD,MAAM,WAAW,GAAG,IAAA,qBAAa,EAC/B,MAAM,CAAC,QAAQ,EACf,gCAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,CAAC,EAAE,QAAQ,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,CAC7D,CAAC;IACF,MAAM,eAAe,GAAG,iDAAY,CAAC,MAAM,CACzC,QAAQ,CAAC,GAAG,EACZ,KAAK,CAAC,QAAQ,EACd,QAAQ,CAAC,OAAO,EAChB,KAAK,CAAC,OAAO,CACd,CAAC;IAEF,MAAM,WAAW,GAAG,OAAO,CAAC,UAAU,CACpC,eAAe,EACf,WAAW,EACX,OAAO,CAAC,eAAe,CAAC,eAAe,CAAC,CACzC,CAAC;IAEF,OAAO,IAAA,6BAAqB,EAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;AACtD,CAAC;AA1BD,oCA0BC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
|
-
tslib_1.__exportStar(require("./types/attributeName"), exports);
|
|
5
|
-
tslib_1.__exportStar(require("./types/openTagName"), exports);
|
|
4
|
+
(0, tslib_1.__exportStar)(require("./types/attributeName"), exports);
|
|
5
|
+
(0, tslib_1.__exportStar)(require("./types/openTagName"), exports);
|
|
6
6
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/definitions/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/definitions/index.ts"],"names":[],"mappings":";;;AAAA,qEAAsC;AACtC,mEAAoC"}
|
|
@@ -4,7 +4,7 @@ exports.attributeName = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const vscode_uri_1 = require("vscode-uri");
|
|
6
6
|
const vscode_languageserver_1 = require("vscode-languageserver");
|
|
7
|
-
const regexp_builder_1 = tslib_1.__importDefault(require("../../regexp-builder"));
|
|
7
|
+
const regexp_builder_1 = (0, tslib_1.__importDefault)(require("../../regexp-builder"));
|
|
8
8
|
const utils_1 = require("../../utils");
|
|
9
9
|
function attributeName(taglib, document, params, event) {
|
|
10
10
|
const tagName = event.tag.tagNameExpression ? undefined : event.tag.tagName;
|
|
@@ -19,13 +19,13 @@ function attributeName(taglib, document, params, event) {
|
|
|
19
19
|
return;
|
|
20
20
|
}
|
|
21
21
|
if (/\/marko(?:-tag)?\.json$/.test(attrEntryFile)) {
|
|
22
|
-
const tagDefDoc = utils_1.createTextDocument(attrEntryFile);
|
|
23
|
-
const match = regexp_builder_1.default `/"@${event.name}"\s*:\s*[^\r\n,]+/g`.exec(tagDefDoc.getText());
|
|
22
|
+
const tagDefDoc = (0, utils_1.createTextDocument)(attrEntryFile);
|
|
23
|
+
const match = (0, regexp_builder_1.default) `/"@${event.name}"\s*:\s*[^\r\n,]+/g`.exec(tagDefDoc.getText());
|
|
24
24
|
if (match && match.index) {
|
|
25
25
|
range = vscode_languageserver_1.Range.create(tagDefDoc.positionAt(match.index), tagDefDoc.positionAt(match.index + match[0].length));
|
|
26
26
|
}
|
|
27
27
|
}
|
|
28
|
-
return vscode_languageserver_1.LocationLink.create(vscode_uri_1.URI.file(attrEntryFile).toString(), range, range, utils_1.rangeFromEvent(document, event));
|
|
28
|
+
return vscode_languageserver_1.LocationLink.create(vscode_uri_1.URI.file(attrEntryFile).toString(), range, range, (0, utils_1.rangeFromEvent)(document, event));
|
|
29
29
|
}
|
|
30
30
|
exports.attributeName = attributeName;
|
|
31
31
|
//# sourceMappingURL=attributeName.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attributeName.js","sourceRoot":"","sources":["../../../../src/utils/definitions/types/attributeName.ts"],"names":[],"mappings":";;;;AAAA,2CAAiC;AACjC,iEAI+B;AAI/B,
|
|
1
|
+
{"version":3,"file":"attributeName.js","sourceRoot":"","sources":["../../../../src/utils/definitions/types/attributeName.ts"],"names":[],"mappings":";;;;AAAA,2CAAiC;AACjC,iEAI+B;AAI/B,uFAAiD;AACjD,uCAAgF;AAEhF,SAAgB,aAAa,CAC3B,MAAoB,EACpB,QAAsB,EACtB,MAAkC,EAClC,KAAiC;IAEjC,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC;IAC5E,MAAM,MAAM,GAAG,OAAO,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACjD,MAAM,OAAO,GAAG,MAAM,CAAC,YAAY,CAAC,OAAO,IAAI,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAChE,IAAI,KAAK,GAAG,qBAAa,CAAC;IAE1B,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO;KACR;IAED,MAAM,aAAa,GAAG,OAAO,CAAC,QAAQ,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAC;IAEtE,IAAI,CAAC,aAAa,EAAE;QAClB,OAAO;KACR;IAED,IAAI,yBAAyB,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE;QACjD,MAAM,SAAS,GAAG,IAAA,0BAAkB,EAAC,aAAa,CAAC,CAAC;QACpD,MAAM,KAAK,GAAG,IAAA,wBAAa,EAAA,MAAM,KAAK,CAAC,IAAI,qBAAqB,CAAC,IAAI,CACnE,SAAS,CAAC,OAAO,EAAE,CACpB,CAAC;QAEF,IAAI,KAAK,IAAI,KAAK,CAAC,KAAK,EAAE;YACxB,KAAK,GAAG,6BAAK,CAAC,MAAM,CAClB,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,EACjC,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CACpD,CAAC;SACH;KACF;IAED,OAAO,oCAAY,CAAC,MAAM,CACxB,gBAAG,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE,EAClC,KAAK,EACL,KAAK,EACL,IAAA,sBAAc,EAAC,QAAQ,EAAE,KAAK,CAAC,CAChC,CAAC;AACJ,CAAC;AAzCD,sCAyCC"}
|
|
@@ -4,14 +4,14 @@ exports.openTagName = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const vscode_uri_1 = require("vscode-uri");
|
|
6
6
|
const vscode_languageserver_1 = require("vscode-languageserver");
|
|
7
|
-
const regexp_builder_1 = tslib_1.__importDefault(require("../../regexp-builder"));
|
|
7
|
+
const regexp_builder_1 = (0, tslib_1.__importDefault)(require("../../regexp-builder"));
|
|
8
8
|
const utils_1 = require("../../utils");
|
|
9
9
|
function openTagName(taglib, document, params, event) {
|
|
10
10
|
let tagDef;
|
|
11
11
|
let range = utils_1.START_OF_FILE;
|
|
12
12
|
const isAttributeTag = event.tagName[0] === "@";
|
|
13
13
|
if (isAttributeTag) {
|
|
14
|
-
const parentTag = utils_1.findNonControlFlowParent(event);
|
|
14
|
+
const parentTag = (0, utils_1.findNonControlFlowParent)(event);
|
|
15
15
|
tagDef =
|
|
16
16
|
parentTag &&
|
|
17
17
|
(parentTag.tagNameExpression
|
|
@@ -26,13 +26,13 @@ function openTagName(taglib, document, params, event) {
|
|
|
26
26
|
}
|
|
27
27
|
const tagEntryFile = tagDef.template || tagDef.renderer || tagDef.filePath;
|
|
28
28
|
if (/\/marko(?:-tag)?\.json$/.test(tagEntryFile)) {
|
|
29
|
-
const tagDefDoc = utils_1.createTextDocument(tagEntryFile);
|
|
30
|
-
const match = regexp_builder_1.default `/"<${event.tagName}>"\s*:\s*[^\r\n,]+/g`.exec(tagDefDoc.getText());
|
|
29
|
+
const tagDefDoc = (0, utils_1.createTextDocument)(tagEntryFile);
|
|
30
|
+
const match = (0, regexp_builder_1.default) `/"<${event.tagName}>"\s*:\s*[^\r\n,]+/g`.exec(tagDefDoc.getText());
|
|
31
31
|
if (match && match.index) {
|
|
32
32
|
range = vscode_languageserver_1.Range.create(tagDefDoc.positionAt(match.index), tagDefDoc.positionAt(match.index + match[0].length));
|
|
33
33
|
}
|
|
34
34
|
}
|
|
35
|
-
return vscode_languageserver_1.LocationLink.create(vscode_uri_1.URI.file(tagEntryFile).toString(), range, range, utils_1.rangeFromEvent(document, event));
|
|
35
|
+
return vscode_languageserver_1.LocationLink.create(vscode_uri_1.URI.file(tagEntryFile).toString(), range, range, (0, utils_1.rangeFromEvent)(document, event));
|
|
36
36
|
}
|
|
37
37
|
exports.openTagName = openTagName;
|
|
38
38
|
//# sourceMappingURL=openTagName.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openTagName.js","sourceRoot":"","sources":["../../../../src/utils/definitions/types/openTagName.ts"],"names":[],"mappings":";;;;AAAA,2CAAiC;AACjC,iEAI+B;AAI/B,
|
|
1
|
+
{"version":3,"file":"openTagName.js","sourceRoot":"","sources":["../../../../src/utils/definitions/types/openTagName.ts"],"names":[],"mappings":";;;;AAAA,2CAAiC;AACjC,iEAI+B;AAI/B,uFAAiD;AACjD,uCAKqB;AAErB,SAAgB,WAAW,CACzB,MAAoB,EACpB,QAAsB,EACtB,MAAkC,EAClC,KAA+B;IAE/B,IAAI,MAAwC,CAAC;IAC7C,IAAI,KAAK,GAAG,qBAAa,CAAC;IAC1B,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC;IAEhD,IAAI,cAAc,EAAE;QAClB,MAAM,SAAS,GAAG,IAAA,gCAAwB,EAAC,KAAK,CAAC,CAAC;QAClD,MAAM;YACJ,SAAS;gBACT,CAAC,SAAS,CAAC,iBAAiB;oBAC1B,CAAC,CAAC,SAAS;oBACX,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;KACzC;SAAM;QACL,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;KACvC;IAED,IAAI,CAAC,MAAM,EAAE;QACX,OAAO;KACR;IAED,MAAM,YAAY,GAAG,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC;IAE3E,IAAI,yBAAyB,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE;QAChD,MAAM,SAAS,GAAG,IAAA,0BAAkB,EAAC,YAAY,CAAC,CAAC;QACnD,MAAM,KAAK,GAAG,IAAA,wBAAa,EAAA,MAAM,KAAK,CAAC,OAAO,sBAAsB,CAAC,IAAI,CACvE,SAAS,CAAC,OAAO,EAAE,CACpB,CAAC;QAEF,IAAI,KAAK,IAAI,KAAK,CAAC,KAAK,EAAE;YACxB,KAAK,GAAG,6BAAK,CAAC,MAAM,CAClB,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,EACjC,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CACpD,CAAC;SACH;KACF;IAED,OAAO,oCAAY,CAAC,MAAM,CACxB,gBAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,QAAQ,EAAE,EACjC,KAAK,EACL,KAAK,EACL,IAAA,sBAAc,EAAC,QAAQ,EAAE,KAAK,CAAC,CAChC,CAAC;AACJ,CAAC;AA/CD,kCA+CC"}
|
|
@@ -11,7 +11,7 @@ function parseUntilOffset(options) {
|
|
|
11
11
|
const { offset, text, taglib, includeErrors } = options;
|
|
12
12
|
let result = null;
|
|
13
13
|
let parentTag = null;
|
|
14
|
-
const parser = htmljs_parser_1.createParser({
|
|
14
|
+
const parser = (0, htmljs_parser_1.createParser)({
|
|
15
15
|
onError: includeErrors && finish,
|
|
16
16
|
onScriptlet: finish,
|
|
17
17
|
onPlaceholder: finish,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"htmljs-parser.js","sourceRoot":"","sources":["../../src/utils/htmljs-parser.ts"],"names":[],"mappings":";;;AAAA,iDAA6C;AAqI7C,MAAM,qBAAqB,GAAG;IAC5B,GAAG,EAAE,IAAI;IACT,IAAI,EAAE,IAAI;IACV,IAAI,EAAE,IAAI;CACX,CAAC;AAEF,SAAgB,gBAAgB,CAAC,OAKhC;IACC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IACxD,IAAI,MAAM,GAA4B,IAAI,CAAC;IAC3C,IAAI,SAAS,GAA2D,IAAI,CAAC;IAC7E,MAAM,MAAM,GAAG,4BAAY,
|
|
1
|
+
{"version":3,"file":"htmljs-parser.js","sourceRoot":"","sources":["../../src/utils/htmljs-parser.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/utils.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.shiftPosition = exports.shiftRange = exports.shiftEdit = exports.shiftCompletionRanges = exports.createTextDocument = exports.rangeFromEvent = exports.findNonControlFlowParent = exports.START_OF_FILE = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const fs_1 = tslib_1.__importDefault(require("fs"));
|
|
5
|
+
const fs_1 = (0, tslib_1.__importDefault)(require("fs"));
|
|
6
6
|
const vscode_uri_1 = require("vscode-uri");
|
|
7
7
|
const vscode_languageserver_1 = require("vscode-languageserver");
|
|
8
8
|
const vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
|
package/dist/utils/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils/utils.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils/utils.ts"],"names":[],"mappings":";;;;AAAA,yDAAoB;AACpB,2CAAiC;AACjC,iEAM+B;AAC/B,2FAAkE;AAGrD,QAAA,aAAa,GAAG,6BAAK,CAAC,MAAM,CACvC,gCAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,EACrB,gCAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CACtB,CAAC;AAEF,SAAgB,wBAAwB,CAAC,GAA6B;IACpE,IAAI,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;IAExB,OAAO,MAAM,EAAE;QACb,IAAI,CAAC,+BAA+B,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE;YACzD,OAAO,MAAM,CAAC;SACf;QAED,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;KACxB;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAZD,4DAYC;AAED,SAAgB,cAAc,CAC5B,QAAsB,EACtB,KAAuB;IAEvB,OAAO,6BAAK,CAAC,MAAM,CACjB,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,EAC9B,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,CAClC,CAAC;AACJ,CAAC;AARD,wCAQC;AAED,SAAgB,kBAAkB,CAAC,QAAgB;IACjD,MAAM,GAAG,GAAG,gBAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC1C,MAAM,OAAO,GAAG,YAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACnD,OAAO,iDAAY,CAAC,MAAM,CAAC,GAAG,EAAE,WAAW,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;AAC3D,CAAC;AAJD,gDAIC;AAED,SAAgB,qBAAqB,CAAC,IAAoB,EAAE,MAAgB;IAC1E,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAC1B,IAAI,IAAI,CAAC,mBAAmB,EAAE;YAC5B,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CACxC,UAAU,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,CAC/B,CAAC;SACH;QAED,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;SAClC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AACd,CAAC;AAdD,sDAcC;AAED,SAAgB,SAAS,CACvB,IAAkC,EAClC,MAAgB;IAEhB,IAAI,gCAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE;QACrB,UAAU,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;KAChC;SAAM;QACL,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAChC,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;KAClC;AACH,CAAC;AAVD,8BAUC;AAED,SAAgB,UAAU,CAAC,KAAwB,EAAE,MAAgB;IACnE,IAAI,KAAK,EAAE;QACT,aAAa,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACnC,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;KAClC;AACH,CAAC;AALD,gCAKC;AAED,SAAgB,aAAa,CAAC,GAAa,EAAE,MAAgB;IAC3D,IAAI,GAAG,CAAC,IAAI,KAAK,CAAC,EAAE;QAClB,GAAG,CAAC,SAAS,IAAI,MAAM,CAAC,SAAS,CAAC;KACnC;IAED,GAAG,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC;IACxB,OAAO,GAAG,CAAC;AACb,CAAC;AAPD,sCAOC"}
|
package/package.json
CHANGED
|
@@ -1,25 +1,24 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@marko/language-server",
|
|
3
3
|
"description": "Marko Language Server",
|
|
4
|
-
"version": "0.
|
|
4
|
+
"version": "0.10.0",
|
|
5
5
|
"author": "Diego Berrocal",
|
|
6
6
|
"bugs": "https://github.com/marko-js/language-server/issues/new?template=Bug_report.md",
|
|
7
7
|
"bin": {
|
|
8
8
|
"marko-language-server": "./dist/bin.js"
|
|
9
9
|
},
|
|
10
10
|
"dependencies": {
|
|
11
|
-
"@marko/compiler": "^5.
|
|
12
|
-
"@marko/
|
|
13
|
-
"@marko/translator-default": "^5.15.0",
|
|
14
|
-
"@types/vscode": "^1.58.1",
|
|
11
|
+
"@marko/compiler": "^5.16.1",
|
|
12
|
+
"@marko/translator-default": "^5.16.1",
|
|
15
13
|
"lasso-package-root": "^1.0.1",
|
|
16
|
-
"
|
|
17
|
-
"
|
|
14
|
+
"marko": "^5.16.1",
|
|
15
|
+
"prettier": "^2.4.1",
|
|
16
|
+
"prettier-plugin-marko": "^1.1.2",
|
|
18
17
|
"resolve-from": "^5.0.0",
|
|
19
18
|
"tslib": "^2.2.0",
|
|
20
|
-
"vscode-css-languageservice": "^5.1.
|
|
19
|
+
"vscode-css-languageservice": "^5.1.7",
|
|
21
20
|
"vscode-languageserver": "^7.0.0",
|
|
22
|
-
"vscode-languageserver-textdocument": "^1.0.
|
|
21
|
+
"vscode-languageserver-textdocument": "^1.0.2",
|
|
23
22
|
"vscode-uri": "^3.0.2"
|
|
24
23
|
},
|
|
25
24
|
"files": [
|
|
@@ -39,5 +38,5 @@
|
|
|
39
38
|
"type": "git",
|
|
40
39
|
"url": "https://github.com/marko-js/language-server/tree/master/server"
|
|
41
40
|
},
|
|
42
|
-
"gitHead": "
|
|
41
|
+
"gitHead": "caf2b5f6382ddd230e44fb3e566055e1129a7320"
|
|
43
42
|
}
|