Skip to content

Commit d4771d9

Browse files
committed
fix global function annotation syntax
1 parent 5a604ff commit d4771d9

3 files changed

Lines changed: 5 additions & 4 deletions

File tree

generated/secondlife.d.luau

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ declare getfenv: nil
306306
-- declare function getmetatable<T>(obj: T): getmetatable<T> -- builtin
307307
declare function ipairs<V>(tab: {V}): (({V}, number) -> (number?, V), {V}, number)
308308
declare loadstring: nil
309-
declare @checked function newproxy(mt: boolean?): any
309+
@checked declare function newproxy(mt: boolean?): any
310310
-- declare function next<K, V>(t: {[K]: V}, i: K?): (K?, V) -- builtin
311311
-- declare function pairs<K, V>(t: {[K]: V}): (({[K]: V}, K?) -> (K?, V), {[K]: V}, K) -- builtin
312312
declare function pcall<A..., R...>(f: (A...) -> R..., ...: A...): (boolean, R...)
@@ -315,7 +315,7 @@ declare function rawequal<T1, T2>(a: T1, b: T2): boolean
315315
declare function rawget<K, V>(t: {[K]: V}, k: K): V?
316316
declare function rawlen<K, V>(t: {[K]: V} | string): number
317317
declare function rawset<K, V>(t: {[K]: V}, k: K, v: V): {[K]: V}
318-
-- declare @checked function require(target: any): any -- magic type
318+
-- @checked declare function require(target: any): any -- magic type
319319
-- declare function select<A...>(i: string | number, ...: A...): ...any -- magic type
320320
declare setfenv: nil
321321
-- declare function setmetatable<T, MT>(t: T, mt: MT): setmetatable<T, MT> -- builtin, magic type

lsl_definitions/generators/slua.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ def gen_luau_lsp_defs(definitions: LSLDefinitions, slua_definitions: SLuaDefinit
5656
continue
5757
if not func.typechecker_flags.fully_defined:
5858
defs.write("-- ")
59-
defs.write("declare ")
6059
func.write_luau_global_def(defs)
6160
for module in sorted(slua_definitions.modules, key=lambda x: x.name):
6261
if module.name in {"ll", "llcompat"}:

lsl_definitions/slua.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,13 +226,15 @@ def to_keywords_dict(self) -> dict:
226226
def write_luau_global_def(self, f: TextIO, indent: int = 0) -> None:
227227
"""For declaring global functions and class/extern type methods"""
228228
if self.slua_removed:
229-
f.write(f"{self.name}: nil\n")
229+
f.write(f"declare {self.name}: nil\n")
230230
elif self.overloads:
231231
# the function format can't handle overloads
232232
self.write_luau_table_def(f, indent, suffix="")
233233
else:
234234
f.write(f"{' ' * indent}")
235235
f.write(self.annotation_string)
236+
if indent == 0:
237+
f.write("declare ")
236238
f.write(f"function {self.name}")
237239
f.write(self.type_parameters_string)
238240
f.write(self.parameters_string(declaration=True))

0 commit comments

Comments
 (0)