@adrk/mxls 1.0.6 → 1.0.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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TextAnalyzer.d.ts","sourceRoot":"","sources":["../../src/completion/TextAnalyzer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;
|
|
1
|
+
{"version":3,"file":"TextAnalyzer.d.ts","sourceRoot":"","sources":["../../src/completion/TextAnalyzer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AA4EzC,0DAA0D;AAC1D,qBAAa,YAAY;IACrB;;;OAGG;IACH,iBAAiB,CACb,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,MAAM,GACrB,cAAc;IAuBjB,mEAAmE;IACnE,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAM9C;;;OAGG;IACH,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE;IAKxC,2EAA2E;IAC3E,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE;IAIvC,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAKtC;;;;;OAKG;IACH,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IASvD,6EAA6E;IAC7E,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAIzD;;;OAGG;IACH,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;CAQnF"}
|
|
@@ -2,28 +2,46 @@ import { CompletionType } from '../types';
|
|
|
2
2
|
import { getUnclosedTags, stripNsPrefix, extractCurrentAttributeName, } from '../utils/XmlTextUtils';
|
|
3
3
|
function scan(text) {
|
|
4
4
|
let inStr = null;
|
|
5
|
+
let inComment = false;
|
|
5
6
|
let lastOpen = -1;
|
|
6
7
|
let lastClose = -1;
|
|
7
8
|
for (let i = 0; i < text.length; i++) {
|
|
8
9
|
const ch = text[i];
|
|
10
|
+
if (inComment) {
|
|
11
|
+
// Wait for --> to close the comment
|
|
12
|
+
if (ch === '-' && text[i + 1] === '-' && text[i + 2] === '>') {
|
|
13
|
+
i += 2;
|
|
14
|
+
inComment = false;
|
|
15
|
+
}
|
|
16
|
+
continue;
|
|
17
|
+
}
|
|
9
18
|
if (inStr !== null) {
|
|
10
19
|
if (ch === inStr)
|
|
11
20
|
inStr = null;
|
|
21
|
+
continue;
|
|
12
22
|
}
|
|
13
|
-
|
|
23
|
+
if (ch === '"' || ch === "'") {
|
|
14
24
|
inStr = ch;
|
|
15
25
|
}
|
|
16
26
|
else if (ch === '<') {
|
|
17
|
-
|
|
27
|
+
if (text[i + 1] === '!' && text[i + 2] === '-' && text[i + 3] === '-') {
|
|
28
|
+
inComment = true;
|
|
29
|
+
i += 3;
|
|
30
|
+
}
|
|
31
|
+
else {
|
|
32
|
+
lastOpen = i;
|
|
33
|
+
}
|
|
18
34
|
}
|
|
19
35
|
else if (ch === '>') {
|
|
20
36
|
lastClose = i;
|
|
21
37
|
}
|
|
22
38
|
}
|
|
23
|
-
return { lastOpen, lastClose, inString: inStr !== null };
|
|
39
|
+
return { lastOpen, lastClose, inString: inStr !== null, inComment };
|
|
24
40
|
}
|
|
25
41
|
function deriveType(text) {
|
|
26
|
-
const { lastOpen, lastClose, inString } = scan(text);
|
|
42
|
+
const { lastOpen, lastClose, inString, inComment } = scan(text);
|
|
43
|
+
if (inComment)
|
|
44
|
+
return CompletionType.none;
|
|
27
45
|
if (inString)
|
|
28
46
|
return CompletionType.attributeValue;
|
|
29
47
|
const insideTag = lastOpen !== -1 && lastOpen > lastClose;
|
|
@@ -58,7 +76,10 @@ export class TextAnalyzer {
|
|
|
58
76
|
case "'":
|
|
59
77
|
return CompletionType.attributeValue;
|
|
60
78
|
case ' ':
|
|
61
|
-
|
|
79
|
+
// Only suggest attributes when cursor is actually inside an opening tag
|
|
80
|
+
return deriveType(text) === CompletionType.incompleteAttribute
|
|
81
|
+
? CompletionType.incompleteAttribute
|
|
82
|
+
: CompletionType.none;
|
|
62
83
|
}
|
|
63
84
|
}
|
|
64
85
|
return deriveType(text);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TextAnalyzer.js","sourceRoot":"","sources":["../../src/completion/TextAnalyzer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AACzC,OAAO,EACH,eAAe,EACf,aAAa,EACb,2BAA2B,GAC9B,MAAM,uBAAuB,CAAA;
|
|
1
|
+
{"version":3,"file":"TextAnalyzer.js","sourceRoot":"","sources":["../../src/completion/TextAnalyzer.ts"],"names":[],"mappings":"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"}
|