Move setGutterMarker, clearGutter and lineInfo to Doc

Author: Todd Berman

doc/manual.html

@@ -1699,7 +1699,7 @@ <h3 id="api_marker">Text-marking methods</h3>
     <h3 id="api_decoration">Widget, gutter, and decoration methods</h3>
 
     <dl>
-      <dt id="setGutterMarker"><code><strong>cm.setGutterMarker</strong>(line: integer|LineHandle, gutterID: string, value: Element) → LineHandle</code></dt>
+      <dt id="setGutterMarker"><code><strong>doc.setGutterMarker</strong>(line: integer|LineHandle, gutterID: string, value: Element) → LineHandle</code></dt>
       <dd>Sets the gutter marker for the given gutter (identified by
       its CSS class, see
       the <a href="#option_gutters"><code>gutters</code></a> option)
@@ -1708,7 +1708,7 @@ <h3 id="api_decoration">Widget, gutter, and decoration methods</h3>
       will be shown in the specified gutter next to the specified
       line.</dd>
 
-      <dt id="clearGutter"><code><strong>cm.clearGutter</strong>(gutterID: string)</code></dt>
+      <dt id="clearGutter"><code><strong>doc.clearGutter</strong>(gutterID: string)</code></dt>
       <dd>Remove all gutter markers in
       the <a href="#option_gutters">gutter</a> with the given ID.</dd>
 
@@ -1733,7 +1733,7 @@ <h3 id="api_decoration">Widget, gutter, and decoration methods</h3>
       can be left off to remove all classes for the specified node, or
       be a string to remove only a specific class.</dd>
 
-      <dt id="lineInfo"><code><strong>cm.lineInfo</strong>(line: integer|LineHandle) → object</code></dt>
+      <dt id="lineInfo"><code><strong>doc.lineInfo</strong>(line: integer|LineHandle) → object</code></dt>
       <dd>Returns the line number, text content, and marker status of
       the given line, which can be either a number or a line handle.
       The returned object has the structure <code>{line, handle, text,

src/edit/methods.js

@@ -1,5 +1,4 @@
 import { deleteNearSelection } from "./deleteNearSelection"
-import { changeLine } from "../model/changes"
 import { commands } from "./commands"
 import { attachDoc } from "../model/document_data"
 import { activeElt, addClass, rmClass } from "../util/dom"
@@ -18,9 +17,9 @@ import { addToScrollPos, calculateScrollPos, ensureCursorVisible, resolveScrollT
 import { heightAtLine } from "../line/spans"
 import { updateGutterSpace } from "../display/update_display"
 import { lineLeft, lineRight, moveLogically, moveVisually } from "../util/bidi"
-import { indexOf, insertSorted, isEmpty, isWordChar, sel_dontScroll, sel_move } from "../util/misc"
+import { indexOf, insertSorted, isWordChar, sel_dontScroll, sel_move } from "../util/misc"
 import { signalLater } from "../util/operation_group"
-import { getLine, isLine, lineAtHeight, lineNo } from "../line/utils_line"
+import { getLine, isLine, lineAtHeight } from "../line/utils_line"
 import { regChange, regLineChange } from "../display/view_tracking"
 
 // The publicly visible API. Note that methodOp(f) means
@@ -218,43 +217,6 @@ export default function(CodeMirror) {
     defaultTextHeight: function() { return textHeight(this.display) },
     defaultCharWidth: function() { return charWidth(this.display) },
 
-    setGutterMarker: methodOp(function(line, gutterID, value) {
-      return changeLine(this.doc, line, "gutter", line => {
-        let markers = line.gutterMarkers || (line.gutterMarkers = {})
-        markers[gutterID] = value
-        if (!value && isEmpty(markers)) line.gutterMarkers = null
-        return true
-      })
-    }),
-
-    clearGutter: methodOp(function(gutterID) {
-      let doc = this.doc, i = doc.first
-      doc.iter(line => {
-        if (line.gutterMarkers && line.gutterMarkers[gutterID]) {
-          line.gutterMarkers[gutterID] = null
-          regLineChange(this, i, "gutter")
-          if (isEmpty(line.gutterMarkers)) line.gutterMarkers = null
-        }
-        ++i
-      })
-    }),
-
-    lineInfo: function(line) {
-      let n
-      if (typeof line == "number") {
-        if (!isLine(this.doc, line)) return null
-        n = line
-        line = getLine(this.doc, line)
-        if (!line) return null
-      } else {
-        n = lineNo(line)
-        if (n == null) return null
-      }
-      return {line: n, handle: line, text: line.text, gutterMarkers: line.gutterMarkers,
-              textClass: line.textClass, bgClass: line.bgClass, wrapClass: line.wrapClass,
-              widgets: line.widgets}
-    },
-
     getViewport: function() { return {from: this.display.viewFrom, to: this.display.viewTo}},
 
     addWidget: function(pos, node, scroll, vert, horiz) {

src/model/Doc.js

@@ -6,7 +6,7 @@ import { visualLine } from "../line/spans"
 import { getBetween, getLine, getLines, isLine, lineNo } from "../line/utils_line"
 import { classTest } from "../util/dom"
 import { splitLinesAuto } from "../util/feature_detection"
-import { createObj, map, sel_dontScroll } from "../util/misc"
+import { createObj, map, isEmpty, sel_dontScroll } from "../util/misc"
 import { ensureCursorVisible } from "../display/scrolling"
 
 import { changeLine, makeChange, makeChangeFromHistory, replaceRange } from "./changes"
@@ -219,6 +219,45 @@ Doc.prototype = createObj(BranchChunk.prototype, {
     hist.undone = copyHistoryArray(histData.undone.slice(0), null, true)
   },
 
+  setGutterMarker: docMethodOp(function(line, gutterID, value) {
+    return changeLine(this, line, "gutter", line => {
+      let markers = line.gutterMarkers || (line.gutterMarkers = {})
+      markers[gutterID] = value
+      if (!value && isEmpty(markers)) line.gutterMarkers = null
+      return true
+    })
+  }),
+
+  clearGutter: docMethodOp(function(gutterID) {
+    let i = this.first
+    this.iter(line => {
+      if (line.gutterMarkers && line.gutterMarkers[gutterID]) {
+        changeLine(this, line, "gutter", () => {
+          line.gutterMarkers[gutterID] = null
+          if (isEmpty(line.gutterMarkers)) line.gutterMarkers = null
+          return true
+        })
+      }
+      ++i
+    })
+  }),
+
+  lineInfo: function(line) {
+    let n
+    if (typeof line == "number") {
+      if (!isLine(this, line)) return null
+      n = line
+      line = getLine(this, line)
+      if (!line) return null
+    } else {
+      n = lineNo(line)
+      if (n == null) return null
+    }
+    return {line: n, handle: line, text: line.text, gutterMarkers: line.gutterMarkers,
+            textClass: line.textClass, bgClass: line.bgClass, wrapClass: line.wrapClass,
+            widgets: line.widgets}
+  },
+
   addLineClass: docMethodOp(function(handle, where, cls) {
     return changeLine(this, handle, where == "gutter" ? "gutter" : "class", line => {
       let prop = where == "text" ? "textClass"