Skip to content

Commit b87ef8b

Browse files
GarthexGarthex
Garthex
authored and
Garthex
committed
[Release 1.1] Fixed keyword generator and updated keyword list.
1 parent 81da9a0 commit b87ef8b

File tree

8 files changed

+29
-76
lines changed

8 files changed

+29
-76
lines changed

‎GmodLua/GmodLua.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ extern "C" __declspec(dllexport) LRESULT messageProc(UINT Message, WPARAM wParam
105105
}
106106

107107
void aboutDlg(){
108-
::MessageBox(nppData._nppHandle, "Garry's Mod 10 Lua\nSyntax Highlighting 1.0\n\nAuthor: Garthex\ngarthex@gmail.com", "<-About->", MB_OK);
108+
::MessageBox(nppData._nppHandle, "Garry's Mod 10 Lua Syntax Highlighter 1.1\nhttp://code.google.com/p/npp-gmod-lua/\n\n Author: Garthex", "<-About->", MB_OK);
109109
}
110110

111111
static void ColouriseGmodLuaDoc( unsigned int startPos, int length,

‎GmodLua/bin/Config/GmodLua.xml

Lines changed: 10 additions & 11 deletions
Large diffs are not rendered by default.

‎GmodLua/bin/Npp_Keywords.lua

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ end
6464

6565
local Ignores = { "mathx", "stringx", "_G", "_R", "_E", "GAMEMODE", "g_SBoxObjects", "tablex", "color_black",
6666
"color_white", "utilx", "_LOADLIB", "_LOADED", "color_transparent", "filex", "func", "DOF_Ents",
67-
"Morph", "_ENT", "PANEL" }
67+
"Morph", "_ENT" }
6868

