From 3dab8e92eefc854385b72b90667fb60fdf4783ad Mon Sep 17 00:00:00 2001
From: Kevin Sawicki & Nathan Sobo <kevin+nathan@github.com>
Date: Tue, 5 Feb 2013 15:54:41 -0700
Subject: [PATCH] Convert snippets to use markers instead of anchor ranges

---
 src/app/edit-session.coffee                   |  4 ++
 .../snippets/spec/snippets-spec.coffee        |  2 +-
 .../snippets/src/snippet-expansion.coffee     | 49 +++++++------------
 3 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/src/app/edit-session.coffee b/src/app/edit-session.coffee
index 65f9c5b8e..bad4b92b8 100644
--- a/src/app/edit-session.coffee
+++ b/src/app/edit-session.coffee
@@ -765,6 +765,10 @@ class EditSession
       true
     else
       false
+
+  markersForBufferPosition: (bufferPosition) ->
+    @buffer.markersForPosition(bufferPosition)
+
   mergeCursors: ->
     positions = []
     for cursor in @getCursors()
diff --git a/src/packages/snippets/spec/snippets-spec.coffee b/src/packages/snippets/spec/snippets-spec.coffee
index c9582a336..35460e22f 100644
--- a/src/packages/snippets/spec/snippets-spec.coffee
+++ b/src/packages/snippets/spec/snippets-spec.coffee
@@ -139,7 +139,7 @@ describe "Snippets extension", ->
             editor.trigger 'snippets:next-tab-stop'
             expect(editSession.getCursorBufferPosition()).toEqual [3, 25]
 
-        describe "when the cursor is moved beyond the bounds of a tab stop", ->
+        describe "when the cursor is moved beyond the bounds of the current tab stop", ->
           it "terminates the snippet", ->
             editor.setCursorScreenPosition([2, 0])
             editor.insertText('t2')
diff --git a/src/packages/snippets/src/snippet-expansion.coffee b/src/packages/snippets/src/snippet-expansion.coffee
index 4a6958aba..fe343d80a 100644
--- a/src/packages/snippets/src/snippet-expansion.coffee
+++ b/src/packages/snippets/src/snippet-expansion.coffee
@@ -4,10 +4,11 @@ _ = require 'underscore'
 module.exports =
 class SnippetExpansion
   snippet: null
-  tabStopAnchorRanges: null
+  tabStopMarkers: null
   settingTabStop: false
 
   constructor: (@snippet, @editSession) ->
+
     @editSession.selectToBeginningOfWord()
     startPosition = @editSession.getCursorBufferPosition()
     @editSession.transact =>
@@ -16,7 +17,7 @@ class SnippetExpansion
         editSession.pushOperation
           do: =>
             @subscribe @editSession, 'cursor-moved.snippet-expansion', (e) => @cursorMoved(e)
-            @placeTabStopAnchorRanges(startPosition, snippet.tabStops)
+            @placeTabStopMarkers(startPosition, snippet.tabStops)
             @editSession.snippetExpansion = this
           undo: => @destroy()
         @editSession.normalizeTabsInBufferRange(newRange)
@@ -28,12 +29,9 @@ class SnippetExpansion
     newTabStops = @tabStopsForBufferPosition(newBufferPosition)
     @destroy() unless _.intersect(oldTabStops, newTabStops).length
 
-  placeTabStopAnchorRanges: (startPosition, tabStopRanges) ->
-    @tabStopAnchorRanges = tabStopRanges.map ({start, end}) =>
-      anchorRange = @editSession.addAnchorRange([startPosition.add(start), startPosition.add(end)])
-      @subscribe anchorRange, 'destroyed', =>
-        _.remove(@tabStopAnchorRanges, anchorRange)
-      anchorRange
+  placeTabStopMarkers: (startPosition, tabStopRanges) ->
+    @tabStopMarkers = tabStopRanges.map ({start, end}) =>
+      @editSession.markBufferRange([startPosition.add(start), startPosition.add(end)])
     @setTabStopIndex(0)
 
   indentSubsequentLines: (startRow, snippet) ->
@@ -43,46 +41,35 @@ class SnippetExpansion
 
   goToNextTabStop: ->
     nextIndex = @tabStopIndex + 1
-    if @cursorIsInsideTabStops() and nextIndex < @tabStopAnchorRanges.length
-      @setTabStopIndex(nextIndex)
-      true
+    if nextIndex < @tabStopMarkers.length
+      if @setTabStopIndex(nextIndex)
+        true
+      else
+        @goToNextTabStop()
     else
       @destroy()
       false
 
   goToPreviousTabStop: ->
-    if @cursorIsInsideTabStops()
-      @setTabStopIndex(@tabStopIndex - 1) if @tabStopIndex > 0
-      true
-    else
-      @destroy()
-      false
-
-  ensureValidTabStops: ->
-    @tabStopAnchorRanges? and @destroyIfCursorIsOutsideTabStops()
+    @setTabStopIndex(@tabStopIndex - 1) if @tabStopIndex > 0
 
   setTabStopIndex: (@tabStopIndex) ->
     @settingTabStop = true
-    @editSession.setSelectedBufferRange(@tabStopAnchorRanges[@tabStopIndex].getBufferRange())
+    markerSelected = @editSession.selectMarker(@tabStopMarkers[@tabStopIndex])
     @settingTabStop = false
-
-  cursorIsInsideTabStops: ->
-    position = @editSession.getCursorBufferPosition()
-    for anchorRange in @tabStopAnchorRanges
-      return true if anchorRange.containsBufferPosition(position)
-    false
+    markerSelected
 
   tabStopsForBufferPosition: (bufferPosition) ->
-    _.intersection(@tabStopAnchorRanges, @editSession.anchorRangesForBufferPosition(bufferPosition))
+    _.intersection(@tabStopMarkers, @editSession.markersForBufferPosition(bufferPosition))
 
   destroy: ->
     @unsubscribe()
-    anchorRange.destroy() for anchorRange in @tabStopAnchorRanges
+    @editSession.destroyMarker(marker) for marker in @tabStopMarkers
     @editSession.snippetExpansion = null
 
   restore: (@editSession) ->
     @editSession.snippetExpansion = this
-    @tabStopAnchorRanges = @tabStopAnchorRanges.map (anchorRange) =>
-      @editSession.addAnchorRange(anchorRange.getBufferRange())
+#     @tabStopMarkers = @tabStopMarkers.map (anchorRange) =>
+#       @editSession.addAnchorRange(anchorRange.getBufferRange())
 
 _.extend(SnippetExpansion.prototype, Subscriber)