fix vgui and color overrides (file case)

Author: luttje

__tests__/api-writer/glua-api-writer.spec.ts

@@ -73,7 +73,7 @@ describe('GLua API Writer', () => {
 
     const api = writer.writePages([<WikiPage>hookJson]);
 
-    expect(api).toEqual(override);
+    expect(api).toEqual(`${override}\n\n`);
   });
 
   it('should allow overriding specific class declarations', () => {

custom/global.color.lua custom/Global.Color.luacustom/global.color.lua renamed to custom/Global.Color.lua

@@ -6,5 +6,5 @@
 ---@param g number An integer from `0-255` describing the green value of the color.
 ---@param b number An integer from `0-255` describing the blue value of the color.
 ---@param a number An integer from `0-255` describing the alpha (transparency) of the color.
----@return Color #The created Color (is returned as a table without the Color metatable, [(See GitHub issue)](https://github.com/Facepunch/garrysmod-issues/issues/2407)).
+---@return Color #The created Color. Is returned as a table without the Color metatable, [(See GitHub issue)](https://github.com/Facepunch/garrysmod-issues/issues/2407).
 function _G.Color(r, g, b, a) end

custom/vgui.create.lua custom/vgui.Create.luacustom/vgui.create.lua renamed to custom/vgui.Create.lua

@@ -66,9 +66,18 @@ export class GluaApiWriter {
   }
 
   public writePage(page: WikiPage) {
-    if (this.pageOverrides.has(page.address))
-      return this.pageOverrides.get(page.address);
-    else if (isClassFunction(page))
+    if (this.pageOverrides.has(page.address)) {
+      let api = '';
+      
+      if (isClassFunction(page))
+        api += this.writeClass(page.parent);
+      else if (isLibraryFunction(page))
+        api += this.writeLibraryGlobal(page);
+      
+      api += this.pageOverrides.get(page.address);
+
+      return `${api}\n\n`;
+    } else if (isClassFunction(page))
       return this.writeClassFunction(page);
     else if (isLibraryFunction(page))
       return this.writeLibraryFunction(page);
@@ -107,6 +116,18 @@ export class GluaApiWriter {
     return api;
   }
 
+  private writeLibraryGlobal(func: LibraryFunction) {
+    if (!func.dontDefineParent && !this.writtenLibraryGlobals.has(func.parent)) {
+      const global = `${func.parent} = {}\n\n`;
+
+      this.writtenLibraryGlobals.add(func.parent);
+
+      return global;
+    }
+
+    return '';
+  }
+
   private writeClassFunction(func: ClassFunction) {
     let api: string = this.writeClass(func.parent);
 
@@ -117,13 +138,7 @@ export class GluaApiWriter {
   }
 
   private writeLibraryFunction(func: LibraryFunction) {
-    let api: string = '';
-
-    if (!func.dontDefineParent && !this.writtenLibraryGlobals.has(func.parent)) {
-      api += `${func.parent} = {}\n\n`;
-
-      this.writtenLibraryGlobals.add(func.parent);
-    }
+    let api: string = this.writeLibraryGlobal(func);
 
     api += this.writeFunctionLuaDocComment(func, func.realm);
     api += this.writeFunctionDeclaration(func, func.realm);