Dev (#244)

* VS like selection style for editor Signed-off-by: Konstantin Gawrilyako <[email protected]> * update packages, remove browser unload code, move to vs2017 * update packages * move to .net 4.7, update get/setter styles * fix out of range crash * fix out of range crash * fix file in use crash * fix some crash reports * add github cmark for for future consideration * update pandoc, mess around with cmark-gfm
mike-ward · Jun 10, 2017 · 00a5929 · 00a5929
1 parent b122000
commit 00a5929
Show file tree

Hide file tree

Showing 36 changed files with 351 additions and 287 deletions.
diff --git a/src/MarkdownEdit/App.config b/src/MarkdownEdit/App.config
@@ -6,7 +6,7 @@
     </sectionGroup>
   </configSections>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/>
   </startup>
   <userSettings>
     <MarkdownEdit.Properties.Settings>
@@ -43,6 +43,6 @@
     </MarkdownEdit.Properties.Settings>
   </userSettings>
   <runtime>
-    <AppContextSwitchOverrides value = "Switch.System.Windows.DoNotScaleForDpiChanges=false"/>
+    <AppContextSwitchOverrides value="Switch.System.Windows.DoNotScaleForDpiChanges=false"/>
   </runtime>
 </configuration>
diff --git a/src/MarkdownEdit/Commands/SnippetTabCommand.cs b/src/MarkdownEdit/Commands/SnippetTabCommand.cs
@@ -69,7 +69,7 @@ private static int StartOfListOffset(ITextSource textSource, int offset)
             var startOffset = offset - 1;
             while (startOffset > 0 && char.IsWhiteSpace(textSource.GetCharAt(startOffset)))
             {
-                startOffset -= 1;
+                startOffset = Math.Min(0, startOffset - 1);
             }
             var c = textSource.GetCharAt(startOffset);
             return (c == '-' || c == '*') ? startOffset : -1;

diff --git a/src/MarkdownEdit/Controls/DisplayDocumentStructure.xaml.cs b/src/MarkdownEdit/Controls/DisplayDocumentStructure.xaml.cs
@@ -16,8 +16,8 @@ public DisplayDocumentStructure()
 
         public Block AbstractSyntaxTree
         {
-            get { return (Block)GetValue(AbstractSyntaxTreeProperty); }
-            set { SetValue(AbstractSyntaxTreeProperty, value); }
+            get => (Block)GetValue(AbstractSyntaxTreeProperty);
+            set => SetValue(AbstractSyntaxTreeProperty, value);
         }
 
         private void OnIsVisibleChanged(

diff --git a/src/MarkdownEdit/Controls/DisplayDocumentStructureViewModel.cs b/src/MarkdownEdit/Controls/DisplayDocumentStructureViewModel.cs
@@ -15,8 +15,8 @@ internal class DisplayDocumentStructureViewModel : INotifyPropertyChanged
 
         public DocumentStructure[] Structure
         {
-            get { return _structure; }
-            set { Set(ref _structure, value); }
+            get => _structure;
+            set => Set(ref _structure, value);
         }
 
         public event PropertyChangedEventHandler PropertyChanged;
@@ -46,7 +46,7 @@ private string InlineContent(Inline inline)
 
         public void Selected(int index)
         {
-            var offset = index <= Structure.Length ? Structure[index].Offset : 0;
+            var offset = index >= 0 && index < Structure.Length ? Structure[index].Offset : 0;
             ScrollToOffsetCommand.Command.Execute(offset, Application.Current.MainWindow);
         }
 

diff --git a/src/MarkdownEdit/Controls/DisplaySettings.xaml.cs b/src/MarkdownEdit/Controls/DisplaySettings.xaml.cs
@@ -23,8 +23,8 @@ public DisplaySettings()
 
         public ISpellCheckProvider SpellCheckProvider
         {
-            get { return (ISpellCheckProvider)GetValue(SpellCheckProviderProperty); }
-            set { SetValue(SpellCheckProviderProperty, value); }
+            get => (ISpellCheckProvider)GetValue(SpellCheckProviderProperty);
+            set => SetValue(SpellCheckProviderProperty, value);
         }
 
         private void OnIsVisibleChanged(object sender,

diff --git a/src/MarkdownEdit/Controls/Editor.xaml b/src/MarkdownEdit/Controls/Editor.xaml
@@ -28,7 +28,27 @@
       ScrollViewer.ScrollChanged="ScrollViewerOnScrollChanged"
       ShowLineNumbers="{Binding Path=ShowLineNumbers, Mode=TwoWay}"
       VerticalScrollBarVisibility="{Binding VerticalScrollBarVisibility}"
-      WordWrap="{Binding Path=WordWrap, Mode=TwoWay}" />
+      WordWrap="{Binding Path=WordWrap, Mode=TwoWay}">
+      <avalonedit:TextEditor.Resources>
+        <Style TargetType="{x:Type avalonedit:TextArea}">
+          <Setter Property="FocusVisualStyle"      Value="{x:Null}" />
+          <Setter Property="SelectionForeground"   Value="{x:Null}" />
+          <Setter Property="SelectionCornerRadius" Value="0.0" />
+
+          <Setter Property="SelectionBrush">
+            <Setter.Value>
+              <SolidColorBrush Color="{DynamicResource {x:Static SystemColors.HighlightColorKey}}" Opacity="0.3" />
+            </Setter.Value>
+          </Setter>
+
+          <Setter Property="SelectionBorder">
+            <Setter.Value>
+              <Pen Brush="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" Thickness="0" />
+            </Setter.Value>
+          </Setter>
+        </Style>
+      </avalonedit:TextEditor.Resources>
+    </avalonedit:TextEditor>
   </Border>
 
   <UserControl.CommandBindings>

diff --git a/src/MarkdownEdit/Controls/Editor.xaml.cs b/src/MarkdownEdit/Controls/Editor.xaml.cs
@@ -93,123 +93,120 @@ public FindReplaceDialog FindReplaceDialog
 
         public string Text
         {
-            get { return EditBox.Text; }
-            set { EditBox.Text = value; }
+            get => EditBox.Text;
+            set => EditBox.Text = value;
         }
 
         public bool IsReadOnly
         {
-            get { return EditBox.IsReadOnly; }
-            set { EditBox.IsReadOnly = value; }
+            get => EditBox.IsReadOnly;
+            set => EditBox.IsReadOnly = value;
         }
 
         public string FileName
         {
-            get { return _fileName; }
-            set { Set(ref _fileName, value); }
+            get => _fileName;
+            set => Set(ref _fileName, value);
         }
 
         public string DisplayName
         {
-            get
-            {
-                return string.IsNullOrWhiteSpace(_displayName) == false
-                    ? _displayName
-                    : string.IsNullOrWhiteSpace(FileName)
-                        ? $"{Translate("editor-new-document")} {_f1ForHelp}"
-                        : Path.GetFileName(FileName);
-            }
-            set { Set(ref _displayName, value); }
+            get => string.IsNullOrWhiteSpace(_displayName) == false
+                ? _displayName
+                : string.IsNullOrWhiteSpace(FileName)
+                    ? $"{Translate("editor-new-document")} {_f1ForHelp}"
+                    : Path.GetFileName(FileName);
+            set => Set(ref _displayName, value);
         }
 
         public bool IsModified
         {
-            get { return _isModified; }
-            set { Set(ref _isModified, value); }
+            get => _isModified;
+            set => Set(ref _isModified, value);
         }
 
         public bool AutoSave
         {
-            get { return (bool)GetValue(AutoSaveProperty); }
-            set { SetValue(AutoSaveProperty, value); }
+            get => (bool)GetValue(AutoSaveProperty);
+            set => SetValue(AutoSaveProperty, value);
         }
 
         public Theme Theme
         {
-            get { return (Theme)GetValue(ThemeProperty); }
-            set { SetValue(ThemeProperty, value); }
+            get => (Theme)GetValue(ThemeProperty);
+            set => SetValue(ThemeProperty, value);
         }
 
         public ScrollBarVisibility VerticalScrollBarVisibility
         {
-            get { return (ScrollBarVisibility)GetValue(VerticalScrollBarVisibilityProperty); }
-            set { SetValue(VerticalScrollBarVisibilityProperty, value); }
+            get => (ScrollBarVisibility)GetValue(VerticalScrollBarVisibilityProperty);
+            set => SetValue(VerticalScrollBarVisibilityProperty, value);
         }
 
         public bool ShowEndOfLine
         {
-            get { return (bool)GetValue(ShowEndOfLineProperty); }
-            set { SetValue(ShowEndOfLineProperty, value); }
+            get => (bool)GetValue(ShowEndOfLineProperty);
+            set => SetValue(ShowEndOfLineProperty, value);
         }
 
         public bool ShowSpaces
         {
-            get { return (bool)GetValue(ShowSpacesProperty); }
-            set { SetValue(ShowSpacesProperty, value); }
+            get => (bool)GetValue(ShowSpacesProperty);
+            set => SetValue(ShowSpacesProperty, value);
         }
 
         public bool ShowLineNumbers
         {
-            get { return (bool)GetValue(ShowLineNumbersProperty); }
-            set { SetValue(ShowLineNumbersProperty, value); }
+            get => (bool)GetValue(ShowLineNumbersProperty);
+            set => SetValue(ShowLineNumbersProperty, value);
         }
 
         public bool ShowTabs
         {
-            get { return (bool)GetValue(ShowTabsProperty); }
-            set { SetValue(ShowTabsProperty, value); }
+            get => (bool)GetValue(ShowTabsProperty);
+            set => SetValue(ShowTabsProperty, value);
         }
 
         public ISpellCheckProvider SpellCheckProvider
         {
-            get { return (ISpellCheckProvider)GetValue(SpellCheckProviderProperty); }
-            set { SetValue(SpellCheckProviderProperty, value); }
+            get => (ISpellCheckProvider)GetValue(SpellCheckProviderProperty);
+            set => SetValue(SpellCheckProviderProperty, value);
         }
 
         public bool HighlightCurrentLine
         {
-            get { return (bool)GetValue(HighlightCurrentLineProperty); }
-            set { SetValue(HighlightCurrentLineProperty, value); }
+            get => (bool)GetValue(HighlightCurrentLineProperty);
+            set => SetValue(HighlightCurrentLineProperty, value);
         }
 
         public ISnippetManager SnippetManager
         {
-            get { return (ISnippetManager)GetValue(SnippetManagerProperty); }
-            set { SetValue(SnippetManagerProperty, value); }
+            get => (ISnippetManager)GetValue(SnippetManagerProperty);
+            set => SetValue(SnippetManagerProperty, value);
         }
 
         public bool WordWrap
         {
-            get { return (bool)GetValue(WordWrapProperty); }
-            set { SetValue(WordWrapProperty, value); }
+            get => (bool)GetValue(WordWrapProperty);
+            set => SetValue(WordWrapProperty, value);
         }
 
         public bool SpellCheck
         {
-            get { return (bool)GetValue(SpellCheckProperty); }
-            set { SetValue(SpellCheckProperty, value); }
+            get => (bool)GetValue(SpellCheckProperty);
+            set => SetValue(SpellCheckProperty, value);
         }
 
         public Block AbstractSyntaxTree
         {
-            get { return (Block)GetValue(AbstractSyntaxTreeProperty); }
-            set { SetValue(AbstractSyntaxTreeProperty, value); }
+            get => (Block)GetValue(AbstractSyntaxTreeProperty);
+            set => SetValue(AbstractSyntaxTreeProperty, value);
         }
 
         public MyEncodingInfo Encoding
         {
-            get { return (MyEncodingInfo)GetValue(MyEncodingInfoProperty); }
-            set { SetValue(MyEncodingInfoProperty, value); }
+            get => (MyEncodingInfo)GetValue(MyEncodingInfoProperty);
+            set => SetValue(MyEncodingInfoProperty, value);
         }
 
         private void OnIsVisibleChanged(object sender,

diff --git a/src/MarkdownEdit/Controls/EncodingComboBox.xaml.cs b/src/MarkdownEdit/Controls/EncodingComboBox.xaml.cs
@@ -14,8 +14,8 @@ public partial class EncodingComboBox
 
         public MyEncodingInfo SelectedEncoding
         {
-            get { return (MyEncodingInfo)GetValue(SelectedEncodingProperty); }
-            set { SetValue(SelectedEncodingProperty, value); }
+            get => (MyEncodingInfo)GetValue(SelectedEncodingProperty);
+            set => SetValue(SelectedEncodingProperty, value);
         }
 
         public ICollection<MyEncodingInfo> SystemEncodings => MyEncodingInfo.GetEncodings();

diff --git a/src/MarkdownEdit/Controls/FindReplaceDialog.xaml.cs b/src/MarkdownEdit/Controls/FindReplaceDialog.xaml.cs
@@ -30,12 +30,14 @@ public FindReplaceDialog(FindReplaceSettings findReplaceSettings)
             };
         }
 
-        public string FindText { get { return _findText; } set { Set(ref _findText, value); } }
+        public string FindText { get => _findText;
+            set => Set(ref _findText, value);
+        }
 
         public FindReplaceSettings FindReplaceSettings
         {
-            get { return _findReplaceSettings; }
-            set { Set(ref _findReplaceSettings, value); }
+            get => _findReplaceSettings;
+            set => Set(ref _findReplaceSettings, value);
         }
 
         public event PropertyChangedEventHandler PropertyChanged;

diff --git a/src/MarkdownEdit/Controls/FontComboBox.xaml.cs b/src/MarkdownEdit/Controls/FontComboBox.xaml.cs
@@ -15,14 +15,14 @@ public partial class FontComboBox
 
         public FontFamily SelectedFontFamily
         {
-            get { return (FontFamily)GetValue(SelectedFontFamilyProperty); }
-            set { SetValue(SelectedFontFamilyProperty, value); }
+            get => (FontFamily)GetValue(SelectedFontFamilyProperty);
+            set => SetValue(SelectedFontFamilyProperty, value);
         }
 
         public double SelectedFontSize
         {
-            get { return (double)GetValue(SelectedFontSizeProperty); }
-            set { SetValue(SelectedFontSizeProperty, value); }
+            get => (double)GetValue(SelectedFontSizeProperty);
+            set => SetValue(SelectedFontSizeProperty, value);
         }
     }
 }
