!fixup make DataStructures multiline aware

TTT-2 · Oct 1, 2024 · 18b1d98 · 18b1d98
1 parent b2afe35
commit 18b1d98
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 11 deletions.
diff --git a/source/DataStructures/Lua/Accessor.cs b/source/DataStructures/Lua/Accessor.cs
@@ -53,16 +53,19 @@ public override void Process(FileParser fileParser)
 			if (local)
 				Ignore = true;
 
-			string line = fileParser.Lines[fileParser.CurrentLineCount];
+			for (int j = 0; j < fileParser.CurrentMatchedLines; j++)
+			{
+				Line = Line + fileParser.Lines[fileParser.CurrentLineCount + j];
+			}
 
 			if (typs == null)
 				NeoDoc.WriteErrors("Missing essential param", new List<string>{
 					"Missing '@accessor' in '" + GetName() + "' datastructure"
 				}, fileParser.relPath, fileParser.CurrentLineCount + 1, (int)NeoDoc.ERROR_CODES.MISSING_ESSENTIAL_PARAMS);
 
-			Match splitMatch = GetRegex().Match(line);
+			Match splitMatch = GetRegex().Match(Line);
 
-			List<string> tmpData = NeoDoc.GetEntriesFromString(line.Substring(splitMatch.Index, line.Length - splitMatch.Index), out _);
+			List<string> tmpData = NeoDoc.GetEntriesFromString(Line.Substring(splitMatch.Index, Line.Length - splitMatch.Index), out _);
 
 			string wrapperName = tmpData[0].Trim();
 			string varName = tmpData[1].Trim('"');
@@ -76,9 +79,9 @@ public override void Process(FileParser fileParser)
 				FoundPath = fileParser.relPath
 			};
 
-			setterFunc.Line = line;
+			setterFunc.Line = Line;
 			setterFunc.Local = local;
-			setterFunc.FunctionData = line;
+			setterFunc.FunctionData = Line;
 			setterFunc.Name = wrapperName + ":" + "Set" + (name ?? funcPartName);
 
 			List<Param> _tmpList;
@@ -105,9 +108,9 @@ public override void Process(FileParser fileParser)
 				FoundPath = fileParser.relPath
 			};
 
-			getterFunc.Line = line;
+			getterFunc.Line = Line;
 			getterFunc.Local = local;
-			getterFunc.FunctionData = line;
+			getterFunc.FunctionData = Line;
 			getterFunc.Name = wrapperName + ":" + "Get" + (name ?? funcPartName);
 
 			if (ParamsList == null)

diff --git a/source/DataStructures/Lua/CreateConVar.cs b/source/DataStructures/Lua/CreateConVar.cs
@@ -25,8 +25,6 @@ public override bool CheckMatch(string line)
 
 		public override void Process(FileParser fileParser)
 		{
-			Line = fileParser.Lines[fileParser.CurrentLineCount];
-
 			string name = null;
 
 			if (ParamsList != null && ParamsList.Count > 0)
@@ -47,6 +45,11 @@ public override void Process(FileParser fileParser)
 					ParamsList = null;
 			}
 
+			for (int j = 0; j < fileParser.CurrentMatchedLines; j++)
+			{
+				Line = Line + fileParser.Lines[fileParser.CurrentLineCount + j];
+			}
+
 			Match splitMatch = GetRegex().Match(Line);
 			string result = Line.Substring(splitMatch.Index, Line.Length - splitMatch.Index);
 

diff --git a/source/DataStructures/Lua/Function.cs b/source/DataStructures/Lua/Function.cs
@@ -45,7 +45,10 @@ public override void Process(FileParser fileParser)
 				}
 			}
 
-			Line = fileParser.Lines[fileParser.CurrentLineCount];
+			for (int j = 0; j < fileParser.CurrentMatchedLines; j++)
+			{
+				Line = Line + fileParser.Lines[fileParser.CurrentLineCount + j];
+			}
 
 			if (!Local)
 			{

diff --git a/source/DataStructures/Lua/Hook.cs b/source/DataStructures/Lua/Hook.cs
@@ -37,7 +37,6 @@ public override bool CheckMatch(string line)
 
 		public override void Process(FileParser fileParser)
 		{
-			Line = fileParser.Lines[fileParser.CurrentLineCount];
 
 			string name = null;
 
@@ -59,6 +58,11 @@ public override void Process(FileParser fileParser)
 					ParamsList = null;
 			}
 
+			for (int j = 0; j < fileParser.CurrentMatchedLines; j++)
+			{
+				Line = Line + fileParser.Lines[fileParser.CurrentLineCount + j];
+			}
+
 			Match splitMatch = GetRegex().Match(Line);
 
 			if (splitMatch.NextMatch().Success) // there are multiple hooks in this line

diff --git a/source/FileParser.cs b/source/FileParser.cs
@@ -22,6 +22,7 @@ public class FileParser
 
 		internal readonly string relPath;
 		internal int CurrentLineCount { get; set; }
+		internal int CurrentMatchedLines { get; set; }
 		internal List<Param> paramsList { get; set; }
 
 		public SortedDictionary<string, WrapperParam> WrapperDict { get; set; }
@@ -96,6 +97,7 @@ public void Process()
 
 					if (dataStructure != null)
 					{
+						CurrentMatchedLines = counter - 1;
 						dataStructure.Initialize(this);
 					}