diff --git a/src/edit-session.coffee b/src/edit-session.coffee index a3bb2673c..42c08c5ff 100644 --- a/src/edit-session.coffee +++ b/src/edit-session.coffee @@ -335,9 +335,6 @@ class EditSession # {Delegates to: TextBuffer.getPath} getPath: -> @buffer.getPath() - # {Delegates to: TextBuffer.getRelativePath} - getRelativePath: -> @buffer.getRelativePath() - # {Delegates to: TextBuffer.getText} getText: -> @buffer.getText() diff --git a/src/editor.coffee b/src/editor.coffee index f75c84cf7..e236ca41c 100644 --- a/src/editor.coffee +++ b/src/editor.coffee @@ -600,9 +600,6 @@ class Editor extends View # {Delegates to: EditSession.getPath} getPath: -> @activeEditSession?.getPath() - # {Delegates to: EditSession.getRelativePath} - getRelativePath: -> @activeEditSession?.getRelativePath() - # {Delegates to: TextBuffer.getLineCount} getLineCount: -> @getBuffer().getLineCount() diff --git a/src/text-buffer.coffee b/src/text-buffer.coffee index 26f69209d..1fba092b2 100644 --- a/src/text-buffer.coffee +++ b/src/text-buffer.coffee @@ -27,8 +27,6 @@ class TextBuffer extends Model modifiedWhenLastPersisted: false digestWhenLastPersisted: null - @::lazyGetter 'project', -> @grandparent - stoppedChangingDelay: 300 stoppedChangingTimeout: null cachedDiskContents: null @@ -46,7 +44,7 @@ class TextBuffer extends Model @subscribe @text, 'marker-created', (marker) => @emit 'marker-created', marker @subscribe @text, 'markers-updated', => @emit 'markers-updated' - @setPath(@project.resolve(@filePath)) if @project + @setPath(@filePath) # Private: Called by telepath beforePersistence: -> @@ -118,7 +116,6 @@ class TextBuffer extends Model @emitModifiedStatusChanged(@isModified()) @file.on "moved", => - @relativePath = @project.relativize(@getPath()) @emit "path-changed", this ### Public ### @@ -161,10 +158,7 @@ class TextBuffer extends Model @file?.getPath() getUri: -> - @getRelativePath() - - getRelativePath: -> - @relativePath + @getPath() # Sets the path for the file. # @@ -180,7 +174,6 @@ class TextBuffer extends Model else @file = null - @relativePath = @project.relativize(path) @emit "path-changed", this # Retrieves the current buffer's file extension. diff --git a/src/tokenized-buffer.coffee b/src/tokenized-buffer.coffee index 4dc775496..7b1ca378d 100644 --- a/src/tokenized-buffer.coffee +++ b/src/tokenized-buffer.coffee @@ -36,7 +36,7 @@ class TokenizedBuffer { @buffer, tabLength } = optionsOrState @state = atom.site.createDocument deserializer: @constructor.name - bufferPath: @buffer.getRelativePath() + bufferPath: @buffer.getPath() tabLength: tabLength ? atom.config.get('editor.tabLength') ? 2 @subscribe syntax, 'grammar-added grammar-updated', (grammar) => @@ -48,7 +48,7 @@ class TokenizedBuffer @on 'grammar-changed grammar-updated', => @resetTokenizedLines() @subscribe @buffer, "changed", (e) => @handleBufferChange(e) - @subscribe @buffer, "path-changed", => @state.set('bufferPath', @buffer.getRelativePath()) + @subscribe @buffer, "path-changed", => @state.set('bufferPath', @buffer.getPath()) @reloadGrammar()