diff --git a/src/ClipCMD/ClipCmd.csproj b/src/ClipCMD/ClipCmd.csproj index 17a6b6a..6c003dd 100644 --- a/src/ClipCMD/ClipCmd.csproj +++ b/src/ClipCMD/ClipCmd.csproj @@ -17,24 +17,24 @@ - - - - - + + + + + - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/ClipCMD/Views/EditorWindow.axaml.cs b/src/ClipCMD/Views/EditorWindow.axaml.cs index 34477bf..9500a9b 100644 --- a/src/ClipCMD/Views/EditorWindow.axaml.cs +++ b/src/ClipCMD/Views/EditorWindow.axaml.cs @@ -21,6 +21,25 @@ public partial class EditorWindow : Window InitializeComponent(); } + private static void CheckScript(EditorViewModel editorViewModel) + { + _ = Parser.ParseInput(editorViewModel.Script, out _, out ParseError[] parseErrors); + + editorViewModel.Messages.Clear(); + + if (parseErrors.Length > 0) + { + foreach (ParseError parseError in parseErrors) + { + editorViewModel.Messages.Add(new($"Error: {parseError.Message} at line {parseError.Extent.StartLineNumber} and column {parseError.Extent.StartColumnNumber}", Brushes.Red)); + } + } + else + { + editorViewModel.Messages.Add(new("No errors", Brushes.Green)); + } + } + private void Window_Loaded(object? sender, Avalonia.Interactivity.RoutedEventArgs e) { EditorViewModel editorViewModel = DataContext as EditorViewModel ?? throw new InvalidOperationException("DataContext is not EditorViewModel"); @@ -49,23 +68,4 @@ public partial class EditorWindow : Window CheckScript(editorViewModel); } - - private void CheckScript(EditorViewModel editorViewModel) - { - _ = Parser.ParseInput(editorViewModel.Script, out _, out ParseError[] parseErrors); - - editorViewModel.Messages.Clear(); - - if (parseErrors.Length > 0) - { - foreach (ParseError parseError in parseErrors) - { - editorViewModel.Messages.Add(new($"Error: {parseError.Message} at line {parseError.Extent.StartLineNumber} and column {parseError.Extent.StartColumnNumber}", Brushes.Red)); - } - } - else - { - editorViewModel.Messages.Add(new("No errors", Brushes.Green)); - } - } } \ No newline at end of file diff --git a/src/ClipCmd.Desktop/ClipCmd.Desktop.csproj b/src/ClipCmd.Desktop/ClipCmd.Desktop.csproj index cc33b40..e8556e0 100644 --- a/src/ClipCmd.Desktop/ClipCmd.Desktop.csproj +++ b/src/ClipCmd.Desktop/ClipCmd.Desktop.csproj @@ -13,12 +13,12 @@ - + - - - - + + + +