Skip to content

Make vscode-extension-schema honour default values #3925

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 10, 2024
Merged

Make vscode-extension-schema honour default values #3925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions hls-plugin-api/src/Ide/Plugin/ConfigUtils.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,29 +108,29 @@ pluginsToVSCodeExtensionSchema IdePlugins {..} = A.object $ mconcat $ singlePlug
(PluginId pId) = pluginId
genericSchema =
let x =
[toKey' "diagnosticsOn" A..= schemaEntry "diagnostics" | configHasDiagnostics]
<> nubOrd (mconcat (handlersToGenericSchema <$> handlers))
[toKey' "diagnosticsOn" A..= schemaEntry "diagnostics" True | configHasDiagnostics]
<> nubOrd (mconcat (handlersToGenericSchema configInitialGenericConfig <$> handlers))
in case x of
-- If the plugin has only one capability, we produce globalOn instead of the specific one;
-- otherwise we don't produce globalOn at all
[_] -> [toKey' "globalOn" A..= schemaEntry "plugin"]
[_] -> [toKey' "globalOn" A..= schemaEntry "plugin" (plcGlobalOn configInitialGenericConfig)]
_ -> x
dedicatedSchema = customConfigToDedicatedSchema configCustomConfig
handlersToGenericSchema (IdeMethod m DSum.:=> _) = case m of
SMethod_TextDocumentCodeAction -> [toKey' "codeActionsOn" A..= schemaEntry "code actions"]
SMethod_TextDocumentCodeLens -> [toKey' "codeLensOn" A..= schemaEntry "code lenses"]
SMethod_TextDocumentRename -> [toKey' "renameOn" A..= schemaEntry "rename"]
SMethod_TextDocumentHover -> [toKey' "hoverOn" A..= schemaEntry "hover"]
SMethod_TextDocumentDocumentSymbol -> [toKey' "symbolsOn" A..= schemaEntry "symbols"]
SMethod_TextDocumentCompletion -> [toKey' "completionOn" A..= schemaEntry "completions"]
SMethod_TextDocumentPrepareCallHierarchy -> [toKey' "callHierarchyOn" A..= schemaEntry "call hierarchy"]
SMethod_TextDocumentSemanticTokensFull -> [toKey' "semanticTokensOn" A..= schemaEntry "semantic tokens"]
_ -> []
schemaEntry desc =
handlersToGenericSchema PluginConfig{..} (IdeMethod m DSum.:=> _) = case m of
SMethod_TextDocumentCodeAction -> [toKey' "codeActionsOn" A..= schemaEntry "code actions" plcCodeActionsOn]
SMethod_TextDocumentCodeLens -> [toKey' "codeLensOn" A..= schemaEntry "code lenses" plcCodeLensOn]
SMethod_TextDocumentRename -> [toKey' "renameOn" A..= schemaEntry "rename" plcRenameOn]
SMethod_TextDocumentHover -> [toKey' "hoverOn" A..= schemaEntry "hover" plcHoverOn]
SMethod_TextDocumentDocumentSymbol -> [toKey' "symbolsOn" A..= schemaEntry "symbols" plcSymbolsOn]
SMethod_TextDocumentCompletion -> [toKey' "completionOn" A..= schemaEntry "completions" plcCompletionOn]
SMethod_TextDocumentPrepareCallHierarchy -> [toKey' "callHierarchyOn" A..= schemaEntry "call hierarchy" plcCallHierarchyOn]
SMethod_TextDocumentSemanticTokensFull -> [toKey' "semanticTokensOn" A..= schemaEntry "semantic tokens" plcSemanticTokensOn]
_ -> []
schemaEntry desc defaultVal =
A.object
[ "scope" A..= A.String "resource",
"type" A..= A.String "boolean",
"default" A..= True,
"default" A..= A.Bool defaultVal,
"description" A..= A.String ("Enables " <> pId <> " " <> desc)
]
withIdPrefix x = "haskell.plugin." <> pId <> "." <> x
Expand Down
2 changes: 1 addition & 1 deletion test/testdata/schema/ghc92/vscode-extension-schema.golden.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@
"type": "boolean"
},
"haskell.plugin.semanticTokens.globalOn": {
"default": true,
"default": false,
"description": "Enables semanticTokens plugin",
"scope": "resource",
"type": "boolean"
Expand Down
4 changes: 2 additions & 2 deletions test/testdata/schema/ghc94/vscode-extension-schema.golden.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@
"type": "boolean"
},
"haskell.plugin.semanticTokens.globalOn": {
"default": true,
"default": false,
"description": "Enables semanticTokens plugin",
"scope": "resource",
"type": "boolean"
Expand All @@ -262,7 +262,7 @@
"type": "boolean"
},
"haskell.plugin.stan.globalOn": {
"default": true,
"default": false,
"description": "Enables stan plugin",
"scope": "resource",
"type": "boolean"
Expand Down
4 changes: 2 additions & 2 deletions test/testdata/schema/ghc96/vscode-extension-schema.golden.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@
"type": "boolean"
},
"haskell.plugin.semanticTokens.globalOn": {
"default": true,
"default": false,
"description": "Enables semanticTokens plugin",
"scope": "resource",
"type": "boolean"
Expand All @@ -262,7 +262,7 @@
"type": "boolean"
},
"haskell.plugin.stan.globalOn": {
"default": true,
"default": false,
"description": "Enables stan plugin",
"scope": "resource",
"type": "boolean"
Expand Down
4 changes: 2 additions & 2 deletions test/testdata/schema/ghc98/vscode-extension-schema.golden.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,13 +172,13 @@
"type": "boolean"
},
"haskell.plugin.semanticTokens.globalOn": {
"default": true,
"default": false,
"description": "Enables semanticTokens plugin",
"scope": "resource",
"type": "boolean"
},
"haskell.plugin.stan.globalOn": {
"default": true,
"default": false,
"description": "Enables stan plugin",
"scope": "resource",
"type": "boolean"
Expand Down