From f766bbbb38ca6a15507b2454db0426fca92901e2 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Tue, 2 Jul 2013 14:40:43 -0700
Subject: [PATCH] Remove Point and Range classes now provided by telepath

---
 benchmark/benchmark-helper.coffee             |   2 +-
 spec/app/editor-spec.coffee                   |   2 +-
 spec/app/point-spec.coffee                    |   2 +-
 spec/app/range-spec.coffee                    |   3 +-
 spec/app/selection-spec.coffee                |   2 +-
 spec/app/tokenized-buffer-spec.coffee         |   2 +-
 spec/app/undo-manager-spec.coffee             |   2 +-
 spec/spec-helper.coffee                       |   2 +-
 src/app/buffer-marker.coffee                  |   3 +-
 src/app/cursor-view.coffee                    |   3 +-
 src/app/cursor.coffee                         |   3 +-
 src/app/display-buffer-marker.coffee          |   2 +-
 src/app/display-buffer.coffee                 |   3 +-
 src/app/edit-session.coffee                   |   3 +-
 src/app/editor.coffee                         |   3 +-
 src/app/fold.coffee                           |   3 +-
 src/app/gutter.coffee                         |   2 +-
 src/app/language-mode.coffee                  |   2 +-
 src/app/point.coffee                          | 182 ---------------
 src/app/project.coffee                        |   2 +-
 src/app/range.coffee                          | 216 ------------------
 src/app/selection-view.coffee                 |   3 +-
 src/app/selection.coffee                      |   2 +-
 src/app/text-buffer.coffee                    |   3 +-
 src/app/tokenized-buffer.coffee               |   3 +-
 .../autocomplete/lib/autocomplete-view.coffee |   2 +-
 .../lib/bracket-matcher.coffee                |   2 +-
 .../collaboration/lib/join-prompt-view.coffee |   1 -
 .../lib/commands/address-range.coffee         |   2 +-
 .../lib/commands/eof-address.coffee           |   2 +-
 .../lib/commands/line-address.coffee          |   2 +-
 .../lib/commands/regex-address.coffee         |   2 +-
 .../lib/commands/zero-address.coffee          |   2 +-
 .../fuzzy-finder/lib/fuzzy-finder-view.coffee |   2 +-
 .../go-to-line/lib/go-to-line-view.coffee     |   2 +-
 src/packages/snippets/lib/snippet.coffee      |   2 +-
 .../spell-check/lib/corrections-view.coffee   |   2 +-
 .../spell-check/lib/misspelling-view.coffee   |   2 +-
 .../symbols-view/lib/symbols-view.coffee      |   2 +-
 .../symbols-view/lib/tag-generator.coffee     |   2 +-
 40 files changed, 37 insertions(+), 447 deletions(-)
 delete mode 100644 src/app/point.coffee
 delete mode 100644 src/app/range.coffee

diff --git a/benchmark/benchmark-helper.coffee b/benchmark/benchmark-helper.coffee
index fd1a1ed41..aa5502a69 100644
--- a/benchmark/benchmark-helper.coffee
+++ b/benchmark/benchmark-helper.coffee
@@ -2,7 +2,7 @@ nakedLoad 'jasmine-jquery'
 $ = require 'jquery'
 _ = require 'underscore'
 Keymap = require 'keymap'
-Point = require 'point'
+{Point} = require 'telepath'
 Config = require 'config'
 Project = require 'project'
 
diff --git a/spec/app/editor-spec.coffee b/spec/app/editor-spec.coffee
index fb3cd15e6..914f81f0c 100644
--- a/spec/app/editor-spec.coffee
+++ b/spec/app/editor-spec.coffee
@@ -2,7 +2,7 @@ RootView = require 'root-view'
 EditSession = require 'edit-session'
 Buffer = require 'text-buffer'
 Editor = require 'editor'
-Range = require 'range'
+{Range} = require 'telepath'
 Project = require 'project'
 $ = require 'jquery'
 {$$} = require 'space-pen'
diff --git a/spec/app/point-spec.coffee b/spec/app/point-spec.coffee
index d4d78715c..1d5a91b20 100644
--- a/spec/app/point-spec.coffee
+++ b/spec/app/point-spec.coffee
@@ -1,4 +1,4 @@
-Point = require 'point'
+{Point} = require 'telepath'
 
 describe "Point", ->
   describe ".isEqual(value)", ->
