Merge pull request #13 from CodinGame/update-monaco-0.32

Update monaco 0.32

Author: CGNonofr

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-editor-wrapper",
-  "version": "1.4.3",
+  "version": "1.5.0",
   "private": false,
   "description": "Enhanced Monaco editor with TextMate grammars and more",
   "scripts": {
@@ -22,19 +22,19 @@
   ],
   "types": "dist/index.d.ts",
   "dependencies": {
-    "@codingame/monaco-emacs": "^0.2.2",
+    "@codingame/monaco-emacs": "^0.2.3",
     "delay": ">=5.0.0",
-    "monaco-editor": "npm:@codingame/monaco-editor@^0.31.8",
-    "monaco-vim": "^0.1.19",
+    "monaco-editor": "npm:@codingame/monaco-editor@^0.32.0",
+    "monaco-vim": "^0.2.0",
     "vscode-oniguruma": "^1.6.1"
   },
   "devDependencies": {
-    "@babel/core": "7.16.12",
+    "@babel/core": "7.17.5",
     "@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.16.7",
+    "@babel/runtime": "7.17.2",
     "@rollup/plugin-alias": "3.1.9",
     "@rollup/plugin-babel": "5.3.0",
     "@rollup/plugin-commonjs": "21.0.1",
@@ -45,12 +45,12 @@
     "@types/ini": "1.3.31",
     "@types/node": "14.14.31",
     "@types/rollup-plugin-node-builtins": "^2.1.2",
-    "@typescript-eslint/eslint-plugin": "5.10.1",
-    "@typescript-eslint/parser": "5.10.1",
+    "@typescript-eslint/eslint-plugin": "5.12.0",
+    "@typescript-eslint/parser": "5.12.0",
     "babel-eslint": "10.1.0",
     "cson-parser": "4.0.9",
     "deep-equal": "2.0.5",
-    "eslint": "8.8.0",
+    "eslint": "8.9.0",
     "eslint-config-standard": "16.0.3",
     "eslint-config-standard-jsx": "10.0.0",
     "eslint-plugin-import": "2.25.4",
@@ -61,15 +61,15 @@
     "fast-plist": "0.1.2",
     "ini": "2.0.0",
     "json5": "2.2.0",
-    "postcss": "8.4.5",
-    "rollup": "2.66.1",
+    "postcss": "8.4.6",
+    "rollup": "2.67.3",
     "rollup-plugin-json5": "1.0.0",
     "rollup-plugin-node-builtins": "^2.1.2",
     "rollup-plugin-string": "^3.0.0",
     "rollup-plugin-uglify": "^6.0.4",
     "rollup-plugin-visualizer": "5.5.4",
     "rollup-plugin-web-worker-loader": "1.6.1",
-    "ts-node": "10.4.0",
+    "ts-node": "10.5.0",
     "tslib": "^2.3.1",
     "typescript": "4.5.5",
     "vscode-languageserver-protocol": "3.16.0",
@@ -83,5 +83,9 @@
     "safari >= 12",
     "not IE 11",
     "not IE_Mob 11"
-  ]
-}
+  ],
+  "volta": {
+    "node": "16.14.0",
+    "npm": "8.5.0"
+  }
+}

package.json

@@ -15,7 +15,7 @@ configurationRegistry.registerDefaultConfigurations([{
   overrides: extensions.configurationDefaults
 }])
 
-const simpleConfigurationService = monaco.editor.StaticServices.configurationService.get() as monaco.extra.SimpleConfigurationService
+const simpleConfigurationService = monaco.extra.StandaloneServices.get(monaco.extra.IConfigurationService) as monaco.extra.StandaloneConfigurationService
 
 export const onConfigurationChanged = simpleConfigurationService.onDidChangeConfiguration
 

src/configuration/index.ts

