From 7a04a414f790134176a878b2f1540fc7c9780a41 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Tue, 18 Feb 2014 18:57:45 -0800
Subject: [PATCH] Remove relative URI usage

---
 spec/workspace-spec.coffee | 14 +++++++-------
 src/cursor.coffee          |  8 ++++++++
 src/workspace.coffee       | 10 +++++-----
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/spec/workspace-spec.coffee b/spec/workspace-spec.coffee
index 312e3ea4e..be574cff6 100644
--- a/spec/workspace-spec.coffee
+++ b/spec/workspace-spec.coffee
@@ -46,7 +46,7 @@ describe "Workspace", ->
               workspace.open('a').then (o) -> editor = o
 
             runs ->
-              expect(editor.getUri()).toBe 'a'
+              expect(editor.getUri()).toBe atom.project.resolve('a')
               expect(workspace.activePaneItem).toBe editor
               expect(workspace.activePane.items).toEqual [editor]
               expect(workspace.activePane.activate).toHaveBeenCalled()
@@ -199,23 +199,23 @@ describe "Workspace", ->
       expect(workspace.activePaneItem.getUri()).not.toBeUndefined()
 
       # destroy all items
-      expect(workspace.activePaneItem.getUri()).toBe 'file1'
+      expect(workspace.activePaneItem.getUri()).toBe atom.project.resolve('file1')
       pane.destroyActiveItem()
-      expect(workspace.activePaneItem.getUri()).toBe 'b'
+      expect(workspace.activePaneItem.getUri()).toBe atom.project.resolve('b')
       pane.destroyActiveItem()
-      expect(workspace.activePaneItem.getUri()).toBe 'a'
+      expect(workspace.activePaneItem.getUri()).toBe atom.project.resolve('a')
       pane.destroyActiveItem()
 
       # reopens items with uris
       expect(workspace.activePaneItem).toBeUndefined()
       workspace.reopenItemSync()
-      expect(workspace.activePaneItem.getUri()).toBe 'a'
+      expect(workspace.activePaneItem.getUri()).toBe atom.project.resolve('a')
 
       # does not reopen items that are already open
       workspace.openSync('b')
-      expect(workspace.activePaneItem.getUri()).toBe 'b'
+      expect(workspace.activePaneItem.getUri()).toBe atom.project.resolve('b')
       workspace.reopenItemSync()
-      expect(workspace.activePaneItem.getUri()).toBe 'file1'
+      expect(workspace.activePaneItem.getUri()).toBe atom.project.resolve('file1')
 
   describe "::increase/decreaseFontSize()", ->
     it "increases/decreases the font size without going below 1", ->
diff --git a/src/cursor.coffee b/src/cursor.coffee
index 6b3747479..d6fd2097b 100644
--- a/src/cursor.coffee
+++ b/src/cursor.coffee
@@ -19,12 +19,19 @@ class Cursor
 
   # Instantiated by an {Editor}
   constructor: ({@editor, @marker}) ->
+    unless @editor.mini
+      console.log 'adding cursor', @marker.id
+
     @updateVisibility()
     @marker.on 'changed', (e) =>
       @updateVisibility()
       {oldHeadScreenPosition, newHeadScreenPosition} = e
       {oldHeadBufferPosition, newHeadBufferPosition} = e
       {textChanged} = e
+
+      unless @editor.mini
+        console.log 'marker changed', @editor.getCursorBufferPosition(), @marker.id
+
       return if oldHeadScreenPosition.isEqual(newHeadScreenPosition)
 
       @needsAutoscroll ?= @isLastCursor() and !textChanged
@@ -40,6 +47,7 @@ class Cursor
       @emit 'moved', movedEvent
       @editor.emit 'cursor-moved', movedEvent
     @marker.on 'destroyed', =>
+      console.log 'destroyed'
       @destroyed = true
       @editor.removeCursor(this)
       @emit 'destroyed'
diff --git a/src/workspace.coffee b/src/workspace.coffee
index 8b8138b67..3ca16e4a2 100644
--- a/src/workspace.coffee
+++ b/src/workspace.coffee
@@ -72,10 +72,10 @@ class Workspace extends Model
   #                     if the uri is already open (default: false)
   #
   # Returns a promise that resolves to the {Editor} for the file URI.
-  open: (uri, options={}) ->
+  open: (uri='', options={}) ->
     searchAllPanes = options.searchAllPanes
     split = options.split
-    uri = atom.project.relativize(uri) ? ''
+    uri = atom.project.resolve(uri)
 
     pane = switch split
       when 'left'
@@ -91,15 +91,15 @@ class Workspace extends Model
     @openUriInPane(uri, pane, options)
 
   # Only used in specs
-  openSync: (uri, options={}) ->
+  openSync: (uri='', options={}) ->
     {initialLine} = options
     # TODO: Remove deprecated changeFocus option
     activatePane = options.activatePane ? options.changeFocus ? true
-    uri = atom.project.relativize(uri) ? ''
+    uri = atom.project.resolve(uri)
 
     item = @activePane.itemForUri(uri)
     if uri
-      item ?= opener(atom.project.resolve(uri), options) for opener in @getOpeners() when !item
+      item ?= opener(uri, options) for opener in @getOpeners() when !item
     item ?= atom.project.openSync(uri, {initialLine})
 
     @activePane.activateItem(item)