diff --git a/spec/app/range-spec.coffee b/spec/app/range-spec.coffee
index 24460a064..50282354c 100644
--- a/spec/app/range-spec.coffee
+++ b/spec/app/range-spec.coffee
@@ -1,5 +1,4 @@
-Range = require 'range'
-Point = require 'point'
+{Point, Range} = require 'telepath'
 
 describe "Range", ->
   describe "constructor", ->
diff --git a/spec/app/selection-spec.coffee b/spec/app/selection-spec.coffee
index 995d91cf0..bb4308ed3 100644
--- a/spec/app/selection-spec.coffee
+++ b/spec/app/selection-spec.coffee
@@ -1,6 +1,6 @@
 Buffer = require 'text-buffer'
 EditSession = require 'edit-session'
-Range = require 'range'
+{Range} = require 'telepath'
 
 describe "Selection", ->
   [buffer, editSession, selection] = []
diff --git a/spec/app/tokenized-buffer-spec.coffee b/spec/app/tokenized-buffer-spec.coffee
index 2a1ce0c0f..f35dde3fe 100644
--- a/spec/app/tokenized-buffer-spec.coffee
+++ b/spec/app/tokenized-buffer-spec.coffee
@@ -1,6 +1,6 @@
 TokenizedBuffer = require 'tokenized-buffer'
 Buffer = require 'text-buffer'
-Range = require 'range'
+{Range} = require 'telepath'
 _ = require 'underscore'
 
 describe "TokenizedBuffer", ->
diff --git a/spec/app/undo-manager-spec.coffee b/spec/app/undo-manager-spec.coffee
index 0ac4a2ca2..6dc458691 100644
--- a/spec/app/undo-manager-spec.coffee
+++ b/spec/app/undo-manager-spec.coffee
@@ -1,6 +1,6 @@
 UndoManager = require 'undo-manager'
 Buffer = require 'text-buffer'
-Range = require 'range'
+{Range} = require 'telepath'
 
 describe "UndoManager", ->
   [buffer, undoManager] = []
diff --git a/spec/spec-helper.coffee b/spec/spec-helper.coffee
index 057986f20..21116ecb7 100644
--- a/spec/spec-helper.coffee
+++ b/spec/spec-helper.coffee
@@ -7,7 +7,7 @@ $ = jQuery = require 'jquery'
 _ = require 'underscore'
 Keymap = require 'keymap'
 Config = require 'config'
-Point = require 'point'
+{Point} = require 'telepath'
 Project = require 'project'
 Directory = require 'directory'
 File = require 'file'
diff --git a/src/app/buffer-marker.coffee b/src/app/buffer-marker.coffee
index 83636e42d..d01b0ad5d 100644
--- a/src/app/buffer-marker.coffee
+++ b/src/app/buffer-marker.coffee
@@ -1,6 +1,5 @@
 _ = require 'underscore'
-Point = require 'point'
-Range = require 'range'
+{Point, Range} = require 'telepath'
 EventEmitter = require 'event-emitter'
 
 module.exports =
diff --git a/src/app/cursor-view.coffee b/src/app/cursor-view.coffee
index 64b9851dd..a551a454d 100644
--- a/src/app/cursor-view.coffee
+++ b/src/app/cursor-view.coffee
@@ -1,6 +1,5 @@
 {View} = require 'space-pen'
-Point = require 'point'
-Range = require 'range'
+{Point, Range} = require 'telepath'
 _ = require 'underscore'
 
 ### Internal ###
diff --git a/src/app/cursor.coffee b/src/app/cursor.coffee
index 6db87b6e3..6998aee75 100644
--- a/src/app/cursor.coffee
+++ b/src/app/cursor.coffee
@@ -1,5 +1,4 @@
-Point = require 'point'
-Range = require 'range'
+{Point, Range} = require 'telepath'
 EventEmitter = require 'event-emitter'
 _ = require 'underscore'
 
diff --git a/src/app/display-buffer-marker.coffee b/src/app/display-buffer-marker.coffee
index 4fd3f9689..6ad92f5e3 100644
--- a/src/app/display-buffer-marker.coffee
+++ b/src/app/display-buffer-marker.coffee
@@ -1,4 +1,4 @@
-Range = require 'range'
+{Range} = require 'telepath'
 _ = require 'underscore'
 EventEmitter = require 'event-emitter'
 Subscriber = require 'subscriber'
diff --git a/src/app/display-buffer.coffee b/src/app/display-buffer.coffee
index 0a1d98da1..11f7bbae4 100644
--- a/src/app/display-buffer.coffee
+++ b/src/app/display-buffer.coffee
@@ -1,9 +1,8 @@
 _ = require 'underscore'
 TokenizedBuffer = require 'tokenized-buffer'
 RowMap = require 'row-map'
