Skip to content

Commit de8c9af

Browse files
CGNonofrCGNonofr
authored
Merge pull request #25 from CodinGame/fix-themes-hc
Fix default themes + monarch fallback
2 parents 2d15fe2 + d5fbe13 commit de8c9af

49 files changed

Lines changed: 3635 additions & 1657 deletions

Some content is hidden

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

‎package-lock.json‎

Lines changed: 289 additions & 306 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,46 +21,45 @@
2121
],
2222
"types": "dist/index.d.ts",
2323
"dependencies": {
24-
"delay": ">=5.0.0",
25-
"monaco-editor": "npm:@codingame/monaco-editor@^0.33.0",
26-
"monaco-emacs": "^0.3.0",
27-
"monaco-vim": "^0.3.0",
24+
"monaco-editor": "npm:@codingame/monaco-editor@^0.33.6",
2825
"vscode-oniguruma": "^1.6.2"
2926
},
3027
"devDependencies": {
31-
"@babel/core": "7.17.8",
28+
"@babel/core": "7.17.9",
3229
"@babel/plugin-proposal-class-properties": "7.16.7",
3330
"@babel/plugin-proposal-optional-chaining": "7.16.7",
3431
"@babel/preset-env": "7.16.11",
3532
"@babel/preset-typescript": "7.16.7",
36-
"@babel/runtime": "7.17.8",
33+
"@babel/runtime": "7.17.9",
3734
"@rollup/plugin-alias": "3.1.9",
3835
"@rollup/plugin-babel": "5.3.1",
3936
"@rollup/plugin-commonjs": "21.0.3",
40-
"@rollup/plugin-eslint": "8.0.1",
37+
"@rollup/plugin-eslint": "8.0.2",
4138
"@rollup/plugin-json": "4.1.0",
42-
"@rollup/plugin-node-resolve": "13.1.3",
43-
"@rollup/plugin-typescript": "^8.3.1",
39+
"@rollup/plugin-node-resolve": "13.2.0",
40+
"@rollup/plugin-typescript": "^8.3.2",
4441
"@types/ini": "1.3.31",
4542
"@types/node": "16.11.7",
4643
"@types/rollup-plugin-node-builtins": "^2.1.2",
47-
"@typescript-eslint/eslint-plugin": "5.16.0",
48-
"@typescript-eslint/parser": "5.16.0",
44+
"@typescript-eslint/eslint-plugin": "5.19.0",
45+
"@typescript-eslint/parser": "5.19.0",
4946
"babel-eslint": "10.1.0",
5047
"conventional-changelog-conventionalcommits": "^4.6.3",
5148
"cson-parser": "4.0.9",
5249
"deep-equal": "2.0.5",
53-
"eslint": "8.12.0",
50+
"eslint": "8.13.0",
5451
"eslint-config-standard": "16.0.3",
5552
"eslint-config-standard-jsx": "10.0.0",
56-
"eslint-plugin-import": "2.25.4",
53+
"eslint-plugin-import": "2.26.0",
5754
"eslint-plugin-node": "11.1.0",
5855
"eslint-plugin-promise": "6.0.0",
5956
"eslint-plugin-standard": "5.0.0",
6057
"eslint-plugin-unused-imports": "2.0.0",
6158
"fast-plist": "0.1.2",
62-
"ini": "2.0.0",
59+
"ini": "3.0.0",
6360
"json5": "2.2.1",
61+
"monaco-emacs": "^0.3.0",
62+
"monaco-vim": "^0.3.4",
6463
"postcss": "8.4.12",
6564
"rollup": "2.70.1",
6665
"rollup-plugin-json5": "1.0.0",
@@ -73,8 +72,8 @@
7372
"tslib": "^2.3.1",
7473
"typescript": "4.6.3",
7574
"vscode-languageserver-protocol": "3.16.0",
76-
"vscode-textmate": "6.0.0",
77-
"yaml": "1.10.2"
75+
"vscode-textmate": "^6.0.0",
76+
"yaml": "2.0.0"
7877
},
7978
"browserslist": [
8079
"defaults",

‎src/index.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import * as monaco from 'monaco-editor'
22
import { createEditor, registerEditorOpenHandler, registerTextModelContentProvider } from './monaco'
3-
import { addVSCodeTheme } from './theme'
3+
import { defineVSCodeTheme } from './theme'
44
import { updateUserConfiguration, registerConfigurations, registerDefaultConfigurations, onConfigurationChanged, getConfiguration } from './configuration'
55
import { getMonacoLanguage, loadLanguage } from './languages'
66
import { updateKeybindings, updateEditorKeybindingsMode } from './keybindings'
7-
import { getThemeData } from './theme/registry'
7+
import { getThemeData, getThemes } from './theme/registry'
88
import type { IVSCodeTheme } from './theme/tools'
99

1010
export * from './tools'
@@ -13,7 +13,8 @@ export {
1313
monaco,
1414
createEditor,
1515

16-
addVSCodeTheme,
16+
defineVSCodeTheme,
17+
getThemes,
1718
getThemeData,
1819

1920
registerConfigurations,

‎src/languages/extensions/configurations/angular.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,12 @@
4848
"default": true,
4949
"markdownDescription": "Enable/disable snippet completions from Angular language server. Requires using TypeScript 4.3+ in the workspace and the `legacy View Engine` option to be disabled.",
5050
"scope": 3
51+
},
52+
"angular.disableAutomaticNgcc": {
53+
"type": "boolean",
54+
"default": false,
55+
"markdownDescription": "Disable the step to automatically run ngcc. [ngcc](https://github.com/angular/angular/blob/master/packages/compiler/design/architecture.md#high-level-proposal) is required to run and gather metadata from libraries not published with Ivy instructions. This can be run outside of VSCode instead (for example, as part of the build/rebuild in the CLI). Note that ngcc needs to run not only at startup, but also whenever the dependencies change. Failing to run ngcc when required can result in incomplete information and spurious errors reported by the language service.",
56+
"scope": 3
5157
}
5258
}
5359
}

