diff options
Diffstat (limited to '')
-rw-r--r-- | vscode/packages/.DS_Store | bin | 0 -> 6148 bytes | |||
-rw-r--r-- | vscode/packages/client/.DS_Store | bin | 0 -> 6148 bytes | |||
-rw-r--r-- | vscode/packages/client/package-lock.json | 91 | ||||
-rw-r--r-- | vscode/packages/client/package.json | 12 | ||||
-rw-r--r-- | vscode/packages/client/src/features/defaultSettings.ts | 30 | ||||
-rw-r--r-- | vscode/packages/client/src/index.ts | 79 | ||||
-rw-r--r-- | vscode/packages/client/tsconfig.json | 12 | ||||
-rw-r--r-- | vscode/packages/server/.DS_Store | bin | 0 -> 6148 bytes | |||
-rw-r--r-- | vscode/packages/server/package-lock.json | 115 | ||||
-rw-r--r-- | vscode/packages/server/package.json | 21 | ||||
-rw-r--r-- | vscode/packages/server/src/index.ts | 32 | ||||
-rw-r--r-- | vscode/packages/server/tsconfig.json | 9 |
12 files changed, 401 insertions, 0 deletions
diff --git a/vscode/packages/.DS_Store b/vscode/packages/.DS_Store Binary files differnew file mode 100644 index 000000000..9bb33f4a5 --- /dev/null +++ b/vscode/packages/.DS_Store diff --git a/vscode/packages/client/.DS_Store b/vscode/packages/client/.DS_Store Binary files differnew file mode 100644 index 000000000..5008ddfcf --- /dev/null +++ b/vscode/packages/client/.DS_Store diff --git a/vscode/packages/client/package-lock.json b/vscode/packages/client/package-lock.json new file mode 100644 index 000000000..58d3b4e97 --- /dev/null +++ b/vscode/packages/client/package-lock.json @@ -0,0 +1,91 @@ +{ + "name": "@astro-vscode/client", + "version": "0.1.0", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "@types/vscode": { + "version": "1.54.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.54.0.tgz", + "integrity": "sha512-sHHw9HG4bTrnKhLGgmEiOS88OLO/2RQytUN4COX9Djv81zc0FSZsSiYaVyjNidDzUSpXsySKBkZ31lk2/FbdCg==", + "dev": true + }, + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" + }, + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + }, + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "requires": { + "yallist": "^4.0.0" + } + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "semver": { + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "requires": { + "lru-cache": "^6.0.0" + } + }, + "vscode-jsonrpc": { + "version": "6.1.0-next.2", + "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.1.0-next.2.tgz", + "integrity": "sha512-nkiNDGI+Ytp7uj1lxHXddXCoEunhcry1D+KmVHBfUUgWT9jMF8ZJyH5KQObdF+OGAh7bXZxD/SV4uGwSCeHHWA==" + }, + "vscode-languageclient": { + "version": "7.1.0-next.4", + "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.1.0-next.4.tgz", + "integrity": "sha512-Gal+DvbI1KIwO1z90MvSnghMCVBCGlwdpOVIS0Hhmep7rjHUOwuC5Df7YlVkpzfPm+RCRyZQnUSJ19VNrnxxhA==", + "requires": { + "minimatch": "^3.0.4", + "semver": "^7.3.4", + "vscode-languageserver-protocol": "3.17.0-next.5" + } + }, + "vscode-languageserver-protocol": { + "version": "3.17.0-next.5", + "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.0-next.5.tgz", + "integrity": "sha512-LFZ6WMB3iPezQAU9OnGoERzcIVKhcs0OLfD/NHcqSj3g1wgxuLUL5kSlZbbjFySQCmhzm6b0yb3hjTSeBtq1+w==", + "requires": { + "vscode-jsonrpc": "6.1.0-next.2", + "vscode-languageserver-types": "3.17.0-next.1" + } + }, + "vscode-languageserver-types": { + "version": "3.17.0-next.1", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.0-next.1.tgz", + "integrity": "sha512-VGzh06oynbYa6JbTKUbxOEZN7CYEtWhN7DK5wfzUpeCJl8X8xZX39g2PVfpqXrIEduu7dcJgK007KgnX9tHNKA==" + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + } + } +} diff --git a/vscode/packages/client/package.json b/vscode/packages/client/package.json new file mode 100644 index 000000000..3a693790d --- /dev/null +++ b/vscode/packages/client/package.json @@ -0,0 +1,12 @@ +{ + "name": "@astro-vscode/client", + "version": "0.1.0", + "author": "Skypack", + "license": "MIT", + "dependencies": { + "vscode-languageclient": "next" + }, + "devDependencies": { + "@types/vscode": "latest" + } +} diff --git a/vscode/packages/client/src/features/defaultSettings.ts b/vscode/packages/client/src/features/defaultSettings.ts new file mode 100644 index 000000000..ec3de70a1 --- /dev/null +++ b/vscode/packages/client/src/features/defaultSettings.ts @@ -0,0 +1,30 @@ +import * as vscode from 'vscode'; + +export async function activate() { + onConfigUpdated(); + + vscode.workspace.onDidChangeConfiguration(onConfigUpdated); + + function onConfigUpdated() { + const astro = vscode.extensions.getExtension('skypack.astro'); + if (!astro) { + return; + } + const emmet = vscode.extensions.getExtension('vscode.emmet'); + if (!emmet) { + return; + } + + const emmetIncludeLanguages = getEmmetIncludeLanguages(); + if (emmetIncludeLanguages && emmetIncludeLanguages['astro']) { + return; + } + setEmmetIncludeLanguages({ ...emmetIncludeLanguages, astro: 'html' }); + } + function getEmmetIncludeLanguages() { + return vscode.workspace.getConfiguration('emmet').get<Record<string, string>>('includeLanguages'); + } + function setEmmetIncludeLanguages(value: Record<string, string>) { + return vscode.workspace.getConfiguration('emmet').set('includeLanguages', value); + } +} diff --git a/vscode/packages/client/src/index.ts b/vscode/packages/client/src/index.ts new file mode 100644 index 000000000..c7233892b --- /dev/null +++ b/vscode/packages/client/src/index.ts @@ -0,0 +1,79 @@ +import * as path from 'path'; +import * as vscode from 'vscode'; +import * as lsp from 'vscode-languageclient/node'; + +import * as defaultSettings from './features/defaultSettings.js'; + +let docClient: lsp.LanguageClient; + +export async function activate(context: vscode.ExtensionContext) { + docClient = createLanguageService(context, 'doc', 'astro', 'Astro', 6040); + + defaultSettings.activate(); + + await docClient.onReady(); + startEmbeddedLanguageServices(); +} + +function createLanguageService(context: vscode.ExtensionContext, mode: 'doc', id: string, name: string, port: number) { + const serverModule = context.asAbsolutePath(path.join('dist', 'server.js')); + const debugOptions = { execArgv: ['--nolazy', '--inspect=' + port] }; + const serverOptions: lsp.ServerOptions = { + run: { module: serverModule, transport: lsp.TransportKind.ipc }, + debug: { + module: serverModule, + transport: lsp.TransportKind.ipc, + options: debugOptions, + }, + }; + const serverInitOptions: any = { + mode: mode, + appRoot: vscode.env.appRoot, + language: vscode.env.language, + }; + const clientOptions: lsp.LanguageClientOptions = { + documentSelector: [{ scheme: 'file', language: 'astro' }], + initializationOptions: serverInitOptions, + }; + const client = new lsp.LanguageClient(id, name, serverOptions, clientOptions); + context.subscriptions.push(client.start()); + + return client; +} + +async function startEmbeddedLanguageServices() { + const ts = vscode.extensions.getExtension('vscode.typescript-language-features'); + const css = vscode.extensions.getExtension('vscode.css-language-features'); + const html = vscode.extensions.getExtension('vscode.html-language-features'); + + if (ts && !ts.isActive) { + await ts.activate(); + } + if (css && !css.isActive) { + await css.activate(); + } + if (html && !html.isActive) { + await html.activate(); + } + + /* from html-language-features */ + const EMPTY_ELEMENTS: string[] = ['area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'keygen', 'link', 'menuitem', 'meta', 'param', 'source', 'track', 'wbr']; + vscode.languages.setLanguageConfiguration('astro', { + indentationRules: { + increaseIndentPattern: /<(?!\?|(?:area|base|br|col|frame|hr|html|img|input|link|meta|param)\b|[^>]*\/>)([-_\.A-Za-z0-9]+)(?=\s|>)\b[^>]*>(?!.*<\/\1>)|<!--(?!.*-->)|\{[^}"']*$/, + decreaseIndentPattern: /^\s*(<\/(?!html)[-_\.A-Za-z0-9]+\b[^>]*>|-->|\})/, + }, + wordPattern: /(-?\d*\.\d\w*)|([^\`\~\!\@\$\^\&\*\(\)\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\s]+)/g, + onEnterRules: [ + { + beforeText: new RegExp(`<(?!(?:${EMPTY_ELEMENTS.join('|')}))([_:\\w][_:\\w-.\\d]*)([^/>]*(?!/)>)[^<]*$`, 'i'), + afterText: /^<\/([_:\w][_:\w-.\d]*)\s*>/i, + action: { indentAction: vscode.IndentAction.IndentOutdent }, + }, + { + beforeText: new RegExp(`<(?!(?:${EMPTY_ELEMENTS.join('|')}))(\\w[\\w\\d]*)([^/>]*(?!/)>)[^<]*$`, 'i'), + action: { indentAction: vscode.IndentAction.Indent }, + }, + ], + }); +} diff --git a/vscode/packages/client/tsconfig.json b/vscode/packages/client/tsconfig.json new file mode 100644 index 000000000..51e95f536 --- /dev/null +++ b/vscode/packages/client/tsconfig.json @@ -0,0 +1,12 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "outDir": "dist", + "rootDir": "src", + }, + "include": ["src"], + "exclude": ["node_modules"], + "references": [ + { "path": "../server" } + ] +} diff --git a/vscode/packages/server/.DS_Store b/vscode/packages/server/.DS_Store Binary files differnew file mode 100644 index 000000000..5008ddfcf --- /dev/null +++ b/vscode/packages/server/.DS_Store diff --git a/vscode/packages/server/package-lock.json b/vscode/packages/server/package-lock.json new file mode 100644 index 000000000..71cdde13c --- /dev/null +++ b/vscode/packages/server/package-lock.json @@ -0,0 +1,115 @@ +{ + "name": "@astro-vscode/server", + "version": "0.1.0", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "astro": { + "version": "file:../..", + "dev": true, + "requires": { + "typescript": "^4.2.3", + "vscode-languageserver": "^7.0.0" + }, + "dependencies": { + "typescript": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.2.3.tgz", + "integrity": "sha512-qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw==", + "dev": true + }, + "vscode-jsonrpc": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz", + "integrity": "sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==", + "dev": true + }, + "vscode-languageserver": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-7.0.0.tgz", + "integrity": "sha512-60HTx5ID+fLRcgdHfmz0LDZAXYEV68fzwG0JWwEPBode9NuMYTIxuYXPg4ngO8i8+Ou0lM7y6GzaYWbiDL0drw==", + "dev": true, + "requires": { + "vscode-languageserver-protocol": "3.16.0" + } + }, + "vscode-languageserver-protocol": { + "version": "3.16.0", + "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0.tgz", + "integrity": "sha512-sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A==", + "dev": true, + "requires": { + "vscode-jsonrpc": "6.0.0", + "vscode-languageserver-types": "3.16.0" + } + }, + "vscode-languageserver-types": { + "version": "3.16.0", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz", + "integrity": "sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==", + "dev": true + } + } + }, + "vscode-html-languageservice": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-3.2.0.tgz", + "integrity": "sha512-aLWIoWkvb5HYTVE0kI9/u3P0ZAJGrYOSAAE6L0wqB9radKRtbJNrF9+BjSUFyCgBdNBE/GFExo35LoknQDJrfw==", + "requires": { + "vscode-languageserver-textdocument": "^1.0.1", + "vscode-languageserver-types": "3.16.0-next.2", + "vscode-nls": "^5.0.0", + "vscode-uri": "^2.1.2" + } + }, + "vscode-jsonrpc": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz", + "integrity": "sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==" + }, + "vscode-languageserver": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-6.1.1.tgz", + "integrity": "sha512-DueEpkUAkD5XTR4MLYNr6bQIp/UFR0/IPApgXU3YfCBCB08u2sm9hRCs6DxYZELkk++STPjpcjksR2H8qI3cDQ==", + "requires": { + "vscode-languageserver-protocol": "^3.15.3" + } + }, + "vscode-languageserver-protocol": { + "version": "3.16.0", + "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0.tgz", + "integrity": "sha512-sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A==", + "requires": { + "vscode-jsonrpc": "6.0.0", + "vscode-languageserver-types": "3.16.0" + }, + "dependencies": { + "vscode-languageserver-types": { + "version": "3.16.0", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz", + "integrity": "sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==" + } + } + }, + "vscode-languageserver-textdocument": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.1.tgz", + "integrity": "sha512-UIcJDjX7IFkck7cSkNNyzIz5FyvpQfY7sdzVy+wkKN/BLaD4DQ0ppXQrKePomCxTS7RrolK1I0pey0bG9eh8dA==" + }, + "vscode-languageserver-types": { + "version": "3.16.0-next.2", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.2.tgz", + "integrity": "sha512-QjXB7CKIfFzKbiCJC4OWC8xUncLsxo19FzGVp/ADFvvi87PlmBSCAtZI5xwGjF5qE0xkLf0jjKUn3DzmpDP52Q==" + }, + "vscode-nls": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-5.0.0.tgz", + "integrity": "sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA==" + }, + "vscode-uri": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.1.2.tgz", + "integrity": "sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A==" + } + } +} diff --git a/vscode/packages/server/package.json b/vscode/packages/server/package.json new file mode 100644 index 000000000..d5837cc08 --- /dev/null +++ b/vscode/packages/server/package.json @@ -0,0 +1,21 @@ +{ + "name": "@astro-vscode/server", + "version": "0.1.0", + "author": "Skypack", + "license": "MIT", + "main": "dist/index.js", + "files": [ + "dist" + ], + "scripts": { + "build": "tsc" + }, + "devDependencies": { + "astro": "file:../../" + }, + "dependencies": { + "vscode-html-languageservice": "^3.0.3", + "vscode-languageserver": "^6.1.1", + "vscode-languageserver-textdocument": "^1.0.1" + } +} diff --git a/vscode/packages/server/src/index.ts b/vscode/packages/server/src/index.ts new file mode 100644 index 000000000..dda369929 --- /dev/null +++ b/vscode/packages/server/src/index.ts @@ -0,0 +1,32 @@ +import { getLanguageService } from 'vscode-html-languageservice'; +import { createConnection, ProposedFeatures, TextDocuments, TextDocumentSyncKind } from 'vscode-languageserver'; +import { TextDocument } from 'vscode-languageserver-textdocument'; + +let connection = createConnection(ProposedFeatures.all); +let documents: TextDocuments<TextDocument> = new TextDocuments(TextDocument); + +const htmlLanguageService = getLanguageService(); + +connection.onInitialize(() => { + return { + capabilities: { + textDocumentSync: TextDocumentSyncKind.Full, + completionProvider: { + resolveProvider: false, + }, + }, + }; +}); + +connection.onCompletion(async (textDocumentPosition, token) => { + console.log(token); + const document = documents.get(textDocumentPosition.textDocument.uri); + if (!document) { + return null; + } + + return htmlLanguageService.doComplete(document, textDocumentPosition.position, htmlLanguageService.parseHTMLDocument(document)); +}); + +documents.listen(connection); +connection.listen(); diff --git a/vscode/packages/server/tsconfig.json b/vscode/packages/server/tsconfig.json new file mode 100644 index 000000000..6af42d0b2 --- /dev/null +++ b/vscode/packages/server/tsconfig.json @@ -0,0 +1,9 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "outDir": "dist", + "rootDir": "src", + }, + "include": ["src"], + "exclude": ["node_modules"], +} |