From 7ff4978468bce034953102009da864f555749dcc Mon Sep 17 00:00:00 2001 From: Vu Nguyen Date: Sat, 18 Mar 2023 11:59:14 +0800 Subject: [PATCH 01/12] fix: show morden css color format --- .../src/CSSVariableManager.ts | 9 +- .../src/index.ts | 6 + .../src/utils/isColor.ts | 214 +----------------- 3 files changed, 13 insertions(+), 216 deletions(-) diff --git a/packages/css-variables-language-server/src/CSSVariableManager.ts b/packages/css-variables-language-server/src/CSSVariableManager.ts index 0a35f54..c642102 100644 --- a/packages/css-variables-language-server/src/CSSVariableManager.ts +++ b/packages/css-variables-language-server/src/CSSVariableManager.ts @@ -137,11 +137,10 @@ export default class CSSVariableManager { }, }; - if (isColor(decl.value)) { - const culoriColor = culori.parse(decl.value); - if (culoriColor) { - variable.color = culoriColorToVscodeColor(culoriColor); - } + const culoriColor = culori.parse(decl.value); + + if (culoriColor) { + variable.color = culoriColorToVscodeColor(culoriColor); } // add to cache diff --git a/packages/css-variables-language-server/src/index.ts b/packages/css-variables-language-server/src/index.ts index d8744b0..3d30b49 100644 --- a/packages/css-variables-language-server/src/index.ts +++ b/packages/css-variables-language-server/src/index.ts @@ -22,6 +22,7 @@ import { indexToPosition } from './utils/indexToPosition'; import { getCurrentWord } from './utils/getCurrentWord'; import { isInFunctionExpression } from './utils/isInFunctionExpression'; import CSSVariableManager, { CSSVariablesSettings, defaultSettings } from './CSSVariableManager'; +import { formatHex } from 'culori'; // Create a connection for the server, using Node's IPC as a transport. // Also include all preview / proposed LSP features. @@ -199,6 +200,11 @@ connection.onCompletion( sortText: 'z', }; + if (isColor(varSymbol.value)) { + // convert to hex code + completion.documentation = formatHex(varSymbol.value); + } + if (isFunctionCall) { completion.detail = varSymbol.value; } diff --git a/packages/css-variables-language-server/src/utils/isColor.ts b/packages/css-variables-language-server/src/utils/isColor.ts index 0a5df3e..c972545 100644 --- a/packages/css-variables-language-server/src/utils/isColor.ts +++ b/packages/css-variables-language-server/src/utils/isColor.ts @@ -1,217 +1,9 @@ -// borrow from https://github.com/princejwesley/is-css-color/blob/master/index.js -'use strict'; - -//every string I match against are lowercase -const HEX_PATTERN = /^#(?:[a-f0-9]{3})?(?:[a-f0-9]{3})$/; -// css color names + initial + inherit + currentColor + transparent -const CSS_COLOR_NAMES = [ - 'aliceblue', - 'antiquewhite', - 'aqua', - 'aquamarine', - 'azure', - 'beige', - 'bisque', - 'black', - 'blanchedalmond', - 'blue', - 'blueviolet', - 'brown', - 'burlywood', - 'cadetblue', - 'chartreuse', - 'chocolate', - 'coral', - 'cornflowerblue', - 'cornsilk', - 'crimson', - 'currentColor', - 'cyan', - 'darkblue', - 'darkcyan', - 'darkgoldenrod', - 'darkgray', - 'darkgreen', - 'darkgrey', - 'darkkhaki', - 'darkmagenta', - 'darkolivegreen', - 'darkorange', - 'darkorchid', - 'darkred', - 'darksalmon', - 'darkseagreen', - 'darkslateblue', - 'darkslategray', - 'darkslategrey', - 'darkturquoise', - 'darkviolet', - 'deeppink', - 'deepskyblue', - 'dimgray', - 'dimgrey', - 'dodgerblue', - 'firebrick', - 'floralwhite', - 'forestgreen', - 'fuchsia', - 'gainsboro', - 'ghostwhite', - 'gold', - 'goldenrod', - 'gray', - 'green', - 'greenyellow', - 'grey', - 'honeydew', - 'hotpink', - 'indianred', - 'indigo', - 'inherit', - 'initial', - 'ivory', - 'khaki', - 'lavender', - 'lavenderblush', - 'lawngreen', - 'lemonchiffon', - 'lightblue', - 'lightcoral', - 'lightcyan', - 'lightgoldenrodyellow', - 'lightgray', - 'lightgreen', - 'lightgrey', - 'lightpink', - 'lightsalmon', - 'lightseagreen', - 'lightskyblue', - 'lightslategray', - 'lightslategrey', - 'lightsteelblue', - 'lightyellow', - 'lime', - 'limegreen', - 'linen', - 'magenta', - 'maroon', - 'mediumaquamarine', - 'mediumblue', - 'mediumorchid', - 'mediumpurple', - 'mediumseagreen', - 'mediumslateblue', - 'mediumspringgreen', - 'mediumturquoise', - 'mediumvioletred', - 'midnightblue', - 'mintcream', - 'mistyrose', - 'moccasin', - 'navajowhite', - 'navy', - 'oldlace', - 'olive', - 'olivedrab', - 'orange', - 'orangered', - 'orchid', - 'palegoldenrod', - 'palegreen', - 'paleturquoise', - 'palevioletred', - 'papayawhip', - 'peachpuff', - 'peru', - 'pink', - 'plum', - 'powderblue', - 'purple', - 'rebeccapurple', - 'red', - 'rosybrown', - 'royalblue', - 'saddlebrown', - 'salmon', - 'sandybrown', - 'seagreen', - 'seashell', - 'sienna', - 'silver', - 'skyblue', - 'slateblue', - 'slategray', - 'slategrey', - 'snow', - 'springgreen', - 'steelblue', - 'tan', - 'teal', - 'thistle', - 'tomato', - 'transparent', - 'turquoise', - 'violet', - 'wheat', - 'white', - 'whitesmoke', - 'yellow', - 'yellowgreen', -]; - -const PREFIX = '^(rgb|hsl)(a?)\\s*\\('; -const VALUE = '\\s*([-+]?\\d+%?)\\s*'; -const ALPHA = '(?:,\\s*([-+]?(?:(?:\\d+(?:.\\d+)?)|(?:.\\d+))\\s*))?'; -const SUFFIX = '\\)$'; -const RGB_HSL_PATTERN = new RegExp(PREFIX + VALUE + ',' + VALUE + ',' + VALUE + ALPHA + SUFFIX); - -const NUM_TYPE = 1; -const PERCENTAGE_TYPE = 2; -const ERROR_TYPE = NUM_TYPE & PERCENTAGE_TYPE; +import * as culori from 'culori'; const isColor = (str: string) => { - function getColorType(token: string) { - return token.indexOf('%') !== -1 ? PERCENTAGE_TYPE : NUM_TYPE; - } - - if(!str || typeof str !== 'string') { - return false; - } - - const color = str.replace(/^\s+|\s+$/g, '').toLocaleLowerCase(); - - // named colors or hex code - if((CSS_COLOR_NAMES.indexOf(color) !== -1) || HEX_PATTERN.test(color)) { - return true; - } - - const result = color.match(RGB_HSL_PATTERN); - if(result) { - const flavor = result[1]; - const alpha = result[2]; - const rh = result[3]; - const gs = result[4]; - const bl = result[5]; - const a = result[6]; - - // alpha test - if((alpha === 'a' && !a) || (a && alpha === '')) { - return false; - } - - // hsl - if(flavor === 'hsl') { - if(getColorType(rh) !== NUM_TYPE) { - return false; - } - return (getColorType(gs) & getColorType(bl)) === PERCENTAGE_TYPE; - } - - // rgb - return (getColorType(rh) & getColorType(gs) & getColorType(bl)) !== ERROR_TYPE; - } + const colorTemp = culori.parse(str); - return false; + return !!colorTemp; }; export default isColor; \ No newline at end of file From 3c3030fc82b3115af4a7cf4b98c5bb9e5af6f744 Mon Sep 17 00:00:00 2001 From: Vu Nguyen Date: Sat, 18 Mar 2023 12:34:54 +0800 Subject: [PATCH 02/12] fix: #49 hover range --- packages/css-variables-language-server/src/index.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/css-variables-language-server/src/index.ts b/packages/css-variables-language-server/src/index.ts index 3d30b49..46e9376 100644 --- a/packages/css-variables-language-server/src/index.ts +++ b/packages/css-variables-language-server/src/index.ts @@ -284,7 +284,6 @@ connection.onHover((params) => { if (cssVariable) { return { contents: cssVariable.symbol.value, - range: cssVariable.definition.range, } as Hover; } From f3804031d78fba8d2215d1e747b13011fab7b8c8 Mon Sep 17 00:00:00 2001 From: Vu Nguyen Date: Sat, 2 Sep 2023 16:23:51 +0800 Subject: [PATCH 03/12] Create tall-turtles-arrive.md --- .changeset/tall-turtles-arrive.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changeset/tall-turtles-arrive.md diff --git a/.changeset/tall-turtles-arrive.md b/.changeset/tall-turtles-arrive.md new file mode 100644 index 0000000..d528190 --- /dev/null +++ b/.changeset/tall-turtles-arrive.md @@ -0,0 +1,6 @@ +--- +"css-variables-language-server": patch +--- + +feat: 52 support for color functional notation +fix: excessive highlighting when hovering over variable From 113a41003348a9f4c972aaf4b351e2d93a64616c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 27 Nov 2023 04:03:35 +0000 Subject: [PATCH 04/12] Version Packages --- .changeset/tall-turtles-arrive.md | 6 ------ packages/css-variables-language-server/CHANGELOG.md | 7 +++++++ packages/css-variables-language-server/package.json | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) delete mode 100644 .changeset/tall-turtles-arrive.md diff --git a/.changeset/tall-turtles-arrive.md b/.changeset/tall-turtles-arrive.md deleted file mode 100644 index d528190..0000000 --- a/.changeset/tall-turtles-arrive.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"css-variables-language-server": patch ---- - -feat: 52 support for color functional notation -fix: excessive highlighting when hovering over variable diff --git a/packages/css-variables-language-server/CHANGELOG.md b/packages/css-variables-language-server/CHANGELOG.md index 49c0cc1..7fc98db 100644 --- a/packages/css-variables-language-server/CHANGELOG.md +++ b/packages/css-variables-language-server/CHANGELOG.md @@ -1,5 +1,12 @@ # css-variables-language-server +## 2.6.4 + +### Patch Changes + +- f380403: feat: 52 support for color functional notation + fix: excessive highlighting when hovering over variable + ## 2.6.2 ### Patch Changes diff --git a/packages/css-variables-language-server/package.json b/packages/css-variables-language-server/package.json index 95ff113..749e2b8 100644 --- a/packages/css-variables-language-server/package.json +++ b/packages/css-variables-language-server/package.json @@ -1,7 +1,7 @@ { "name": "css-variables-language-server", "description": "CSS Variables Language Server in node.", - "version": "2.6.2", + "version": "2.6.4", "author": "Vu Nguyen", "license": "MIT", "repository": { From 3798d52edbf6fb3701eaf85d8c29b3e6d26113b7 Mon Sep 17 00:00:00 2001 From: Michael Ferris Date: Tue, 30 Jan 2024 19:32:37 -0500 Subject: [PATCH 05/12] Added setting to configure languages the extension should provide suggestions --- README.md | 25 +++++++++++++-- package-lock.json | 8 ++--- packages/vscode-css-variables/package.json | 23 +++++++++++++- packages/vscode-css-variables/src/index.ts | 37 ++++++++++++---------- 4 files changed, 68 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 5a6339c..3781f99 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ **[Install via the Visual Studio Code Marketplace →](https://marketplace.visualstudio.com/items?itemName=vunguyentuan.vscode-css-variables)** -By default the extension only scan files with this glob patterns: +By default the extension only scan files with this glob patterns: ```json [ @@ -26,7 +26,6 @@ And ignore files in these folders: "**/.hg", "**/CVS", "**/.DS_Store", - "**/.git", "**/node_modules", "**/bower_components", "**/tmp", @@ -35,6 +34,28 @@ And ignore files in these folders: ] ``` +And provides suggestions to files for the following languages + +```json +[ + "astro", + "svelte", + "vue", + "vue-html", + "vue-postcss", + "scss", + "postcss", + "less", + "css", + "html", + "javascript", + "javascriptreact", + "typescript", + "typescriptreact", + "source.css.styled" +] +``` + ## Features ### Autocomplete & Color Preview diff --git a/package-lock.json b/package-lock.json index e92a1dc..8b13b09 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10298,7 +10298,7 @@ } }, "packages/css-variables-language-server": { - "version": "2.6.1", + "version": "2.6.4", "license": "MIT", "dependencies": { "axios": "^0.27.2", @@ -10352,10 +10352,7 @@ } }, "packages/vscode-css-variables": { - "version": "2.6.1", - "dependencies": { - "css-variables-language-server": "*" - }, + "version": "2.6.3", "devDependencies": { "@types/mocha": "^9.1.1", "@types/node": "^18.7.13", @@ -10363,6 +10360,7 @@ "@typescript-eslint/eslint-plugin": "^5.35.1", "@typescript-eslint/parser": "^5.35.1", "@vscode/test-electron": "^2.1.5", + "css-variables-language-server": "*", "eslint": "^8.23.0", "eslint-config-airbnb-typescript": "^17.0.0", "mocha": "^10.0.0", diff --git a/packages/vscode-css-variables/package.json b/packages/vscode-css-variables/package.json index 84ad2be..55cf67a 100644 --- a/packages/vscode-css-variables/package.json +++ b/packages/vscode-css-variables/package.json @@ -61,6 +61,28 @@ ] } }, + "cssVariables.languages": { + "type": "array", + "markdownDescription": "Configure the languages for which the extension should be activated. Read more about language identifiers [here](https://code.visualstudio.com/docs/languages/identifiers#_known-language-identifiers).", + "default": [ + "astro", + "svelte", + "vue", + "vue-html", + "vue-postcss", + "scss", + "postcss", + "less", + "css", + "html", + "javascript", + "javascriptreact", + "typescript", + "typescriptreact", + "source.css.styled" + ], + "scope": 3 + }, "cssVariables.blacklistFolders": { "type": "array", "markdownDescription": "Configure glob patterns for excluding files and folders. The extension will not scan variables in these files and folders. Read more about glob patterns [here](https://code.visualstudio.com/docs/editor/codebasics#_advanced-search-options).", @@ -70,7 +92,6 @@ "**/.hg", "**/CVS", "**/.DS_Store", - "**/.git", "**/node_modules", "**/bower_components", "**/tmp", diff --git a/packages/vscode-css-variables/src/index.ts b/packages/vscode-css-variables/src/index.ts index f5bddb6..52c64ee 100644 --- a/packages/vscode-css-variables/src/index.ts +++ b/packages/vscode-css-variables/src/index.ts @@ -34,25 +34,28 @@ export function activate(context: ExtensionContext) { }, }; + const settings = workspace.getConfiguration('cssVariables'); + const languages = settings.get('languages', [ + 'astro', + 'svelte', + 'vue', + 'vue-html', + 'vue-postcss', + 'scss', + 'postcss', + 'less', + 'css', + 'html', + 'javascript', + 'javascriptreact', + 'typescript', + 'typescriptreact', + 'source.css.styled', + ]); + // Options to control the language client const clientOptions: LanguageClientOptions = { - documentSelector: [ - 'onLanguage:astro', - 'onLanguage:svelte', - 'onLanguage:vue', - 'onLanguage:vue-html', - 'onLanguage:vue-postcss', - 'onLanguage:scss', - 'onLanguage:postcss', - 'onLanguage:less', - 'onLanguage:css', - 'onLanguage:html', - 'onLanguage:javascript', - 'onLanguage:javascriptreact', - 'onLanguage:typescript', - 'onLanguage:typescriptreact', - 'onLanguage:source.css.styled', - ].map((event) => ({ + documentSelector: languages.map((event) => ({ scheme: 'file', language: event.split(':')[1], })), From d887de03c1ab54bf18b5239250f1bb6abc67db91 Mon Sep 17 00:00:00 2001 From: Michael Ferris Date: Tue, 30 Jan 2024 19:37:18 -0500 Subject: [PATCH 06/12] Add changeset --- .changeset/rude-students-mate.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/rude-students-mate.md diff --git a/.changeset/rude-students-mate.md b/.changeset/rude-students-mate.md new file mode 100644 index 0000000..9fe1ba7 --- /dev/null +++ b/.changeset/rude-students-mate.md @@ -0,0 +1,5 @@ +--- +"vscode-css-variables": patch +--- + +Added setting to configure languages the extension should provide suggestions From 0299cc6681705a51c27c7e4632155d74260295ae Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 31 Jan 2024 04:37:45 +0000 Subject: [PATCH 07/12] Version Packages --- .changeset/rude-students-mate.md | 5 ----- packages/vscode-css-variables/CHANGELOG.md | 6 ++++++ packages/vscode-css-variables/package.json | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) delete mode 100644 .changeset/rude-students-mate.md diff --git a/.changeset/rude-students-mate.md b/.changeset/rude-students-mate.md deleted file mode 100644 index 9fe1ba7..0000000 --- a/.changeset/rude-students-mate.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"vscode-css-variables": patch ---- - -Added setting to configure languages the extension should provide suggestions diff --git a/packages/vscode-css-variables/CHANGELOG.md b/packages/vscode-css-variables/CHANGELOG.md index cd327e0..33680b7 100644 --- a/packages/vscode-css-variables/CHANGELOG.md +++ b/packages/vscode-css-variables/CHANGELOG.md @@ -1,5 +1,11 @@ # vscode-css-variables +## 2.6.5 + +### Patch Changes + +- d887de0: Added setting to configure languages the extension should provide suggestions + ## 2.6.3 ### Patch Changes diff --git a/packages/vscode-css-variables/package.json b/packages/vscode-css-variables/package.json index 55cf67a..a547c4e 100644 --- a/packages/vscode-css-variables/package.json +++ b/packages/vscode-css-variables/package.json @@ -1,6 +1,6 @@ { "name": "vscode-css-variables", - "version": "2.6.3", + "version": "2.6.5", "displayName": "CSS Variable Autocomplete", "description": "Autocomplete CSS Variable support CSS, SCSS, LESS, PostCSS, VueJS, ReactJS and more", "publisher": "vunguyentuan", From 26ad307c8c065c1a913174bd0cc423422fcb8b70 Mon Sep 17 00:00:00 2001 From: Rogin Farrer Date: Fri, 1 Mar 2024 18:00:03 -0800 Subject: [PATCH 08/12] Add executable for language server --- package-lock.json | 5 +- .../.eslintrc.js | 31 +++---- .../bin/index.js | 3 + .../package.json | 93 ++++++++++--------- 4 files changed, 69 insertions(+), 63 deletions(-) create mode 100755 packages/css-variables-language-server/bin/index.js diff --git a/package-lock.json b/package-lock.json index 8b13b09..7c34742 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10314,6 +10314,9 @@ "vscode-languageserver-textdocument": "^1.0.1", "vscode-uri": "^3.0.3" }, + "bin": { + "css-variables-language-server": "bin/index.mjs" + }, "devDependencies": { "@types/jest": "^28.1.8", "@types/less": "^3.0.3", @@ -10352,7 +10355,7 @@ } }, "packages/vscode-css-variables": { - "version": "2.6.3", + "version": "2.6.5", "devDependencies": { "@types/mocha": "^9.1.1", "@types/node": "^18.7.13", diff --git a/packages/css-variables-language-server/.eslintrc.js b/packages/css-variables-language-server/.eslintrc.js index f660e39..a2a99f6 100644 --- a/packages/css-variables-language-server/.eslintrc.js +++ b/packages/css-variables-language-server/.eslintrc.js @@ -1,20 +1,17 @@ /**@type {import('eslint').Linter.Config} */ // eslint-disable-next-line no-undef module.exports = { - root: true, - parser: '@typescript-eslint/parser', - plugins: [ - '@typescript-eslint', - ], - extends: [ - 'eslint:recommended', - 'plugin:@typescript-eslint/recommended', - ], - rules: { - 'semi': [2, "always"], - '@typescript-eslint/no-unused-vars': 0, - '@typescript-eslint/no-explicit-any': 0, - '@typescript-eslint/explicit-module-boundary-types': 0, - '@typescript-eslint/no-non-null-assertion': 0, - } -}; \ No newline at end of file + root: true, + env: { node: true }, + parser: "@typescript-eslint/parser", + plugins: ["@typescript-eslint"], + extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended"], + rules: { + semi: [2, "always"], + "@typescript-eslint/no-unused-vars": 0, + "@typescript-eslint/no-explicit-any": 0, + "@typescript-eslint/explicit-module-boundary-types": 0, + "@typescript-eslint/no-non-null-assertion": 0 + } +}; + diff --git a/packages/css-variables-language-server/bin/index.js b/packages/css-variables-language-server/bin/index.js new file mode 100755 index 0000000..b3a7f9f --- /dev/null +++ b/packages/css-variables-language-server/bin/index.js @@ -0,0 +1,3 @@ +#!/usr/bin/env node + +require("../dist/index.js"); diff --git a/packages/css-variables-language-server/package.json b/packages/css-variables-language-server/package.json index 749e2b8..8e6c02c 100644 --- a/packages/css-variables-language-server/package.json +++ b/packages/css-variables-language-server/package.json @@ -1,47 +1,50 @@ { - "name": "css-variables-language-server", - "description": "CSS Variables Language Server in node.", - "version": "2.6.4", - "author": "Vu Nguyen", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/vunguyentuan/vscode-css-variables.git" - }, - "main": "dist/index.js", - "dependencies": { - "axios": "^0.27.2", - "culori": "0.20.1", - "fast-glob": "^3.2.7", - "less": "^4.1.3", - "line-column": "^1.0.2", - "postcss": "^8.4.16", - "postcss-less": "^6.0.0", - "postcss-scss": "^4.0.4", - "sass": "^1.54.7", - "vscode-languageserver": "^7.0.0", - "vscode-languageserver-textdocument": "^1.0.1", - "vscode-uri": "^3.0.3" - }, - "scripts": { - "test": "jest", - "build": "tsup src/index.ts --format esm,cjs", - "dev": "tsup src/index.ts --format esm,cjs --watch", - "clean": "rm -rf dist", - "lint": "eslint ./src --ext .ts,.tsx --fix" - }, - "devDependencies": { - "@types/jest": "^28.1.8", - "@types/less": "^3.0.3", - "@types/postcss-less": "^4.0.2", - "@typescript-eslint/eslint-plugin": "^5.35.1", - "@typescript-eslint/parser": "^5.35.1", - "eslint": "^8.23.0", - "eslint-config-airbnb-typescript": "^17.0.0", - "jest": "^28.0.0", - "jest-environment-node-single-context": "^28.1.0", - "ts-jest": "^28.0.8", - "tsup": "^6.2.3", - "typescript": "^4.8.2" - } + "name": "css-variables-language-server", + "description": "CSS Variables Language Server in node.", + "version": "2.6.4", + "author": "Vu Nguyen", + "license": "MIT", + "repository": { + "type": "git", + "url": "https://github.com/vunguyentuan/vscode-css-variables.git" + }, + "main": "dist/index.js", + "bin": { + "css-variables-language-server": "bin/index.js" + }, + "dependencies": { + "axios": "^0.27.2", + "culori": "0.20.1", + "fast-glob": "^3.2.7", + "less": "^4.1.3", + "line-column": "^1.0.2", + "postcss": "^8.4.16", + "postcss-less": "^6.0.0", + "postcss-scss": "^4.0.4", + "sass": "^1.54.7", + "vscode-languageserver": "^7.0.0", + "vscode-languageserver-textdocument": "^1.0.1", + "vscode-uri": "^3.0.3" + }, + "scripts": { + "test": "jest", + "build": "tsup src/index.ts --format esm,cjs", + "dev": "tsup src/index.ts --format esm,cjs --watch", + "clean": "rm -rf dist", + "lint": "eslint ./src --ext .ts,.tsx --fix" + }, + "devDependencies": { + "@types/jest": "^28.1.8", + "@types/less": "^3.0.3", + "@types/postcss-less": "^4.0.2", + "@typescript-eslint/eslint-plugin": "^5.35.1", + "@typescript-eslint/parser": "^5.35.1", + "eslint": "^8.23.0", + "eslint-config-airbnb-typescript": "^17.0.0", + "jest": "^28.0.0", + "jest-environment-node-single-context": "^28.1.0", + "ts-jest": "^28.0.8", + "tsup": "^6.2.3", + "typescript": "^4.8.2" + } } From 3a5bfa921673bcc40ead0a37a30583f65e29eba7 Mon Sep 17 00:00:00 2001 From: Rogin Farrer Date: Sat, 2 Mar 2024 10:05:57 -0800 Subject: [PATCH 09/12] Create loud-lizards-tan.md --- .changeset/loud-lizards-tan.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .changeset/loud-lizards-tan.md diff --git a/.changeset/loud-lizards-tan.md b/.changeset/loud-lizards-tan.md new file mode 100644 index 0000000..859adea --- /dev/null +++ b/.changeset/loud-lizards-tan.md @@ -0,0 +1,10 @@ +--- +"css-variables-language-server": minor +--- + +Add executable for language server to run from the commandline. + +```sh +$ npm install -g css-variables-language-server +$ css-variables-language-server --stdio +``` From b50a29c1d6c90501de4830eda3fc49a5a7c91a2f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 3 Mar 2024 09:44:33 +0000 Subject: [PATCH 10/12] Version Packages --- .changeset/loud-lizards-tan.md | 10 ---------- packages/css-variables-language-server/CHANGELOG.md | 11 +++++++++++ packages/css-variables-language-server/package.json | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) delete mode 100644 .changeset/loud-lizards-tan.md diff --git a/.changeset/loud-lizards-tan.md b/.changeset/loud-lizards-tan.md deleted file mode 100644 index 859adea..0000000 --- a/.changeset/loud-lizards-tan.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -"css-variables-language-server": minor ---- - -Add executable for language server to run from the commandline. - -```sh -$ npm install -g css-variables-language-server -$ css-variables-language-server --stdio -``` diff --git a/packages/css-variables-language-server/CHANGELOG.md b/packages/css-variables-language-server/CHANGELOG.md index 7fc98db..9dc215f 100644 --- a/packages/css-variables-language-server/CHANGELOG.md +++ b/packages/css-variables-language-server/CHANGELOG.md @@ -1,5 +1,16 @@ # css-variables-language-server +## 2.7.0 + +### Minor Changes + +- 3a5bfa9: Add executable for language server to run from the commandline. + + ```sh + $ npm install -g css-variables-language-server + $ css-variables-language-server --stdio + ``` + ## 2.6.4 ### Patch Changes diff --git a/packages/css-variables-language-server/package.json b/packages/css-variables-language-server/package.json index 8e6c02c..2aa9c06 100644 --- a/packages/css-variables-language-server/package.json +++ b/packages/css-variables-language-server/package.json @@ -1,7 +1,7 @@ { "name": "css-variables-language-server", "description": "CSS Variables Language Server in node.", - "version": "2.6.4", + "version": "2.7.0", "author": "Vu Nguyen", "license": "MIT", "repository": { From ee114b141b8cc11d7376d25f59665d0d285bfee4 Mon Sep 17 00:00:00 2001 From: Michael Ferris Date: Wed, 6 Mar 2024 10:02:26 -0500 Subject: [PATCH 11/12] Fixed settings to only contribute this extension to files with specified languages --- .changeset/kind-years-heal.md | 5 +++++ .vscode/launch.json | 2 +- .vscode/settings.json | 2 +- packages/vscode-css-variables/src/index.ts | 4 ++-- 4 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 .changeset/kind-years-heal.md diff --git a/.changeset/kind-years-heal.md b/.changeset/kind-years-heal.md new file mode 100644 index 0000000..3f2b79f --- /dev/null +++ b/.changeset/kind-years-heal.md @@ -0,0 +1,5 @@ +--- +"vscode-css-variables": patch +--- + +Fixed settings to only contribute this extension to files with specified languages diff --git a/.vscode/launch.json b/.vscode/launch.json index fea3525..1ffee42 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -7,7 +7,7 @@ "request": "launch", "name": "Launch Client", "runtimeExecutable": "${execPath}", - "args": ["--extensionDevelopmentPath=${workspaceRoot}/packages/vscode-css-variables"], + "args": ["--extensionDevelopmentPath=${workspaceRoot}/packages/vscode-css-variables", "--disable-extensions"], "sourceMaps": true, "outFiles": ["${workspaceRoot}/packages/vscode-css-variables/dist/**/*.js"], "preLaunchTask": "npm: build" diff --git a/.vscode/settings.json b/.vscode/settings.json index 6f21526..e494c2d 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -3,7 +3,7 @@ "typescript.tsc.autoDetect": "off", "typescript.preferences.quoteStyle": "single", "editor.codeActionsOnSave": { - "source.fixAll.eslint": true + "source.fixAll.eslint": "explicit" }, "eslint.workingDirectories": [ "packages/*" diff --git a/packages/vscode-css-variables/src/index.ts b/packages/vscode-css-variables/src/index.ts index 52c64ee..81204d0 100644 --- a/packages/vscode-css-variables/src/index.ts +++ b/packages/vscode-css-variables/src/index.ts @@ -55,9 +55,9 @@ export function activate(context: ExtensionContext) { // Options to control the language client const clientOptions: LanguageClientOptions = { - documentSelector: languages.map((event) => ({ + documentSelector: languages.map((language) => ({ scheme: 'file', - language: event.split(':')[1], + language, })), synchronize: { fileEvents: [ From ce88c60498a51e0e689b5d228b685a253732343d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 6 Mar 2024 15:50:18 +0000 Subject: [PATCH 12/12] Version Packages --- .changeset/kind-years-heal.md | 5 ----- packages/vscode-css-variables/CHANGELOG.md | 6 ++++++ packages/vscode-css-variables/package.json | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) delete mode 100644 .changeset/kind-years-heal.md diff --git a/.changeset/kind-years-heal.md b/.changeset/kind-years-heal.md deleted file mode 100644 index 3f2b79f..0000000 --- a/.changeset/kind-years-heal.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"vscode-css-variables": patch ---- - -Fixed settings to only contribute this extension to files with specified languages diff --git a/packages/vscode-css-variables/CHANGELOG.md b/packages/vscode-css-variables/CHANGELOG.md index 33680b7..d1b1c87 100644 --- a/packages/vscode-css-variables/CHANGELOG.md +++ b/packages/vscode-css-variables/CHANGELOG.md @@ -1,5 +1,11 @@ # vscode-css-variables +## 2.7.1 + +### Patch Changes + +- ee114b1: Fixed settings to only contribute this extension to files with specified languages + ## 2.6.5 ### Patch Changes diff --git a/packages/vscode-css-variables/package.json b/packages/vscode-css-variables/package.json index a547c4e..8b7e33c 100644 --- a/packages/vscode-css-variables/package.json +++ b/packages/vscode-css-variables/package.json @@ -1,6 +1,6 @@ { "name": "vscode-css-variables", - "version": "2.6.5", + "version": "2.7.1", "displayName": "CSS Variable Autocomplete", "description": "Autocomplete CSS Variable support CSS, SCSS, LESS, PostCSS, VueJS, ReactJS and more", "publisher": "vunguyentuan",