‎src/languages/extensions/configurations/cobol.json‎

Lines changed: 189 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"properties": {
55
"cobol-lsp.cpy-manager.profiles": {
66
"type": "string",
7-
"description": "Current default profile for copybook downloader",
7+
"description": "Current default profile for copybook downloader\nZowe Explorer version 1.15.0 or higher is required to download copybooks from the mainframe",
88
"scope": 3
99
},
1010
"cobol-lsp.cpy-manager.paths-local": {
@@ -21,10 +21,185 @@
2121
"items": {
2222
"type": "string"
2323
},
24-
"description": "Default list of datasets to search for copybooks",
24+
"description": "Default list of datasets to search for copybooks\nZowe Explorer version 1.15.0 or higher is required to download copybooks from the mainframe",
2525
"uniqueItems": true,
2626
"scope": 3
2727
},
28+
"cobol-lsp.cpy-manager.paths-uss": {
29+
"type": "array",
30+
"items": {
31+
"type": "string"
32+
},
33+
"description": "Default list of USS paths to search for copybooks\nZowe Explorer version 1.15.0 or higher is required to download copybooks from the mainframe",
34+
"uniqueItems": true,
35+
"scope": 3
36+
},
37+
"cobol-lsp.cpy-manager.idms.paths-local": {
38+
"type": "array",
39+
"items": {
40+
"type": "string"
41+
},
42+
"description": "Default list of relative local paths to search for IDMS copybooks",
43+
"uniqueItems": true,
44+
"scope": 3
45+
},
46+
"cobol-lsp.cpy-manager.idms.paths-dsn": {
47+
"type": "array",
48+
"items": {
49+
"type": "string"
50+
},
51+
"description": "Default list of datasets to search for IDMS copybooks\nZowe Explorer version 1.15.0 or higher is required to download copybooks from the mainframe",
52+
"uniqueItems": true,
53+
"scope": 3
54+
},
55+
"cobol-lsp.cpy-manager.idms.paths-uss": {
56+
"type": "array",
57+
"items": {
58+
"type": "string"
59+
},
60+
"description": "Default list of USS paths to search for IDMS copybooks\nZowe Explorer version 1.15.0 or higher is required to download copybooks from the mainframe",
61+
"uniqueItems": true,
62+
"scope": 3
63+
},
64+
"cobol-lsp.cpy-manager.copybook-file-encoding": {
65+
"type": "string",
66+
"markdownDescription": "The encoding for the copybooks. Alternatively edit in .vscode\\settings.json. Other supported encodings can be found at [supported encodings](https://github.com/ashtuchkin/iconv-lite/wiki/Supported-Encodings) ",
67+
"enum": [
68+
"utf8",
69+
"ucs2",
70+
"utf16le",
71+
"ascii",
72+
"base64",
73+
"UTF7",
74+
"UTF7-IMAP",
75+
"UTF-16BE",
76+
"UTF-16",
77+
"UCS-4",
78+
"UTF-32",
79+
"UTF-32LE",
80+
"UTF-32BE",
81+
"ISO-8859-1",
82+
"ISO-8859-2",
83+
"ISO-8859-3",
84+
"ISO-8859-4",
85+
"ISO-8859-5",
86+
"ISO-8859-6",
87+
"ISO-8859-7",
88+
"ISO-8859-8",
89+
"ISO-8859-9",
90+
"ISO-8859-10",
91+
"ISO-8859-11",
92+
"ISO-8859-12",
93+
"ISO-8859-13",
94+
"ISO-8859-14",
95+
"ISO-8859-15",
96+
"ISO-8859-16",
97+
"cp437",
98+
"cp720",
99+
"cp737",
100+
"cp775",
101+
"cp808",
102+
"cp850",
103+
"cp852",
104+
"cp855",
105+
"cp856",
106+
"cp857",
107+
"cp858",
108+
"cp860",
109+
"cp861",
110+
"cp862",
111+
"cp863",
112+
"cp864",
113+
"cp865",
114+
"cp866",
115+
"cp869",
116+
"cp922",
117+
"cp1046",
118+
"cp1124",
119+
"cp1125",
120+
"cp1129",
121+
"cp1133",
122+
"cp1161",
123+
"cp1162",
124+
"cp1163",
125+
"cp1047",
126+
"cp1140",
127+
"cp1147",
128+
"cp1148",
129+
"cp037",
130+
"cp500",
131+
"iso646cn",
132+
"iso646jp"
133+
],
134+
"enumDescriptions": [
135+
"utf8",
136+
"ucs2",
137+
"utf16le",
138+
"ascii",
139+
"base64",
140+
"UTF7",
141+
"UTF7-IMAP",
142+
"UTF-16BE",
143+
"UTF-16",
144+
"UCS-4",
145+
"UTF-32",
146+
"UTF-32LE",
147+
"UTF-32BE",
148+
"ISO-8859-1",
149+
"ISO-8859-2",
150+
"ISO-8859-3",
151+
"ISO-8859-4",
152+
"ISO-8859-5",
153+
"ISO-8859-6",
154+
"ISO-8859-7",
155+
"ISO-8859-8",
156+
"ISO-8859-9",
157+
"ISO-8859-10",
158+
"ISO-8859-11",
159+
"ISO-8859-12",
160+
"ISO-8859-13",
161+
"ISO-8859-14",
162+
"ISO-8859-15",
163+
"ISO-8859-16",
164+
"IBM-437",
165+
"IBM-720",
166+
"IBM-737",
167+
"IBM-775",
168+
"IBM-808",
169+
"IBM-850",
170+
"IBM-852",
171+
"IBM-855",
172+
"IBM-856",
173+
"IBM-857",
174+
"IBM-858",
175+
"IBM-860",
176+
"IBM-861",
177+
"IBM-862",
178+
"IBM-863",
179+
"IBM-864",
180+
"IBM-865",
181+
"IBM-866",
182+
"IBM-869",
183+
"IBM-922",
184+
"IBM-1046",
185+
"IBM-1124",
186+
"IBM-1125",
187+
"IBM-1129",
188+
"IBM-1133",
189+
"IBM-1161",
190+
"IBM-1162",
191+
"IBM-1163",
192+
"IBM-1047",
193+
"IBM-1140",
194+
"IBM-1147",
195+
"IBM-1148",
196+
"IBM-037",
197+
"IBM-500",
198+
"iso646cn",
199+
"iso646jp"
200+
],
201+
"scope": 3
202+
},
28203
"cobol-lsp.subroutine-manager.paths-local": {
29204
"type": "array",
30205
"items": {
@@ -72,6 +247,18 @@
72247
],
73248
"description": "The target SQL backend server which will be used in mainframe",
74249
"scope": 3
250+
},
251+
"cobol-lsp.dialects": {
252+
"type": "array",
253+
"items": {
254+
"type": "string",
255+
"enum": [
256+
"IDMS"
257+
]
258+
},
259+
"description": "List of enabled dialects",
260+
"uniqueItems": true,
261+
"scope": 3
75262
}
76263
}
77264
}