-Point = require 'point'
 EventEmitter = require 'event-emitter'
-Range = require 'range'
+{Point, Range} = require 'telepath'
 Fold = require 'fold'
 Token = require 'token'
 DisplayBufferMarker = require 'display-buffer-marker'
diff --git a/src/app/edit-session.coffee b/src/app/edit-session.coffee
index f337e1dd0..f5c5ef630 100644
--- a/src/app/edit-session.coffee
+++ b/src/app/edit-session.coffee
@@ -2,7 +2,7 @@ _ = require 'underscore'
 fsUtils = require 'fs-utils'
 path = require 'path'
 telepath = require 'telepath'
-Point = require 'point'
+{Point, Range} = telepath
 Buffer = require 'text-buffer'
 LanguageMode = require 'language-mode'
 DisplayBuffer = require 'display-buffer'
@@ -10,7 +10,6 @@ Cursor = require 'cursor'
 Selection = require 'selection'
 EventEmitter = require 'event-emitter'
 Subscriber = require 'subscriber'
-Range = require 'range'
 TextMateScopeSelector = require 'text-mate-scope-selector'
 
 # An `EditSession` manages the states between {Editor}s, {Buffer}s, and the project as a whole.
diff --git a/src/app/editor.coffee b/src/app/editor.coffee
index 3ec56362e..f73512285 100644
--- a/src/app/editor.coffee
+++ b/src/app/editor.coffee
@@ -1,8 +1,7 @@
 {View, $$} = require 'space-pen'
 Buffer = require 'text-buffer'
 Gutter = require 'gutter'
-Point = require 'point'
-Range = require 'range'
+{Point, Range} = require 'telepath'
 EditSession = require 'edit-session'
 CursorView = require 'cursor-view'
 SelectionView = require 'selection-view'
diff --git a/src/app/fold.coffee b/src/app/fold.coffee
index a086930a6..9de3dfdf4 100644
--- a/src/app/fold.coffee
+++ b/src/app/fold.coffee
@@ -1,5 +1,4 @@
-Range = require 'range'
-Point = require 'point'
+{Point, Range} = require 'telepath'
 
 # Public: Represents a fold that collapses multiple buffer lines into a single
 # line on the screen.
diff --git a/src/app/gutter.coffee b/src/app/gutter.coffee
index 883646323..511a6f328 100644
--- a/src/app/gutter.coffee
+++ b/src/app/gutter.coffee
@@ -1,5 +1,5 @@
 {View, $$, $$$} = require 'space-pen'
-Range = require 'range'
+{Range} = require 'telepath'
 $ = require 'jquery'
 _ = require 'underscore'
 
diff --git a/src/app/language-mode.coffee b/src/app/language-mode.coffee
index 204e3f7ef..e0e10107f 100644
--- a/src/app/language-mode.coffee
+++ b/src/app/language-mode.coffee
@@ -1,4 +1,4 @@
-Range = require 'range'
+{Range} = require 'telepath'
 _ = require 'underscore'
 require 'underscore-extensions'
 {OnigRegExp} = require 'oniguruma'