@@ -6,7 +6,7 @@ export default function setup (editor: monaco.editor.IStandaloneCodeEditor): voi
     label: 'Fold all autofold regions',
     run: async (editor: monaco.editor.ICodeEditor) => {
       const foldingController = monaco.extra.FoldingController.get(editor)
-      const foldingModelPromise: Promise<monaco.extra.FoldingModel> | null = foldingController.getFoldingModel()
+      const foldingModelPromise: Promise<monaco.extra.FoldingModel> | null = foldingController?.getFoldingModel()
       if (foldingModelPromise != null) {
         return foldingModelPromise.then(foldingModel => {
           const editorModel = editor.getModel()

src/extensions/autofold.ts

@@ -1,27 +1,23 @@
 
 import * as monaco from 'monaco-editor'
 
-monaco.errorHandler.setUnexpectedErrorHandler(error => {
-  console.error('Unexpected error', error)
-})
-
 /* Add custom blocks parsing (for tech.io):
 // { [autofold]
 //  custom block content
 // }
 */
 const CUSTOM_BLOCK_BEGIN_REGEX = '^\\w*(?:\\/\\/|#).*\\{'
 const CUSTOM_BLOCK_END_REGEX = '^\\w*(?:\\/\\/|#).*\\}'
-const original = monaco.languages.LanguageConfigurationRegistryImpl.prototype.getFoldingRules
-monaco.languages.LanguageConfigurationRegistryImpl.prototype.getFoldingRules = function (languageId: string) {
-  const foldingRules: monaco.languages.FoldingRules = original.call(this, languageId)
-
-  const markers = foldingRules.markers
+export function addCustomFoldingMarkers (configuration: monaco.extra.ILanguageConfiguration): monaco.extra.ILanguageConfiguration {
+  const markers = configuration.folding?.markers
   return {
-    ...foldingRules,
-    markers: {
-      start: markers != null ? new RegExp(markers.start.source + '|' + CUSTOM_BLOCK_BEGIN_REGEX) : new RegExp(CUSTOM_BLOCK_BEGIN_REGEX),
-      end: markers != null ? new RegExp(markers.end.source + '|' + CUSTOM_BLOCK_END_REGEX) : new RegExp(CUSTOM_BLOCK_END_REGEX)
+    ...configuration,
+    folding: {
+      ...configuration.folding ?? {},
+      markers: {
+        start: markers != null ? new RegExp(markers.start.source + '|' + CUSTOM_BLOCK_BEGIN_REGEX) : new RegExp(CUSTOM_BLOCK_BEGIN_REGEX),
+        end: markers != null ? new RegExp(markers.end.source + '|' + CUSTOM_BLOCK_END_REGEX) : new RegExp(CUSTOM_BLOCK_END_REGEX)
+      }
     }
   }
 }

src/hacks.ts

@@ -2200,6 +2200,12 @@
         "markdownDescription": "Controls whether the extension will report errors detected in `c_cpp_properties.json`.",
         "scope": 4
       },
+      "C_Cpp.default.dotConfig": {
+        "type": "string",
+        "default": null,
+        "markdownDescription": "%c_cpp.configuration.default.dotConfig.markdownDescription%",
+        "scope": 4
+      },
       "C_Cpp.updateChannel": {
         "type": "string",
         "enum": [

src/languages/extensions/configurations/cpptools.json

@@ -46,8 +46,9 @@
         "scope": 3
       },
       "java.configuration.checkProjectSettingsExclusions": {
+        "deprecationMessage": "Please use 'java.import.generatesMetadataFilesAtProjectRoot' to control whether to generate the project metadata files at the project root. And use 'files.exclude' to control whether to hide the project metadata files from the file explorer.",
         "type": "boolean",
-        "default": true,
+        "default": false,
         "description": "Controls whether to exclude extension-generated project settings files (.project, .classpath, .factorypath, .settings/) from the file explorer.",
         "scope": 3
       },

src/languages/extensions/configurations/java.json

@@ -226,6 +226,16 @@
             ],
             "type": "string"
           },
+          "codestyle-check": {
+            "default": "None",
+            "description": "%config.diagnostics.codestyle-check%",
+            "enum": [
+              "Any",
+              "Opened",
+              "None"
+            ],
+            "type": "string"
+          },
           "count-down-loop": {
             "default": "Any",
             "description": "%config.diagnostics.count-down-loop%",
@@ -640,6 +650,17 @@
             ],
             "type": "string"
           },
+          "codestyle-check": {
+            "default": "Warning",
+            "description": "%config.diagnostics.codestyle-check%",
+            "enum": [
+              "Error",
+              "Warning",
+              "Information",
+              "Hint"
+            ],
+            "type": "string"
+          },
           "count-down-loop": {
             "default": "Warning",
             "description": "%config.diagnostics.count-down-loop%",
@@ -1042,6 +1063,17 @@
         "scope": 4,
         "type": "integer"
       },
+      "Lua.format.defaultConfig": {
+        "markdownDescription": "%config.format.defaultConfig%",
+        "scope": 4,
+        "type": "object"
+      },
+      "Lua.format.enable": {
+        "default": "true",
+        "markdownDescription": "Enable code formatter.",
+        "scope": 4,
+        "type": "boolean"
+      },
       "Lua.hint.arrayIndex": {
         "default": "Auto",
         "enum": [
@@ -1428,6 +1460,9 @@
         "default": null,
         "markdownDescription": "Enable telemetry to send your editor information and error logs over the network. Read our privacy policy [here](https://github.com/sumneko/lua-language-server/wiki/Privacy-Policy).\n",
         "scope": 4,
+        "tags": [
+          "telemetry"
+        ],
         "type": [
           "boolean",
           "null"

src/languages/extensions/configurations/lua.json

@@ -4,7 +4,7 @@
     "properties": {
       "metals.serverVersion": {
         "type": "string",
-        "default": "0.11.1+97-0ef9a93b-SNAPSHOT",
+        "default": "0.11.1+114-58f06ff8-SNAPSHOT",
         "markdownDescription": "The version of the Metals server artifact. Requires reloading the window.\n\n**Change only if you know what you're doing**",
         "scope": 3
       },
@@ -169,6 +169,12 @@
         "type": "string",
         "markdownDescription": "Optional Eclipse format profile to use.",
         "scope": 3
+      },
+      "metals.suggestLatestUpgrade": {
+        "type": "boolean",
+        "default": false,
+        "markdownDescription": "Once in a day, notify if there are new server releases (including snapshots)",
+        "scope": 3
       }
     }
   }

src/languages/extensions/configurations/scalameta.json

@@ -645,7 +645,12 @@
           "double"
         ],
         "default": "auto",
-        "markdownDescription": "Preferred quote style to use for quick fixes: `single` quotes, `double` quotes, or `auto` infer quote type from existing imports.",
+        "markdownDescription": "Preferred quote style to use for quick fixes.",
+        "markdownEnumDescriptions": [
+          "Infer quote type from existing code",
+          "Always use single quotes: `'`",
+          "Always use double quotes: `\"`"
+        ],
         "scope": 5
       },
       "typescript.preferences.quoteStyle": {
@@ -656,7 +661,12 @@
           "double"
         ],
         "default": "auto",
-        "markdownDescription": "Preferred quote style to use for quick fixes: `single` quotes, `double` quotes, or `auto` infer quote type from existing imports.",
+        "markdownDescription": "Preferred quote style to use for quick fixes.",
+        "markdownEnumDescriptions": [
+          "Infer quote type from existing code",
+          "Always use single quotes: `'`",
+          "Always use double quotes: `\"`"
+        ],
         "scope": 5
       },
       "javascript.preferences.importModuleSpecifier": {
@@ -739,7 +749,7 @@
           "none"
         ],
         "markdownEnumDescriptions": [
-          "Insert `={}` or `=\"\"` after attribute names based on the prop type.",
+          "Insert `={}` or `=\"\"` after attribute names based on the prop type. See `javascript.preferences.quoteStyle` to control the type of quotes used for string attributes.",
           "Insert `={}` after attribute names.",
           "Only insert attribute names."
         ],
@@ -755,7 +765,7 @@
           "none"
         ],
         "markdownEnumDescriptions": [
-          "Insert `={}` or `=\"\"` after attribute names based on the prop type.",
+          "Insert `={}` or `=\"\"` after attribute names based on the prop type. See `typescript.preferences.quoteStyle` to control the type of quotes used for string attributes.",
           "Insert `={}` after attribute names.",
           "Only insert attribute names."
         ],