From f1a8a5d68400cd295dc122d6530abec355dd102e Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 24 Oct 2012 08:24:16 -0700 Subject: [PATCH] Store tag location in a Point --- spec/extensions/outline-view-spec.coffee | 4 ++-- src/extensions/outline-view/outline-view.coffee | 8 ++++---- src/extensions/outline-view/tag-generator.coffee | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/spec/extensions/outline-view-spec.coffee b/spec/extensions/outline-view-spec.coffee index 2a98d45f4..d183ffe75 100644 --- a/spec/extensions/outline-view-spec.coffee +++ b/spec/extensions/outline-view-spec.coffee @@ -13,9 +13,9 @@ describe "OutlineView", -> generator.generate().done -> expect(tags.length).toBe 2 expect(tags[0].name).toBe "quicksort" - expect(tags[0].row).toBe 0 + expect(tags[0].position.row).toBe 0 expect(tags[1].name).toBe "quicksort.sort" - expect(tags[1].row).toBe 1 + expect(tags[1].position.row).toBe 1 it "generates no tags for text file", -> waitsForPromise -> diff --git a/src/extensions/outline-view/outline-view.coffee b/src/extensions/outline-view/outline-view.coffee index d273e9551..2d6780c48 100644 --- a/src/extensions/outline-view/outline-view.coffee +++ b/src/extensions/outline-view/outline-view.coffee @@ -20,12 +20,12 @@ class OutlineView extends SelectList initialize: (@rootView) -> super - itemForElement: ({row, name}) -> + itemForElement: ({position, name}) -> $$ -> @li => @div name, class: 'function-name' @div class: 'right', => - @div "Line #{row + 1}", class: 'function-line' + @div "Line #{position.row + 1}", class: 'function-line' @div class: 'clear-float' toggle: -> @@ -44,9 +44,9 @@ class OutlineView extends SelectList @setArray(tags) @attach() - confirmed : ({row, column, name}) -> + confirmed : ({position, name}) -> @cancel() - @rootView.getActiveEditor().setCursorBufferPosition([row, column]) + @rootView.getActiveEditor().setCursorBufferPosition(position) cancelled: -> @miniEditor.setText('') diff --git a/src/extensions/outline-view/tag-generator.coffee b/src/extensions/outline-view/tag-generator.coffee index 3b87f65fc..c0079fbde 100644 --- a/src/extensions/outline-view/tag-generator.coffee +++ b/src/extensions/outline-view/tag-generator.coffee @@ -1,3 +1,4 @@ +Point = require 'point' ChildProcess = require 'child-process' module.exports = @@ -29,8 +30,7 @@ class TagGenerator label = "#{label}#{signature}" tag = - row: line - column: 0 + position: new Point(line, 0) name: label return tag