Syntax support for singleton types, fix #141

Author: NightrainsRbx

client/out/extension.js

@@ -86,13 +86,15 @@ async function openUpdatesWindow(context: vscode.ExtensionContext) {
                 <p style="font-size:1rem">Report any bug or question here: <a href="https://github.com/NightrainsRbx/RobloxLsp/issues">https://github.com/NightrainsRbx/RobloxLsp/issues</a></p>
                 <hr style="height:2px;border:none;color:#333;background-color:#333;"/>
                 <h2 style="font-size:2rem; font-weight:100">v1.5.6</h2>
-                <li style="font-size:1rem">Improved syntax support for Luau and added basic support for type packs.</li>
+                <li style="font-size:1rem">Improved syntax support for Luau.</li>
+                <li style="font-size:1rem">Added basic syntax support for generic type packs and singleton types.</li>
                 <li style="font-size:1rem">Implemented suggeted imports for modules (thanks to <a href="https://github.com/Corecii">@Corecii</a>, <a href="https://github.com/NightrainsRbx/RobloxLsp/pull/123">#123</a>)</li>
                 <li style="font-size:1rem">Added Vector3 constants (thanks to <a href="https://github.com/aku-e">@aku-e</a>, <a href="https://github.com/NightrainsRbx/RobloxLsp/pull/145">#145</a>)</li>
                 <li style="font-size:1rem">Color3.fromHex is no longer deprecated.</li>
                 <li style="font-size:1rem">Fixed deprecated classes not having typings. (<a href="https://github.com/NightrainsRbx/RobloxLsp/issues/147">#147</a>)</li>
                 <li style="font-size:1rem">Fixed embedded rojo projects not using their correct root name. (<a href="https://github.com/NightrainsRbx/RobloxLsp/issues/128">#128</a>)</li>
                 <li style="font-size:1rem">Inlay hints are not displayed if the type is "none" or "any".</li>
+                <li style="font-size:1rem">Fixed diagnostics for type aliases with the same names as built-in types.</li>
                 <li style="font-size:1rem">Updated binaries.</li>
             </div>
         </body>

client/out/extension.js.map

@@ -165,6 +165,7 @@ m.typeAnnTypes = {
     ["type.variadic"] = true,
     ["type.typeof"] = true,
     ["type.genericpack"] = true,
+    ["type.singleton"] = true,
     ["type.library"] = true
 }
 
@@ -4714,6 +4715,8 @@ function m.buildTypeAnn(typeUnit, mark)
         text = "..." .. m.buildTypeAnn(typeUnit.value, mark)
     elseif typeUnit.type == "type.typeof" then
         text = "typeof(" .. m.buildExp(typeUnit.value) .. ")"
+    elseif typeUnit.type == "type.singleton" then
+        text = typeUnit[2] .. typeUnit[1] .. typeUnit[2]:gsub("%[", "]")
     elseif typeUnit.type == "type.meta" then
         text = "{" .. m.buildTypeAnn(typeUnit[1], mark) .. ", @metatable " .. m.buildTypeAnn(typeUnit[2], mark) .. "}"
     elseif typeUnit.type == "paren" then

client/src/extension.ts

@@ -967,6 +967,10 @@ local Defs = {
         name.dots = dots
         return name
     end,
+    SingletonType = function (str)
+        str.type = "type.singleton"
+        return str
+    end,
     NamedType = function (key, colon, value)
         value.paramName = key
         return value

server/script/core/guide.lua

@@ -418,6 +418,7 @@ TypeUnit    <-  ModuleType
             /   NameType
             /   FuncType
             /   TableType
+            /   SingletonType
             /   TypeSimple
 
 TypeSimple  <-  ({| TypePrefix |} Optional?)
@@ -435,7 +436,7 @@ Typeof      <-  Sp ({} 'typeof' Sp {} PL Exp DirtyPR {} Optional?)
 Generics1   <-  Sp ({} AL Sp {| (GenericPackType / Name / COMMA)+ |} Sp DirtyAR {})
             ->  Generics
             /   %nil
-Generics2   <-  Sp ({} AL Sp {| (TypeList / VariadicType / Type / COMMA)* |} Sp DirtyAR {})
+Generics2   <-  Sp ({} AL Sp {| (VariadicType / Type / TypeList / COMMA)* |} Sp DirtyAR {})
             ->  Generics
             /   %nil
 TypeList    <-  Sp ({} PL {| (VariadicType / Type / COMMA)* |} DirtyPR {})
@@ -457,6 +458,9 @@ VariadicType
 GenericPackType
             <-  Sp (Name DOTS)
             ->  GenericPackType
+SingletonType
+            <-  String
+            ->  SingletonType
 
 FieldType   <-  Sp ({} Name COLON Type {}) 
             ->  FieldType

server/script/parser/ast.lua

@@ -549,6 +549,9 @@
 				},
 				{
 					"include": "#comments"
+				},
+				{
+					"include": "#strings"
 				}
 			]
 		},