Merge pull request #162 from mrjones2014/mrj/push-qwtxottqyqrl

fix(docs): Fix merge conflict markers in README.md

Author: mrjones2014

README.md

@@ -548,88 +548,3 @@ This project would not exist without the hard work of some other open source pro
 
 - Some parts of this plugin are based on [folke's neoconf.nvim plugin](https://github.com/folke/neoconf.nvim)
 - This plugin bundles [json.lua](https://github.com/actboy168/json.lua), a pure-Lua JSON library for parsing `jsonc` files
-<<<<<<< conflict 1 of 1
-+++++++ lqouommn f234f871 "chore(build): auto-generate schemas" (rebase destination)
-%%%%%%% diff from: sppmyoml 5905da98 "chore(ci): auto-generate vimdoc" (parents of rebased revision)
-\\\\\\\        to: yuywnoum 2b697016 "feat(schema): Add support for GraphQL LSP" (rebased revision)
- 
- ## Supported LSP Servers
- 
- <!-- GENERATED:SERVERS:START -->
-
-- [x] [als](https://github.com/AdaCore/ada_language_server/tree/master/integration/vscode/ada/package.json)
-- [x] [angularls](https://github.com/angular/vscode-ng-language-service/refs/heads/tree/main/package.json)
-- [x] [astro](https://github.com/withastro/language-tools/tree/main/packages/vscode/package.json)
-- [x] [awkls](https://github.com/Beaglefoot/awk-language-server/tree/master/client/package.json)
-- [x] [basedpyright](https://github.com/DetachHead/basedpyright/tree/main/packages/vscode-pyright/package.json)
-- [x] [bashls](https://github.com/bash-lsp/bash-language-server/tree/master/vscode-client/package.json)
-- [x] [clangd](https://github.com/clangd/vscode-clangd/tree/master/package.json)
-- [x] [cssls](https://github.com/microsoft/vscode/tree/main/extensions/css-language-features/package.json) (supports i18n)
-- [x] [dartls](https://github.com/Dart-Code/Dart-Code/tree/master/package.json)
-- [x] [denols](https://github.com/denoland/vscode_deno/tree/main/package.json)
-- [x] [elixirls](https://github.com/elixir-lsp/vscode-elixir-ls/tree/master/package.json)
-- [x] [elmls](https://github.com/elm-tooling/elm-language-client-vscode/tree/master/package.json)
-- [x] [emmylua_ls](https://github.com/EmmyLuaLs/emmylua-analyzer-rust/86ae47efba57c2d70a5af18faa6e8418b0129b22/crates/emmylua_code_analysis/resources/schema.json)
-- [x] [eslint](https://github.com/microsoft/vscode-eslint/tree/main/package.json)
-- [x] [flow](https://github.com/flowtype/flow-for-vscode/tree/master/package.json)
-- [x] [fsautocomplete](https://github.com/ionide/ionide-vscode-fsharp/tree/main/release/package.json)
-- [x] [gopls](https://github.com/golang/vscode-go/tree/master/extension/package.json)
-- [x] [grammarly](https://github.com/znck/grammarly/tree/main/extension/package.json)
-- [x] [graphql](https://github.com/graphql/graphiql/refs/heads/tree/main/packages/vscode-graphql/package.json)
-- [x] [haxe_language_server](https://github.com/vshaxe/vshaxe/tree/master/package.json)
-- [x] [hhvm](https://github.com/slackhq/vscode-hack/tree/master/package.json)
-- [x] [hie](https://github.com/alanz/vscode-hie-server/tree/master/package.json)
-- [x] [hls](https://github.com/haskell/vscode-haskell/refs/heads/tree/master/package.json)
-- [x] [html](https://github.com/microsoft/vscode/tree/main/extensions/html-language-features/package.json) (supports i18n)
-- [x] [intelephense](https://github.com/bmewburn/vscode-intelephense/tree/master/package.json)
-- [x] [java_language_server](https://github.com/georgewfraser/java-language-server/tree/master/package.json)
-- [x] [jdtls](https://github.com/redhat-developer/vscode-java/tree/master/package.json)
-- [x] [jsonls](https://github.com/microsoft/vscode/tree/master/extensions/json-language-features/package.json) (supports i18n)
-- [x] [julials](https://github.com/julia-vscode/julia-vscode/tree/master/package.json)
-- [x] [kotlin_language_server](https://github.com/fwcd/vscode-kotlin/tree/master/package.json)
-- [x] [ltex](https://github.com/valentjn/vscode-ltex/tree/develop/package.json) (supports i18n)
-- [x] [lua_ls](https://github.com/LuaLS/vscode-lua/tree/master/package.json) (supports i18n)
-- [x] [luau_lsp](https://github.com/JohnnyMorganz/luau-lsp/tree/main/editors/code/package.json)
-- [x] [nickel_ls](https://github.com/tweag/nickel/refs/heads/tree/master/lsp/vscode-extension/package.json)
-- [x] [nil_ls](https://github.com/oxalica/nil/refs/heads/tree/main/editors/coc-nil/package.json)
-- [x] [nixd](https://github.com/nix-community/nixd/refs/heads/tree/main/nixd/docs/nixd-schema.json)
-- [x] [omnisharp](https://github.com/OmniSharp/omnisharp-vscode/tree/master/package.json) (supports i18n)
-- [x] [perlls](https://github.com/richterger/Perl-LanguageServer/tree/master/clients/vscode/perl/package.json)
-- [x] [perlnavigator](https://github.com/bscan/PerlNavigator/tree/main/package.json)
-- [x] [perlpls](https://github.com/FractalBoy/perl-language-server/tree/master/client/package.json)
-- [x] [powershell_es](https://github.com/PowerShell/vscode-powershell/tree/main/package.json)
-- [x] [psalm](https://github.com/psalm/psalm-vscode-plugin/tree/master/package.json)
-- [x] [puppet](https://github.com/puppetlabs/puppet-vscode/tree/main/package.json)
-- [x] [purescriptls](https://github.com/nwolverson/vscode-ide-purescript/tree/master/package.json)
-- [x] [pylsp](https://github.com/python-lsp/python-lsp-server/tree/develop/pylsp/config/schema.json)
-- [x] [pyright](https://github.com/microsoft/pyright/tree/master/packages/vscode-pyright/package.json)
-- [x] [r_language_server](https://github.com/REditorSupport/vscode-r-lsp/tree/master/package.json)
-- [x] [rescriptls](https://github.com/rescript-lang/rescript-vscode/tree/master/package.json)
-- [x] [rls](https://github.com/rust-lang/vscode-rust/tree/master/package.json)
-- [x] [rome](https://github.com/rome/tools/tree/main/editors/vscode/package.json)
-- [x] [ruff](https://github.com/astral-sh/ruff-vscode/tree/main/package.json)
-- [x] [rust_analyzer](https://github.com/rust-analyzer/rust-analyzer/tree/master/editors/code/package.json)
-- [x] [solargraph](https://github.com/castwide/vscode-solargraph/tree/master/package.json)
-- [x] [solidity_ls](https://github.com/juanfranblanco/vscode-solidity/tree/master/package.json)
-- [x] [sonarlint](https://github.com/SonarSource/sonarlint-vscode/tree/master/package.json)
-- [x] [sorbet](https://github.com/sorbet/sorbet/tree/master/vscode_extension/package.json)
-- [x] [sourcekit](https://github.com/swift-server/vscode-swift/tree/main/package.json)
-- [x] [spectral](https://github.com/stoplightio/vscode-spectral/tree/master/package.json)
-- [x] [stylelint_lsp](https://github.com/bmatcuk/coc-stylelintplus/tree/master/package.json)
-- [x] [svelte](https://github.com/sveltejs/language-tools/tree/master/packages/svelte-vscode/package.json)
-- [x] [svlangserver](https://github.com/eirikpre/VSCode-SystemVerilog/tree/master/package.json)
-- [x] [tailwindcss](https://github.com/tailwindlabs/tailwindcss-intellisense/tree/master/packages/vscode-tailwindcss/package.json)
-- [x] [terraformls](https://github.com/hashicorp/vscode-terraform/tree/master/package.json)
-- [x] [tinymist](https://github.com/Myriad-Dreamin/tinymist/refs/heads/tree/main/editors/vscode/package.json) (supports i18n)
-- [x] [ts_ls](https://github.com/microsoft/vscode/tree/main/extensions/typescript-language-features/package.json) (supports i18n)
-- [x] [typst_lsp](https://github.com/nvarner/typst-lsp/refs/heads/tree/master/editors/vscode/package.json)
-- [x] [volar](https://github.com/vuejs/language-tools/tree/master/extensions/vscode/package.json) (supports i18n)
-- [x] [vtsls](https://github.com/yioneko/vtsls/tree/main/packages/service/configuration.schema.json)
-- [x] [vuels](https://github.com/vuejs/vetur/tree/master/package.json)
-- [x] [wgls_analyzer](https://github.com/wgsl-analyzer/wgsl-analyzer/tree/main/editors/code/package.json)
-- [x] [yamlls](https://github.com/redhat-developer/vscode-yaml/tree/master/package.json)
-- [x] [zeta_note](https://github.com/artempyanykh/zeta-note-vscode/tree/main/package.json)
-- [x] [zls](https://github.com/zigtools/zls-vscode/tree/master/package.json)
-
-<!-- GENERATED:SERVERS:END -->
->>>>>>> conflict 1 of 1 ends

after/codesettings-schemas/powershell_es.json

@@ -411,6 +411,11 @@
       "markdownDescription": "Suppresses the warning message when any of `#powershell.powerShellAdditionalExePaths#` is not found.",
       "type": "boolean"
     },
+    "powershell.suppressTerminalStoppedNotification": {
+      "default": false,
+      "markdownDescription": "Do not show a notification when the PowerShell Extension Terminal has stopped.",
+      "type": "boolean"
+    },
     "powershell.trace.server": {
       "default": "off",
       "enum": [

lua/codesettings/generated/annotations.lua

@@ -18029,6 +18029,8 @@
 ---@field startAutomatically boolean?
 -- Suppresses the warning message when any of `#powershell.powerShellAdditionalExePaths#` is not found.
 ---@field suppressAdditionalExeNotFoundWarning boolean?
+-- Do not show a notification when the PowerShell Extension Terminal has stopped.
+---@field suppressTerminalStoppedNotification boolean?
 ---@field trace lsp.powershell_es.Trace?
 -- **Deprecated:** Uses the 32-bit language service on 64-bit Windows. This setting has no effect on 32-bit Windows or on the PowerShell extension debugger, which has its own architecture configuration.
 ---@field useX86Host boolean?