Skip to content

Commit

Permalink
Merge pull request #25 from CodinGame/fix-themes-hc
Browse files Browse the repository at this point in the history
Fix default themes + monarch fallback
  • Loading branch information
CGNonofr authored Apr 14, 2022
2 parents 2d15fe2 + d5fbe13 commit de8c9af
Show file tree
Hide file tree
Showing 49 changed files with 3,635 additions and 1,657 deletions.
595 changes: 289 additions & 306 deletions package-lock.json

Large diffs are not rendered by default.

31 changes: 15 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,46 +21,45 @@
],
"types": "dist/index.d.ts",
"dependencies": {
"delay": ">=5.0.0",
"monaco-editor": "npm:@codingame/monaco-editor@^0.33.0",
"monaco-emacs": "^0.3.0",
"monaco-vim": "^0.3.0",
"monaco-editor": "npm:@codingame/monaco-editor@^0.33.6",
"vscode-oniguruma": "^1.6.2"
},
"devDependencies": {
"@babel/core": "7.17.8",
"@babel/core": "7.17.9",
"@babel/plugin-proposal-class-properties": "7.16.7",
"@babel/plugin-proposal-optional-chaining": "7.16.7",
"@babel/preset-env": "7.16.11",
"@babel/preset-typescript": "7.16.7",
"@babel/runtime": "7.17.8",
"@babel/runtime": "7.17.9",
"@rollup/plugin-alias": "3.1.9",
"@rollup/plugin-babel": "5.3.1",
"@rollup/plugin-commonjs": "21.0.3",
"@rollup/plugin-eslint": "8.0.1",
"@rollup/plugin-eslint": "8.0.2",
"@rollup/plugin-json": "4.1.0",
"@rollup/plugin-node-resolve": "13.1.3",
"@rollup/plugin-typescript": "^8.3.1",
"@rollup/plugin-node-resolve": "13.2.0",
"@rollup/plugin-typescript": "^8.3.2",
"@types/ini": "1.3.31",
"@types/node": "16.11.7",
"@types/rollup-plugin-node-builtins": "^2.1.2",
"@typescript-eslint/eslint-plugin": "5.16.0",
"@typescript-eslint/parser": "5.16.0",
"@typescript-eslint/eslint-plugin": "5.19.0",
"@typescript-eslint/parser": "5.19.0",
"babel-eslint": "10.1.0",
"conventional-changelog-conventionalcommits": "^4.6.3",
"cson-parser": "4.0.9",
"deep-equal": "2.0.5",
"eslint": "8.12.0",
"eslint": "8.13.0",
"eslint-config-standard": "16.0.3",
"eslint-config-standard-jsx": "10.0.0",
"eslint-plugin-import": "2.25.4",
"eslint-plugin-import": "2.26.0",
"eslint-plugin-node": "11.1.0",
"eslint-plugin-promise": "6.0.0",
"eslint-plugin-standard": "5.0.0",
"eslint-plugin-unused-imports": "2.0.0",
"fast-plist": "0.1.2",
"ini": "2.0.0",
"ini": "3.0.0",
"json5": "2.2.1",
"monaco-emacs": "^0.3.0",
"monaco-vim": "^0.3.4",
"postcss": "8.4.12",
"rollup": "2.70.1",
"rollup-plugin-json5": "1.0.0",
Expand All @@ -73,8 +72,8 @@
"tslib": "^2.3.1",
"typescript": "4.6.3",
"vscode-languageserver-protocol": "3.16.0",
"vscode-textmate": "6.0.0",
"yaml": "1.10.2"
"vscode-textmate": "^6.0.0",
"yaml": "2.0.0"
},
"browserslist": [
"defaults",
Expand Down
7 changes: 4 additions & 3 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import * as monaco from 'monaco-editor'
import { createEditor, registerEditorOpenHandler, registerTextModelContentProvider } from './monaco'
import { addVSCodeTheme } from './theme'
import { defineVSCodeTheme } from './theme'
import { updateUserConfiguration, registerConfigurations, registerDefaultConfigurations, onConfigurationChanged, getConfiguration } from './configuration'
import { getMonacoLanguage, loadLanguage } from './languages'
import { updateKeybindings, updateEditorKeybindingsMode } from './keybindings'
import { getThemeData } from './theme/registry'
import { getThemeData, getThemes } from './theme/registry'
import type { IVSCodeTheme } from './theme/tools'

export * from './tools'
Expand All @@ -13,7 +13,8 @@ export {
monaco,
createEditor,

addVSCodeTheme,
defineVSCodeTheme,
getThemes,
getThemeData,

registerConfigurations,
Expand Down
6 changes: 6 additions & 0 deletions src/languages/extensions/configurations/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@
"default": true,
"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.",
"scope": 3
},
"angular.disableAutomaticNgcc": {
"type": "boolean",
"default": false,
"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.",
"scope": 3
}
}
}
Expand Down
191 changes: 189 additions & 2 deletions src/languages/extensions/configurations/cobol.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"properties": {
"cobol-lsp.cpy-manager.profiles": {
"type": "string",
"description": "Current default profile for copybook downloader",
"description": "Current default profile for copybook downloader\nZowe Explorer version 1.15.0 or higher is required to download copybooks from the mainframe",
"scope": 3
},
"cobol-lsp.cpy-manager.paths-local": {
Expand All @@ -21,10 +21,185 @@
"items": {
"type": "string"
},
"description": "Default list of datasets to search for copybooks",
"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",
"uniqueItems": true,
"scope": 3
},
"cobol-lsp.cpy-manager.paths-uss": {
"type": "array",
"items": {
"type": "string"
},
"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",
"uniqueItems": true,
"scope": 3
},
"cobol-lsp.cpy-manager.idms.paths-local": {
"type": "array",
"items": {
"type": "string"
},
"description": "Default list of relative local paths to search for IDMS copybooks",
"uniqueItems": true,
"scope": 3
},
"cobol-lsp.cpy-manager.idms.paths-dsn": {
"type": "array",
"items": {
"type": "string"
},
"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",
"uniqueItems": true,
"scope": 3
},
"cobol-lsp.cpy-manager.idms.paths-uss": {
"type": "array",
"items": {
"type": "string"
},
"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",
"uniqueItems": true,
"scope": 3
},
"cobol-lsp.cpy-manager.copybook-file-encoding": {
"type": "string",
"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) ",
"enum": [
"utf8",
"ucs2",
"utf16le",
"ascii",
"base64",
"UTF7",
"UTF7-IMAP",
"UTF-16BE",
"UTF-16",
"UCS-4",
"UTF-32",
"UTF-32LE",
"UTF-32BE",
"ISO-8859-1",
"ISO-8859-2",
"ISO-8859-3",
"ISO-8859-4",
"ISO-8859-5",
"ISO-8859-6",
"ISO-8859-7",
"ISO-8859-8",
"ISO-8859-9",
"ISO-8859-10",
"ISO-8859-11",
"ISO-8859-12",
"ISO-8859-13",
"ISO-8859-14",
"ISO-8859-15",
"ISO-8859-16",
"cp437",
"cp720",
"cp737",
"cp775",
"cp808",
"cp850",
"cp852",
"cp855",
"cp856",
"cp857",
"cp858",
"cp860",
"cp861",
"cp862",
"cp863",
"cp864",
"cp865",
"cp866",
"cp869",
"cp922",
"cp1046",
"cp1124",
"cp1125",
"cp1129",
"cp1133",
"cp1161",
"cp1162",
"cp1163",
"cp1047",
"cp1140",
"cp1147",
"cp1148",
"cp037",
"cp500",
"iso646cn",
"iso646jp"
],
"enumDescriptions": [
"utf8",
"ucs2",
"utf16le",
"ascii",
"base64",
"UTF7",
"UTF7-IMAP",
"UTF-16BE",
"UTF-16",
"UCS-4",
"UTF-32",
"UTF-32LE",
"UTF-32BE",
"ISO-8859-1",
"ISO-8859-2",
"ISO-8859-3",
"ISO-8859-4",
"ISO-8859-5",
"ISO-8859-6",
"ISO-8859-7",
"ISO-8859-8",
"ISO-8859-9",
"ISO-8859-10",
"ISO-8859-11",
"ISO-8859-12",
"ISO-8859-13",
"ISO-8859-14",
"ISO-8859-15",
"ISO-8859-16",
"IBM-437",
"IBM-720",
"IBM-737",
"IBM-775",
"IBM-808",
"IBM-850",
"IBM-852",
"IBM-855",
"IBM-856",
"IBM-857",
"IBM-858",
"IBM-860",
"IBM-861",
"IBM-862",
"IBM-863",
"IBM-864",
"IBM-865",
"IBM-866",
"IBM-869",
"IBM-922",
"IBM-1046",
"IBM-1124",
"IBM-1125",
"IBM-1129",
"IBM-1133",
"IBM-1161",
"IBM-1162",
"IBM-1163",
"IBM-1047",
"IBM-1140",
"IBM-1147",
"IBM-1148",
"IBM-037",
"IBM-500",
"iso646cn",
"iso646jp"
],
"scope": 3
},
"cobol-lsp.subroutine-manager.paths-local": {
"type": "array",
"items": {
Expand Down Expand Up @@ -72,6 +247,18 @@
],
"description": "The target SQL backend server which will be used in mainframe",
"scope": 3
},
"cobol-lsp.dialects": {
"type": "array",
"items": {
"type": "string",
"enum": [
"IDMS"
]
},
"description": "List of enabled dialects",
"uniqueItems": true,
"scope": 3
}
}
}
Expand Down
10 changes: 9 additions & 1 deletion src/languages/extensions/configurations/cpptools.json
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,12 @@
"markdownDescription": "Additional command line arguments to pass to `clang-tidy`. These take precedence over the equivalent `C_Cpp.codeAnalysis.clangTidy.*` settings.",
"scope": 4
},
"C_Cpp.codeAnalysis.clangTidy.useBuildPath": {
"type": "boolean",
"default": false,
"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.",
"scope": 4
},
"C_Cpp.codeAnalysis.clangTidy.checks.enabled": {
"type": "array",
"items": {
Expand Down Expand Up @@ -2132,12 +2138,14 @@
"c++14",
"c++17",
"c++20",
"c++23",
"gnu++98",
"gnu++03",
"gnu++11",
"gnu++14",
"gnu++17",
"gnu++20"
"gnu++20",
"gnu++23"
],
"markdownDescription": "The value to use in a configuration if `cppStandard` is either not specified or set to `${default}`.",
"scope": 4
Expand Down
6 changes: 6 additions & 0 deletions src/languages/extensions/configurations/dart.json
Original file line number Diff line number Diff line change
Expand Up @@ -622,6 +622,12 @@
"description": "The maximum length of a line in the log file. Lines longer than this will be truncated and suffixed with an ellipsis.",
"scope": 3
},
"dart.maxCompletionItems": {
"type": "number",
"default": 2000,
"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.",
"scope": 3
},
"dart.dartTestLogFile": {
"type": [
"null",
Expand Down
19 changes: 18 additions & 1 deletion src/languages/extensions/configurations/java.json
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,8 @@
"JavaSE-14",
"JavaSE-15",
"JavaSE-16",
"JavaSE-17"
"JavaSE-17",
"JavaSE-18"
],
"description": "Java Execution Environment name. Must be unique."
},
Expand Down Expand Up @@ -697,6 +698,22 @@
"default": "line",
"description": "Show quickfixes at the problem or line level.",
"scope": 3
},
"java.inlayHints.parameterNames.enabled": {
"type": "string",
"enum": [
"none",
"literals",
"all"
],
"enumDescriptions": [
"Disable parameter name hints",
"Enable parameter name hints only for literal arguments",
"Enable parameter name hints for literal and non-literal arguments"
],
"default": "literals",
"markdownDescription": "Enable/disable inlay hints for parameter names:\n```java\n\nInteger.valueOf(/* s: */ '123', /* radix: */ 10)\n \n```\n",
"scope": 3
}
}
}
Expand Down
Loading

0 comments on commit de8c9af

Please sign in to comment.