fix CondenserTest a bit

Author: maxijabase

SourcepawnCondenser/CondenserTest/CondenserTest.csproj

@@ -10,6 +10,7 @@
     <RootNamespace>CondenserTest</RootNamespace>
     <AssemblyName>CondenserTest</AssemblyName>
     <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <LangVersion>latest</LangVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>

SourcepawnCondenser/CondenserTest/MainWindow.xaml.cs

@@ -18,14 +18,18 @@ public MainWindow()
             InitializeComponent();
             var str = new StringBuilder();
             var files = new List<string>();
-            files.AddRange(Directory.GetFiles(@"D:\AlliedModders\includes", "*.inc", SearchOption.AllDirectories));
-            str.AppendLine(files.Count.ToString());
-            foreach (var f in files)
+            var dir = @"D:\spcodecomp\custom configs\include";
+            if (Directory.Exists(dir))
             {
-                str.AppendLine(File.ReadAllText(f));
+                files.AddRange(Directory.GetFiles(dir, "*.inc", SearchOption.AllDirectories));
+                str.AppendLine(files.Count.ToString());
+                foreach (var f in files)
+                {
+                    str.AppendLine(File.ReadAllText(f));
+                }
+                textBox.Text = str.ToString();
             }
             ExpandBox.IsChecked = false;
-            textBox.Text = str.ToString();
         }
 
         private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
@@ -332,22 +336,22 @@ private void G_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
 
         private Brush ChooseBackgroundFromTokenKind(TokenKind kind)
         {
-            switch (kind)
+            return kind switch
             {
-                case TokenKind.BraceClose:
-                case TokenKind.BraceOpen: return Brushes.LightGray;
-                case TokenKind.Character: return Brushes.LightSalmon;
-                case TokenKind.EOF: return Brushes.LimeGreen;
-                case TokenKind.Identifier: return Brushes.LightSteelBlue;
-                case TokenKind.Number: return Brushes.LightSeaGreen;
-                case TokenKind.ParenthesisClose:
-                case TokenKind.ParenthesisOpen: return Brushes.LightSlateGray;
-                case TokenKind.Quote: return Brushes.LightGoldenrodYellow;
-                case TokenKind.EOL: return Brushes.Aqua;
-                case TokenKind.SingleLineComment:
-                case TokenKind.MultiLineComment: return Brushes.Honeydew;
-                default: return Brushes.IndianRed;
-            }
+                TokenKind.BraceClose or
+                TokenKind.BraceOpen => Brushes.LightGray,
+                TokenKind.Character => Brushes.LightSalmon,
+                TokenKind.EOF => Brushes.LimeGreen,
+                TokenKind.Identifier => Brushes.LightSteelBlue,
+                TokenKind.Number => Brushes.LightSeaGreen,
+                TokenKind.ParenthesisClose or
+                TokenKind.ParenthesisOpen => Brushes.LightSlateGray,
+                TokenKind.Quote => Brushes.LightGoldenrodYellow,
+                TokenKind.EOL => Brushes.Aqua,
+                TokenKind.SingleLineComment or
+                TokenKind.MultiLineComment => Brushes.Honeydew,
+                _ => Brushes.IndianRed
+            };
         }
 
         private void CaretPositionChangedEvent(object sender, RoutedEventArgs e)

SourcepawnCondenser/SourcepawnCondenser/Condenser.cs

@@ -81,7 +81,7 @@ public SMDefinition Condense()
 
                             break;
                         }
-                    case TokenKind.PrePocessorDirective:
+                    case TokenKind.PreprocessorDirective:
                         {
                             var newIndex = ConsumeSMPPDirective();
                             if (newIndex != -1)

SourcepawnCondenser/SourcepawnCondenser/Tokenizer/TokenKind.cs

@@ -23,7 +23,7 @@ public enum TokenKind
         Struct,                 //d
         MethodMap,              //d
         Property,               //d
-        PrePocessorDirective,   //d
+        PreprocessorDirective,   //d
         TypeDef,                //d
         TypeSet,                //d
         New,

SourcepawnCondenser/SourcepawnCondenser/Tokenizer/Tokenizer.cs

@@ -446,7 +446,7 @@ public static List<Token> TokenizeString(string Source, bool IgnoreMultipleEOL)
                             }
 
                             var directiveString = Source.Substring(startIndex, endIndex - startIndex);
-                            token.Add(new Token(directiveString, TokenKind.PrePocessorDirective, startIndex));
+                            token.Add(new Token(directiveString, TokenKind.PreprocessorDirective, startIndex));
 
                             if (directiveString == "#define" && sArray[endIndex] == ' ')
                             {