cleanup and order

maxijabase · maxijabase · commit 2b30cb544fda · 2021-01-30T14:08:12.000-03:00
diff --git a/Deploy/SpcodeUpdater/Program.cs b/Deploy/SpcodeUpdater/Program.cs
@@ -1,11 +1,11 @@
-﻿using SpcodeUpdater.Properties;
-using System;
+﻿using System;
 using System.Diagnostics;
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
 using System.Threading;
 using System.Windows.Forms;
+using SpcodeUpdater.Properties;
 
 namespace SpcodeUpdater
 {
diff --git a/Deploy/SpcodeUpdater/UpdateMarquee.cs b/Deploy/SpcodeUpdater/UpdateMarquee.cs
@@ -1,6 +1,6 @@
-﻿using SpcodeUpdater.Properties;
-using System;
+﻿using System;
 using System.Windows.Forms;
+using SpcodeUpdater.Properties;
 
 namespace SpcodeUpdater
 {
diff --git a/Interop/PipeInteropServer.cs b/Interop/PipeInteropServer.cs
@@ -1,7 +1,7 @@
-﻿using SPCode.UI;
-using System;
+﻿using System;
 using System.IO.Pipes;
 using System.Text;
+using SPCode.UI;
 
 namespace SPCode.Interop
 {
diff --git a/Interop/Updater/UpdateCheck.cs b/Interop/Updater/UpdateCheck.cs
@@ -1,7 +1,7 @@
-﻿using Octokit;
-using System;
+﻿using System;
 using System.Reflection;
 using System.Threading.Tasks;
+using Octokit;
 
 namespace SPCode.Interop.Updater
 {
diff --git a/Interop/Updater/UpdateInfo.cs b/Interop/Updater/UpdateInfo.cs
@@ -1,5 +1,5 @@
-﻿using Octokit;
-using System.Linq;
+﻿using System.Linq;
+using Octokit;
 
 namespace SPCode.Interop.Updater
 {
diff --git a/Interop/Updater/UpdateWindow.xaml.cs b/Interop/Updater/UpdateWindow.xaml.cs
@@ -1,10 +1,10 @@
-﻿using Octokit;
-using System;
+﻿using System;
 using System.Diagnostics;
 using System.IO;
 using System.Net;
 using System.Threading;
 using System.Windows;
+using Octokit;
 
 namespace SPCode.Interop.Updater
 {
diff --git a/SourcepawnCondenser/CondenserTest/MainWindow.xaml.cs b/SourcepawnCondenser/CondenserTest/MainWindow.xaml.cs
@@ -28,7 +28,6 @@ public MainWindow()
                 str.AppendLine(File.ReadAllText(f));
             }
             ExpandBox.IsChecked = false;
-            //str.AppendLine(File.ReadAllText(@"C:\Users\Jelle\Desktop\coding\sm-scripting\CondenserTestFile.inc"));
             textBox.Text = str.ToString();
         }
 
diff --git a/UI/Components/DASMElement.xaml.cs b/UI/Components/DASMElement.xaml.cs
@@ -1,11 +1,11 @@
-﻿using smxdasm;
-using System;
+﻿using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
+using smxdasm;
 
 namespace SPCode.UI.Components
 {
diff --git a/UI/Components/DASMElementHighlighter.cs b/UI/Components/DASMElementHighlighter.cs
@@ -1,7 +1,7 @@
-﻿using ICSharpCode.AvalonEdit.Highlighting;
-using System.Collections.Generic;
+﻿using System.Collections.Generic;
 using System.Text.RegularExpressions;
 using System.Windows.Media;
+using ICSharpCode.AvalonEdit.Highlighting;
 
 namespace SPCode.UI.Components
 {
diff --git a/UI/Components/EditorElement.xaml.cs b/UI/Components/EditorElement.xaml.cs
@@ -1,12 +1,3 @@
-using ICSharpCode.AvalonEdit.Document;
-using ICSharpCode.AvalonEdit.Editing;
-using ICSharpCode.AvalonEdit.Folding;
-using ICSharpCode.AvalonEdit.Rendering;
-using ICSharpCode.AvalonEdit.Utils;
-using MahApps.Metro.Controls.Dialogs;
-using SourcepawnCondenser;
-using SourcepawnCondenser.SourcemodDefinition;
-using SPCode.Utils.SPSyntaxTidy;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -22,6 +13,15 @@
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
+using ICSharpCode.AvalonEdit.Document;
+using ICSharpCode.AvalonEdit.Editing;
+using ICSharpCode.AvalonEdit.Folding;
+using ICSharpCode.AvalonEdit.Rendering;
+using ICSharpCode.AvalonEdit.Utils;
+using MahApps.Metro.Controls.Dialogs;
+using SourcepawnCondenser;
+using SourcepawnCondenser.SourcemodDefinition;
+using SPCode.Utils.SPSyntaxTidy;
 using Xceed.Wpf.AvalonDock.Layout;
 using Timer = System.Timers.Timer;
 
@@ -278,7 +278,7 @@ private SMBaseDefinition MatchDefinition(SMDefinition smDef, string word, MouseB
             if (currentFile)
             {
                 sm ??= smDef.Functions.FirstOrDefault(
-                    func => func.Index <= offset && 
+                    func => func.Index <= offset &&
                             offset <= func.EndPos)
                     ?.FuncVariables?.FirstOrDefault(
                         i => i.Name.Equals(word));
@@ -330,7 +330,7 @@ private SMBaseDefinition MatchDefinition(SMDefinition smDef, string word, MouseB
 
             sm ??= smDef.Methodmaps.FirstOrDefault(
                 i => i.Methods.Any(j => j.Name == word));
-            
+
             // structs?
             sm ??= smDef.Structs.FirstOrDefault(i => i.Name.Equals(word, StringComparison.InvariantCultureIgnoreCase));
 
diff --git a/UI/Components/EditorElementBracketHighlighter.cs b/UI/Components/EditorElementBracketHighlighter.cs
@@ -1,8 +1,8 @@
-﻿using ICSharpCode.AvalonEdit.Document;
-using ICSharpCode.AvalonEdit.Rendering;
-using System;
+﻿using System;
 using System.Collections.Generic;
 using System.Windows.Media;
+using ICSharpCode.AvalonEdit.Document;
+using ICSharpCode.AvalonEdit.Rendering;
 
 namespace SPCode.UI.Components
 {
diff --git a/UI/Components/EditorElementHighlighter.cs b/UI/Components/EditorElementHighlighter.cs
@@ -1,7 +1,4 @@
-﻿using ICSharpCode.AvalonEdit.Highlighting;
-using ICSharpCode.AvalonEdit.Rendering;
-using SourcepawnCondenser.SourcemodDefinition;
-using System;
+﻿using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
@@ -10,6 +7,9 @@
 using System.Text.RegularExpressions;
 using System.Windows;
 using System.Windows.Media;
+using ICSharpCode.AvalonEdit.Highlighting;
+using ICSharpCode.AvalonEdit.Rendering;
+using SourcepawnCondenser.SourcemodDefinition;
 
 namespace SPCode.UI.Components
 {
diff --git a/UI/Components/EditorFoldingStrategy.cs b/UI/Components/EditorFoldingStrategy.cs
@@ -1,6 +1,6 @@
-﻿using ICSharpCode.AvalonEdit.Document;
+﻿using System.Collections.Generic;
+using ICSharpCode.AvalonEdit.Document;
 using ICSharpCode.AvalonEdit.Folding;
-using System.Collections.Generic;
 
 namespace SPCode.UI.Components
 {
diff --git a/UI/Components/IntelliSenseController.cs b/UI/Components/IntelliSenseController.cs
@@ -1,13 +1,13 @@
-﻿using ICSharpCode.AvalonEdit;
-using ICSharpCode.AvalonEdit.Editing;
-using ICSharpCode.AvalonEdit.Rendering;
-using SourcepawnCondenser.SourcemodDefinition;
-using System;
+﻿using System;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Media.Animation;
+using ICSharpCode.AvalonEdit;
+using ICSharpCode.AvalonEdit.Editing;
+using ICSharpCode.AvalonEdit.Rendering;
+using SourcepawnCondenser.SourcemodDefinition;
 
 namespace SPCode.UI.Components
 {
diff --git a/UI/Interop/LanguageChooserWindow.xaml.cs b/UI/Interop/LanguageChooserWindow.xaml.cs
@@ -1,6 +1,6 @@
-﻿using MahApps.Metro.Controls;
-using System.Windows;
+﻿using System.Windows;
 using System.Windows.Controls;
+using MahApps.Metro.Controls;
 
 namespace SPCode.UI.Interop
 {
diff --git a/UI/MainWindow.xaml.cs b/UI/MainWindow.xaml.cs
@@ -1,8 +1,4 @@
-﻿using DiscordRPC;
-using MahApps.Metro;
-using SPCode.Interop.Updater;
-using SPCode.UI.Components;
-using System;
+﻿using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
@@ -13,6 +9,9 @@
 using System.Windows.Controls;
 using System.Windows.Media.Animation;
 using System.Windows.Threading;
+using DiscordRPC;
+using MahApps.Metro;
+using SPCode.UI.Components;
 using Xceed.Wpf.AvalonDock;
 using Xceed.Wpf.AvalonDock.Layout;
 
diff --git a/UI/MainWindowCommands.cs b/UI/MainWindowCommands.cs
@@ -1,13 +1,13 @@
-﻿using Lysis;
+﻿using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Text;
+using Lysis;
 using MahApps.Metro.Controls.Dialogs;
 using Microsoft.Win32;
 using SPCode.UI.Components;
 using SPCode.UI.Windows;
 using SPCode.Utils.SPSyntaxTidy;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Text;
 
 namespace SPCode.UI
 {
diff --git a/UI/MainWindowConfigHandler.cs b/UI/MainWindowConfigHandler.cs
@@ -1,7 +1,7 @@
-﻿using SPCode.UI.Components;
-using SPCode.UI.Windows;
-using System.Windows;
+﻿using System.Windows;
 using System.Windows.Controls;
+using SPCode.UI.Components;
+using SPCode.UI.Windows;
 
 namespace SPCode.UI
 {
diff --git a/UI/MainWindowFindReplaceHandler.cs b/UI/MainWindowFindReplaceHandler.cs
@@ -1,10 +1,10 @@
-﻿using SPCode.UI.Components;
-using System;
+﻿using System;
 using System.Diagnostics;
 using System.Globalization;
 using System.Text.RegularExpressions;
 using System.Windows;
 using System.Windows.Input;
+using SPCode.UI.Components;
 
 namespace SPCode.UI
 {
diff --git a/UI/MainWindowMenuHandler.cs b/UI/MainWindowMenuHandler.cs
@@ -1,12 +1,12 @@
-﻿using MahApps.Metro.Controls.Dialogs;
-using SPCode.Interop.Updater;
-using SPCode.UI.Windows;
-using SPCode.Utils;
-using System;
+﻿using System;
 using System.Diagnostics;
 using System.Reflection;
 using System.Windows;
 using System.Windows.Controls;
+using MahApps.Metro.Controls.Dialogs;
+using SPCode.Interop.Updater;
+using SPCode.UI.Windows;
+using SPCode.Utils;
 
 namespace SPCode.UI
 {
diff --git a/UI/MainWindowObjectBrowser.cs b/UI/MainWindowObjectBrowser.cs
@@ -1,11 +1,11 @@
-﻿using SPCode.UI.Components;
-using System;
+﻿using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media.Imaging;
+using SPCode.UI.Components;
 
 namespace SPCode.UI
 {
diff --git a/UI/MainWindowSPCompiler.cs b/UI/MainWindowSPCompiler.cs
@@ -1,6 +1,4 @@
-﻿using MahApps.Metro.Controls.Dialogs;
-using SPCode.Utils;
-using System;
+﻿using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
@@ -9,6 +7,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
+using MahApps.Metro.Controls.Dialogs;
+using SPCode.Utils;
 
 namespace SPCode.UI
 {
diff --git a/UI/MainWindowServerQuery.cs b/UI/MainWindowServerQuery.cs
@@ -1,8 +1,8 @@
-﻿using QueryMaster;
-using System;
+﻿using System;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
+using QueryMaster;
 
 namespace SPCode.UI
 {
diff --git a/UI/MainWindowTranslations.cs b/UI/MainWindowTranslations.cs
@@ -1,6 +1,6 @@
-﻿using SPCode.UI.Components;
-using System.Collections.ObjectModel;
+﻿using System.Collections.ObjectModel;
 using System.Windows.Controls;
+using SPCode.UI.Components;
 
 namespace SPCode.UI
 {
diff --git a/UI/Windows/AboutWindow.xaml.cs b/UI/Windows/AboutWindow.xaml.cs
@@ -1,10 +1,10 @@
-﻿using MahApps.Metro;
-using System.Diagnostics;
+﻿using System.Diagnostics;
 using System.Reflection;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
 using System.Windows.Navigation;
+using MahApps.Metro;
 
 namespace SPCode.UI.Windows
 {
diff --git a/UI/Windows/NewFileWindow.xaml.cs b/UI/Windows/NewFileWindow.xaml.cs
@@ -1,13 +1,13 @@
-﻿using MahApps.Metro;
-using Microsoft.Win32;
-using System;
+﻿using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Xml;
+using MahApps.Metro;
+using Microsoft.Win32;
 
 namespace SPCode.UI.Windows
 {
diff --git a/UI/Windows/OptionsWindow.xaml.cs b/UI/Windows/OptionsWindow.xaml.cs
@@ -1,13 +1,13 @@
-﻿using DiscordRPC;
-using MahApps.Metro;
-using MahApps.Metro.Controls.Dialogs;
-using SPCode.UI.Components;
-using System;
+﻿using System;
 using System.Diagnostics;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
+using DiscordRPC;
+using MahApps.Metro;
+using MahApps.Metro.Controls.Dialogs;
+using SPCode.UI.Components;
 
 namespace SPCode.UI.Windows
 {
diff --git a/UI/Windows/SPDefinitionWindow.xaml.cs b/UI/Windows/SPDefinitionWindow.xaml.cs

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`		`-using SpcodeUpdater.Properties;`
`2`		`-using System;`
	`1`	`+using System;`
`3`	`2`	`using System.Windows.Forms;`
	`3`	`+using SpcodeUpdater.Properties;`
`4`	`4`
`5`	`5`	`namespace SpcodeUpdater`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`		`-using SPCode.UI;`
`2`		`-using System;`
	`1`	`+using System;`
`3`	`2`	`using System.IO.Pipes;`
`4`	`3`	`using System.Text;`
	`4`	`+using SPCode.UI;`
`5`	`5`
`6`	`6`	`namespace SPCode.Interop`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`		`-using Octokit;`
`2`		`-using System;`
	`1`	`+using System;`
`3`	`2`	`using System.Reflection;`
`4`	`3`	`using System.Threading.Tasks;`
	`4`	`+using Octokit;`
`5`	`5`
`6`	`6`	`namespace SPCode.Interop.Updater`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-using Octokit;`
`2`		`-using System.Linq;`
	`1`	`+using System.Linq;`
	`2`	`+using Octokit;`
`3`	`3`
`4`	`4`	`namespace SPCode.Interop.Updater`
`5`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ public MainWindow()`
`28`	`28`	`str.AppendLine(File.ReadAllText(f));`
`29`	`29`	`}`
`30`	`30`	`ExpandBox.IsChecked = false;`
`31`		`- //str.AppendLine(File.ReadAllText(@"C:\Users\Jelle\Desktop\coding\sm-scripting\CondenserTestFile.inc"));`
`32`	`31`	`textBox.Text = str.ToString();`
`33`	`32`	`}`
`34`	`33`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`		`-using ICSharpCode.AvalonEdit.Highlighting;`
`2`		`-using System.Collections.Generic;`
	`1`	`+using System.Collections.Generic;`
`3`	`2`	`using System.Text.RegularExpressions;`
`4`	`3`	`using System.Windows.Media;`
	`4`	`+using ICSharpCode.AvalonEdit.Highlighting;`
`5`	`5`
`6`	`6`	`namespace SPCode.UI.Components`
`7`	`7`	`{`