Skip to content

Commit

Permalink
Merge branch 'folke:main' into feature/callback_live_reload
Browse files Browse the repository at this point in the history
  • Loading branch information
Ajaymamtora authored Sep 26, 2024
2 parents 868c645 + 944f30e commit 92823ad
Show file tree
Hide file tree
Showing 4 changed files with 64 additions and 0 deletions.
12 changes: 12 additions & 0 deletions schemas/als.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,12 @@
"scope": "window",
"type": "boolean"
},
"ada.projectDiagnostics": {
"default": true,
"description": "Controls whether or not the Ada Language Server should emit project diagnostics into the VS Code Problems view.\n\nNote: this setting is ignored if `ada.enableDiagnostics` is disabled and a workspace reload is necessary to refresh the diagnostics after modifying this setting.",
"scope": "window",
"type": "boolean"
},
"ada.projectFile": {
"default": "",
"description": "GPR project file (*.gpr) for this workspace.\n\nIt is recommended to set this to a relative path starting at the root of the workspace.",
Expand Down Expand Up @@ -142,6 +148,12 @@
"scope": "window",
"type": "boolean"
},
"ada.useGnatformat": {
"default": true,
"markdownDescription": "Enable GNATformat as the formatting provider for Ada source files.",
"scope": "window",
"type": "boolean"
},
"gpr.trace.server": {
"default": "off",
"description": "Traces the communication between VS Code and the GPR language server in the 'GPR Language Server' Output view.",
Expand Down
15 changes: 15 additions & 0 deletions schemas/jdtls.json
Original file line number Diff line number Diff line change
Expand Up @@ -973,6 +973,21 @@
"scope": "window",
"type": "boolean"
},
"java.search.scope": {
"default": "all",
"enum": [
"all",
"main"
],
"enumDescriptions": [
"Search on all classpath entries including reference libraries and projects.",
"All classpath entries excluding test classpath entries."
],
"markdownDescription": "Specifies the scope which must be used for search operation like \n - Find Reference\n - Call Hierarchy\n - Workspace Symbols",
"order": 90,
"scope": "window",
"type": "string"
},
"java.selectionRange.enabled": {
"default": true,
"description": "Enable/disable Smart Selection support for Java. Disabling this option will not affect the VS Code built-in word-based and bracket-based smart selection.",
Expand Down
9 changes: 9 additions & 0 deletions schemas/ts_ls.json
Original file line number Diff line number Diff line change
Expand Up @@ -579,6 +579,15 @@
"scope": "window",
"type": "boolean"
},
"typescript.experimental.expandableHover": {
"default": false,
"description": "(Experimental) Enable/disable expanding on hover.",
"scope": "window",
"tags": [
"experimental"
],
"type": "boolean"
},
"typescript.experimental.updateImportsOnPaste": {
"default": false,
"description": "Automatically update imports when pasting code. Requires TypeScript 5.6+.",
Expand Down
28 changes: 28 additions & 0 deletions types/lsp.lua
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,14 @@
-- ```
---@field namedNotationThreshold integer
---@field onTypeFormatting _.lspconfig.settings.als.OnTypeFormatting
-- Controls whether or not the Ada Language Server should emit project diagnostics into the VS Code Problems view.
--
-- Note: this setting is ignored if `ada.enableDiagnostics` is disabled and a workspace reload is necessary to refresh the diagnostics after modifying this setting.
--
-- ```lua
-- default = true
-- ```
---@field projectDiagnostics boolean
-- GPR project file (*.gpr) for this workspace.
--
-- It is recommended to set this to a relative path starting at the root of the workspace.
Expand Down Expand Up @@ -108,6 +116,12 @@
---@field trace _.lspconfig.settings.als.Trace
-- Enable snippets in completion results (e.g. subprogram calls).
---@field useCompletionSnippets boolean
-- Enable GNATformat as the formatting provider for Ada source files.
--
-- ```lua
-- default = true
-- ```
---@field useGnatformat boolean

---@class _.lspconfig.settings.als.Trace
-- Traces the communication between VS Code and the GPR language server in the 'GPR Language Server' Output view.
Expand Down Expand Up @@ -6058,6 +6072,17 @@
-- Enable/disable auto organize imports on save action
---@field organizeImports boolean

---@class _.lspconfig.settings.jdtls.Search
-- Specifies the scope which must be used for search operation like
-- - Find Reference
-- - Call Hierarchy
-- - Workspace Symbols
--
-- ```lua
-- default = "all"
-- ```
---@field scope "all" | "main"

---@class _.lspconfig.settings.jdtls.SelectionRange
-- Enable/disable Smart Selection support for Java. Disabling this option will not affect the VS Code built-in word-based and bracket-based smart selection.
--
Expand Down Expand Up @@ -6204,6 +6229,7 @@
---@field references _.lspconfig.settings.jdtls.References
---@field referencesCodeLens _.lspconfig.settings.jdtls.ReferencesCodeLens
---@field saveActions _.lspconfig.settings.jdtls.SaveActions
---@field search _.lspconfig.settings.jdtls.Search
---@field selectionRange _.lspconfig.settings.jdtls.SelectionRange
---@field server _.lspconfig.settings.jdtls.Server
---@field settings _.lspconfig.settings.jdtls.Settings
Expand Down Expand Up @@ -16041,6 +16067,8 @@
---@field npmIsInstalled boolean

---@class _.lspconfig.settings.ts_ls.Experimental
-- (Experimental) Enable/disable expanding on hover.
---@field expandableHover boolean
-- Automatically update imports when pasting code. Requires TypeScript 5.6+.
---@field updateImportsOnPaste boolean

Expand Down

0 comments on commit 92823ad

Please sign in to comment.