     # Register the markers of the references' ranges.
     # Highlight these markers.
     @renamingMarkers = for range in ranges
-      @editor.addSelectionForBufferRange range
       marker = @editor.markBufferRange range
+      marker.shorthand = range.shorthand
+      marker.delimiter = range.delimiter
+      marker.key = @editor.markBufferRange range.key if range.key
       @editor.decorateMarker marker, type: 'highlight', class: 'refactor-reference'
       marker
+
+    for marker in @renamingMarkers
+      if marker.shorthand
+        range = marker.getBufferRange()
+        origin = @editor.markBufferRange range, invalidate: 'inside'
+        text = @editor.getTextInBufferRange range
+        start = range.start
+        @editor.setTextInBufferRange [start, start], marker.delimiter, undo: 'skip'
+        key = @editor.setTextInBufferRange [start, start], text
+        marker.key = @editor.markBufferRange key
+        marker.setBufferRange origin.getBufferRange()
+
+    for marker in @renamingMarkers
+      @editor.addSelectionForBufferRange marker.getBufferRange()
+
     # Start renaming life cycle.
     @eventCursorMoved = off
     @eventCursorMoved = 'abort'

    delete @renamingCursor
    # Remove all markers for renaming.
    for marker in @renamingMarkers
      marker.destroy()
    delete @renamingMarkers


    d 'buffer changed'
    @parse()

  onCursorMoved: (event) =>
    return unless @eventCursorMoved
    if @eventCursorMoved == 'abort'
      @abort event
    else
      clearTimeout @cursorMovedTimeoutId
      @cursorMovedTimeoutId = setTimeout @onCursorMovedAfter, 100
