Merge branch 'folke:main' into main

folke · Aug 24, 2024 · fc02e73 · fc02e73
2 parents cdf76f4 + 39bf4e5
commit fc02e73
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 54 deletions.
diff --git a/schemas/dartls.json b/schemas/dartls.json
@@ -486,6 +486,12 @@
       "scope": "resource",
       "type": "boolean"
     },
+    "dart.enablePub": {
+      "default": true,
+      "description": "Whether to enable functionality for using Pub. Turning this setting off will prevent the extension from ever running pub and hide all commands relating to this. Use this if you are using an alternative package manager.",
+      "scope": "window",
+      "type": "boolean"
+    },
     "dart.enableSdkFormatter": {
       "default": true,
       "markdownDescription": "Whether to enable the [dart_style](https://pub.dev/packages/dart_style) formatter for Dart code.",

diff --git a/schemas/pylsp.json b/schemas/pylsp.json
@@ -165,6 +165,11 @@
       },
       "type": "array"
     },
+    "pylsp.plugins.jedi.prioritize_extra_paths": {
+      "default": false,
+      "description": "Whether to place extra_paths at the beginning (true) or end (false) of `sys.path`",
+      "type": "boolean"
+    },
     "pylsp.plugins.jedi_completion.cache_for": {
       "default": [
         "pandas",

diff --git a/schemas/sorbet.json b/schemas/sorbet.json
@@ -5,7 +5,6 @@
     "sorbet.configFilePatterns": {
       "default": [
         "**/sorbet/config",
-        "**/Gemfile",
         "**/Gemfile.lock"
       ],
       "description": "List of workspace file patterns that contribute to Sorbet's configuration.  Changes to any of those files should trigger a restart of any actively running Sorbet language server.",

diff --git a/schemas/tsserver.json b/schemas/tsserver.json
@@ -215,6 +215,14 @@
       "scope": "resource",
       "type": "array"
     },
+    "javascript.preferences.autoImportSpecifierExcludeRegexes": {
+      "items": {
+        "type": "string"
+      },
+      "markdownDescription": "Specify regular expressions to exclude auto imports with matching import specifiers. Examples:\n\n- `^node:`\n- `lib/internal` (slashes don't need to be escaped...)\n- `/lib\\/internal/i` (...unless including surrounding slashes for `i` or `u` flags)\n- `^lodash$` (only allow subpath imports from lodash)",
+      "scope": "resource",
+      "type": "array"
+    },
     "javascript.preferences.importModuleSpecifier": {
       "default": "shortest",
       "description": "Preferred path style for auto imports.",
@@ -312,23 +320,6 @@
           "markdownDescription": "Sort numeric strings by integer value",
           "type": "boolean"
         },
-        "presets": {
-          "default": "auto",
-          "enum": [
-            "auto",
-            "eslint sort-imports",
-            "eslint plugin-simple-import-sort",
-            "dprint"
-          ],
-          "markdownDescription": "%typescript.preferences.organizeImports.presets%",
-          "markdownEnumDescriptions": [
-            "%typescript.preferences.organizeImports.presets.auto%",
-            "%typescript.preferences.organizeImports.presets.eslintSortImports%",
-            "%typescript.preferences.organizeImports.presets.eslintPluginSimpleImportSort%",
-            "%typescript.preferences.organizeImports.presets.dprint%"
-          ],
-          "type": "string"
-        },
         "typeOrder": {
           "default": "auto",
           "enum": [
@@ -834,6 +825,14 @@
       "scope": "resource",
       "type": "array"
     },
+    "typescript.preferences.autoImportSpecifierExcludeRegexes": {
+      "items": {
+        "type": "string"
+      },
+      "markdownDescription": "Specify regular expressions to exclude auto imports with matching import specifiers. Examples:\n\n- `^node:`\n- `lib/internal` (slashes don't need to be escaped...)\n- `/lib\\/internal/i` (...unless including surrounding slashes for `i` or `u` flags)\n- `^lodash$` (only allow subpath imports from lodash)",
+      "scope": "resource",
+      "type": "array"
+    },
     "typescript.preferences.importModuleSpecifier": {
       "default": "shortest",
       "description": "Preferred path style for auto imports.",
@@ -947,23 +946,6 @@
           "markdownDescription": "Sort numeric strings by integer value",
           "type": "boolean"
         },
-        "presets": {
-          "default": "auto",
-          "enum": [
-            "auto",
-            "eslint sort-imports",
-            "eslint plugin-simple-import-sort",
-            "dprint"
-          ],
-          "markdownDescription": "%typescript.preferences.organizeImports.presets%",
-          "markdownEnumDescriptions": [
-            "%typescript.preferences.organizeImports.presets.auto%",
-            "%typescript.preferences.organizeImports.presets.eslintSortImports%",
-            "%typescript.preferences.organizeImports.presets.eslintPluginSimpleImportSort%",
-            "%typescript.preferences.organizeImports.presets.dprint%"
-          ],
-          "type": "string"
-        },
         "typeOrder": {
           "default": "auto",
           "enum": [
@@ -1295,13 +1277,13 @@
       "type": "boolean"
     },
     "typescript.tsserver.web.projectWideIntellisense.suppressSemanticErrors": {
-      "default": true,
+      "default": false,
       "description": "Suppresses semantic errors on web even when project wide IntelliSense is enabled. This is always on when project wide IntelliSense is not enabled or available. See `#typescript.tsserver.web.projectWideIntellisense.enabled#`",
       "scope": "window",
       "type": "boolean"
     },
     "typescript.tsserver.web.typeAcquisition.enabled": {
-      "default": false,
+      "default": true,
       "description": "Enable/disable package acquisition on the web. This enables IntelliSense for imported packages. Requires `#typescript.tsserver.web.projectWideIntellisense.enabled#`. Currently not supported for Safari.",
       "scope": "window",
       "type": "boolean"

diff --git a/types/lsp.lua b/types/lsp.lua
@@ -1153,6 +1153,12 @@
 ---@field documentation "full" | "summary" | "none"
 -- Whether to automatically commit the selected completion item when pressing certain keys such as . , ( and \[. This setting does not currently apply to LSP, see `#dart.previewCommitCharacters#`.
 ---@field enableCompletionCommitCharacters boolean
+-- Whether to enable functionality for using Pub. Turning this setting off will prevent the extension from ever running pub and hide all commands relating to this. Use this if you are using an alternative package manager.
+-- 
+-- ```lua
+-- default = true
+-- ```
+---@field enablePub boolean
 -- Whether to enable the [dart_style](https://pub.dev/packages/dart_style) formatter for Dart code.
 -- 
 -- ```lua
@@ -10789,6 +10795,8 @@
 -- default = {}
 -- ```
 ---@field extra_paths string[]
+-- Whether to place extra_paths at the beginning (true) or end (false) of `sys.path`
+---@field prioritize_extra_paths boolean
 
 ---@class _.lspconfig.settings.pylsp.Jedi.Completion
 -- Modules for which labels and snippets should be cached.
@@ -13861,7 +13869,7 @@
 -- List of workspace file patterns that contribute to Sorbet's configuration.  Changes to any of those files should trigger a restart of any actively running Sorbet language server.
 -- 
 -- ```lua
--- default = { "**/sorbet/config", "**/Gemfile", "**/Gemfile.lock" }
+-- default = { "**/sorbet/config", "**/Gemfile.lock" }
 -- ```
 ---@field configFilePatterns string[]
 -- Enable Sorbet Ruby IDE features
@@ -15123,12 +15131,6 @@
 ---@field locale string
 -- Sort numeric strings by integer value
 ---@field numericCollation boolean
--- %typescript.preferences.organizeImports.presets%
--- 
--- ```lua
--- default = "auto"
--- ```
----@field presets "auto" | "eslint sort-imports" | "eslint plugin-simple-import-sort" | "dprint"
 -- ```lua
 -- default = "auto"
 -- ```
@@ -15141,6 +15143,13 @@
 ---@class _.lspconfig.settings.tsserver.Preferences
 -- Specify glob patterns of files to exclude from auto imports. Relative paths are resolved relative to the workspace root. Patterns are evaluated using tsconfig.json [`exclude`](https://www.typescriptlang.org/tsconfig#exclude) semantics.
 ---@field autoImportFileExcludePatterns string[]
+-- Specify regular expressions to exclude auto imports with matching import specifiers. Examples:
+-- 
+-- - `^node:`
+-- - `lib/internal` (slashes don't need to be escaped...)
+-- - `/lib\/internal/i` (...unless including surrounding slashes for `i` or `u` flags)
+-- - `^lodash$` (only allow subpath imports from lodash)
+---@field autoImportSpecifierExcludeRegexes string[]
 -- Preferred path style for auto imports.
 -- 
 -- ```lua
@@ -15546,12 +15555,6 @@
 ---@field locale string
 -- Sort numeric strings by integer value
 ---@field numericCollation boolean
--- %typescript.preferences.organizeImports.presets%
--- 
--- ```lua
--- default = "auto"
--- ```
----@field presets "auto" | "eslint sort-imports" | "eslint plugin-simple-import-sort" | "dprint"
 -- ```lua
 -- default = "auto"
 -- ```
@@ -15564,6 +15567,13 @@
 ---@class _.lspconfig.settings.tsserver.Preferences
 -- Specify glob patterns of files to exclude from auto imports. Relative paths are resolved relative to the workspace root. Patterns are evaluated using tsconfig.json [`exclude`](https://www.typescriptlang.org/tsconfig#exclude) semantics.
 ---@field autoImportFileExcludePatterns string[]
+-- Specify regular expressions to exclude auto imports with matching import specifiers. Examples:
+-- 
+-- - `^node:`
+-- - `lib/internal` (slashes don't need to be escaped...)
+-- - `/lib\/internal/i` (...unless including surrounding slashes for `i` or `u` flags)
+-- - `^lodash$` (only allow subpath imports from lodash)
+---@field autoImportSpecifierExcludeRegexes string[]
 -- Preferred path style for auto imports.
 -- 
 -- ```lua
@@ -15751,14 +15761,14 @@
 -- ```
 ---@field enabled boolean
 -- Suppresses semantic errors on web even when project wide IntelliSense is enabled. This is always on when project wide IntelliSense is not enabled or available. See `#typescript.tsserver.web.projectWideIntellisense.enabled#`
--- 
--- ```lua
--- default = true
--- ```
 ---@field suppressSemanticErrors boolean
 
 ---@class _.lspconfig.settings.tsserver.TypeAcquisition
 -- Enable/disable package acquisition on the web. This enables IntelliSense for imported packages. Requires `#typescript.tsserver.web.projectWideIntellisense.enabled#`. Currently not supported for Safari.
+-- 
+-- ```lua
+-- default = true
+-- ```
 ---@field enabled boolean
 
 ---@class _.lspconfig.settings.tsserver.Web