@astrojs/language-server 0.11.0 → 0.12.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 +6 -0
- package/bin/browserServer.js +3 -0
- package/bin/nodeServer.js +3 -0
- package/dist/browser.d.ts +1 -0
- package/dist/browser.js +8 -0
- package/dist/check.js +2 -5
- package/dist/core/DiagnosticsManager.d.ts +3 -3
- package/dist/core/DiagnosticsManager.js +2 -2
- package/dist/core/config/ConfigManager.d.ts +19 -164
- package/dist/core/config/ConfigManager.js +62 -101
- package/dist/core/config/index.d.ts +1 -0
- package/dist/core/config/index.js +1 -0
- package/dist/core/config/interfaces.d.ts +123 -0
- package/dist/core/config/interfaces.js +2 -0
- package/dist/core/documents/AstroDocument.d.ts +18 -0
- package/dist/core/documents/AstroDocument.js +37 -0
- package/dist/core/documents/DocumentBase.d.ts +10 -2
- package/dist/core/documents/DocumentBase.js +15 -50
- package/dist/core/documents/DocumentManager.d.ts +12 -16
- package/dist/core/documents/DocumentManager.js +32 -26
- package/dist/core/documents/DocumentMapper.js +3 -1
- package/dist/core/documents/index.d.ts +1 -1
- package/dist/core/documents/index.js +1 -1
- package/dist/core/documents/parseAstro.d.ts +2 -2
- package/dist/core/documents/parseHtml.d.ts +2 -2
- package/dist/core/documents/parseHtml.js +4 -1
- package/dist/core/documents/utils.d.ts +22 -26
- package/dist/core/documents/utils.js +96 -134
- package/dist/index.d.ts +0 -1
- package/dist/index.js +1 -3
- package/dist/node.d.ts +1 -0
- package/dist/node.js +29 -0
- package/dist/plugins/PluginHost.d.ts +8 -9
- package/dist/plugins/PluginHost.js +22 -36
- package/dist/plugins/astro/AstroPlugin.d.ts +11 -12
- package/dist/plugins/astro/AstroPlugin.js +17 -42
- package/dist/plugins/astro/features/{CompletionProvider.d.ts → CompletionsProvider.d.ts} +5 -5
- package/dist/plugins/astro/features/{CompletionProvider.js → CompletionsProvider.js} +33 -58
- package/dist/plugins/css/CSSDocument.d.ts +3 -3
- package/dist/plugins/css/CSSDocument.js +7 -16
- package/dist/plugins/css/CSSPlugin.d.ts +19 -11
- package/dist/plugins/css/CSSPlugin.js +63 -41
- package/dist/plugins/css/StyleAttributeDocument.d.ts +2 -2
- package/dist/plugins/css/StyleAttributeDocument.js +2 -2
- package/dist/plugins/css/features/astro-selectors.d.ts +2 -0
- package/dist/plugins/css/features/astro-selectors.js +16 -0
- package/dist/plugins/css/features/{getIdClassCompletion.d.ts → getIdClassCompletions.d.ts} +3 -3
- package/dist/plugins/css/features/{getIdClassCompletion.js → getIdClassCompletions.js} +10 -9
- package/dist/plugins/css/{service.d.ts → language-service.d.ts} +0 -0
- package/dist/plugins/css/{service.js → language-service.js} +2 -1
- package/dist/plugins/html/HTMLPlugin.d.ts +15 -17
- package/dist/plugins/html/HTMLPlugin.js +33 -41
- package/dist/plugins/index.d.ts +2 -2
- package/dist/plugins/index.js +2 -2
- package/dist/plugins/interfaces.d.ts +35 -48
- package/dist/plugins/typescript/LanguageServiceManager.d.ts +33 -14
- package/dist/plugins/typescript/LanguageServiceManager.js +57 -32
- package/dist/plugins/typescript/TypeScriptPlugin.d.ts +16 -23
- package/dist/plugins/typescript/TypeScriptPlugin.js +43 -55
- package/dist/plugins/typescript/astro-sys.d.ts +5 -3
- package/dist/plugins/typescript/astro-sys.js +24 -45
- package/dist/plugins/typescript/features/CompletionsProvider.d.ts +6 -6
- package/dist/plugins/typescript/features/CompletionsProvider.js +17 -37
- package/dist/plugins/typescript/features/DiagnosticsProvider.d.ts +4 -4
- package/dist/plugins/typescript/features/DiagnosticsProvider.js +22 -61
- package/dist/plugins/typescript/features/HoverProvider.d.ts +4 -5
- package/dist/plugins/typescript/features/HoverProvider.js +9 -10
- package/dist/plugins/typescript/features/SignatureHelpProvider.d.ts +4 -5
- package/dist/plugins/typescript/features/SignatureHelpProvider.js +15 -11
- package/dist/plugins/typescript/features/utils.d.ts +1 -12
- package/dist/plugins/typescript/features/utils.js +2 -22
- package/dist/plugins/typescript/language-service.d.ts +38 -0
- package/dist/plugins/typescript/language-service.js +227 -0
- package/dist/plugins/typescript/module-loader.d.ts +5 -8
- package/dist/plugins/typescript/module-loader.js +43 -23
- package/dist/plugins/typescript/snapshots/DocumentSnapshot.d.ts +90 -0
- package/dist/plugins/typescript/snapshots/DocumentSnapshot.js +135 -0
- package/dist/plugins/typescript/snapshots/SnapshotManager.d.ts +42 -0
- package/dist/plugins/typescript/snapshots/SnapshotManager.js +197 -0
- package/dist/plugins/typescript/snapshots/utils.d.ts +28 -0
- package/dist/plugins/typescript/snapshots/utils.js +84 -0
- package/dist/plugins/typescript/utils.d.ts +8 -12
- package/dist/plugins/typescript/utils.js +105 -158
- package/dist/server.d.ts +2 -4
- package/dist/server.js +88 -54
- package/dist/utils.d.ts +16 -8
- package/dist/utils.js +29 -14
- package/package.json +18 -12
- package/bin/server.js +0 -7
- package/dist/core/documents/Document.d.ts +0 -51
- package/dist/core/documents/Document.js +0 -135
- package/dist/plugins/typescript/DocumentSnapshot.d.ts +0 -99
- package/dist/plugins/typescript/DocumentSnapshot.js +0 -259
- package/dist/plugins/typescript/SnapshotManager.d.ts +0 -24
- package/dist/plugins/typescript/SnapshotManager.js +0 -103
- package/dist/plugins/typescript/languageService.d.ts +0 -17
- package/dist/plugins/typescript/languageService.js +0 -173
- package/types/index.d.ts +0 -4
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import type { AppCompletionList } from '../../interfaces';
|
|
2
|
-
import type {
|
|
2
|
+
import type { AstroDocument, DocumentManager } from '../../../core/documents';
|
|
3
3
|
import { CompletionContext, Position } from 'vscode-languageserver';
|
|
4
4
|
import { LanguageServiceManager as TypeScriptLanguageServiceManager } from '../../typescript/LanguageServiceManager';
|
|
5
|
-
export declare class
|
|
5
|
+
export declare class CompletionsProviderImpl {
|
|
6
6
|
private readonly docManager;
|
|
7
|
-
private readonly
|
|
8
|
-
constructor(docManager: DocumentManager,
|
|
9
|
-
getCompletions(document:
|
|
7
|
+
private readonly languageServiceManager;
|
|
8
|
+
constructor(docManager: DocumentManager, languageServiceManager: TypeScriptLanguageServiceManager);
|
|
9
|
+
getCompletions(document: AstroDocument, position: Position, completionContext?: CompletionContext): Promise<AppCompletionList | null>;
|
|
10
10
|
private getClientHintCompletion;
|
|
11
11
|
private getComponentScriptCompletion;
|
|
12
12
|
private getPropCompletions;
|
|
@@ -1,38 +1,18 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var
|
|
3
|
-
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
24
4
|
};
|
|
25
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.
|
|
6
|
+
exports.CompletionsProviderImpl = void 0;
|
|
27
7
|
const vscode_languageserver_1 = require("vscode-languageserver");
|
|
28
|
-
const
|
|
8
|
+
const typescript_1 = __importDefault(require("typescript"));
|
|
29
9
|
const utils_1 = require("../../../core/documents/utils");
|
|
30
10
|
const utils_2 = require("../../../utils");
|
|
31
11
|
const utils_3 = require("../../typescript/utils");
|
|
32
|
-
class
|
|
33
|
-
constructor(docManager,
|
|
12
|
+
class CompletionsProviderImpl {
|
|
13
|
+
constructor(docManager, languageServiceManager) {
|
|
34
14
|
this.docManager = docManager;
|
|
35
|
-
this.
|
|
15
|
+
this.languageServiceManager = languageServiceManager;
|
|
36
16
|
}
|
|
37
17
|
async getCompletions(document, position, completionContext) {
|
|
38
18
|
const doc = this.docManager.get(document.uri);
|
|
@@ -80,8 +60,8 @@ class CompletionProvider {
|
|
|
80
60
|
{
|
|
81
61
|
label: ':media',
|
|
82
62
|
insertText: 'media',
|
|
83
|
-
commitCharacters: ['m']
|
|
84
|
-
}
|
|
63
|
+
commitCharacters: ['m'],
|
|
64
|
+
},
|
|
85
65
|
];
|
|
86
66
|
}
|
|
87
67
|
getComponentScriptCompletion(document, position, completionContext) {
|
|
@@ -95,18 +75,22 @@ class CompletionProvider {
|
|
|
95
75
|
commitCharacters: ['-'],
|
|
96
76
|
};
|
|
97
77
|
const prefix = document.getLineUntilOffset(document.offsetAt(position));
|
|
98
|
-
if (document.
|
|
78
|
+
if (document.astroMeta.frontmatter.state === null) {
|
|
99
79
|
return {
|
|
100
80
|
...base,
|
|
101
81
|
insertText: '---\n$0\n---',
|
|
102
|
-
textEdit: prefix.match(/^\s*\-+/)
|
|
82
|
+
textEdit: prefix.match(/^\s*\-+/)
|
|
83
|
+
? vscode_languageserver_1.TextEdit.replace({ start: { ...position, character: 0 }, end: position }, '---\n$0\n---')
|
|
84
|
+
: undefined,
|
|
103
85
|
};
|
|
104
86
|
}
|
|
105
|
-
if (document.
|
|
87
|
+
if (document.astroMeta.frontmatter.state === 'open') {
|
|
106
88
|
return {
|
|
107
89
|
...base,
|
|
108
90
|
insertText: '---',
|
|
109
|
-
textEdit: prefix.match(/^\s*\-+/)
|
|
91
|
+
textEdit: prefix.match(/^\s*\-+/)
|
|
92
|
+
? vscode_languageserver_1.TextEdit.replace({ start: { ...position, character: 0 }, end: position }, '---')
|
|
93
|
+
: undefined,
|
|
110
94
|
};
|
|
111
95
|
}
|
|
112
96
|
return null;
|
|
@@ -127,15 +111,17 @@ class CompletionProvider {
|
|
|
127
111
|
return [];
|
|
128
112
|
}
|
|
129
113
|
// If inside of attribute value, skip.
|
|
130
|
-
if (completionContext &&
|
|
114
|
+
if (completionContext &&
|
|
115
|
+
completionContext.triggerKind === vscode_languageserver_1.CompletionTriggerKind.TriggerCharacter &&
|
|
116
|
+
completionContext.triggerCharacter === '"') {
|
|
131
117
|
return [];
|
|
132
118
|
}
|
|
133
119
|
const componentName = node.tag;
|
|
134
|
-
const { lang
|
|
120
|
+
const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);
|
|
135
121
|
// Get the source file
|
|
136
122
|
const filePath = (0, utils_2.urlToPath)(document.uri);
|
|
137
123
|
const tsFilePath = (0, utils_3.toVirtualAstroFilePath)(filePath);
|
|
138
|
-
const program =
|
|
124
|
+
const program = lang.getProgram();
|
|
139
125
|
const sourceFile = program === null || program === void 0 ? void 0 : program.getSourceFile(tsFilePath);
|
|
140
126
|
const typeChecker = program === null || program === void 0 ? void 0 : program.getTypeChecker();
|
|
141
127
|
if (!sourceFile || !typeChecker) {
|
|
@@ -156,14 +142,14 @@ class CompletionProvider {
|
|
|
156
142
|
// Add completions for this types props
|
|
157
143
|
for (let baseType of componentType.getBaseTypes() || []) {
|
|
158
144
|
const members = ((_a = baseType.getSymbol()) === null || _a === void 0 ? void 0 : _a.members) || [];
|
|
159
|
-
members.forEach(mem => {
|
|
145
|
+
members.forEach((mem) => {
|
|
160
146
|
let completionItem = this.getCompletionItemForTypeMember(mem, typeChecker);
|
|
161
147
|
completionItems.push(completionItem);
|
|
162
148
|
});
|
|
163
149
|
}
|
|
164
150
|
// Add completions for this types base members
|
|
165
151
|
const members = ((_b = componentType.getSymbol()) === null || _b === void 0 ? void 0 : _b.members) || [];
|
|
166
|
-
members.forEach(mem => {
|
|
152
|
+
members.forEach((mem) => {
|
|
167
153
|
let completionItem = this.getCompletionItemForTypeMember(mem, typeChecker);
|
|
168
154
|
completionItems.push(completionItem);
|
|
169
155
|
});
|
|
@@ -172,19 +158,20 @@ class CompletionProvider {
|
|
|
172
158
|
getImportedSymbol(sourceFile, identifier) {
|
|
173
159
|
for (let list of sourceFile.getChildren()) {
|
|
174
160
|
for (let node of list.getChildren()) {
|
|
175
|
-
if (
|
|
161
|
+
if (typescript_1.default.isImportDeclaration(node)) {
|
|
176
162
|
let clauses = node.importClause;
|
|
177
163
|
if (!clauses)
|
|
178
164
|
return null;
|
|
179
165
|
let namedImport = clauses.getChildAt(0);
|
|
180
|
-
if (
|
|
181
|
-
for (let imp of namedImport.elements) {
|
|
166
|
+
if (typescript_1.default.isNamedImports(namedImport)) {
|
|
167
|
+
for (let imp of namedImport.elements) {
|
|
168
|
+
// Iterate the named imports
|
|
182
169
|
if (imp.name.getText() === identifier) {
|
|
183
170
|
return imp;
|
|
184
171
|
}
|
|
185
172
|
}
|
|
186
173
|
}
|
|
187
|
-
else if (
|
|
174
|
+
else if (typescript_1.default.isIdentifier(namedImport)) {
|
|
188
175
|
if (namedImport.getText() === identifier) {
|
|
189
176
|
return namedImport;
|
|
190
177
|
}
|
|
@@ -200,21 +187,9 @@ class CompletionProvider {
|
|
|
200
187
|
return null;
|
|
201
188
|
}
|
|
202
189
|
for (const decl of (sym === null || sym === void 0 ? void 0 : sym.getDeclarations()) || []) {
|
|
203
|
-
const fileName = decl.getSourceFile().fileName;
|
|
204
|
-
if ((
|
|
205
|
-
if (!
|
|
206
|
-
console.error(`Unexpected: .astro files should export a default function for the component definition.`);
|
|
207
|
-
continue;
|
|
208
|
-
}
|
|
209
|
-
const fn = decl;
|
|
210
|
-
if (!fn.parameters.length)
|
|
211
|
-
continue;
|
|
212
|
-
const param1 = fn.parameters[0];
|
|
213
|
-
const type = typeChecker.getTypeAtLocation(param1);
|
|
214
|
-
return type;
|
|
215
|
-
}
|
|
216
|
-
else if (fileName.endsWith('.tsx') || fileName.endsWith('.jsx')) {
|
|
217
|
-
if (!ts.isFunctionDeclaration(decl)) {
|
|
190
|
+
const fileName = (0, utils_3.toVirtualFilePath)(decl.getSourceFile().fileName);
|
|
191
|
+
if (fileName.endsWith('.tsx') || fileName.endsWith('.jsx')) {
|
|
192
|
+
if (!typescript_1.default.isFunctionDeclaration(decl)) {
|
|
218
193
|
console.error(`We only support function components for tsx/jsx at the moment.`);
|
|
219
194
|
continue;
|
|
220
195
|
}
|
|
@@ -259,4 +234,4 @@ class CompletionProvider {
|
|
|
259
234
|
return (0, utils_1.isInsideFrontmatter)(document.getText(), document.offsetAt(position));
|
|
260
235
|
}
|
|
261
236
|
}
|
|
262
|
-
exports.
|
|
237
|
+
exports.CompletionsProviderImpl = CompletionsProviderImpl;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Stylesheet, TextDocument } from 'vscode-css-languageservice';
|
|
2
2
|
import { Position } from 'vscode-languageserver';
|
|
3
|
-
import {
|
|
3
|
+
import { AstroDocument, DocumentMapper, ReadableDocument, TagInformation } from '../../core/documents';
|
|
4
4
|
export interface CSSDocumentBase extends DocumentMapper, TextDocument {
|
|
5
5
|
languageId: string;
|
|
6
6
|
stylesheet: Stylesheet;
|
|
@@ -11,7 +11,7 @@ export declare class CSSDocument extends ReadableDocument implements DocumentMap
|
|
|
11
11
|
readonly version: number;
|
|
12
12
|
stylesheet: Stylesheet;
|
|
13
13
|
languageId: string;
|
|
14
|
-
constructor(parent:
|
|
14
|
+
constructor(parent: AstroDocument, styleInfo: Pick<TagInformation, 'attributes' | 'start' | 'end'>);
|
|
15
15
|
/**
|
|
16
16
|
* Get the fragment position relative to the parent
|
|
17
17
|
* @param pos Position in fragment
|
|
@@ -32,7 +32,7 @@ export declare class CSSDocument extends ReadableDocument implements DocumentMap
|
|
|
32
32
|
*/
|
|
33
33
|
getText(): string;
|
|
34
34
|
/**
|
|
35
|
-
* Returns the length of the fragment as calculated from the start and end
|
|
35
|
+
* Returns the length of the fragment as calculated from the start and end position
|
|
36
36
|
*/
|
|
37
37
|
getTextLength(): number;
|
|
38
38
|
/**
|
|
@@ -1,25 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CSSDocument = void 0;
|
|
4
|
-
const
|
|
5
|
-
const
|
|
6
|
-
class CSSDocument extends
|
|
7
|
-
constructor(parent) {
|
|
4
|
+
const language_service_1 = require("./language-service");
|
|
5
|
+
const documents_1 = require("../../core/documents");
|
|
6
|
+
class CSSDocument extends documents_1.ReadableDocument {
|
|
7
|
+
constructor(parent, styleInfo) {
|
|
8
8
|
super();
|
|
9
9
|
this.parent = parent;
|
|
10
|
+
this.styleInfo = styleInfo;
|
|
10
11
|
this.version = this.parent.version;
|
|
11
|
-
if (this.parent.styleInfo) {
|
|
12
|
-
this.styleInfo = this.parent.styleInfo;
|
|
13
|
-
}
|
|
14
|
-
else {
|
|
15
|
-
this.styleInfo = {
|
|
16
|
-
attributes: {},
|
|
17
|
-
start: -1,
|
|
18
|
-
end: -1,
|
|
19
|
-
};
|
|
20
|
-
}
|
|
21
12
|
this.languageId = this.language;
|
|
22
|
-
this.stylesheet = (0,
|
|
13
|
+
this.stylesheet = (0, language_service_1.getLanguageService)(this.language).parseStylesheet(this);
|
|
23
14
|
}
|
|
24
15
|
/**
|
|
25
16
|
* Get the fragment position relative to the parent
|
|
@@ -52,7 +43,7 @@ class CSSDocument extends index_1.ReadableDocument {
|
|
|
52
43
|
return this.parent.getText().slice(this.styleInfo.start, this.styleInfo.end);
|
|
53
44
|
}
|
|
54
45
|
/**
|
|
55
|
-
* Returns the length of the fragment as calculated from the start and end
|
|
46
|
+
* Returns the length of the fragment as calculated from the start and end position
|
|
56
47
|
*/
|
|
57
48
|
getTextLength() {
|
|
58
49
|
return this.styleInfo.end - this.styleInfo.start;
|
|
@@ -1,17 +1,25 @@
|
|
|
1
|
-
import type { CompletionsProvider } from '../interfaces';
|
|
2
|
-
import type { Document, DocumentManager } from '../../core/documents';
|
|
3
|
-
import type { ConfigManager } from '../../core/config';
|
|
4
1
|
import { CompletionContext, CompletionList, Position } from 'vscode-languageserver';
|
|
5
|
-
|
|
6
|
-
|
|
2
|
+
import { ConfigManager } from '../../core/config/ConfigManager';
|
|
3
|
+
import { AstroDocument } from '../../core/documents';
|
|
4
|
+
import type { Plugin } from '../interfaces';
|
|
5
|
+
export declare class CSSPlugin implements Plugin {
|
|
6
|
+
__name: string;
|
|
7
7
|
private configManager;
|
|
8
|
-
private
|
|
8
|
+
private cssDocuments;
|
|
9
9
|
private triggerCharacters;
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
getCompletions(document: Document, position: Position, completionContext?: CompletionContext): CompletionList | null;
|
|
10
|
+
constructor(configManager: ConfigManager);
|
|
11
|
+
getCompletions(document: AstroDocument, position: Position, completionContext?: CompletionContext): CompletionList | null;
|
|
13
12
|
private getCompletionsInternal;
|
|
14
13
|
private inStyleAttributeWithoutInterpolation;
|
|
15
|
-
|
|
16
|
-
|
|
14
|
+
/**
|
|
15
|
+
* Get the associated CSS Document for a style tag
|
|
16
|
+
*/
|
|
17
|
+
private getCSSDocumentForStyleTag;
|
|
18
|
+
private getCSSDocumentsForDocument;
|
|
19
|
+
private getStylesheetsForDocument;
|
|
20
|
+
/**
|
|
21
|
+
* Get style tag at position for a document
|
|
22
|
+
*/
|
|
23
|
+
private getStyleTagForPosition;
|
|
24
|
+
private featureEnabled;
|
|
17
25
|
}
|
|
@@ -1,82 +1,104 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CSSPlugin = void 0;
|
|
4
|
-
const emmet_helper_1 = require("@vscode/emmet-helper");
|
|
5
4
|
const vscode_languageserver_1 = require("vscode-languageserver");
|
|
6
|
-
const utils_1 = require("../../core/documents/utils");
|
|
7
|
-
const CSSDocument_1 = require("./CSSDocument");
|
|
8
|
-
const service_1 = require("./service");
|
|
9
|
-
const StyleAttributeDocument_1 = require("./StyleAttributeDocument");
|
|
10
5
|
const documents_1 = require("../../core/documents");
|
|
6
|
+
const emmet_helper_1 = require("@vscode/emmet-helper");
|
|
7
|
+
const CSSDocument_1 = require("./CSSDocument");
|
|
8
|
+
const language_service_1 = require("./language-service");
|
|
11
9
|
const parseHtml_1 = require("../../core/documents/parseHtml");
|
|
12
|
-
const
|
|
10
|
+
const StyleAttributeDocument_1 = require("./StyleAttributeDocument");
|
|
11
|
+
const getIdClassCompletions_1 = require("./features/getIdClassCompletions");
|
|
13
12
|
class CSSPlugin {
|
|
14
|
-
constructor(
|
|
15
|
-
this.
|
|
13
|
+
constructor(configManager) {
|
|
14
|
+
this.__name = 'css';
|
|
15
|
+
this.cssDocuments = new WeakMap();
|
|
16
16
|
this.triggerCharacters = new Set(['.', ':', '-', '/']);
|
|
17
|
-
this.pluginName = 'CSS';
|
|
18
|
-
this.docManager = docManager;
|
|
19
17
|
this.configManager = configManager;
|
|
20
|
-
this.docManager.on('documentChange', (document) => {
|
|
21
|
-
this.documents.set(document, new CSSDocument_1.CSSDocument(document));
|
|
22
|
-
});
|
|
23
18
|
}
|
|
24
19
|
getCompletions(document, position, completionContext) {
|
|
20
|
+
if (!this.featureEnabled('completions')) {
|
|
21
|
+
return null;
|
|
22
|
+
}
|
|
23
|
+
if ((0, documents_1.isInsideFrontmatter)(document.getText(), document.offsetAt(position))) {
|
|
24
|
+
return null;
|
|
25
|
+
}
|
|
25
26
|
const triggerCharacter = completionContext === null || completionContext === void 0 ? void 0 : completionContext.triggerCharacter;
|
|
26
27
|
const triggerKind = completionContext === null || completionContext === void 0 ? void 0 : completionContext.triggerKind;
|
|
27
28
|
const isCustomTriggerCharacter = triggerKind === vscode_languageserver_1.CompletionTriggerKind.TriggerCharacter;
|
|
28
29
|
if (isCustomTriggerCharacter && triggerCharacter && !this.triggerCharacters.has(triggerCharacter)) {
|
|
29
30
|
return null;
|
|
30
31
|
}
|
|
31
|
-
|
|
32
|
+
const styleTag = this.getStyleTagForPosition(document, position);
|
|
33
|
+
// If we don't have a style tag at this position, we might be in a style property instead, let's check
|
|
34
|
+
if (!styleTag) {
|
|
35
|
+
const attributeContext = (0, parseHtml_1.getAttributeContextAtPosition)(document, position);
|
|
36
|
+
if (!attributeContext) {
|
|
37
|
+
return null;
|
|
38
|
+
}
|
|
39
|
+
if (this.inStyleAttributeWithoutInterpolation(attributeContext, document.getText())) {
|
|
40
|
+
const [start, end] = attributeContext.valueRange;
|
|
41
|
+
return this.getCompletionsInternal(document, position, new StyleAttributeDocument_1.StyleAttributeDocument(document, start, end));
|
|
42
|
+
}
|
|
43
|
+
// If we're not in a style attribute, instead give completions for ids and classes used in the current document
|
|
44
|
+
else if ((attributeContext.name == 'id' || attributeContext.name == 'class') && attributeContext.inValue) {
|
|
45
|
+
const stylesheets = this.getStylesheetsForDocument(document);
|
|
46
|
+
return (0, getIdClassCompletions_1.getIdClassCompletion)(stylesheets, attributeContext);
|
|
47
|
+
}
|
|
32
48
|
return null;
|
|
33
49
|
}
|
|
34
|
-
const cssDocument = this.
|
|
35
|
-
|
|
36
|
-
return this.getCompletionsInternal(document, position, cssDocument);
|
|
37
|
-
}
|
|
38
|
-
const attributeContext = (0, parseHtml_1.getAttributeContextAtPosition)(document, position);
|
|
39
|
-
if (!attributeContext) {
|
|
40
|
-
return null;
|
|
41
|
-
}
|
|
42
|
-
if (this.inStyleAttributeWithoutInterpolation(attributeContext, document.getText())) {
|
|
43
|
-
const [start, end] = attributeContext.valueRange;
|
|
44
|
-
return this.getCompletionsInternal(document, position, new StyleAttributeDocument_1.StyleAttributeDocument(document, start, end));
|
|
45
|
-
}
|
|
46
|
-
else {
|
|
47
|
-
return (0, getIdClassCompletion_1.getIdClassCompletion)(cssDocument, attributeContext);
|
|
48
|
-
}
|
|
50
|
+
const cssDocument = this.getCSSDocumentForStyleTag(styleTag, document);
|
|
51
|
+
return this.getCompletionsInternal(document, position, cssDocument);
|
|
49
52
|
}
|
|
50
53
|
getCompletionsInternal(document, position, cssDocument) {
|
|
51
54
|
if (isSASS(cssDocument)) {
|
|
52
|
-
//
|
|
53
|
-
//
|
|
55
|
+
// The CSS language service does not support SASS (not to be confused with SCSS)
|
|
56
|
+
// however we can at least still at least provide Emmet completions in SASS blocks
|
|
54
57
|
return (0, emmet_helper_1.doComplete)(document, position, 'sass', this.configManager.getEmmetConfig()) || null;
|
|
55
58
|
}
|
|
56
|
-
const
|
|
57
|
-
const
|
|
59
|
+
const cssLang = extractLanguage(cssDocument);
|
|
60
|
+
const langService = (0, language_service_1.getLanguageService)(cssLang);
|
|
58
61
|
const emmetResults = {
|
|
59
62
|
isIncomplete: true,
|
|
60
63
|
items: [],
|
|
61
64
|
};
|
|
62
|
-
const results =
|
|
65
|
+
const results = langService.doComplete(cssDocument, cssDocument.getGeneratedPosition(position), cssDocument.stylesheet);
|
|
63
66
|
return vscode_languageserver_1.CompletionList.create([...(results ? results.items : []), ...emmetResults.items].map((completionItem) => (0, documents_1.mapCompletionItemToOriginal)(cssDocument, completionItem)),
|
|
64
67
|
// Emmet completions change on every keystroke, so they are never complete
|
|
65
68
|
emmetResults.items.length > 0);
|
|
66
69
|
}
|
|
67
70
|
inStyleAttributeWithoutInterpolation(attrContext, text) {
|
|
68
|
-
return attrContext.name === 'style' &&
|
|
71
|
+
return (attrContext.name === 'style' &&
|
|
72
|
+
!!attrContext.valueRange &&
|
|
73
|
+
!text.substring(attrContext.valueRange[0], attrContext.valueRange[1]).includes('{'));
|
|
69
74
|
}
|
|
70
|
-
|
|
71
|
-
|
|
75
|
+
/**
|
|
76
|
+
* Get the associated CSS Document for a style tag
|
|
77
|
+
*/
|
|
78
|
+
getCSSDocumentForStyleTag(tag, document) {
|
|
79
|
+
let cssDoc = this.cssDocuments.get(tag);
|
|
72
80
|
if (!cssDoc || cssDoc.version < document.version) {
|
|
73
|
-
cssDoc = new CSSDocument_1.CSSDocument(document);
|
|
74
|
-
this.
|
|
81
|
+
cssDoc = new CSSDocument_1.CSSDocument(document, tag);
|
|
82
|
+
this.cssDocuments.set(tag, cssDoc);
|
|
75
83
|
}
|
|
76
84
|
return cssDoc;
|
|
77
85
|
}
|
|
78
|
-
|
|
79
|
-
return (
|
|
86
|
+
getCSSDocumentsForDocument(document) {
|
|
87
|
+
return document.styleTags.map((tag) => this.getCSSDocumentForStyleTag(tag, document));
|
|
88
|
+
}
|
|
89
|
+
getStylesheetsForDocument(document) {
|
|
90
|
+
return this.getCSSDocumentsForDocument(document).map((cssDoc) => cssDoc.stylesheet);
|
|
91
|
+
}
|
|
92
|
+
/**
|
|
93
|
+
* Get style tag at position for a document
|
|
94
|
+
*/
|
|
95
|
+
getStyleTagForPosition(document, position) {
|
|
96
|
+
return document.styleTags.find((styleTag) => {
|
|
97
|
+
return (0, documents_1.isInTag)(position, styleTag);
|
|
98
|
+
});
|
|
99
|
+
}
|
|
100
|
+
featureEnabled(feature) {
|
|
101
|
+
return this.configManager.enabled('css.enabled') && this.configManager.enabled(`css.${feature}.enabled`);
|
|
80
102
|
}
|
|
81
103
|
}
|
|
82
104
|
exports.CSSPlugin = CSSPlugin;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Stylesheet } from 'vscode-css-languageservice';
|
|
2
2
|
import { Position } from 'vscode-languageserver';
|
|
3
|
-
import {
|
|
3
|
+
import { AstroDocument, DocumentMapper, ReadableDocument } from '../../core/documents';
|
|
4
4
|
export declare class StyleAttributeDocument extends ReadableDocument implements DocumentMapper {
|
|
5
5
|
private readonly parent;
|
|
6
6
|
private readonly attrStart;
|
|
@@ -8,7 +8,7 @@ export declare class StyleAttributeDocument extends ReadableDocument implements
|
|
|
8
8
|
readonly version: number;
|
|
9
9
|
stylesheet: Stylesheet;
|
|
10
10
|
languageId: string;
|
|
11
|
-
constructor(parent:
|
|
11
|
+
constructor(parent: AstroDocument, attrStart: number, attrEnd: number);
|
|
12
12
|
/**
|
|
13
13
|
* Get the fragment position relative to the parent
|
|
14
14
|
* @param pos Position in fragment
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.StyleAttributeDocument = void 0;
|
|
4
|
-
const
|
|
4
|
+
const language_service_1 = require("./language-service");
|
|
5
5
|
const documents_1 = require("../../core/documents");
|
|
6
6
|
const PREFIX = '__ {';
|
|
7
7
|
const SUFFIX = '}';
|
|
@@ -13,7 +13,7 @@ class StyleAttributeDocument extends documents_1.ReadableDocument {
|
|
|
13
13
|
this.attrEnd = attrEnd;
|
|
14
14
|
this.version = this.parent.version;
|
|
15
15
|
this.languageId = 'css';
|
|
16
|
-
this.stylesheet = (0,
|
|
16
|
+
this.stylesheet = (0, language_service_1.getLanguageService)(this.languageId).parseStylesheet(this);
|
|
17
17
|
}
|
|
18
18
|
/**
|
|
19
19
|
* Get the fragment position relative to the parent
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.pseudoClass = void 0;
|
|
4
|
+
exports.pseudoClass = [
|
|
5
|
+
{
|
|
6
|
+
name: ':global()',
|
|
7
|
+
description: `[astro] :global modifier
|
|
8
|
+
Applying styles to a selector globally`,
|
|
9
|
+
references: [
|
|
10
|
+
{
|
|
11
|
+
name: 'Astro Docs',
|
|
12
|
+
url: 'https://docs.astro.build/en/guides/styling/#global-styles-within-style-tag',
|
|
13
|
+
},
|
|
14
|
+
],
|
|
15
|
+
},
|
|
16
|
+
];
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { CompletionItem, CompletionList } from 'vscode-languageserver';
|
|
2
2
|
import { AttributeContext } from '../../../core/documents/parseHtml';
|
|
3
|
-
import {
|
|
4
|
-
export declare function getIdClassCompletion(
|
|
3
|
+
import { Stylesheet } from 'vscode-css-languageservice';
|
|
4
|
+
export declare function getIdClassCompletion(stylesheets: Stylesheet[], attributeContext: AttributeContext): CompletionList | null;
|
|
5
5
|
/**
|
|
6
6
|
* incomplete see
|
|
7
7
|
* https://github.com/microsoft/vscode-css-languageservice/blob/master/src/parser/cssNodes.ts#L14
|
|
@@ -16,4 +16,4 @@ export declare type CSSNode = {
|
|
|
16
16
|
children: CSSNode[] | undefined;
|
|
17
17
|
getText(): string;
|
|
18
18
|
};
|
|
19
|
-
export declare function collectSelectors(
|
|
19
|
+
export declare function collectSelectors(stylesheets: CSSNode[], type: number): CompletionItem[];
|
|
@@ -2,13 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.collectSelectors = exports.NodeType = exports.getIdClassCompletion = void 0;
|
|
4
4
|
const vscode_languageserver_1 = require("vscode-languageserver");
|
|
5
|
-
function getIdClassCompletion(
|
|
5
|
+
function getIdClassCompletion(stylesheets, attributeContext) {
|
|
6
6
|
const collectingType = getCollectingType(attributeContext);
|
|
7
7
|
if (!collectingType) {
|
|
8
8
|
return null;
|
|
9
9
|
}
|
|
10
|
-
const items = collectSelectors(
|
|
11
|
-
console.log('getIdClassCompletion items', items.length);
|
|
10
|
+
const items = collectSelectors(stylesheets, collectingType);
|
|
12
11
|
return vscode_languageserver_1.CompletionList.create(items);
|
|
13
12
|
}
|
|
14
13
|
exports.getIdClassCompletion = getIdClassCompletion;
|
|
@@ -35,12 +34,14 @@ var NodeType;
|
|
|
35
34
|
NodeType[NodeType["ClassSelector"] = 14] = "ClassSelector";
|
|
36
35
|
NodeType[NodeType["IdentifierSelector"] = 15] = "IdentifierSelector";
|
|
37
36
|
})(NodeType = exports.NodeType || (exports.NodeType = {}));
|
|
38
|
-
function collectSelectors(
|
|
37
|
+
function collectSelectors(stylesheets, type) {
|
|
39
38
|
const result = [];
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
39
|
+
stylesheets.forEach((stylesheet) => {
|
|
40
|
+
walk(stylesheet, (node) => {
|
|
41
|
+
if (node.type === type) {
|
|
42
|
+
result.push(node);
|
|
43
|
+
}
|
|
44
|
+
});
|
|
44
45
|
});
|
|
45
46
|
return result.map((node) => ({
|
|
46
47
|
label: node.getText().substring(1),
|
|
@@ -51,6 +52,6 @@ exports.collectSelectors = collectSelectors;
|
|
|
51
52
|
function walk(node, callback) {
|
|
52
53
|
callback(node);
|
|
53
54
|
if (node.children) {
|
|
54
|
-
node.children.forEach((
|
|
55
|
+
node.children.forEach((childrenNode) => walk(childrenNode, callback));
|
|
55
56
|
}
|
|
56
57
|
}
|
|
File without changes
|
|
@@ -2,9 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getLanguageService = exports.getLanguage = void 0;
|
|
4
4
|
const vscode_css_languageservice_1 = require("vscode-css-languageservice");
|
|
5
|
+
const astro_selectors_1 = require("./features/astro-selectors");
|
|
5
6
|
const customDataProvider = {
|
|
6
7
|
providePseudoClasses() {
|
|
7
|
-
return
|
|
8
|
+
return astro_selectors_1.pseudoClass;
|
|
8
9
|
},
|
|
9
10
|
provideProperties() {
|
|
10
11
|
return [];
|
|
@@ -1,24 +1,22 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import
|
|
5
|
-
|
|
6
|
-
|
|
1
|
+
import { CompletionList, Position, FoldingRange } from 'vscode-languageserver';
|
|
2
|
+
import type { Plugin } from '../interfaces';
|
|
3
|
+
import { ConfigManager } from '../../core/config/ConfigManager';
|
|
4
|
+
import { AstroDocument } from '../../core/documents/AstroDocument';
|
|
5
|
+
export declare class HTMLPlugin implements Plugin {
|
|
6
|
+
__name: string;
|
|
7
7
|
private lang;
|
|
8
|
-
private documents;
|
|
9
8
|
private styleScriptTemplate;
|
|
10
9
|
private configManager;
|
|
11
|
-
|
|
12
|
-
constructor(docManager: DocumentManager, configManager: ConfigManager);
|
|
13
|
-
getCompletions(document: Document, position: Position): CompletionList | null;
|
|
14
|
-
getFoldingRanges(document: Document): FoldingRange[] | null;
|
|
15
|
-
doTagComplete(document: Document, position: Position): string | null;
|
|
10
|
+
constructor(configManager: ConfigManager);
|
|
16
11
|
/**
|
|
17
|
-
*
|
|
18
|
-
|
|
12
|
+
* Get HTML completions
|
|
13
|
+
*/
|
|
14
|
+
getCompletions(document: AstroDocument, position: Position): CompletionList | null;
|
|
15
|
+
getFoldingRanges(document: AstroDocument): FoldingRange[] | null;
|
|
16
|
+
doTagComplete(document: AstroDocument, position: Position): string | null;
|
|
17
|
+
/**
|
|
18
|
+
* Get lang completions for style tags (ex: `<style lang="scss">`)
|
|
19
19
|
*/
|
|
20
|
-
private toCompletionItems;
|
|
21
20
|
private getLangCompletions;
|
|
22
|
-
private
|
|
23
|
-
private isInsideFrontmatter;
|
|
21
|
+
private featureEnabled;
|
|
24
22
|
}
|