diff --git a/src/app/point.coffee b/src/app/point.coffee
deleted file mode 100644
index cf1329e05..000000000
--- a/src/app/point.coffee
+++ /dev/null
@@ -1,182 +0,0 @@
-_ = require 'underscore'
-
-# Public: Represents a coordinate in the editor.
-#
-# Each `Point` is actually an object with two properties: `row` and `column`.
-module.exports =
-class Point
-
-  # Constructs a `Point` from a given object.
-  #
-  # object - This can be an {Array} (`[startRow, startColumn, endRow, endColumn]`) or an object `{row, column}`
-  #
-  # Returns the new {Point}.
-  @fromObject: (object) ->
-    if object instanceof Point
-      object
-    else
-      if _.isArray(object)
-        [row, column] = object
-      else
-        { row, column } = object
-
-      new Point(row, column)
-
-  # Identifies which `Point` is smaller.
-  #
-  # "Smaller" means that both the `row` and `column` values of one `Point` are less than or equal
-  # to the other.
-  #
-  # point1 - The first {Point} to check
-  # point2 - The second {Point} to check
-  #
-  # Returns the smaller {Point}.
-  @min: (point1, point2) ->
-    point1 = @fromObject(point1)
-    point2 = @fromObject(point2)
-    if point1.isLessThanOrEqual(point2)
-      point1
-    else
-      point2
-
-  # Creates a new `Point` object.
-  #
-  # row - A {Number} indicating the row (default: 0)
-  # column - A {Number} indicating the column (default: 0)
-  #
-  # Returns a {Point},
-  constructor: (@row=0, @column=0) ->
-
-  # Creates an identical copy of the `Point`.
-  #
-  # Returns a duplicate {Point}.
-  copy: ->
-    new Point(@row, @column)
-
-  # Adds the `column`s of two `Point`s together.
-  #
-  # other - The {Point} to add with
-  #
-  # Returns the new {Point}.
-  add: (other) ->
-    other = Point.fromObject(other)
-    row = @row + other.row
-    if other.row == 0
-      column = @column + other.column
-    else
-      column = other.column
-
-    new Point(row, column)
-
-  # Moves a `Point`.
-  #
-  # In other words, the `row` values and `column` values are added to each other.
-  #
-  # other - The {Point} to add with
-  #
-  # Returns the new {Point}.
-  translate: (other) ->
-    other = Point.fromObject(other)
-    new Point(@row + other.row, @column + other.column)
-
-  # Creates two new `Point`s, split down a `column` value.
-  #
-  # In other words, given a point, this creates `Point(0, column)` and `Point(row, column)`.
-  #
-  # column - The {Number} to split at
-  #
-  # Returns an {Array} of two {Point}s.
-  splitAt: (column) ->
-    if @row == 0
-      rightColumn = @column - column
-    else
-      rightColumn = @column
-
-    [new Point(0, column), new Point(@row, rightColumn)]
-
-  # Compares two `Point`s.
-  #
-  # other - The {Point} to compare against
-  #
-  # Returns a {Number} matching the following rules:
-  # * If the first `row` is greater than `other.row`, returns `1`.
-  # * If the first `row` is less than `other.row`, returns `-1`.
-  # * If the first `column` is greater than `other.column`, returns `1`.
-  # * If the first `column` is less than `other.column`, returns `-1`.
-  #
-  # Otherwise, returns `0`.
-  compare: (other) ->
-    if @row > other.row
-      1
-    else if @row < other.row
-      -1
-    else
-      if @column > other.column
-        1
-      else if @column < other.column
-        -1
-      else
-        0
-
-  # Identifies if two `Point`s are equal.
-  #
-  # other - The {Point} to compare against
-  #
-  # Returns a {Boolean}.
-  isEqual: (other) ->
-    return false unless other
-    other = Point.fromObject(other)
-    @row == other.row and @column == other.column
-
-  # Identifies if one `Point` is less than another.
-  #
-  # other - The {Point} to compare against
-  #
-  # Returns a {Boolean}.
-  isLessThan: (other) ->
-    @compare(other) < 0
-
-  # Identifies if one `Point` is less than or equal to another.
-  #
-  # other - The {Point} to compare against
-  #
-  # Returns a {Boolean}.
-  isLessThanOrEqual: (other) ->
-    @compare(other) <= 0
-
-  # Identifies if one `Point` is greater than another.
-  #
-  # other - The {Point} to compare against
-  #
-  # Returns a {Boolean}.
-  isGreaterThan: (other) ->
-    @compare(other) > 0
-
-  # Identifies if one `Point` is greater than or equal to another.
-  #
-  # other - The {Point} to compare against
-  #
-  # Returns a {Boolean}.
-  isGreaterThanOrEqual: (other) ->
-    @compare(other) >= 0
-
-  # Converts the {Point} to a String.
-  #
-  # Returns a {String}.
-  toString: ->
-    "#{@row},#{@column}"
-
-  # Converts the {Point} to an Array.
-  #
-  # Returns an {Array}.
-  toArray: ->
-    [@row, @column]
-
-  ### Internal ###
-
-  inspect: ->
-    "(#{@row}, #{@column})"
-
-  # Internal:
-  serialize: ->
-    @toArray()
diff --git a/src/app/project.coffee b/src/app/project.coffee
index b99bece69..04a8f74e6 100644
--- a/src/app/project.coffee
+++ b/src/app/project.coffee
@@ -3,7 +3,7 @@ path = require 'path'
 _ = require 'underscore'
 $ = require 'jquery'
 telepath = require 'telepath'
-Range = require 'range'
+{Range} = telepath
 Buffer = require 'text-buffer'
 EditSession = require 'edit-session'
 EventEmitter = require 'event-emitter'
