Merge branch 'master' into fix/signature-tuple-parameters

Author: sumneko

changelog.md

@@ -3,6 +3,8 @@
 ## Unreleased
 <!-- Add all new changes here. They will be moved under a version at release -->
 * `FIX` Incorrect generation of function signatures with tuple-parameters
+* `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/cli/check.lua

@@ -11,10 +11,10 @@ local function logFileForThread(threadId)
     return LOGPATH .. '/check-partial-' .. threadId .. '.json'
 end
 
-local function buildArgs(exe, numThreads, threadId, format, quiet)
-    local args = {exe}
+local function buildArgs(minIndex, numThreads, threadId, format, quiet)
+    local args = {}
     local skipNext = false
-    for i = 1, #arg do
+    for i = minIndex, #arg do
         local arg = arg[i]
         -- --check needs to be transformed into --check_worker
         if arg:lower():match('^%-%-check$') or arg:lower():match('^%-%-check=') then
@@ -56,9 +56,10 @@ function export.runCLI()
         exe = arg[minIndex]
         minIndex = minIndex - 1
     end
+    minIndex = minIndex + 1
     -- TODO: is this necessary? got it from the shell.lua helper in bee.lua tests
     if platform.os == 'windows' and not exe:match('%.[eE][xX][eE]$') then
-        exe = exe..'.exe'
+        arg[minIndex] = exe..'.exe'
     end
 
     if not QUIET and numThreads > 1 then
@@ -67,7 +68,7 @@ function export.runCLI()
 
     local procs = {}
     for i = 1, numThreads do
-        local process, err = subprocess.spawn({buildArgs(exe, numThreads, i, CHECK_FORMAT, QUIET)})
+        local process, err = subprocess.spawn({buildArgs(minIndex, numThreads, i, CHECK_FORMAT, QUIET)})
         if err then
             print(err)
         end

script/cli/doc/export.lua

@@ -147,7 +147,11 @@ export.makeDocObject['INIT'] = function(source, has_seen)
 end
 
 export.makeDocObject['doc.alias'] = function(source, obj, has_seen)
+    obj.file = export.getLocalPath(guide.getUri(source))
+end
 
+export.makeDocObject['doc.enum'] = function(source, obj, has_seen)
+    obj.file = export.getLocalPath(guide.getUri(source))
 end
 
 export.makeDocObject['doc.field'] = function(source, obj, has_seen)
@@ -256,6 +260,7 @@ export.makeDocObject['variable'] = function(source, obj, has_seen)
         or set.type == 'setmethod'
         or set.type == 'setindex'
         or set.type == 'doc.alias'
+        or set.type == 'doc.enum'
         or set.type == 'doc.class'
         then
             table.insert(obj.defines, export.documentObject(set, has_seen))

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 = {}

script/core/hover/description.lua

@@ -507,7 +507,7 @@ local function tryDocEnum(source)
                 end
                 if field.value.type == 'integer'
                 or field.value.type == 'string' then
-                    md:add('lua', ('    %s: %s = %s,'):format(key, field.value.type, field.value[1]))
+                    md:add('lua', ('    %s: %s = %q,'):format(key, field.value.type, field.value[1]))
                 end
                 if field.value.type == 'binary'
                 or field.value.type == 'unary' then