Move toggleLineCommentsForBufferRows to TokenizedBuffer

src/text-editor.coffee

@@ -3,7 +3,6 @@ path = require 'path'
 fs = require 'fs-plus'
 Grim = require 'grim'
 {CompositeDisposable, Disposable, Emitter} = require 'event-kit'
-{OnigRegExp} = require 'oniguruma'
 {Point, Range} = TextBuffer = require 'text-buffer'
 DecorationManager = require './decoration-manager'
 TokenizedBuffer = require './tokenized-buffer'
@@ -3887,74 +3886,7 @@ class TextEditor extends Model
 
   toggleLineCommentForBufferRow: (row) -> @toggleLineCommentsForBufferRows(row, row)
 
-  toggleLineCommentsForBufferRows: (start, end) ->
-    scope = @scopeDescriptorForBufferPosition([start, 0])
-    commentStrings = @getCommentStrings(scope)
-    return unless commentStrings?.commentStartString
-    {commentStartString, commentEndString} = commentStrings
-
-    buffer = @buffer
-    commentStartRegexString = _.escapeRegExp(commentStartString).replace(/(\s+)$/, '(?:$1)?')
-    commentStartRegex = new OnigRegExp("^(\\s*)(#{commentStartRegexString})")
-
-    if commentEndString
-      shouldUncomment = commentStartRegex.testSync(buffer.lineForRow(start))
-      if shouldUncomment
-        commentEndRegexString = _.escapeRegExp(commentEndString).replace(/^(\s+)/, '(?:$1)?')
-        commentEndRegex = new OnigRegExp("(#{commentEndRegexString})(\\s*)$")
-        startMatch =  commentStartRegex.searchSync(buffer.lineForRow(start))
-        endMatch = commentEndRegex.searchSync(buffer.lineForRow(end))
-        if startMatch and endMatch
-          buffer.transact ->
-            columnStart = startMatch[1].length
-            columnEnd = columnStart + startMatch[2].length
-            buffer.setTextInRange([[start, columnStart], [start, columnEnd]], "")
-
-            endLength = buffer.lineLengthForRow(end) - endMatch[2].length
-            endColumn = endLength - endMatch[1].length
-            buffer.setTextInRange([[end, endColumn], [end, endLength]], "")
-      else
-        buffer.transact ->
-          indentLength = buffer.lineForRow(start).match(/^\s*/)?[0].length ? 0
-          buffer.insert([start, indentLength], commentStartString)
-          buffer.insert([end, buffer.lineLengthForRow(end)], commentEndString)
-    else
-      allBlank = true
-      allBlankOrCommented = true
-
-      for row in [start..end] by 1
-        line = buffer.lineForRow(row)
-        blank = line?.match(/^\s*$/)
-
-        allBlank = false unless blank
-        allBlankOrCommented = false unless blank or commentStartRegex.testSync(line)
-
-      shouldUncomment = allBlankOrCommented and not allBlank
-
-      if shouldUncomment
-        for row in [start..end] by 1
-          if match = commentStartRegex.searchSync(buffer.lineForRow(row))
-            columnStart = match[1].length
-            columnEnd = columnStart + match[2].length
-            buffer.setTextInRange([[row, columnStart], [row, columnEnd]], "")
-      else
-        indents = []
-        for row in [start..end] by 1
-          unless @isBufferRowBlank(row)
-            indents.push(@indentationForBufferRow(start))
-        indents.push(0) if indents.length is 0
-        indent = Math.min(indents...)
-
-        indentString = @buildIndentString(indent)
-        tabLength = @getTabLength()
-        indentRegex = new RegExp("(\t|[ ]{#{tabLength}}){#{Math.floor(indent)}}")
-        for row in [start..end] by 1
-          line = buffer.lineForRow(row)
-          if indentLength = line.match(indentRegex)?[0].length
-            buffer.insert([row, indentLength], commentStartString)
-          else
-            buffer.setTextInRange([[row, 0], [row, indentString.length]], indentString + commentStartString)
-    return
+  toggleLineCommentsForBufferRows: (start, end) -> @tokenizedBuffer.toggleLineCommentsForBufferRows(start, end)
 
   rowRangeForParagraphAtBufferRow: (bufferRow) ->
     return unless NON_WHITESPACE_REGEXP.test(@lineTextForBufferRow(bufferRow))

src/tokenized-buffer.js