6969
// Retrieve Everything Global
7070
for k, v in pairs(_G) do
@@ -180,7 +180,7 @@ for _,kind in pairs({"base_anim", "base_point", "base_brush", "base_vehicle"}) d
180180
end
181181
end
182182
end
183-
--[[
183+
--[[ // Code to determine TOOL functions and variables
184184
local tbl1 = {}
185185
local tbl2 = {}
186186
for _, t in pairs(weapons.Get('gmod_tool').Tool) do
@@ -224,21 +224,6 @@ for kind, tbl in pairs(TOOL) do
224224
end
225225
end
226226
end
227-
if CLIENT then
228-
for k, v in pairs(PANEL) do
229-
if type(k) == "string" then
230-
if type(v) == "function" then
231-
table.insert(output.scriptedFunctions, "self."..k)
232-
table.insert(output.scriptedFunctions, "self:"..k)
233-
table.insert(output.scriptedFunctions, "PANEL."..k)
234-
table.insert(output.scriptedFunctions, "PANEL:"..k)
235-
elseif type(v) == "string" then
236-
table.insert(output.scriptedFunctions, "self."..k)
237-
table.insert(output.scriptedFunctions, "PANEL."..k)
238-
end
239-
end
240-
end
241-
end
242227

243228
for k,v in pairs(GAMEMODE.BaseClass) do
244229
if type(k) == "string" then

‎GmodLuaLite/GmodLua.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ extern "C" __declspec(dllexport) LRESULT messageProc(UINT Message, WPARAM wParam
105105
}
106106

107107
void aboutDlg(){
108-
::MessageBox(nppData._nppHandle, "Garry's Mod 10 Lua\nSyntax Highlighting 1.0\n\nAuthor: Garthex\ngarthex@gmail.com", "<-About->", MB_OK);
108+
::MessageBox(nppData._nppHandle, "Garry's Mod 10 Lua Syntax Highlighter 1.1\nhttp://code.google.com/p/npp-gmod-lua/\n\n Author: Garthex", "<-About->", MB_OK);
109109
}
110110

111111
static void ColouriseGmodLuaDoc( unsigned int startPos, int length,

‎GmodLuaLite/bin/Npp_Keywords.lua

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ end
6464

6565
local Ignores = { "mathx", "stringx", "_G", "_R", "_E", "GAMEMODE", "g_SBoxObjects", "tablex", "color_black",
6666
"color_white", "utilx", "_LOADLIB", "_LOADED", "color_transparent", "filex", "func", "DOF_Ents",
67-
"Morph", "_ENT", "PANEL" }
67+
"Morph", "_ENT" }
6868

6969
// Retrieve Everything Global
7070
for k, v in pairs(_G) do
@@ -180,7 +180,7 @@ for _,kind in pairs({"base_anim", "base_point", "base_brush", "base_vehicle"}) d
180180
end
181181
end
182182
end
183-
--[[
183+
--[[ // Code to determine TOOL functions and variables
184184
local tbl1 = {}
185185
local tbl2 = {}
186186
for _, t in pairs(weapons.Get('gmod_tool').Tool) do
@@ -224,21 +224,6 @@ for kind, tbl in pairs(TOOL) do
224224
end
225225
end
226226
end
227-
if CLIENT then
228-
for k, v in pairs(PANEL) do
229-
if type(k) == "string" then
230-
if type(v) == "function" then
231-
table.insert(output.scriptedFunctions, "self."..k)
232-
table.insert(output.scriptedFunctions, "self:"..k)
233-
table.insert(output.scriptedFunctions, "PANEL."..k)
234-
table.insert(output.scriptedFunctions, "PANEL:"..k)
235-
elseif type(v) == "string" then
236-
table.insert(output.scriptedFunctions, "self."..k)
237-
table.insert(output.scriptedFunctions, "PANEL."..k)
238-
end
239-
end
240-
end
241-
end
242227

243228
for k,v in pairs(GAMEMODE.BaseClass) do
244229
if type(k) == "string" then

‎GmodLuaUnopt/GmodLua.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ extern "C" __declspec(dllexport) LRESULT messageProc(UINT Message, WPARAM wParam
105105
}
106106

107107
void aboutDlg(){
108-
::MessageBox(nppData._nppHandle, "Garry's Mod 10 Lua\nSyntax Highlighting 1.0\n\nAuthor: Garthex\ngarthex@gmail.com", "<-About->", MB_OK);
108+
::MessageBox(nppData._nppHandle, "Garry's Mod 10 Lua Syntax Highlighter 1.1\nhttp://code.google.com/p/npp-gmod-lua/\n\n Author: Garthex", "<-About->", MB_OK);
109109
}
110110

111111
static void ColouriseGmodLuaDoc( unsigned int startPos, int length,

‎GmodLuaUnopt/bin/Config/GmodLua.xml

Lines changed: 10 additions & 11 deletions
Large diffs are not rendered by default.

‎GmodLuaUnopt/bin/Npp_Keywords.lua

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ end
6464

6565
local Ignores = { "mathx", "stringx", "_G", "_R", "_E", "GAMEMODE", "g_SBoxObjects", "tablex", "color_black",
6666
"color_white", "utilx", "_LOADLIB", "_LOADED", "color_transparent", "filex", "func", "DOF_Ents",
67-
"Morph", "_ENT", "PANEL" }
67+
"Morph", "_ENT" }
6868

6969
// Retrieve Everything Global
7070
for k, v in pairs(_G) do
@@ -180,7 +180,7 @@ for _,kind in pairs({"base_anim", "base_point", "base_brush", "base_vehicle"}) d
180180
end
181181
end
182182
end
183-
--[[
183+
--[[ // Code to determine TOOL functions and variables
184184
local tbl1 = {}
185185
local tbl2 = {}
186186
for _, t in pairs(weapons.Get('gmod_tool').Tool) do
@@ -224,21 +224,6 @@ for kind, tbl in pairs(TOOL) do
224224
end
225225
end
226226
end
227-
if CLIENT then
228-
for k, v in pairs(PANEL) do
229-
if type(k) == "string" then
230-
if type(v) == "function" then
231-
table.insert(output.scriptedFunctions, "self."..k)
232-
table.insert(output.scriptedFunctions, "self:"..k)
233-
table.insert(output.scriptedFunctions, "PANEL."..k)
234-
table.insert(output.scriptedFunctions, "PANEL:"..k)
235-
elseif type(v) == "string" then
236-
table.insert(output.scriptedFunctions, "self."..k)
237-
table.insert(output.scriptedFunctions, "PANEL."..k)
238-
end
239-
end
240-
end
241-
end
242227

243228
for k,v in pairs(GAMEMODE.BaseClass) do
244229
if type(k) == "string" then

0 commit comments

Comments
 (0)