diff --git a/src/MarkdownEdit/Controls/ImageDropDialog.xaml.cs b/src/MarkdownEdit/Controls/ImageDropDialog.xaml.cs
@@ -31,12 +31,12 @@ public ImageDropDialog()
 
         public string DocumentFileName
         {
-            set { _vm.DocumentFileName = value; }
+            set => _vm.DocumentFileName = value;
         }
 
         public bool UseClipboardImage
         {
-            set { _vm.UseClipboardImage = value; }
+            set => _vm.UseClipboardImage = value;
         }
 
         private void OnLoaded(object sender, EventArgs eventArgs)

diff --git a/src/MarkdownEdit/Controls/ImageDropDialogViewModel.cs b/src/MarkdownEdit/Controls/ImageDropDialogViewModel.cs
@@ -12,20 +12,20 @@ public class ImageDropDialogViewModel : INotifyPropertyChanged
 
         public string DocumentFileName
         {
-            get { return _documentFileName; }
-            set { Set(ref _documentFileName, value); }
+            get => _documentFileName;
+            set => Set(ref _documentFileName, value);
         }
 
         public bool Uploading
         {
-            get { return _uploading; }
-            set { Set(ref _uploading, value); }
+            get => _uploading;
+            set => Set(ref _uploading, value);
         }
 
         public bool UseClipboardImage
         {
-            get { return _useClipboardImage; }
-            set { Set(ref _useClipboardImage, value); }
+            get => _useClipboardImage;
+            set => Set(ref _useClipboardImage, value);
         }
 
         // INotifyPropertyChanged