diff --git a/src/app/range.coffee b/src/app/range.coffee
deleted file mode 100644
index 2eb393e98..000000000
--- a/src/app/range.coffee
+++ /dev/null
@@ -1,216 +0,0 @@
-Point = require 'point'
-_ = require 'underscore'
-
-# Public: Indicates a region within the editor.
-#
-# To better visualize how this works, imagine a rectangle.
-# Each quadrant of the rectangle is analogus to a range, as ranges contain a
-# starting row and a starting column, as well as an ending row, and an ending column.
-#
-# Each `Range` is actually constructed of two `Point` objects, labelled `start` and `end`.
-module.exports =
-class Range
-
-  # Constructs a `Range` from a given object.
-  #
-  # object - This can be an {Array} (`[startRow, startColumn, endRow, endColumn]`) or an object `{start: Point, end: Point}`
-  #
-  # Returns the new {Range}.
-  @fromObject: (object) ->
-    if _.isArray(object)
-      new Range(object...)
-    else if object instanceof Range
-      object
-    else
-      new Range(object.start, object.end)
-
-  # Constructs a `Range` from a {Point}, and the delta values beyond that point.
-  #
-  # point - A {Point} to start with
-  # rowDelta - A {Number} indicating how far from the starting {Point} the range's row should be
-  # columnDelta - A {Number} indicating how far from the starting {Point} the range's column should be
-  #
-  # Returns the new {Range}.
-  @fromPointWithDelta: (point, rowDelta, columnDelta) ->
-    pointA = Point.fromObject(point)
-    pointB = new Point(point.row + rowDelta, point.column + columnDelta)
-    new Range(pointA, pointB)
-
-  # Creates a new `Range` object based on two {Point}s.
-  #
-  # pointA - The first {Point} (default: `0, 0`)
-  # pointB - The second {Point} (default: `0, 0`)
-  constructor: (pointA = new Point(0, 0), pointB = new Point(0, 0)) ->
-    pointA = Point.fromObject(pointA)
-    pointB = Point.fromObject(pointB)
-
-    if pointA.compare(pointB) <= 0
-      @start = pointA
-      @end = pointB
-    else
-      @start = pointB
-      @end = pointA
-
-  # Creates an identical copy of the `Range`.
-  #
-  # Returns a duplicate {Range}.
-  copy: ->
-    new Range(@start.copy(), @end.copy())
-
-  # Identifies if two `Range`s are equal.
-  #
-  # All four points (`start.row`, `start.column`, `end.row`, `end.column`) must be
-  # equal for this method to return `true`.
-  #
-  # other - A different {Range} to check against
-  #
-  # Returns a {Boolean}.
-  isEqual: (other) ->
-    if _.isArray(other) and other.length == 2
-      other = new Range(other...)
-
-    other.start.isEqual(@start) and other.end.isEqual(@end)
-
-  # Returns an integer (-1, 0, 1) indicating whether this range is less than, equal,
-  # or greater than the given range when sorting.
-  #
-  # Ranges that start earlier are considered "less than" ranges that start later.
-  # If ranges start at the same location, the larger range sorts before the smaller
-  # range.
-  #
-  # other - A {Range} to compare against.
-  #
-  # Returns a {Number}, either -1, 0, or 1.
-  compare: (other) ->
-    other = Range.fromObject(other)
-    if value = @start.compare(other.start)
-      value
-    else
-      other.end.compare(@end)
-
-  # Identifies if the `Range` is on the same line.
-  #
-  # In other words, if `start.row` is equal to `end.row`.
-  #
-  # Returns a {Boolean}.
-  isSingleLine: ->
-    @start.row == @end.row
-
-  # Identifies if two `Range`s are on the same line.
-  #
-  # other - A different {Range} to check against
-  #
-  # Returns a {Boolean}.
-  coversSameRows: (other) ->
-    @start.row == other.start.row && @end.row == other.end.row
-
-  # Adds a new point to the `Range`s `start` and `end`.
-  #
-  # point - A new {Point} to add
-  #
-  # Returns the new {Range}.
-  add: (point) ->
-    new Range(@start.add(point), @end.add(point))
-
-  # Moves a `Range`.
-  #
-  # In other words, the starting and ending `row` values, and the starting and ending
-  # `column` values, are added to each other.
-  #
-  # startPoint - The {Point} to move the `Range`s `start` by
-  # endPoint - The {Point} to move the `Range`s `end` by
-  #
-  # Returns the new {Range}.
-  translate: (startPoint, endPoint=startPoint) ->
-    new Range(@start.translate(startPoint), @end.translate(endPoint))
-
-  # Identifies if two `Range`s intersect each other.
-  #
-  # otherRange - A different {Range} to check against
-  #
-  # Returns a {Boolean}.
-  intersectsWith: (otherRange) ->
-    if @start.isLessThanOrEqual(otherRange.start)
-      @end.isGreaterThanOrEqual(otherRange.start)
-    else
-      otherRange.intersectsWith(this)
-
-  # Identifies if a second `Range` is contained within a first.
-  #
-  # otherRange - A different {Range} to check against
-  # options - A hash with a single option:
-  #          exclusive: A {Boolean} which, if `true`, indicates that no {Point}s in the `Range` can be equal
-  #
-  # Returns a {Boolean}.
-  containsRange: (otherRange, {exclusive} = {}) ->
-    { start, end } = Range.fromObject(otherRange)
-    @containsPoint(start, {exclusive}) and @containsPoint(end, {exclusive})
-
-  # Identifies if a `Range` contains a {Point}.
-  #
-  # point - A {Point} to check against
-  # options - A hash with a single option:
-  #          exclusive: A {Boolean} which, if `true`, indicates that no {Point}s in the `Range` can be equal
-  #
-  # Returns a {Boolean}.
-  containsPoint: (point, {exclusive} = {}) ->
-    point = Point.fromObject(point)
-    if exclusive
-      point.isGreaterThan(@start) and point.isLessThan(@end)
-    else
-      point.isGreaterThanOrEqual(@start) and point.isLessThanOrEqual(@end)
-
-  # Identifies if a `Range` contains a row.
-  #
-  # row - A row {Number} to check against
-  # options - A hash with a single option:
-  #
-  # Returns a {Boolean}.
-  containsRow: (row) ->
-    @start.row <= row <= @end.row
-
-  # Constructs a union between two `Range`s.
-  #
-  # otherRange - A different {Range} to unionize with
-  #
-  # Returns the new {Range}.
-  union: (otherRange) ->
-    start = if @start.isLessThan(otherRange.start) then @start else otherRange.start
-    end = if @end.isGreaterThan(otherRange.end) then @end else otherRange.end
-    new Range(start, end)
-
-  # Identifies if a `Range` is empty.
-  #
-  # A `Range` is empty if its start {Point} matches its end.
-  #
-  # Returns a {Boolean}.
-  isEmpty: ->
-    @start.isEqual(@end)
-
-  # Calculates the difference between a `Range`s `start` and `end` points.
-  #
-  # Returns a {Point}.
-  toDelta: ->
-    rows = @end.row - @start.row
-    if rows == 0
-      columns = @end.column - @start.column
-    else
-      columns = @end.column
-    new Point(rows, columns)
-
-  # Calculates the number of rows a `Range`s contains.
-  #
-  # Returns a {Number}.
-  getRowCount: ->
-    @end.row - @start.row + 1
-
-  # Returns an array of all rows in a `Range`
-  #
-  # Returns an {Array}
-  getRows: ->
-    [@start.row..@end.row]
-
-  ### Internal ###
-
-  inspect: ->
-    "[#{@start.inspect()} - #{@end.inspect()}]"
diff --git a/src/app/selection-view.coffee b/src/app/selection-view.coffee
index bf9ccc777..d4d64d950 100644
--- a/src/app/selection-view.coffee
+++ b/src/app/selection-view.coffee
@@ -1,5 +1,4 @@
-Point = require 'point'
-Range = require 'range'
+{Point, Range} = require 'telepath'
 {View, $$} = require 'space-pen'
 
 # Internal:
diff --git a/src/app/selection.coffee b/src/app/selection.coffee
index 5c987791e..6a084d13b 100644
--- a/src/app/selection.coffee
+++ b/src/app/selection.coffee
@@ -1,4 +1,4 @@
-Range = require 'range'
+{Range} = require 'telepath'
 EventEmitter = require 'event-emitter'
 _ = require 'underscore'
 
diff --git a/src/app/text-buffer.coffee b/src/app/text-buffer.coffee
index 71b689eb2..fe9cf3fc0 100644
--- a/src/app/text-buffer.coffee
+++ b/src/app/text-buffer.coffee
@@ -1,9 +1,8 @@
 _ = require 'underscore'
 telepath = require 'telepath'
+{Point, Range} = telepath
 fsUtils = require 'fs-utils'
 File = require 'file'
-Point = require 'point'
-Range = require 'range'
 EventEmitter = require 'event-emitter'
 UndoManager = require 'undo-manager'
 BufferChangeOperation = require 'buffer-change-operation'
diff --git a/src/app/tokenized-buffer.coffee b/src/app/tokenized-buffer.coffee
index a88dbb026..aebcd8d8e 100644
--- a/src/app/tokenized-buffer.coffee
+++ b/src/app/tokenized-buffer.coffee
@@ -3,8 +3,7 @@ TokenizedLine = require 'tokenized-line'
 EventEmitter = require 'event-emitter'
 Subscriber = require 'subscriber'
 Token = require 'token'
