Changeset 11937 for stable/HeuristicLab.CodeEditor/3.4/CodeEditor.cs

Timestamp:

02/06/15 12:44:09 (9 years ago)

Author:

jkarder

Message:

#2077: merged r11807:11811, r11816, r11819, r11822, r11825, r11834, r11835, r11836, r11933 and r11936 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.CodeEditor/3.4 (copied) (copied from trunk/sources/HeuristicLab.CodeEditor/3.4)
• HeuristicLab.CodeEditor/3.4/CodeEditor.cs (modified) (8 diffs)

stable/HeuristicLab.CodeEditor/3.4/CodeEditor.cs

@@ -61 +61 @@
 
     private AssemblyLoader assemblyLoader;
-    private ILanguageFeatures languageFeatures;
     private TextMarkerService textMarkerService;
 
@@ -79 +78 @@
         if (value == null) value = string.Empty;
         if (prefix == value) return;
-        if (prefixMarker != null) textMarkerService.Remove(prefixMarker);
+        if (prefixMarker != null) prefixMarker.Delete();
         Doc.Remove(0, prefix.Length);
         prefix = value;
@@ -97 +96 @@
         if (value == null) value = string.Empty;
         if (suffix == value) return;
-        if (suffixMarker != null) textMarkerService.Remove(suffixMarker);
+        if (suffixMarker != null) suffixMarker.Delete();
         Doc.Remove(Doc.TextLength - suffix.Length, suffix.Length);
         suffix = value;
@@ -191 +190 @@
       TextEditor.TextArea.TextView.LineTransformers.Add(textMarkerService);
       TextEditor.TextArea.TextView.Services.AddService(typeof(ITextMarkerService), textMarkerService);
-
       #endregion
 
@@ -244 +242 @@
 
       TextEditor.TextChanged += (sender, args) => {
-        textMarkerService.RemoveAll(x => x != prefixMarker && x != suffixMarker);
+        foreach (var marker in textMarkerService.TextMarkers) {
+          if (marker == prefixMarker || marker == suffixMarker) continue;
+          if (marker.Length != (int)marker.Tag)
+            marker.Delete();
+          else {
+            int caretOffset = TextEditor.CaretOffset;
+            var line = Doc.GetLineByOffset(marker.StartOffset);
+            int lineEndOffset = line.EndOffset;
+            if (caretOffset == lineEndOffset) // special case for markers beyond line length
+              marker.Delete();
+          }
+        }
         OnTextEditorTextChanged();
       };
@@ -383 +392 @@
           int offset = line.Offset;
           if (TextUtilities.GetLeadingWhitespace(Doc, line).Length > 0)
-            offset = TextUtilities.GetNextCaretPosition(Doc, offset, LogicalDirection.Forward, CaretPositioningMode.WordStart);
+            offset = TextUtilities.GetNextCaretPosition(Doc, offset, LogicalDirection.Forward, CaretPositioningMode.WordBorder);
           TextEditor.CaretOffset = offset;
         }
@@ -408 +417 @@
       marker.MarkerTypes = TextMarkerTypes.SquigglyUnderline;
       marker.MarkerColor = error.IsWarning ? WarningColor : ErrorColor;
+      marker.Tag = segment.Length;
     }
 
@@ -429 +439 @@
       switch (TextEditorSyntaxHighlighting) {
         case "XML":
-          languageFeatures = new XmlLanguageFeatures(this);
+          XmlLanguageFeatures.Apply(this);
           break;
         default:
-          languageFeatures = new CSharpLanguageFeatures(this);
+          CSharpLanguageFeatures.Apply(this);
           break;
       }