improve case-sensitivity handling

mcmonkey4eva · mcmonkey4eva · commit 6848e733804e · 2023-12-27T18:11:09.000-08:00
diff --git a/SharpDenizenTools/ScriptAnalysis/ScriptChecker.cs b/SharpDenizenTools/ScriptAnalysis/ScriptChecker.cs
@@ -1501,7 +1501,8 @@ public Dictionary<LineTrackedString, object> GatherActualContainers()
                         pspaces = spaces;
                         continue;
                     }
-                    string text = cleaned["- ".Length..];
+                    string textRaw = Lines[i].Trim()["- ".Length..];
+                    string textLow = textRaw.ToLowerFast();
                     if (!cleaned.EndsWith(':'))
                     {
                         while (i + 1 < Lines.Length)
@@ -1510,7 +1511,8 @@ public Dictionary<LineTrackedString, object> GatherActualContainers()
                             string cleaned2 = CleanedLines[i + 1];
                             if (CountPreSpaces(line2) > spaces && !cleaned2.StartsWith("- "))
                             {
-                                text += "\n" + line2;
+                                textRaw += "\n" + line2;
+                                textLow += "\n" + cleaned2;
                                 i++;
                                 if (cleaned2.EndsWith(':'))
                                 {
@@ -1523,11 +1525,11 @@ public Dictionary<LineTrackedString, object> GatherActualContainers()
                             }
                         }
                     }
-                    if (text.EndsWith(':'))
+                    if (textLow.EndsWith(':'))
                     {
-                        if (text.StartsWith("definemap "))
+                        if (textLow.StartsWith("definemap "))
                         {
-                            clist.Add(new LineTrackedString(i, text, cleanStartCut + 2));
+                            clist.Add(new LineTrackedString(i, textRaw, cleanStartCut + 2));
                             while (i + 1 < Lines.Length)
                             {
                                 string subLine = Lines[i + 1].Replace("\t", "    ");
@@ -1543,13 +1545,13 @@ public Dictionary<LineTrackedString, object> GatherActualContainers()
                         }
                         else
                         {
-                            secwaiting = new LineTrackedString(i, text[..^1], cleanStartCut + 2);
+                            secwaiting = new LineTrackedString(i, textRaw[..^1], cleanStartCut + 2);
                             buildingSubList = true;
                         }
                     }
                     else
                     {
-                        clist.Add(new LineTrackedString(i, text, cleanStartCut + 2));
+                        clist.Add(new LineTrackedString(i, textRaw, cleanStartCut + 2));
                     }
                     pspaces = spaces;
                     continue;
@@ -1885,7 +1887,7 @@ void procAsScript(List<object> list)
                     {
                         if (entry is LineTrackedString str)
                         {
-                            procSingleCommand(str.Text);
+                            procSingleCommand(str.Text.ToLowerFast());
                         }
                         else if (entry is Dictionary<LineTrackedString, object> subMap)
                         {

Original file line number	Diff line number	Diff line change
`@@ -1501,7 +1501,8 @@ public Dictionary<LineTrackedString, object> GatherActualContainers()`
`1501`	`1501`	`pspaces = spaces;`
`1502`	`1502`	`continue;`
`1503`	`1503`	`}`
`1504`		`- string text = cleaned["- ".Length..];`
	`1504`	`+ string textRaw = Lines[i].Trim()["- ".Length..];`
	`1505`	`+ string textLow = textRaw.ToLowerFast();`
`1505`	`1506`	`if (!cleaned.EndsWith(':'))`
`1506`	`1507`	`{`
`1507`	`1508`	`while (i + 1 < Lines.Length)`
`@@ -1510,7 +1511,8 @@ public Dictionary<LineTrackedString, object> GatherActualContainers()`
`1510`	`1511`	`string cleaned2 = CleanedLines[i + 1];`
`1511`	`1512`	`if (CountPreSpaces(line2) > spaces && !cleaned2.StartsWith("- "))`
`1512`	`1513`	`{`
`1513`		`- text += "\n" + line2;`
	`1514`	`+ textRaw += "\n" + line2;`
	`1515`	`+ textLow += "\n" + cleaned2;`
`1514`	`1516`	`i++;`
`1515`	`1517`	`if (cleaned2.EndsWith(':'))`
`1516`	`1518`	`{`
`@@ -1523,11 +1525,11 @@ public Dictionary<LineTrackedString, object> GatherActualContainers()`
`1523`	`1525`	`}`
`1524`	`1526`	`}`
`1525`	`1527`	`}`
`1526`		`- if (text.EndsWith(':'))`
	`1528`	`+ if (textLow.EndsWith(':'))`
`1527`	`1529`	`{`
`1528`		`- if (text.StartsWith("definemap "))`
	`1530`	`+ if (textLow.StartsWith("definemap "))`
`1529`	`1531`	`{`
`1530`		`- clist.Add(new LineTrackedString(i, text, cleanStartCut + 2));`
	`1532`	`+ clist.Add(new LineTrackedString(i, textRaw, cleanStartCut + 2));`
`1531`	`1533`	`while (i + 1 < Lines.Length)`
`1532`	`1534`	`{`
`1533`	`1535`	`string subLine = Lines[i + 1].Replace("\t", " ");`
`@@ -1543,13 +1545,13 @@ public Dictionary<LineTrackedString, object> GatherActualContainers()`
`1543`	`1545`	`}`
`1544`	`1546`	`else`
`1545`	`1547`	`{`
`1546`		`- secwaiting = new LineTrackedString(i, text[..^1], cleanStartCut + 2);`
	`1548`	`+ secwaiting = new LineTrackedString(i, textRaw[..^1], cleanStartCut + 2);`
`1547`	`1549`	`buildingSubList = true;`
`1548`	`1550`	`}`
`1549`	`1551`	`}`
`1550`	`1552`	`else`
`1551`	`1553`	`{`
`1552`		`- clist.Add(new LineTrackedString(i, text, cleanStartCut + 2));`
	`1554`	`+ clist.Add(new LineTrackedString(i, textRaw, cleanStartCut + 2));`
`1553`	`1555`	`}`
`1554`	`1556`	`pspaces = spaces;`
`1555`	`1557`	`continue;`
`@@ -1885,7 +1887,7 @@ void procAsScript(List<object> list)`
`1885`	`1887`	`{`
`1886`	`1888`	`if (entry is LineTrackedString str)`
`1887`	`1889`	`{`
`1888`		`- procSingleCommand(str.Text);`
	`1890`	`+ procSingleCommand(str.Text.ToLowerFast());`
`1889`	`1891`	`}`
`1890`	`1892`	`else if (entry is Dictionary<LineTrackedString, object> subMap)`
`1891`	`1893`	`{`