-Range = require 'range'
-Point = require 'point'
+{Point, Range} = require 'telepath'
 
 ### Internal ###
 
diff --git a/src/packages/autocomplete/lib/autocomplete-view.coffee b/src/packages/autocomplete/lib/autocomplete-view.coffee
index 239c938f6..c185785d9 100644
--- a/src/packages/autocomplete/lib/autocomplete-view.coffee
+++ b/src/packages/autocomplete/lib/autocomplete-view.coffee
@@ -1,6 +1,6 @@
 $ = require 'jquery'
 {$$} = require 'space-pen'
-Range = require 'range'
+{Range} = require 'telepath'
 SelectList = require 'select-list'
 
 module.exports =
diff --git a/src/packages/bracket-matcher/lib/bracket-matcher.coffee b/src/packages/bracket-matcher/lib/bracket-matcher.coffee
index e630842d2..27621773f 100644
--- a/src/packages/bracket-matcher/lib/bracket-matcher.coffee
+++ b/src/packages/bracket-matcher/lib/bracket-matcher.coffee
@@ -1,6 +1,6 @@
 _ = require 'underscore'
 {$$} = require 'space-pen'
-Range = require 'range'
+{Range} = require 'telepath'
 
 module.exports =
   pairedCharacters:
diff --git a/src/packages/collaboration/lib/join-prompt-view.coffee b/src/packages/collaboration/lib/join-prompt-view.coffee
index 4ed5a22be..310456ce9 100644
--- a/src/packages/collaboration/lib/join-prompt-view.coffee
+++ b/src/packages/collaboration/lib/join-prompt-view.coffee
@@ -1,7 +1,6 @@
 {View} = require 'space-pen'
 Editor = require 'editor'
 $ = require 'jquery'
-Point = require 'point'
 _ = require 'underscore'
 Guid = require 'guid'
 
diff --git a/src/packages/command-panel/lib/commands/address-range.coffee b/src/packages/command-panel/lib/commands/address-range.coffee
index 8c4c976f2..c4a2e82f8 100644
--- a/src/packages/command-panel/lib/commands/address-range.coffee
+++ b/src/packages/command-panel/lib/commands/address-range.coffee
@@ -1,5 +1,5 @@
 Address = require 'command-panel/lib/commands/address'
-Range = require 'range'
+{Range} = require 'telepath'
 
 module.exports =
 class AddressRange extends Address
diff --git a/src/packages/command-panel/lib/commands/eof-address.coffee b/src/packages/command-panel/lib/commands/eof-address.coffee
index aa13d6041..5b303f202 100644
--- a/src/packages/command-panel/lib/commands/eof-address.coffee
+++ b/src/packages/command-panel/lib/commands/eof-address.coffee
@@ -1,5 +1,5 @@
 Address = require './address'
-Range = require 'range'
+{Range} = require 'telepath'
 
 module.exports =
 class EofAddress extends Address
diff --git a/src/packages/command-panel/lib/commands/line-address.coffee b/src/packages/command-panel/lib/commands/line-address.coffee
index ab0f2ad92..c02f23a7c 100644
--- a/src/packages/command-panel/lib/commands/line-address.coffee
+++ b/src/packages/command-panel/lib/commands/line-address.coffee
@@ -1,5 +1,5 @@
 Address = require './address'
-Range = require 'range'
+{Range} = require 'telepath'
 
 module.exports =
 class LineAddress extends Address
diff --git a/src/packages/command-panel/lib/commands/regex-address.coffee b/src/packages/command-panel/lib/commands/regex-address.coffee
index 721d236c4..a7738d473 100644
--- a/src/packages/command-panel/lib/commands/regex-address.coffee
+++ b/src/packages/command-panel/lib/commands/regex-address.coffee
@@ -1,5 +1,5 @@
 Address = require './address'
-Range = require 'range'
+{Range} = require 'telepath'
 
 module.exports =
 class RegexAddress extends Address
