astro-vscode 0.20.4 → 0.22.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 +32 -0
- package/README.md +2 -2
- package/dist/index.js +31 -2
- package/package.json +18 -2
- package/syntaxes/astro.tmLanguage.json +0 -38
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,37 @@
|
|
|
1
1
|
# astro-vscode
|
|
2
2
|
|
|
3
|
+
## 0.22.0
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- f3777ac: Added settings to configure the path to the language server and the runtime to use to run it
|
|
8
|
+
- Updated dependencies [61620f1]
|
|
9
|
+
- Updated dependencies [9337f00]
|
|
10
|
+
- Updated dependencies [d5aafc0]
|
|
11
|
+
- @astrojs/language-server@0.22.0
|
|
12
|
+
|
|
13
|
+
## 0.21.1
|
|
14
|
+
|
|
15
|
+
### Patch Changes
|
|
16
|
+
|
|
17
|
+
- Updated dependencies [0e9d7d0]
|
|
18
|
+
- Updated dependencies [3f79dbf]
|
|
19
|
+
- @astrojs/language-server@0.21.1
|
|
20
|
+
|
|
21
|
+
## 0.21.0
|
|
22
|
+
|
|
23
|
+
### Minor Changes
|
|
24
|
+
|
|
25
|
+
- 574b75d: Remove support for the Markdown component
|
|
26
|
+
|
|
27
|
+
### Patch Changes
|
|
28
|
+
|
|
29
|
+
- 81f3aa5: Added a debug command to show the currently opened document's TSX output
|
|
30
|
+
- Updated dependencies [81f3aa5]
|
|
31
|
+
- Updated dependencies [574b75d]
|
|
32
|
+
- Updated dependencies [d23ba22]
|
|
33
|
+
- @astrojs/language-server@0.21.0
|
|
34
|
+
|
|
3
35
|
## 0.20.4
|
|
4
36
|
|
|
5
37
|
### Patch Changes
|
package/README.md
CHANGED
|
@@ -12,7 +12,7 @@ Provides language support for `.astro` files. This extension is powered by the [
|
|
|
12
12
|
- [Emmet completions](https://code.visualstudio.com/docs/editor/emmet) in HTML & CSS
|
|
13
13
|
- Props completions for JSX/TSX, Vue (Composition API only) and Svelte components
|
|
14
14
|
- [Code actions](https://code.visualstudio.com/docs/editor/editingevolved#_code-action) (quick fixes, sort imports etc)
|
|
15
|
-
- [Formatting](https://code.visualstudio.com/docs/editor/codebasics#_formatting)
|
|
15
|
+
- [Formatting](https://code.visualstudio.com/docs/editor/codebasics#_formatting) (powered by [Prettier](https://prettier.io/) and [prettier-plugin-astro](https://github.com/withastro/prettier-plugin-astro))
|
|
16
16
|
- [Symbols](https://code.visualstudio.com/docs/editor/editingevolved#_go-to-symbol) ([outline view](https://code.visualstudio.com/docs/getstarted/userinterface#_outline-view), [breadcrumb navigation](https://code.visualstudio.com/docs/editor/editingevolved#_breadcrumbs) etc)
|
|
17
17
|
- [Hover information](https://code.visualstudio.com/Docs/languages/typescript#_hover-information)
|
|
18
18
|
- [Go to Definition](https://code.visualstudio.com/docs/editor/editingevolved#_go-to-definition)
|
|
@@ -25,7 +25,7 @@ A TypeScript plugin adding support for importing Astro components inside JavaScr
|
|
|
25
25
|
|
|
26
26
|
You can disable most features in the extension by going to your workspace settings page. Under **Extension** find Astro configuration and uncheck the feature(s) you do not want. For example to disable error messages unselect **TypeScript > Diagnostics: Enable** (or in JSON, set `astro.typescript.diagnostics.enabled` to `false`).
|
|
27
27
|
|
|
28
|
-
Formatting
|
|
28
|
+
Formatting can be configured through [Prettier's different configuration methods](https://prettier.io/docs/en/configuration.html). TypeScript settings can be configured using VS Code's TypeScript settings (`typescript.xxx`).
|
|
29
29
|
|
|
30
30
|
## Troubleshooting
|
|
31
31
|
|
package/dist/index.js
CHANGED
|
@@ -25,13 +25,24 @@ __export(exports, {
|
|
|
25
25
|
activate: () => activate,
|
|
26
26
|
deactivate: () => deactivate
|
|
27
27
|
});
|
|
28
|
+
var path = __toModule(require("path"));
|
|
28
29
|
var import_vscode = __toModule(require("vscode"));
|
|
29
30
|
var import_node = __toModule(require("vscode-languageclient/node"));
|
|
30
31
|
var import_autoClose = __toModule(require("./html/autoClose.js"));
|
|
31
32
|
const TagCloseRequest = new import_node.RequestType("html/tag");
|
|
32
33
|
let client;
|
|
33
34
|
async function activate(context) {
|
|
34
|
-
const
|
|
35
|
+
const runtimeConfig = import_vscode.workspace.getConfiguration("astro.language-server");
|
|
36
|
+
const {workspaceFolders} = import_vscode.workspace;
|
|
37
|
+
const rootPath = workspaceFolders == null ? void 0 : workspaceFolders[0].uri.fsPath;
|
|
38
|
+
let lsPath = runtimeConfig.get("ls-path");
|
|
39
|
+
if (typeof lsPath === "string" && lsPath.trim() !== "" && typeof rootPath === "string") {
|
|
40
|
+
lsPath = path.isAbsolute(lsPath) ? lsPath : path.join(rootPath, lsPath);
|
|
41
|
+
console.info(`Using language server at ${lsPath}`);
|
|
42
|
+
} else {
|
|
43
|
+
lsPath = void 0;
|
|
44
|
+
}
|
|
45
|
+
const serverModule = lsPath != null ? require.resolve(lsPath) : require.resolve("@astrojs/language-server/bin/nodeServer.js");
|
|
35
46
|
const port = 6040;
|
|
36
47
|
const debugOptions = {execArgv: ["--nolazy", "--inspect=" + port]};
|
|
37
48
|
const serverOptions = {
|
|
@@ -42,6 +53,12 @@ async function activate(context) {
|
|
|
42
53
|
options: debugOptions
|
|
43
54
|
}
|
|
44
55
|
};
|
|
56
|
+
const serverRuntime = runtimeConfig.get("runtime");
|
|
57
|
+
if (serverRuntime) {
|
|
58
|
+
serverOptions.run.runtime = serverRuntime;
|
|
59
|
+
serverOptions.debug.runtime = serverRuntime;
|
|
60
|
+
console.info(`Using ${serverRuntime} as runtime`);
|
|
61
|
+
}
|
|
45
62
|
const clientOptions = {
|
|
46
63
|
documentSelector: [{scheme: "file", language: "astro"}],
|
|
47
64
|
synchronize: {
|
|
@@ -92,6 +109,18 @@ async function activate(context) {
|
|
|
92
109
|
});
|
|
93
110
|
context.subscriptions.push(import_vscode.commands.registerCommand("astro.restartLanguageServer", async () => {
|
|
94
111
|
await restartClient(true);
|
|
112
|
+
}), import_vscode.commands.registerCommand("astro.showTSXOutput", async () => {
|
|
113
|
+
var _a;
|
|
114
|
+
const content = await getLSClient().sendRequest("$/getTSXOutput", (_a = import_vscode.window.activeTextEditor) == null ? void 0 : _a.document.uri.toString());
|
|
115
|
+
if (content) {
|
|
116
|
+
const document = await import_vscode.workspace.openTextDocument({content, language: "typescriptreact"});
|
|
117
|
+
await import_vscode.window.showTextDocument(document, {
|
|
118
|
+
preview: true,
|
|
119
|
+
viewColumn: import_vscode.ViewColumn.Beside
|
|
120
|
+
});
|
|
121
|
+
} else {
|
|
122
|
+
import_vscode.window.showErrorMessage("Could not open the current document's TSX output");
|
|
123
|
+
}
|
|
95
124
|
}));
|
|
96
125
|
let restartingClient = false;
|
|
97
126
|
async function restartClient(showNotification) {
|
|
@@ -128,4 +157,4 @@ function createLanguageServer(serverOptions, clientOptions) {
|
|
|
128
157
|
activate,
|
|
129
158
|
deactivate
|
|
130
159
|
});
|
|
131
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
160
|
+
//# sourceMappingURL=data:application/json;base64,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UUFDM0QsS0FBSyxPQUFPLFNBQVMsSUFBSSxTQUFTO0FBQUEsUUFFbEMsU0FBUyxDQUFDLE9BQU8sVUFBVSxTQUFTLE9BQU8sU0FBUyxjQUNqRCxTQUNBLE9BQU8sZUFBZSxJQUFJLENBQUMsTUFBTztBQUFBLFVBQ2xDLE9BQU87QUFBQSxZQUNOLE9BQU8sQ0FBRSxNQUFNLEVBQUUsTUFBTSxNQUFNLE1BQU0sV0FBVyxFQUFFLE1BQU0sTUFBTTtBQUFBLFlBQzVELEtBQUssQ0FBRSxNQUFNLEVBQUUsTUFBTSxJQUFJLE1BQU0sV0FBVyxFQUFFLE1BQU0sSUFBSTtBQUFBO0FBQUEsVUFFdkQsTUFBTSxFQUFFO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFNZCxVQUFRLGNBQWMsS0FDckIsdUJBQVMsZ0JBQWdCLCtCQUErQixZQUFZO0FBQ25FLFVBQU0sY0FBYztBQUFBLE1BRXJCLHVCQUFTLGdCQUFnQix1QkFBdUIsWUFBWTtBQXRJOUQ7QUF1SUcsVUFBTSxVQUFVLE1BQU0sY0FBYyxZQUNuQyxrQkFDQSwyQkFBTyxxQkFBUCxtQkFBeUIsU0FBUyxJQUFJO0FBR3ZDLFFBQUksU0FBUztBQUNaLFlBQU0sV0FBVyxNQUFNLHdCQUFVLGlCQUFpQixDQUFFLFNBQVMsVUFBVTtBQUV2RSxZQUFNLHFCQUFPLGlCQUFpQixVQUFVO0FBQUEsUUFDdkMsU0FBUztBQUFBLFFBQ1QsWUFBWSx5QkFBVztBQUFBO0FBQUEsV0FFbEI7QUFDTiwyQkFBTyxpQkFBaUI7QUFBQTtBQUFBO0FBSzNCLE1BQUksbUJBQW1CO0FBQ3ZCLCtCQUE2QixrQkFBMkI7QUFDdkQsUUFBSSxrQkFBa0I7QUFDckI7QUFBQTtBQUdELHVCQUFtQjtBQUNuQixVQUFNLE9BQU87QUFFYixhQUFTLHFCQUFxQixlQUFlO0FBQzdDLFVBQU0sT0FBTztBQUViLFFBQUksa0JBQWtCO0FBQ3JCLDJCQUFPLHVCQUF1QjtBQUFBO0FBRy9CLHVCQUFtQjtBQUFBO0FBR3BCLHlCQUF1QjtBQUN0QixXQUFPO0FBQUE7QUFHUixTQUFPO0FBQUEsSUFDTixtQkFBbUI7QUFBQTtBQUFBO0FBSWQsc0JBQWlEO0FBQ3ZELE1BQUksQ0FBQyxRQUFRO0FBQ1osV0FBTztBQUFBO0FBR1IsU0FBTyxPQUFPO0FBQUE7QUFHZiw4QkFBOEIsZUFBOEIsZUFBc0M7QUFDakcsU0FBTyxJQUFJLDJCQUFlLFNBQVMsU0FBUyxlQUFlO0FBQUE7IiwKICAibmFtZXMiOiBbXQp9Cg==
|
package/package.json
CHANGED
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
"color": "#FFBE2D",
|
|
24
24
|
"theme": "dark"
|
|
25
25
|
},
|
|
26
|
-
"version": "0.
|
|
26
|
+
"version": "0.22.0",
|
|
27
27
|
"author": "withastro",
|
|
28
28
|
"license": "MIT",
|
|
29
29
|
"publisher": "astro-build",
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
"workspaceContains:astro.config.*"
|
|
45
45
|
],
|
|
46
46
|
"dependencies": {
|
|
47
|
-
"@astrojs/language-server": "0.
|
|
47
|
+
"@astrojs/language-server": "0.22.0",
|
|
48
48
|
"@astrojs/ts-plugin": "0.2.1",
|
|
49
49
|
"vscode-languageclient": "^8.0.1"
|
|
50
50
|
},
|
|
@@ -77,12 +77,28 @@
|
|
|
77
77
|
{
|
|
78
78
|
"command": "astro.restartLanguageServer",
|
|
79
79
|
"title": "Astro: Restart Language Server"
|
|
80
|
+
},
|
|
81
|
+
{
|
|
82
|
+
"command": "astro.showTSXOutput",
|
|
83
|
+
"title": "Astro: Debug: Show TSX Output"
|
|
80
84
|
}
|
|
81
85
|
],
|
|
82
86
|
"configuration": {
|
|
83
87
|
"type": "object",
|
|
84
88
|
"title": "Astro configuration",
|
|
85
89
|
"properties": {
|
|
90
|
+
"astro.language-server.ls-path": {
|
|
91
|
+
"scope": "application",
|
|
92
|
+
"type": "string",
|
|
93
|
+
"title": "Language Server: Path",
|
|
94
|
+
"description": "Path to the language server executable. You won't need this in most cases, set this only when needing a specific version of the language server"
|
|
95
|
+
},
|
|
96
|
+
"astro.language-server.runtime": {
|
|
97
|
+
"scope": "application",
|
|
98
|
+
"type": "string",
|
|
99
|
+
"title": "Language Server: Runtime",
|
|
100
|
+
"description": "Path to the node executable used to execute the language server. You won't need this in most cases"
|
|
101
|
+
},
|
|
86
102
|
"astro.trace.server": {
|
|
87
103
|
"scope": "window",
|
|
88
104
|
"type": "string",
|
|
@@ -7,9 +7,6 @@
|
|
|
7
7
|
"name": "Astro",
|
|
8
8
|
"scopeName": "source.astro",
|
|
9
9
|
"patterns": [
|
|
10
|
-
{
|
|
11
|
-
"include": "#astro:markdown"
|
|
12
|
-
},
|
|
13
10
|
{
|
|
14
11
|
"include": "#astro:expressions"
|
|
15
12
|
},
|
|
@@ -579,41 +576,6 @@
|
|
|
579
576
|
}
|
|
580
577
|
]
|
|
581
578
|
},
|
|
582
|
-
"astro:markdown": {
|
|
583
|
-
"begin": "(<)(Markdown)",
|
|
584
|
-
"end": "(</)(Markdown)\\s*(>)|(/>)",
|
|
585
|
-
"beginCaptures": {
|
|
586
|
-
"1": {
|
|
587
|
-
"name": "punctuation.definition.tag.begin.astro"
|
|
588
|
-
},
|
|
589
|
-
"2": {
|
|
590
|
-
"name": "entity.name.tag.astro support.class.component.astro"
|
|
591
|
-
}
|
|
592
|
-
},
|
|
593
|
-
"endCaptures": {
|
|
594
|
-
"1": {
|
|
595
|
-
"name": "punctuation.definition.tag.begin.astro"
|
|
596
|
-
},
|
|
597
|
-
"2": {
|
|
598
|
-
"name": "entity.name.tag.astro support.class.component.astro"
|
|
599
|
-
},
|
|
600
|
-
"3": {
|
|
601
|
-
"name": "punctuation.definition.tag.end.astro"
|
|
602
|
-
},
|
|
603
|
-
"4": {
|
|
604
|
-
"name": "punctuation.definition.tag.end.astro"
|
|
605
|
-
}
|
|
606
|
-
},
|
|
607
|
-
"patterns": [
|
|
608
|
-
{
|
|
609
|
-
"begin": "(?<=>)(?!</)",
|
|
610
|
-
"end": "(?=</)",
|
|
611
|
-
"contentName": "text.html.markdown",
|
|
612
|
-
"patterns": [{ "include": "text.html.markdown" }]
|
|
613
|
-
},
|
|
614
|
-
{ "include": "#html:tag-attributes" }
|
|
615
|
-
]
|
|
616
|
-
},
|
|
617
579
|
"frontmatter": {
|
|
618
580
|
"comment": "The frontmatter is treated as comments in order to get the \"faded\" look",
|
|
619
581
|
"begin": "\\A(-{3})\\s*$",
|