‎src/languages/extensions/configurations/cpptools.json‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,12 @@
190190
"markdownDescription": "Additional command line arguments to pass to `clang-tidy`. These take precedence over the equivalent `C_Cpp.codeAnalysis.clangTidy.*` settings.",
191191
"scope": 4
192192
},
193+
"C_Cpp.codeAnalysis.clangTidy.useBuildPath": {
194+
"type": "boolean",
195+
"default": false,
196+
"markdownDescription": "If `true` and `compileCommands` is set, the `-p=<build-path>` argument is passed to `clang-tidy` instead of build arguments being passed after `--`. This may not work if environment variables aren't set so that system includes can be found.",
197+
"scope": 4
198+
},
193199
"C_Cpp.codeAnalysis.clangTidy.checks.enabled": {
194200
"type": "array",
195201
"items": {
@@ -2132,12 +2138,14 @@
21322138
"c++14",
21332139
"c++17",
21342140
"c++20",
2141+
"c++23",
21352142
"gnu++98",
21362143
"gnu++03",
21372144
"gnu++11",
21382145
"gnu++14",
21392146
"gnu++17",
2140-
"gnu++20"
2147+
"gnu++20",
2148+
"gnu++23"
21412149
],
21422150
"markdownDescription": "The value to use in a configuration if `cppStandard` is either not specified or set to `${default}`.",
21432151
"scope": 4

‎src/languages/extensions/configurations/dart.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -622,6 +622,12 @@
622622
"description": "The maximum length of a line in the log file. Lines longer than this will be truncated and suffixed with an ellipsis.",
623623
"scope": 3
624624
},
625+
"dart.maxCompletionItems": {
626+
"type": "number",
627+
"default": 2000,
628+
"description": "The maximum number of completion items to return from a code completion request. Updated results will be fetched as additional characters are typed. Lower numbers may improved performance. Only affects LSP for > Dart SDK 2.17.",
629+
"scope": 3
630+
},
625631
"dart.dartTestLogFile": {
626632
"type": [
627633
"null",

‎src/languages/extensions/configurations/java.json‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,8 @@
537537
"JavaSE-14",
538538
"JavaSE-15",
539539
"JavaSE-16",
540-
"JavaSE-17"
540+
"JavaSE-17",
541+
"JavaSE-18"
541542
],
542543
"description": "Java Execution Environment name. Must be unique."
543544
},
@@ -697,6 +698,22 @@
697698
"default": "line",
698699
"description": "Show quickfixes at the problem or line level.",
699700
"scope": 3
701+
},
702+
"java.inlayHints.parameterNames.enabled": {
703+
"type": "string",
704+
"enum": [
705+
"none",
706+
"literals",
707+
"all"
708+
],
709+
"enumDescriptions": [
710+
"Disable parameter name hints",
711+
"Enable parameter name hints only for literal arguments",
712+
"Enable parameter name hints for literal and non-literal arguments"
713+
],
714+
"default": "literals",
715+
"markdownDescription": "Enable/disable inlay hints for parameter names:\n```java\n\nInteger.valueOf(/* s: */ '123', /* radix: */ 10)\n \n```\n",
716+
"scope": 3
700717
}
701718
}
702719
}

0 commit comments

Comments
 (0)