Merge branch 'master' into alias-enum-doc-export

Author: sumneko

changelog.md

@@ -3,6 +3,7 @@
 ## Unreleased
 <!-- Add all new changes here. They will be moved under a version at release -->
 * `NEW` Doc output now contains file paths for `@alias` and `@enum` types
+* `FIX` Typos in a few error messages.
 * `FIX` Incorrect inject-field message for extra table field in exact class
 * `CHG` Rename configuration option `Lua.diagnostics.disableScheme` to `Lua.diagnostics.validScheme` and improve its description. Now it enables diagnostics for Lua files that use the specified scheme.
 * `FIX` adds the `|lambda|` operator to the `Lua.runtime.nonstandardSymbol` configuration template, which allows the use of that option. Previously, support for it existed in the parser, but we could not actually use the option because it is not recognised in the configuration.

locale/en-us/script.lua

@@ -604,7 +604,7 @@ CONFIG_MODIFY_FAIL_NO_WORKSPACE =
 [[
 Failed to modify settings:
 * The current mode is single-file mode, server cannot create `.luarc.json` without workspace.
-* The language client dose not support modifying settings from the server side.
+* The language client does not support modifying settings from the server side.
 
 Please modify following settings manually:
 {}

locale/pt-br/script.lua

@@ -604,7 +604,7 @@ CONFIG_MODIFY_FAIL_NO_WORKSPACE = -- TODO: need translate!
 [[
 Failed to modify settings:
 * The current mode is single-file mode, server cannot create `.luarc.json` without workspace.
-* The language client dose not support modifying settings from the server side.
+* The language client does not support modifying settings from the server side.
 
 Please modify following settings manually:
 {}

script/client.lua

@@ -480,7 +480,7 @@ local function tryModifyClientGlobal(finalChanges)
  end
  log.info('tryModifyClientGlobal', inspect(finalChanges))
  if not m.getOption 'changeConfiguration' then
- log.info('Client dose not support modifying config')
+ log.info('Client does not support modifying config')
  return
  end
  local changes = {}