diff --git a/src/packages/command-panel/lib/commands/zero-address.coffee b/src/packages/command-panel/lib/commands/zero-address.coffee
index 80928b29b..8b600d983 100644
--- a/src/packages/command-panel/lib/commands/zero-address.coffee
+++ b/src/packages/command-panel/lib/commands/zero-address.coffee
@@ -1,5 +1,5 @@
 Address = require './address'
-Range = require 'range'
+{Range} = require 'telepath'
 
 module.exports =
 class ZeroAddress extends Address
diff --git a/src/packages/fuzzy-finder/lib/fuzzy-finder-view.coffee b/src/packages/fuzzy-finder/lib/fuzzy-finder-view.coffee
index 2003d54cf..0421cf9e9 100644
--- a/src/packages/fuzzy-finder/lib/fuzzy-finder-view.coffee
+++ b/src/packages/fuzzy-finder/lib/fuzzy-finder-view.coffee
@@ -6,7 +6,7 @@ humanize = require 'humanize-plus'
 fsUtils = require 'fs-utils'
 path = require 'path'
 PathLoader = require './path-loader'
-Point = require 'point'
+{Point} = require 'telepath'
 
 module.exports =
 class FuzzyFinderView extends SelectList
diff --git a/src/packages/go-to-line/lib/go-to-line-view.coffee b/src/packages/go-to-line/lib/go-to-line-view.coffee
index 4d9b2e4b4..9473f0bb6 100644
--- a/src/packages/go-to-line/lib/go-to-line-view.coffee
+++ b/src/packages/go-to-line/lib/go-to-line-view.coffee
@@ -1,7 +1,7 @@
 {View} = require 'space-pen'
 Editor = require 'editor'
 $ = require 'jquery'
-Point = require 'point'
+{Point} = require 'telepath'
 
 module.exports =
 class GoToLineView extends View
diff --git a/src/packages/snippets/lib/snippet.coffee b/src/packages/snippets/lib/snippet.coffee
index 6e0069862..f817dd3a4 100644
--- a/src/packages/snippets/lib/snippet.coffee
+++ b/src/packages/snippets/lib/snippet.coffee
@@ -1,5 +1,5 @@
 _ = require 'underscore'
-Range = require 'range'
+{Range} = require 'telepath'
 
 module.exports =
 class Snippet
diff --git a/src/packages/spell-check/lib/corrections-view.coffee b/src/packages/spell-check/lib/corrections-view.coffee
index c752263eb..d83a8e6d6 100644
--- a/src/packages/spell-check/lib/corrections-view.coffee
+++ b/src/packages/spell-check/lib/corrections-view.coffee
@@ -1,5 +1,5 @@
 {$$} = require 'space-pen'
-Range = require 'range'
+{Range} = require 'telepath'
 SelectList = require 'select-list'
 
 module.exports =
diff --git a/src/packages/spell-check/lib/misspelling-view.coffee b/src/packages/spell-check/lib/misspelling-view.coffee
index 0dae2e9a5..9fad82f79 100644
--- a/src/packages/spell-check/lib/misspelling-view.coffee
+++ b/src/packages/spell-check/lib/misspelling-view.coffee
@@ -1,5 +1,5 @@
 {View} = require 'space-pen'
-Range = require 'range'
+{Range} = require 'telepath'
 CorrectionsView = require './corrections-view'
 
 module.exports =
diff --git a/src/packages/symbols-view/lib/symbols-view.coffee b/src/packages/symbols-view/lib/symbols-view.coffee
index 80b3740f1..53621b4a4 100644
--- a/src/packages/symbols-view/lib/symbols-view.coffee
+++ b/src/packages/symbols-view/lib/symbols-view.coffee
@@ -2,7 +2,7 @@
 SelectList = require 'select-list'
 TagGenerator = require './tag-generator'
 TagReader = require './tag-reader'
-Point = require 'point'
+{Point} = require 'telepath'
 fsUtils = require 'fs-utils'
 path = require 'path'
 $ = require 'jquery'
diff --git a/src/packages/symbols-view/lib/tag-generator.coffee b/src/packages/symbols-view/lib/tag-generator.coffee
index 8a847ea25..d3c8a2b3c 100644
--- a/src/packages/symbols-view/lib/tag-generator.coffee
+++ b/src/packages/symbols-view/lib/tag-generator.coffee
@@ -1,4 +1,4 @@
-Point = require 'point'
+{Point} = require 'telepath'
 $ = require 'jquery'
 BufferedProcess = require 'buffered-process'
 fsUtils = require 'fs-utils'