@@ -158,6 +158,94 @@ class TokenizedBuffer {
     return Math.max(desiredIndentLevel, 0)
   }
 
+  /*
+  Section - Comments
+  */
+
+  toggleLineCommentsForBufferRows (start, end) {
+    const scope = this.scopeDescriptorForPosition([start, 0])
+    const commentStrings = this.commentStringsForScopeDescriptor(scope)
+    if (!commentStrings) return
+    const {commentStartString, commentEndString} = commentStrings
+    if (!commentStartString) return
+
+    const commentStartRegexString = _.escapeRegExp(commentStartString).replace(/(\s+)$/, '(?:$1)?')
+    const commentStartRegex = new OnigRegExp(`^(\\s*)(${commentStartRegexString})`)
+
+    if (commentEndString) {
+      const shouldUncomment = commentStartRegex.testSync(this.buffer.lineForRow(start))
+      if (shouldUncomment) {
+        const commentEndRegexString = _.escapeRegExp(commentEndString).replace(/^(\s+)/, '(?:$1)?')
+        const commentEndRegex = new OnigRegExp(`(${commentEndRegexString})(\\s*)$`)
+        const startMatch = commentStartRegex.searchSync(this.buffer.lineForRow(start))
+        const endMatch = commentEndRegex.searchSync(this.buffer.lineForRow(end))
+        if (startMatch && endMatch) {
+          this.buffer.transact(() => {
+            const columnStart = startMatch[1].length
+            const columnEnd = columnStart + startMatch[2].length
+            this.buffer.setTextInRange([[start, columnStart], [start, columnEnd]], '')
+
+            const endLength = this.buffer.lineLengthForRow(end) - endMatch[2].length
+            const endColumn = endLength - endMatch[1].length
+            return this.buffer.setTextInRange([[end, endColumn], [end, endLength]], '')
+          })
+        }
+      } else {
+        this.buffer.transact(() => {
+          const indentLength = this.buffer.lineForRow(start).match(/^\s*/)[0].length
+          this.buffer.insert([start, indentLength], commentStartString)
+          this.buffer.insert([end, this.buffer.lineLengthForRow(end)], commentEndString)
+        })
+      }
+    } else {
+      let allBlank = true
+      let allBlankOrCommented = true
+
+      for (let row = start; row <= end; row++) {
+        const line = this.buffer.lineForRow(row)
+        const blank = line.match(/^\s*$/)
+        if (!blank) allBlank = false
+        if (!blank && !commentStartRegex.testSync(line)) allBlankOrCommented = false
+      }
+
+      const shouldUncomment = allBlankOrCommented && !allBlank
+
+      if (shouldUncomment) {
+        for (let row = start; row <= end; row++) {
+          const match = commentStartRegex.searchSync(this.buffer.lineForRow(row))
+          if (match) {
+            const columnStart = match[1].length
+            const columnEnd = columnStart + match[2].length
+            this.buffer.setTextInRange([[row, columnStart], [row, columnEnd]], '')
+          }
+        }
+      } else {
+        const indents = []
+        for (let row = start; row <= end; row++) {
+          const line = this.buffer.lineForRow(row)
+          if (NON_WHITESPACE_REGEX.test(line)) {
+            indents.push(this.indentLevelForLine(line))
+          }
+        }
+        if (indents.length === 0) indents.push(0)
+        const indent = Math.min(...indents)
+
+        const tabLength = this.getTabLength()
+        const indentString = ' '.repeat(tabLength * indent)
+        const indentRegex = new RegExp(`(\t|[ ]{${tabLength}}){${Math.floor(indent)}}`)
+        for (let row = start; row <= end; row++) {
+          const line = this.buffer.lineForRow(row)
+          const indentMatch = line.match(indentRegex)
+          if (indentMatch) {
+            this.buffer.insert([row, indentMatch[0].length], commentStartString)
+          } else {
+            this.buffer.insert([row, 0], indentString + commentStartString)
+          }
+        }
+      }
+    }
+  }
+
   buildIterator () {
     return new TokenizedBufferIterator(this)
   }
@@ -720,6 +808,12 @@ class TokenizedBuffer {
     }
   }
 
+  commentStringsForScopeDescriptor (scopes) {
+    if (this.scopedSettingsDelegate) {
+      return this.scopedSettingsDelegate.getCommentStrings(scopes)
+    }
+  }
+
   regexForPattern (pattern) {
     if (pattern) {
       if (!this.regexesByPattern[pattern]) {