Skip to content

Commit fcc38d1

Browse files
authored
Merge pull request #120 from zardoy/develop
2 parents 8f884d1 + b23baeb commit fcc38d1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+1844
-1559
lines changed

.eslintignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# ignore files that have typescript import
2-
typescript/**
31
src/configurationType.ts
42
src/configurationTypeCache.jsonc
53
playground.ts

.eslintrc.json

Lines changed: 57 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,61 @@
11
{
22
"extends": "zardoy",
33
"rules": {
4-
"curly": "off"
5-
}
4+
"curly": "off",
5+
"import/no-deprecated": "off",
6+
// investigate why it is soooo slow...
7+
"import/no-named-as-default": "off",
8+
"import/no-named-as-default-member": "off",
9+
"default-case": "off",
10+
"sonarjs/no-duplicate-string": "off",
11+
"@typescript-eslint/naming-convention": "off",
12+
"no-empty-function": "off",
13+
"no-useless-return": "off",
14+
"no-template-curly-in-string": "off",
15+
"@typescript-eslint/no-explicit-any": "off",
16+
// better to fix rule
17+
"unicorn/consistent-destructuring": "off",
18+
"@typescript-eslint/no-restricted-imports": [
19+
"error",
20+
{
21+
"patterns": [
22+
{
23+
"group": [
24+
"typescript*",
25+
"!../*"
26+
],
27+
"message": "Use global ts type and variable instead"
28+
// "allowTypeImports": true
29+
}
30+
]
31+
}
32+
]
33+
},
34+
"overrides": [
35+
{
36+
"files": "typescript/**",
37+
"parserOptions": {
38+
"project": "typescript/tsconfig.json"
39+
},
40+
"rules": {
41+
"@typescript-eslint/padding-line-between-statements": "off",
42+
"arrow-body-style": "off",
43+
"import/no-extraneous-dependencies": "off",
44+
"@typescript-eslint/no-loop-func": "off",
45+
// always used intentionally as workaround for possibly undefined types (to not declare super complex types - cases)
46+
"@typescript-eslint/no-unnecessary-boolean-literal-compare": "off",
47+
// todo configure instead
48+
"complexity": "off",
49+
"max-params": "off",
50+
"max-depth": "off",
51+
"@typescript-eslint/dot-notation": "off",
52+
"no-bitwise": "off",
53+
// todo just not sure
54+
"@typescript-eslint/prefer-regexp-exec": "off",
55+
"no-negated-condition": "off",
56+
"@typescript-eslint/prefer-nullish-coalescing": "off",
57+
"unicorn/prefer-set-has": "off"
58+
}
59+
}
60+
]
661
}

.vscode/settings.json

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,8 @@
66
}
77
},
88
"tsEssentialPlugins.suggestions.ignoreAutoImports": [
9-
"typescript-full"
10-
],
11-
"betterSnippets.customSnippets": [
12-
{
13-
"name": "SyntaxKind",
14-
"body": "ts.SyntaxKind",
15-
"when": {}
16-
},
17-
{
18-
"name": "logKind",
19-
"body": "console.log(ts.SyntaxKind[${1:node}!.kind])",
20-
"when": {
21-
"locations": [
22-
"lineStart"
23-
],
24-
}
25-
}
9+
"typescript-full",
10+
"@volar/language-service/*"
2611
],
2712
"githubPullRequests.ignoredPullRequestBranches": [
2813
"develop"

package.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,11 @@
5050
"command": "goToNodeBySyntaxKindWithinSelection",
5151
"title": "Go to Node by Syntax Kind Within Selection",
5252
"category": "TS Essentials"
53+
},
54+
{
55+
"command": "insertNameOfCompletion",
56+
"title": "Insert Name of Completion",
57+
"category": "TS Essentials"
5358
}
5459
],
5560
"keybindings": [
@@ -98,7 +103,7 @@
98103
"watch-plugin": "node buildTsPlugin.mjs --watch",
99104
"build": "tsc && tsc -p typescript --noEmit && vscode-framework build && pnpm build-plugin",
100105
"build-plugin": "node buildTsPlugin.mjs && node buildTsPlugin.mjs --browser",
101-
"lint": "eslint src/**",
106+
"lint": "eslint {src/**,typescript/src/**}",
102107
"test": "pnpm test-plugin --run && pnpm integration-test",
103108
"test-plugin": "vitest --globals --dir typescript/test/ --environment ts-plugin",
104109
"integration-test": "node integration/prerun.mjs && tsc -p tsconfig.test.json && node testsOut/runTests.js",
@@ -119,7 +124,7 @@
119124
"tsm": "^2.3.0",
120125
"type-fest": "^2.13.1",
121126
"typed-jsonfile": "^0.2.1",
122-
"typescript": "^4.9.3",
127+
"typescript": "^5.0.2",
123128
"vite": "^4.1.1",
124129
"vitest": "^0.26.0",
125130
"vitest-environment-ts-plugin": "./vitest-environment-ts-plugin",

0 commit comments

Comments
 (0)