diff --git a/package.json b/package.json index f4e1b92..8d09ba1 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "intellisense" ], "description": "Intellisense support for CSS Variables", - "version": "1.3.0", + "version": "1.4.0", "publisher": "phoenisx", "license": "MIT", "homepage": "https://github.com/willofindie/vscode-cssvar", @@ -126,41 +126,41 @@ "test": "cross-env NODE_ENV=production jest" }, "devDependencies": { - "@babel/core": "^7.13.15", - "@babel/preset-env": "^7.13.15", - "@babel/preset-typescript": "^7.13.0", - "@rollup/plugin-commonjs": "^18.0.0", + "@babel/core": "^7.17.8", + "@babel/preset-env": "^7.16.11", + "@babel/preset-typescript": "^7.16.7", + "@rollup/plugin-commonjs": "^18.1.0", "@rollup/plugin-node-resolve": "^11.2.1", "@types/css": "^0.0.31", - "@types/glob": "^7.1.3", - "@types/jest": "^26.0.22", - "@types/lodash": "^4.14.168", - "@types/node": "^12.11.7", - "@types/vscode": "^1.46.0", - "@typescript-eslint/eslint-plugin": "^4.14.1", - "@typescript-eslint/parser": "^4.14.1", + "@types/glob": "^7.2.0", + "@types/jest": "^26.0.24", + "@types/lodash": "^4.14.180", + "@types/node": "^12.20.47", + "@types/vscode": "^1.65.0", + "@typescript-eslint/eslint-plugin": "^5.17.0", + "@typescript-eslint/parser": "^5.17.0", "babel-jest": "^26.6.3", "cross-env": "^7.0.3", - "esbuild": "^0.14.25", - "eslint": "^7.19.0", - "eslint-config-prettier": "^8.1.0", - "eslint-plugin-jest": "^24.4.0", - "eslint-plugin-prettier": "^3.3.1", + "esbuild": "^0.14.28", + "eslint": "^7.32.0", + "eslint-config-prettier": "^8.5.0", + "eslint-plugin-jest": "^24.7.0", + "eslint-plugin-prettier": "^3.4.1", "husky": "^5.2.0", "jest": "^26.6.3", "lint-staged": "^10.5.4", "lodash": "^4.17.21", "postcss-scss": "^4.0.3", - "prettier": "^2.2.1", + "prettier": "^2.6.1", "rimraf": "^3.0.2", - "rollup": "^2.43.0", + "rollup": "^2.70.1", "rollup-plugin-esbuild": "^4.8.2", - "typescript": "^4.1.3" + "typescript": "^4.6.3" }, "dependencies": { "culori": "^2.0.3", - "fast-glob": "^3.2.5", - "postcss": "^8.2.8" + "fast-glob": "^3.2.11", + "postcss": "^8.4.12" }, "lint-staged": { "*.{ts,tsx}": [ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 96c57ac..e75e3c4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,39 +1,39 @@ lockfileVersion: 5.3 specifiers: - '@babel/core': ^7.13.15 - '@babel/preset-env': ^7.13.15 - '@babel/preset-typescript': ^7.13.0 - '@rollup/plugin-commonjs': ^18.0.0 + '@babel/core': ^7.17.8 + '@babel/preset-env': ^7.16.11 + '@babel/preset-typescript': ^7.16.7 + '@rollup/plugin-commonjs': ^18.1.0 '@rollup/plugin-node-resolve': ^11.2.1 '@types/css': ^0.0.31 - '@types/glob': ^7.1.3 - '@types/jest': ^26.0.22 - '@types/lodash': ^4.14.168 - '@types/node': ^12.11.7 - '@types/vscode': ^1.46.0 - '@typescript-eslint/eslint-plugin': ^4.14.1 - '@typescript-eslint/parser': ^4.14.1 + '@types/glob': ^7.2.0 + '@types/jest': ^26.0.24 + '@types/lodash': ^4.14.180 + '@types/node': ^12.20.47 + '@types/vscode': ^1.65.0 + '@typescript-eslint/eslint-plugin': ^5.17.0 + '@typescript-eslint/parser': ^5.17.0 babel-jest: ^26.6.3 cross-env: ^7.0.3 culori: ^2.0.3 - esbuild: ^0.14.25 - eslint: ^7.19.0 - eslint-config-prettier: ^8.1.0 - eslint-plugin-jest: ^24.4.0 - eslint-plugin-prettier: ^3.3.1 - fast-glob: ^3.2.5 + esbuild: ^0.14.28 + eslint: ^7.32.0 + eslint-config-prettier: ^8.5.0 + eslint-plugin-jest: ^24.7.0 + eslint-plugin-prettier: ^3.4.1 + fast-glob: ^3.2.11 husky: ^5.2.0 jest: ^26.6.3 lint-staged: ^10.5.4 lodash: ^4.17.21 - postcss: ^8.2.8 + postcss: ^8.4.12 postcss-scss: ^4.0.3 - prettier: ^2.2.1 + prettier: ^2.6.1 rimraf: ^3.0.2 - rollup: ^2.43.0 + rollup: ^2.70.1 rollup-plugin-esbuild: ^4.8.2 - typescript: ^4.1.3 + typescript: ^4.6.3 dependencies: culori: 2.0.3 @@ -52,14 +52,14 @@ devDependencies: '@types/lodash': 4.14.180 '@types/node': 12.20.47 '@types/vscode': 1.65.0 - '@typescript-eslint/eslint-plugin': 4.33.0_0c49e12669280545a7ea3f36dba6eb0a - '@typescript-eslint/parser': 4.33.0_eslint@7.32.0+typescript@4.6.3 + '@typescript-eslint/eslint-plugin': 5.17.0_6da5f837f6da21a8347f2aaca31a901b + '@typescript-eslint/parser': 5.17.0_eslint@7.32.0+typescript@4.6.3 babel-jest: 26.6.3_@babel+core@7.17.8 cross-env: 7.0.3 esbuild: 0.14.28 eslint: 7.32.0 eslint-config-prettier: 8.5.0_eslint@7.32.0 - eslint-plugin-jest: 24.7.0_012529635eb9b641f5155884af76fbb6 + eslint-plugin-jest: 24.7.0_b8be9f661cec642ef0aba918b93e2ff2 eslint-plugin-prettier: 3.4.1_fc2cf6721c04115df0e3cf8c1adfd531 husky: 5.2.0 jest: 26.6.3 @@ -1747,20 +1747,21 @@ packages: '@types/yargs-parser': 21.0.0 dev: true - /@typescript-eslint/eslint-plugin/4.33.0_0c49e12669280545a7ea3f36dba6eb0a: - resolution: {integrity: sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg==} - engines: {node: ^10.12.0 || >=12.0.0} + /@typescript-eslint/eslint-plugin/5.17.0_6da5f837f6da21a8347f2aaca31a901b: + resolution: {integrity: sha512-qVstvQilEd89HJk3qcbKt/zZrfBZ+9h2ynpAGlWjWiizA7m/MtLT9RoX6gjtpE500vfIg8jogAkDzdCxbsFASQ==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: - '@typescript-eslint/parser': ^4.0.0 - eslint: ^5.0.0 || ^6.0.0 || ^7.0.0 + '@typescript-eslint/parser': ^5.0.0 + eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 typescript: '*' peerDependenciesMeta: typescript: optional: true dependencies: - '@typescript-eslint/experimental-utils': 4.33.0_eslint@7.32.0+typescript@4.6.3 - '@typescript-eslint/parser': 4.33.0_eslint@7.32.0+typescript@4.6.3 - '@typescript-eslint/scope-manager': 4.33.0 + '@typescript-eslint/parser': 5.17.0_eslint@7.32.0+typescript@4.6.3 + '@typescript-eslint/scope-manager': 5.17.0 + '@typescript-eslint/type-utils': 5.17.0_eslint@7.32.0+typescript@4.6.3 + '@typescript-eslint/utils': 5.17.0_eslint@7.32.0+typescript@4.6.3 debug: 4.3.4 eslint: 7.32.0 functional-red-black-tree: 1.0.1 @@ -1791,19 +1792,19 @@ packages: - typescript dev: true - /@typescript-eslint/parser/4.33.0_eslint@7.32.0+typescript@4.6.3: - resolution: {integrity: sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==} - engines: {node: ^10.12.0 || >=12.0.0} + /@typescript-eslint/parser/5.17.0_eslint@7.32.0+typescript@4.6.3: + resolution: {integrity: sha512-aRzW9Jg5Rlj2t2/crzhA2f23SIYFlF9mchGudyP0uiD6SenIxzKoLjwzHbafgHn39dNV/TV7xwQkLfFTZlJ4ig==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: - eslint: ^5.0.0 || ^6.0.0 || ^7.0.0 + eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 typescript: '*' peerDependenciesMeta: typescript: optional: true dependencies: - '@typescript-eslint/scope-manager': 4.33.0 - '@typescript-eslint/types': 4.33.0 - '@typescript-eslint/typescript-estree': 4.33.0_typescript@4.6.3 + '@typescript-eslint/scope-manager': 5.17.0 + '@typescript-eslint/types': 5.17.0 + '@typescript-eslint/typescript-estree': 5.17.0_typescript@4.6.3 debug: 4.3.4 eslint: 7.32.0 typescript: 4.6.3 @@ -1819,11 +1820,43 @@ packages: '@typescript-eslint/visitor-keys': 4.33.0 dev: true + /@typescript-eslint/scope-manager/5.17.0: + resolution: {integrity: sha512-062iCYQF/doQ9T2WWfJohQKKN1zmmXVfAcS3xaiialiw8ZUGy05Em6QVNYJGO34/sU1a7a+90U3dUNfqUDHr3w==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + dependencies: + '@typescript-eslint/types': 5.17.0 + '@typescript-eslint/visitor-keys': 5.17.0 + dev: true + + /@typescript-eslint/type-utils/5.17.0_eslint@7.32.0+typescript@4.6.3: + resolution: {integrity: sha512-3hU0RynUIlEuqMJA7dragb0/75gZmwNwFf/QJokWzPehTZousP/MNifVSgjxNcDCkM5HI2K22TjQWUmmHUINSg==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + peerDependencies: + eslint: '*' + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@typescript-eslint/utils': 5.17.0_eslint@7.32.0+typescript@4.6.3 + debug: 4.3.4 + eslint: 7.32.0 + tsutils: 3.21.0_typescript@4.6.3 + typescript: 4.6.3 + transitivePeerDependencies: + - supports-color + dev: true + /@typescript-eslint/types/4.33.0: resolution: {integrity: sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ==} engines: {node: ^8.10.0 || ^10.13.0 || >=11.10.1} dev: true + /@typescript-eslint/types/5.17.0: + resolution: {integrity: sha512-AgQ4rWzmCxOZLioFEjlzOI3Ch8giDWx8aUDxyNw9iOeCvD3GEYAB7dxWGQy4T/rPVe8iPmu73jPHuaSqcjKvxw==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + dev: true + /@typescript-eslint/typescript-estree/4.33.0_typescript@4.6.3: resolution: {integrity: sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA==} engines: {node: ^10.12.0 || >=12.0.0} @@ -1845,6 +1878,45 @@ packages: - supports-color dev: true + /@typescript-eslint/typescript-estree/5.17.0_typescript@4.6.3: + resolution: {integrity: sha512-X1gtjEcmM7Je+qJRhq7ZAAaNXYhTgqMkR10euC4Si6PIjb+kwEQHSxGazXUQXFyqfEXdkGf6JijUu5R0uceQzg==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + peerDependencies: + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@typescript-eslint/types': 5.17.0 + '@typescript-eslint/visitor-keys': 5.17.0 + debug: 4.3.4 + globby: 11.1.0 + is-glob: 4.0.3 + semver: 7.3.5 + tsutils: 3.21.0_typescript@4.6.3 + typescript: 4.6.3 + transitivePeerDependencies: + - supports-color + dev: true + + /@typescript-eslint/utils/5.17.0_eslint@7.32.0+typescript@4.6.3: + resolution: {integrity: sha512-DVvndq1QoxQH+hFv+MUQHrrWZ7gQ5KcJzyjhzcqB1Y2Xes1UQQkTRPUfRpqhS8mhTWsSb2+iyvDW1Lef5DD7vA==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + peerDependencies: + eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + dependencies: + '@types/json-schema': 7.0.11 + '@typescript-eslint/scope-manager': 5.17.0 + '@typescript-eslint/types': 5.17.0 + '@typescript-eslint/typescript-estree': 5.17.0_typescript@4.6.3 + eslint: 7.32.0 + eslint-scope: 5.1.1 + eslint-utils: 3.0.0_eslint@7.32.0 + transitivePeerDependencies: + - supports-color + - typescript + dev: true + /@typescript-eslint/visitor-keys/4.33.0: resolution: {integrity: sha512-uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg==} engines: {node: ^8.10.0 || ^10.13.0 || >=11.10.1} @@ -1853,6 +1925,14 @@ packages: eslint-visitor-keys: 2.1.0 dev: true + /@typescript-eslint/visitor-keys/5.17.0: + resolution: {integrity: sha512-6K/zlc4OfCagUu7Am/BD5k8PSWQOgh34Nrv9Rxe2tBzlJ7uOeJ/h7ugCGDCeEZHT6k2CJBhbk9IsbkPI0uvUkA==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + dependencies: + '@typescript-eslint/types': 5.17.0 + eslint-visitor-keys: 3.3.0 + dev: true + /abab/2.0.5: resolution: {integrity: sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==} dev: true @@ -2877,7 +2957,7 @@ packages: eslint: 7.32.0 dev: true - /eslint-plugin-jest/24.7.0_012529635eb9b641f5155884af76fbb6: + /eslint-plugin-jest/24.7.0_b8be9f661cec642ef0aba918b93e2ff2: resolution: {integrity: sha512-wUxdF2bAZiYSKBclsUMrYHH6WxiBreNjyDxbRv345TIvPeoCEgPNEn3Sa+ZrSqsf1Dl9SqqSREXMHExlMMu1DA==} engines: {node: '>=10'} peerDependencies: @@ -2887,7 +2967,7 @@ packages: '@typescript-eslint/eslint-plugin': optional: true dependencies: - '@typescript-eslint/eslint-plugin': 4.33.0_0c49e12669280545a7ea3f36dba6eb0a + '@typescript-eslint/eslint-plugin': 5.17.0_6da5f837f6da21a8347f2aaca31a901b '@typescript-eslint/experimental-utils': 4.33.0_eslint@7.32.0+typescript@4.6.3 eslint: 7.32.0 transitivePeerDependencies: @@ -2947,6 +3027,11 @@ packages: engines: {node: '>=10'} dev: true + /eslint-visitor-keys/3.3.0: + resolution: {integrity: sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + dev: true + /eslint/7.32.0: resolution: {integrity: sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==} engines: {node: ^10.12.0 || >=12.0.0} diff --git a/src/completion-provider.ts b/src/completion-provider.ts index 9595094..c2db198 100644 --- a/src/completion-provider.ts +++ b/src/completion-provider.ts @@ -16,7 +16,8 @@ export class CssCompletionProvider implements CompletionItemProvider { position: Position ): Promise { const firstInLine = new Position(position.line, 0); - const language: SupportedLanguageIds = document.languageId as SupportedLanguageIds; + const language: SupportedLanguageIds = + document.languageId as SupportedLanguageIds; /** * VSCode auto-fills extra characters post our current cursor position sometimes