yaml-language-server 1.13.1-e701d27.0 → 1.14.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/CHANGELOG.md +20 -0
- package/lib/esm/languageserver/handlers/languageHandlers.d.ts +3 -3
- package/lib/esm/languageserver/handlers/languageHandlers.js +12 -0
- package/lib/esm/languageserver/handlers/languageHandlers.js.map +1 -1
- package/lib/esm/languageservice/parser/ast-converter.js +9 -6
- package/lib/esm/languageservice/parser/ast-converter.js.map +1 -1
- package/lib/esm/languageservice/parser/jsonParser07.js +6 -1
- package/lib/esm/languageservice/parser/jsonParser07.js.map +1 -1
- package/lib/esm/languageservice/services/yamlHover.js +2 -2
- package/lib/esm/languageservice/services/yamlHover.js.map +1 -1
- package/lib/esm/languageservice/services/yamlSchemaService.js +3 -13
- package/lib/esm/languageservice/services/yamlSchemaService.js.map +1 -1
- package/lib/esm/languageservice/services/yamlSelectionRanges.d.ts +3 -0
- package/lib/esm/languageservice/services/yamlSelectionRanges.js +102 -0
- package/lib/esm/languageservice/services/yamlSelectionRanges.js.map +1 -0
- package/lib/esm/languageservice/utils/objects.d.ts +1 -1
- package/lib/esm/languageservice/yamlLanguageService.d.ts +2 -1
- package/lib/esm/languageservice/yamlLanguageService.js +2 -0
- package/lib/esm/languageservice/yamlLanguageService.js.map +1 -1
- package/lib/esm/yamlServerInit.js +1 -0
- package/lib/esm/yamlServerInit.js.map +1 -1
- package/lib/umd/languageserver/handlers/languageHandlers.d.ts +3 -3
- package/lib/umd/languageserver/handlers/languageHandlers.js +12 -0
- package/lib/umd/languageserver/handlers/languageHandlers.js.map +1 -1
- package/lib/umd/languageservice/parser/ast-converter.js +9 -6
- package/lib/umd/languageservice/parser/ast-converter.js.map +1 -1
- package/lib/umd/languageservice/parser/jsonParser07.js +6 -1
- package/lib/umd/languageservice/parser/jsonParser07.js.map +1 -1
- package/lib/umd/languageservice/services/yamlHover.js +2 -2
- package/lib/umd/languageservice/services/yamlHover.js.map +1 -1
- package/lib/umd/languageservice/services/yamlSchemaService.js +3 -13
- package/lib/umd/languageservice/services/yamlSchemaService.js.map +1 -1
- package/lib/umd/languageservice/services/yamlSelectionRanges.d.ts +3 -0
- package/lib/umd/languageservice/services/yamlSelectionRanges.js +116 -0
- package/lib/umd/languageservice/services/yamlSelectionRanges.js.map +1 -0
- package/lib/umd/languageservice/utils/objects.d.ts +1 -1
- package/lib/umd/languageservice/yamlLanguageService.d.ts +2 -1
- package/lib/umd/languageservice/yamlLanguageService.js +3 -1
- package/lib/umd/languageservice/yamlLanguageService.js.map +1 -1
- package/lib/umd/yamlServerInit.js +1 -0
- package/lib/umd/yamlServerInit.js.map +1 -1
- package/out/server/src/languageserver/handlers/languageHandlers.d.ts +3 -3
- package/out/server/src/languageserver/handlers/languageHandlers.js +12 -0
- package/out/server/src/languageserver/handlers/languageHandlers.js.map +1 -1
- package/out/server/src/languageservice/parser/ast-converter.js +9 -6
- package/out/server/src/languageservice/parser/ast-converter.js.map +1 -1
- package/out/server/src/languageservice/parser/jsonParser07.js +6 -1
- package/out/server/src/languageservice/parser/jsonParser07.js.map +1 -1
- package/out/server/src/languageservice/services/yamlHover.js +2 -2
- package/out/server/src/languageservice/services/yamlHover.js.map +1 -1
- package/out/server/src/languageservice/services/yamlSchemaService.js +3 -13
- package/out/server/src/languageservice/services/yamlSchemaService.js.map +1 -1
- package/out/server/src/languageservice/services/yamlSelectionRanges.d.ts +3 -0
- package/out/server/src/languageservice/services/yamlSelectionRanges.js +106 -0
- package/out/server/src/languageservice/services/yamlSelectionRanges.js.map +1 -0
- package/out/server/src/languageservice/utils/objects.d.ts +1 -1
- package/out/server/src/languageservice/yamlLanguageService.d.ts +2 -1
- package/out/server/src/languageservice/yamlLanguageService.js +2 -0
- package/out/server/src/languageservice/yamlLanguageService.js.map +1 -1
- package/out/server/src/yamlServerInit.js +1 -0
- package/out/server/src/yamlServerInit.js.map +1 -1
- package/out/server/test/autoCompletion.test.js +109 -107
- package/out/server/test/autoCompletion.test.js.map +1 -1
- package/out/server/test/autoCompletionFix.test.js +49 -47
- package/out/server/test/autoCompletionFix.test.js.map +1 -1
- package/out/server/test/code-action-schema.test.js +6 -6
- package/out/server/test/code-action-schema.test.js.map +1 -1
- package/out/server/test/hover.test.js +25 -25
- package/out/server/test/hover.test.js.map +1 -1
- package/out/server/test/schemaValidation.test.js +134 -80
- package/out/server/test/schemaValidation.test.js.map +1 -1
- package/out/server/test/utils/testHelper.d.ts +46 -0
- package/out/server/test/utils/testHelper.js +100 -1
- package/out/server/test/utils/testHelper.js.map +1 -1
- package/out/server/test/yamlParser.test.js +6 -0
- package/out/server/test/yamlParser.test.js.map +1 -1
- package/out/server/test/yamlSelectionRanges.test.d.ts +1 -0
- package/out/server/test/yamlSelectionRanges.test.js +180 -0
- package/out/server/test/yamlSelectionRanges.test.js.map +1 -0
- package/package.json +2 -2
- package/eslint-result.sarif +0 -3491
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlSchemaService.js","sourceRoot":"","sources":["../../../../src/languageservice/services/yamlSchemaService.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"yamlSchemaService.js","sourceRoot":"","sources":["../../../../src/languageservice/services/yamlSchemaService.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,102 @@
|
|
|
1
|
+
import { SelectionRange } from 'vscode-languageserver-types';
|
|
2
|
+
import { yamlDocumentsCache } from '../parser/yaml-documents';
|
|
3
|
+
export function getSelectionRanges(document, positions) {
|
|
4
|
+
if (!document) {
|
|
5
|
+
return;
|
|
6
|
+
}
|
|
7
|
+
const doc = yamlDocumentsCache.getYamlDocument(document);
|
|
8
|
+
return positions.map((position) => {
|
|
9
|
+
const ranges = getRanges(position);
|
|
10
|
+
let current;
|
|
11
|
+
for (const range of ranges) {
|
|
12
|
+
current = SelectionRange.create(range, current);
|
|
13
|
+
}
|
|
14
|
+
if (!current) {
|
|
15
|
+
current = SelectionRange.create({
|
|
16
|
+
start: position,
|
|
17
|
+
end: position,
|
|
18
|
+
});
|
|
19
|
+
}
|
|
20
|
+
return current;
|
|
21
|
+
});
|
|
22
|
+
function getRanges(position) {
|
|
23
|
+
const offset = document.offsetAt(position);
|
|
24
|
+
const result = [];
|
|
25
|
+
for (const ymlDoc of doc.documents) {
|
|
26
|
+
let currentNode;
|
|
27
|
+
let firstNodeOffset;
|
|
28
|
+
let isFirstNode = true;
|
|
29
|
+
ymlDoc.visit((node) => {
|
|
30
|
+
const endOffset = node.offset + node.length;
|
|
31
|
+
// Skip if end offset doesn't even reach cursor position
|
|
32
|
+
if (endOffset < offset) {
|
|
33
|
+
return true;
|
|
34
|
+
}
|
|
35
|
+
let startOffset = node.offset;
|
|
36
|
+
// Recheck start offset with the trimmed one in case of this
|
|
37
|
+
// key:
|
|
38
|
+
// - value
|
|
39
|
+
// ↑
|
|
40
|
+
if (startOffset > offset) {
|
|
41
|
+
const nodePosition = document.positionAt(startOffset);
|
|
42
|
+
if (nodePosition.line !== position.line) {
|
|
43
|
+
return true;
|
|
44
|
+
}
|
|
45
|
+
const lineBeginning = { line: nodePosition.line, character: 0 };
|
|
46
|
+
const text = document.getText({
|
|
47
|
+
start: lineBeginning,
|
|
48
|
+
end: nodePosition,
|
|
49
|
+
});
|
|
50
|
+
if (text.trim().length !== 0) {
|
|
51
|
+
return true;
|
|
52
|
+
}
|
|
53
|
+
startOffset = document.offsetAt(lineBeginning);
|
|
54
|
+
if (startOffset > offset) {
|
|
55
|
+
return true;
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
// Allow equal for children to override
|
|
59
|
+
if (!currentNode || startOffset >= currentNode.offset) {
|
|
60
|
+
currentNode = node;
|
|
61
|
+
firstNodeOffset = startOffset;
|
|
62
|
+
}
|
|
63
|
+
return true;
|
|
64
|
+
});
|
|
65
|
+
while (currentNode) {
|
|
66
|
+
const startOffset = isFirstNode ? firstNodeOffset : currentNode.offset;
|
|
67
|
+
const endOffset = currentNode.offset + currentNode.length;
|
|
68
|
+
const range = {
|
|
69
|
+
start: document.positionAt(startOffset),
|
|
70
|
+
end: document.positionAt(endOffset),
|
|
71
|
+
};
|
|
72
|
+
const text = document.getText(range);
|
|
73
|
+
const trimmedText = text.trimEnd();
|
|
74
|
+
const trimmedLength = text.length - trimmedText.length;
|
|
75
|
+
if (trimmedLength > 0) {
|
|
76
|
+
range.end = document.positionAt(endOffset - trimmedLength);
|
|
77
|
+
}
|
|
78
|
+
// Add a jump between '' "" {} []
|
|
79
|
+
const isSurroundedBy = (startCharacter, endCharacter) => {
|
|
80
|
+
return trimmedText.startsWith(startCharacter) && trimmedText.endsWith(endCharacter || startCharacter);
|
|
81
|
+
};
|
|
82
|
+
if ((currentNode.type === 'string' && (isSurroundedBy("'") || isSurroundedBy('"'))) ||
|
|
83
|
+
(currentNode.type === 'object' && isSurroundedBy('{', '}')) ||
|
|
84
|
+
(currentNode.type === 'array' && isSurroundedBy('[', ']'))) {
|
|
85
|
+
result.push({
|
|
86
|
+
start: document.positionAt(startOffset + 1),
|
|
87
|
+
end: document.positionAt(endOffset - 1),
|
|
88
|
+
});
|
|
89
|
+
}
|
|
90
|
+
result.push(range);
|
|
91
|
+
currentNode = currentNode.parent;
|
|
92
|
+
isFirstNode = false;
|
|
93
|
+
}
|
|
94
|
+
// A position can't be in multiple documents
|
|
95
|
+
if (result.length > 0) {
|
|
96
|
+
break;
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
return result.reverse();
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
//# sourceMappingURL=yamlSelectionRanges.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"yamlSelectionRanges.js","sourceRoot":"","sources":["../../../../src/languageservice/services/yamlSelectionRanges.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export declare function equals(one: any, other: any): boolean;
|
|
2
2
|
export declare function isNumber(val: unknown): val is number;
|
|
3
|
-
export declare function isDefined(val: unknown): val is object;
|
|
3
|
+
export declare function isDefined(val: unknown): val is object | string | number | boolean;
|
|
4
4
|
export declare function isBoolean(val: unknown): val is boolean;
|
|
5
5
|
export declare function isString(val: unknown): val is string;
|
|
6
6
|
/**
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { CustomSchemaProvider, SchemaAdditions, SchemaDeletions, SchemaDeletionsAll } from './services/yamlSchemaService';
|
|
2
|
-
import { Position, CodeAction, CompletionList, Diagnostic, Hover, SymbolInformation, DocumentSymbol, FoldingRange, TextEdit, DocumentLink, CodeLens, DefinitionLink } from 'vscode-languageserver-types';
|
|
2
|
+
import { Position, CodeAction, CompletionList, Diagnostic, Hover, SymbolInformation, DocumentSymbol, FoldingRange, TextEdit, DocumentLink, CodeLens, DefinitionLink, SelectionRange } from 'vscode-languageserver-types';
|
|
3
3
|
import { JSONSchema } from './jsonSchema';
|
|
4
4
|
import { DocumentSymbolsContext } from 'vscode-json-languageservice';
|
|
5
5
|
import { ClientCapabilities, CodeActionParams, Connection, DocumentOnTypeFormattingParams, DefinitionParams } from 'vscode-languageserver';
|
|
@@ -116,6 +116,7 @@ export interface LanguageService {
|
|
|
116
116
|
deleteSchemaContent(schemaDeletions: SchemaDeletions): void;
|
|
117
117
|
deleteSchemasWhole(schemaDeletions: SchemaDeletionsAll): void;
|
|
118
118
|
getFoldingRanges(document: TextDocument, context: FoldingRangesContext): FoldingRange[] | null;
|
|
119
|
+
getSelectionRanges(document: TextDocument, positions: Position[]): SelectionRange[] | undefined;
|
|
119
120
|
getCodeAction(document: TextDocument, params: CodeActionParams): CodeAction[] | undefined;
|
|
120
121
|
getCodeLens(document: TextDocument): Thenable<CodeLens[] | undefined> | CodeLens[] | undefined;
|
|
121
122
|
resolveCodeLens(param: CodeLens): Thenable<CodeLens> | CodeLens;
|
|
@@ -17,6 +17,7 @@ import { YamlCompletion } from './services/yamlCompletion';
|
|
|
17
17
|
import { yamlDocumentsCache } from './parser/yaml-documents';
|
|
18
18
|
import { JSONSchemaSelection } from '../languageserver/handlers/schemaSelectionHandlers';
|
|
19
19
|
import { YamlDefinition } from './services/yamlDefinition';
|
|
20
|
+
import { getSelectionRanges } from './services/yamlSelectionRanges';
|
|
20
21
|
export var SchemaPriority;
|
|
21
22
|
(function (SchemaPriority) {
|
|
22
23
|
SchemaPriority[SchemaPriority["SchemaStore"] = 1] = "SchemaStore";
|
|
@@ -83,6 +84,7 @@ export function getLanguageService(params) {
|
|
|
83
84
|
return schemaService.deleteSchemas(schemaDeletions);
|
|
84
85
|
},
|
|
85
86
|
getFoldingRanges,
|
|
87
|
+
getSelectionRanges,
|
|
86
88
|
getCodeAction: (document, params) => {
|
|
87
89
|
return yamlCodeActions.getCodeAction(document, params);
|
|
88
90
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlLanguageService.js","sourceRoot":"","sources":["../../../src/languageservice/yamlLanguageService.ts"],"names":[],"mappings":"AAAA;;;;gGAIgG;AAEhG,OAAO,EACL,iBAAiB,GAKlB,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"yamlLanguageService.js","sourceRoot":"","sources":["../../../src/languageservice/yamlLanguageService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlServerInit.js","sourceRoot":"","sources":["../../src/yamlServerInit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkD,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7G,OAAO,EACL,kBAAkB,IAAI,wBAAwB,GAI/C,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AACxE,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAEjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,4CAA4C,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,gDAAgD,CAAC;AACtF,OAAO,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AAC5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,8CAA8C,CAAC;AACjF,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAEnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAE3E,MAAM,OAAO,cAAc;IAMzB,YACmB,UAAsB,EAC/B,YAA2B,EAC3B,gBAAyC,EACzC,oBAA0C,EAC1C,SAAoB;QAJX,eAAU,GAAV,UAAU,CAAY;QAC/B,iBAAY,GAAZ,YAAY,CAAe;QAC3B,qBAAgB,GAAhB,gBAAgB,CAAyB;QACzC,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,cAAS,GAAT,SAAS,CAAW;QAE5B,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAEpD;;;WAGG;QACH,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,MAAwB,EAAoB,EAAE;YAC1E,OAAO,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE;YACjC,IAAI,IAAI,CAAC,YAAY,CAAC,yCAAyC,EAAE;gBAC/D,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,2BAA2B,CAAC,CAAC,cAAc,EAAE,EAAE;oBACvE,IAAI,CAAC,YAAY,CAAC,gBAAgB,GAAG,uBAAuB,CAAC,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC;gBACnH,CAAC,CAAC,CAAC;aACJ;YACD,iDAAiD;YACjD,IAAI,CAAC,eAAe,CAAC,gBAAgB,EAAE,CAAC;YACxC,IAAI,CAAC,eAAe,CAAC,iBAAiB,EAAE,CAAC;QAC3C,CAAC,CAAC,CAAC;IACL,CAAC;IAED,wBAAwB;IACxB,qBAAqB,CAAC,MAAwB;QAC5C,IAAI,CAAC,YAAY,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;QACrD,IAAI,CAAC,eAAe,GAAG,wBAAwB,CAAC;YAC9C,oBAAoB,EAAE,IAAI,CAAC,oBAAoB;YAC/C,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,kBAAkB,EAAE,MAAM,CAAC,YAAY;SACxC,CAAC,CAAC;QAEH,uFAAuF;QACvF,IAAI,MAAM,CAAC,OAAO,EAAE;YAClB,IAAI,CAAC,YAAY,CAAC,aAAa,GAAG,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;SAC7D;QACD,IAAI,CAAC,YAAY,CAAC,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,IAAI,EAAE,CAAC;QAEnE,IAAI,CAAC,YAAY,CAAC,iCAAiC,GAAG,CAAC,CAAC,CACtD,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,YAAY;YAC3C,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,YAAY,CAAC,cAAc;YAC1D,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,YAAY,CAAC,cAAc,CAAC,iCAAiC,CAC7F,CAAC;QACF,IAAI,CAAC,YAAY,CAAC,4BAA4B,GAAG,CAAC,CAAC,CACjD,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,YAAY;YAC3C,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,YAAY,CAAC,eAAe;YAC3D,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,YAAY,CAAC,eAAe,CAAC,mBAAmB,CAChF,CAAC;QACF,IAAI,CAAC,YAAY,CAAC,4BAA4B;YAC5C,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,SAAS,IAAI,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,SAAS,CAAC,gBAAgB,CAAC;QAE1G,IAAI,CAAC,YAAY,CAAC,0BAA0B,GAAG,CAAC,CAAC,CAC/C,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,SAAS,IAAI,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,SAAS,CAAC,aAAa,CACrG,CAAC;QAEF,IAAI,CAAC,YAAY,CAAC,yCAAyC,GAAG,CAAC,CAAC,CAC9D,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,SAAS;YACxC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,SAAS,CAAC,qBAAqB;YAC9D,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,SAAS,CAAC,qBAAqB,CAAC,mBAAmB,CACnF,CAAC;QACF,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,gBAAgB,CAAC,eAAe,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QAEnD,OAAO;YACL,YAAY,EAAE;gBACZ,gBAAgB,EAAE,oBAAoB,CAAC,WAAW;gBAClD,kBAAkB,EAAE,EAAE,eAAe,EAAE,KAAK,EAAE;gBAC9C,aAAa,EAAE,IAAI;gBACnB,sBAAsB,EAAE,IAAI;gBAC5B,0BAA0B,EAAE,KAAK;gBACjC,gCAAgC,EAAE;oBAChC,qBAAqB,EAAE,IAAI;iBAC5B;gBACD,+BAA+B,EAAE,KAAK;gBACtC,kBAAkB,EAAE,IAAI;gBACxB,oBAAoB,EAAE,EAAE;gBACxB,oBAAoB,EAAE,IAAI;gBAC1B,kBAAkB,EAAE,IAAI;gBACxB,gBAAgB,EAAE;oBAChB,eAAe,EAAE,KAAK;iBACvB;gBACD,sBAAsB,EAAE;oBACtB,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;iBAChE;gBACD,SAAS,EAAE;oBACT,gBAAgB,EAAE;wBAChB,mBAAmB,EAAE,IAAI;wBACzB,SAAS,EAAE,IAAI;qBAChB;iBACF;aACF;SACF,CAAC;IACJ,CAAC;IAEO,gBAAgB;QACtB,qDAAqD;QACrD,IAAI,CAAC,iBAAiB,GAAG,IAAI,iBAAiB,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QACzG,IAAI,CAAC,eAAe,GAAG,IAAI,eAAe,CACxC,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,iBAAiB,EACtB,IAAI,CAAC,SAAS,CACf,CAAC;QACF,2CAA2C;QAC3C,IAAI,CAAC,eAAe,GAAG,IAAI,gBAAgB,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC9H,IAAI,CAAC,eAAe,CAAC,gBAAgB,EAAE,CAAC;QACxC,IAAI,oBAAoB,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAC5H,IAAI,eAAe,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAC9E,IAAI,iBAAiB,CAAC,IAAI,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC7E,CAAC;IAED,KAAK;QACH,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;IAC3B,CAAC;CACF"}
|
|
1
|
+
{"version":3,"file":"yamlServerInit.js","sourceRoot":"","sources":["../../src/yamlServerInit.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import { FoldingRange } from 'vscode-json-languageservice';
|
|
3
2
|
import { Connection } from 'vscode-languageserver';
|
|
4
|
-
import { CodeActionParams, DidChangeWatchedFilesParams, DocumentFormattingParams, DocumentLinkParams, DocumentOnTypeFormattingParams, DocumentSymbolParams, FoldingRangeParams, TextDocumentPositionParams, CodeLensParams, DefinitionParams } from 'vscode-languageserver-protocol';
|
|
5
|
-
import { CodeAction, CodeLens, CompletionList, DefinitionLink, DocumentLink, DocumentSymbol, Hover, SymbolInformation, TextEdit } from 'vscode-languageserver-types';
|
|
3
|
+
import { CodeActionParams, DidChangeWatchedFilesParams, DocumentFormattingParams, DocumentLinkParams, DocumentOnTypeFormattingParams, DocumentSymbolParams, FoldingRangeParams, SelectionRangeParams, TextDocumentPositionParams, CodeLensParams, DefinitionParams } from 'vscode-languageserver-protocol';
|
|
4
|
+
import { CodeAction, CodeLens, CompletionList, DefinitionLink, DocumentLink, DocumentSymbol, Hover, FoldingRange, SelectionRange, SymbolInformation, TextEdit } from 'vscode-languageserver-types';
|
|
6
5
|
import { LanguageService } from '../../languageservice/yamlLanguageService';
|
|
7
6
|
import { SettingsState } from '../../yamlSettings';
|
|
8
7
|
import { ValidationHandler } from './validationHandlers';
|
|
@@ -49,6 +48,7 @@ export declare class LanguageHandlers {
|
|
|
49
48
|
*/
|
|
50
49
|
watchedFilesHandler(change: DidChangeWatchedFilesParams): void;
|
|
51
50
|
foldingRangeHandler(params: FoldingRangeParams): Promise<FoldingRange[] | undefined> | FoldingRange[] | undefined;
|
|
51
|
+
selectionRangeHandler(params: SelectionRangeParams): SelectionRange[] | undefined;
|
|
52
52
|
codeActionHandler(params: CodeActionParams): CodeAction[] | undefined;
|
|
53
53
|
codeLensHandler(params: CodeLensParams): Thenable<CodeLens[] | undefined> | CodeLens[] | undefined;
|
|
54
54
|
codeLensResolveHandler(param: CodeLens): Thenable<CodeLens> | CodeLens;
|
|
@@ -1,3 +1,7 @@
|
|
|
1
|
+
/*---------------------------------------------------------------------------------------------
|
|
2
|
+
* Copyright (c) Red Hat, Inc. All rights reserved.
|
|
3
|
+
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
4
|
+
*--------------------------------------------------------------------------------------------*/
|
|
1
5
|
(function (factory) {
|
|
2
6
|
if (typeof module === "object" && typeof module.exports === "object") {
|
|
3
7
|
var v = factory(require, exports);
|
|
@@ -29,6 +33,7 @@
|
|
|
29
33
|
this.connection.onCompletion((textDocumentPosition) => this.completionHandler(textDocumentPosition));
|
|
30
34
|
this.connection.onDidChangeWatchedFiles((change) => this.watchedFilesHandler(change));
|
|
31
35
|
this.connection.onFoldingRanges((params) => this.foldingRangeHandler(params));
|
|
36
|
+
this.connection.onSelectionRanges((params) => this.selectionRangeHandler(params));
|
|
32
37
|
this.connection.onCodeAction((params) => this.codeActionHandler(params));
|
|
33
38
|
this.connection.onDocumentOnTypeFormatting((params) => this.formatOnTypeHandler(params));
|
|
34
39
|
this.connection.onCodeLens((params) => this.codeLensHandler(params));
|
|
@@ -140,6 +145,13 @@
|
|
|
140
145
|
};
|
|
141
146
|
return this.languageService.getFoldingRanges(textDocument, context);
|
|
142
147
|
}
|
|
148
|
+
selectionRangeHandler(params) {
|
|
149
|
+
const textDocument = this.yamlSettings.documents.get(params.textDocument.uri);
|
|
150
|
+
if (!textDocument) {
|
|
151
|
+
return;
|
|
152
|
+
}
|
|
153
|
+
return this.languageService.getSelectionRanges(textDocument, params.positions);
|
|
154
|
+
}
|
|
143
155
|
codeActionHandler(params) {
|
|
144
156
|
const textDocument = this.yamlSettings.documents.get(params.textDocument.uri);
|
|
145
157
|
if (!textDocument) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"languageHandlers.js","sourceRoot":"","sources":["../../../../src/languageserver/handlers/languageHandlers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"languageHandlers.js","sourceRoot":"","sources":["../../../../src/languageserver/handlers/languageHandlers.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,7 @@
|
|
|
18
18
|
const jsonParser07_1 = require("./jsonParser07");
|
|
19
19
|
const maxRefCount = 1000;
|
|
20
20
|
let refDepth = 0;
|
|
21
|
+
const seenAlias = new Set();
|
|
21
22
|
function convertAST(parent, node, doc, lineCounter) {
|
|
22
23
|
if (!parent) {
|
|
23
24
|
// first invocation
|
|
@@ -38,12 +39,14 @@
|
|
|
38
39
|
if ((0, yaml_1.isScalar)(node)) {
|
|
39
40
|
return convertScalar(node, parent);
|
|
40
41
|
}
|
|
41
|
-
if ((0, yaml_1.isAlias)(node)) {
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
42
|
+
if ((0, yaml_1.isAlias)(node) && !seenAlias.has(node) && refDepth < maxRefCount) {
|
|
43
|
+
seenAlias.add(node);
|
|
44
|
+
const converted = convertAlias(node, parent, doc, lineCounter);
|
|
45
|
+
seenAlias.delete(node);
|
|
46
|
+
return converted;
|
|
47
|
+
}
|
|
48
|
+
else {
|
|
49
|
+
return;
|
|
47
50
|
}
|
|
48
51
|
}
|
|
49
52
|
exports.convertAST = convertAST;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ast-converter.js","sourceRoot":"","sources":["../../../../src/languageservice/parser/ast-converter.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;;;;;;;;;;;;;IAEhG,+BAec;IAEd,iDAQwB;IAIxB,MAAM,WAAW,GAAG,IAAI,CAAC;IACzB,IAAI,QAAQ,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"ast-converter.js","sourceRoot":"","sources":["../../../../src/languageservice/parser/ast-converter.ts"],"names":[],"mappings":"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"}
|
|
@@ -636,6 +636,10 @@
|
|
|
636
636
|
validationResult.merge(bestMatch.validationResult);
|
|
637
637
|
validationResult.propertiesMatches += bestMatch.validationResult.propertiesMatches;
|
|
638
638
|
validationResult.propertiesValueMatches += bestMatch.validationResult.propertiesValueMatches;
|
|
639
|
+
validationResult.enumValueMatch = validationResult.enumValueMatch || bestMatch.validationResult.enumValueMatch;
|
|
640
|
+
if (bestMatch.validationResult.enumValues?.length) {
|
|
641
|
+
validationResult.enumValues = (validationResult.enumValues || []).concat(bestMatch.validationResult.enumValues);
|
|
642
|
+
}
|
|
639
643
|
matchingSchemas.merge(bestMatch.matchingSchemas);
|
|
640
644
|
}
|
|
641
645
|
return matches.length;
|
|
@@ -718,7 +722,8 @@
|
|
|
718
722
|
}
|
|
719
723
|
if ((0, objects_1.isDefined)(schema.const)) {
|
|
720
724
|
const val = getNodeValue(node);
|
|
721
|
-
if (!(0, objects_1.equals)(val, schema.const)
|
|
725
|
+
if (!(0, objects_1.equals)(val, schema.const) &&
|
|
726
|
+
!(callFromAutoComplete && (0, objects_1.isString)(val) && (0, objects_1.isString)(schema.const) && schema.const.startsWith(val))) {
|
|
722
727
|
validationResult.problems.push({
|
|
723
728
|
location: { offset: node.offset, length: node.length },
|
|
724
729
|
severity: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
|