Merge pull request #48 from eirannejad/master

IronPython and AvalonEdit Engine update

Author: daren-thomas

PythonConsoleControl/Properties/AssemblyInfo.cs

@@ -20,7 +20,7 @@
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("b0b5fcfe-99e9-4b16-ba2d-18a595eada4f")]
+[assembly: Guid("799d3277-6903-4a58-bdf8-4984f92993d1")]
 
 // Version information for an assembly consists of the following four values:
 //
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("2017.0.0.0")]
+[assembly: AssemblyFileVersion("2017.0.0.0")]

PythonConsoleControl/PythonConsole.cs

@@ -308,7 +308,7 @@ protected void OnPaste(object target, ExecutedRoutedEventArgs args)
                     }
                     else if (rectangular && textArea.Selection.IsEmpty)
                     {
-                        if (!RectangleSelection.PerformRectangularPaste(textArea, textArea.Caret.Offset, text, false))
+                        if (!RectangleSelection.PerformRectangularPaste(textArea, textArea.Caret.Position, text, false))
                             textEditor.Write(text, false);
                     }
                     else

PythonConsoleControl/PythonConsoleControl.csproj

@@ -91,8 +91,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ICSharpCode.AvalonEdit">
-      <HintPath>RequiredLibraries\AvalonEdit\ICSharpCode.AvalonEdit.dll</HintPath>
+    <Reference Include="ICSharpCode.AvalonEdit, Version=5.0.3.0, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
+      <HintPath>..\packages\AvalonEdit.5.0.3\lib\Net40\ICSharpCode.AvalonEdit.dll</HintPath>
     </Reference>
     <Reference Include="IronPython">
       <HintPath>..\RequiredLibraries\IronPython.dll</HintPath>
@@ -168,6 +168,9 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>

PythonConsoleControl/PythonConsoleControl.xaml.cs

@@ -61,7 +61,7 @@ public IronPythonConsoleControl()
             IList<IVisualLineTransformer> transformers = pad.Control.TextArea.TextView.LineTransformers;
             for (int i = 0; i < transformers.Count; ++i)
             {
-                if (transformers[i] is HighlightingColorizer) transformers[i] = new PythonConsoleHighlightingColorizer(pythonHighlighting.MainRuleSet, pad.Control.Document);
+                if (transformers[i] is HighlightingColorizer) transformers[i] = new PythonConsoleHighlightingColorizer(pythonHighlighting, pad.Control.Document);
             }
         }
 

PythonConsoleControl/PythonConsoleHighlightingColorizer.cs

@@ -27,7 +27,7 @@ public class PythonConsoleHighlightingColorizer : HighlightingColorizer
         /// Creates a new HighlightingColorizer instance.
         /// </summary>
         /// <param name="ruleSet">The root highlighting rule set.</param>
-        public PythonConsoleHighlightingColorizer(HighlightingRuleSet ruleSet, TextDocument document)
+        public PythonConsoleHighlightingColorizer(IHighlightingDefinition ruleSet, TextDocument document)
             : base(ruleSet)
         {
             if (document == null)

PythonConsoleControl/PythonEditingCommandHandler.cs

@@ -83,7 +83,7 @@ internal static void OnCut(object target, ExecutedRoutedEventArgs args)
                 else
                 {
                     CopySelectedText(textArea);
-                    textArea.Selection.ReplaceSelectionWithText(textArea, string.Empty);
+                    textArea.Selection.ReplaceSelectionWithText(string.Empty);
                 }
                 textArea.Caret.BringCaretToView();
                 args.Handled = true;
@@ -105,7 +105,7 @@ internal static void CopySelectedText(TextArea textArea)
                 return;
             }
 
-            string text = textArea.Selection.GetText(textArea.Document);
+            string text = textArea.Selection.GetText();
             text = TextUtilities.NormalizeNewLines(text, Environment.NewLine);
             //textArea.OnTextCopied(new TextEventArgs(text));
         }
@@ -173,7 +173,7 @@ internal static ExecutedRoutedEventHandler OnDelete(RoutedUICommand selectingCom
                                 // If nothing in the selection is deletable; then reset caret+selection
                                 // to the previous value. This prevents the caret from moving through read-only sections.
                                 textArea.Caret.Position = oldCaretPosition;
-                                textArea.Selection = Selection.Empty;
+                                //textArea.Selection = Selection.Empty;
                             }
                         }
                         method = textAreaType.GetMethod("RemoveSelectedText", BindingFlags.Instance | BindingFlags.NonPublic);

PythonConsoleControl/PythonTextEditor.cs

@@ -145,11 +145,11 @@ private void PerformTextInput(string text)
                 string newLine = TextUtilities.GetNewLineFromDocument(textArea.Document, textArea.Caret.Line);
                 using (textArea.Document.RunUpdate())
                 {
-                    textArea.Selection.ReplaceSelectionWithText(textArea, newLine);
+                    textArea.Selection.ReplaceSelectionWithText(newLine);
                 }
             }
             else
-                textArea.Selection.ReplaceSelectionWithText(textArea, text);
+                textArea.Selection.ReplaceSelectionWithText(text);
             textArea.Caret.BringCaretToView();
         }
 
@@ -238,7 +238,7 @@ public bool SelectionIsMultiline
         {
             get
             {
-                return textArea.Selection.IsMultiline(textArea.Document);
+                return textArea.Selection.IsMultiline;
             }
         }