Modernize symbols-view package with package.cson

src/packages/symbols-view/index.coffee

@@ -1,21 +0,0 @@
-DeferredAtomPackage = require 'deferred-atom-package'
-
-module.exports =
-class Symbols extends DeferredAtomPackage
-
-  loadEvents: [
-    'symbols-view:toggle-file-symbols'
-    'symbols-view:toggle-project-symbols'
-    'symbols-view:go-to-declaration'
-  ]
-
-  instanceClass: 'symbols-view/src/symbols-view'
-
-  onLoadEvent: (event, instance) ->
-    switch event.type
-      when 'symbols-view:toggle-file-symbols'
-        instance.toggleFileSymbols()
-      when 'symbols-view:toggle-project-symbols'
-        instance.toggleProjectSymbols()
-      when 'symbols-view:go-to-declaration'
-        instance.goToDeclaration()

src/packages/symbols-view/lib/symbols-view.coffee

@@ -1,7 +1,7 @@
 {$$} = require 'space-pen'
 SelectList = require 'select-list'
-TagGenerator = require 'symbols-view/src/tag-generator'
-TagReader = require 'symbols-view/src/tag-reader'
+TagGenerator = require './tag-generator'
+TagReader = require './tag-reader'
 Point = require 'point'
 fs = require 'fs'
 $ = require 'jquery'
@@ -9,16 +9,20 @@ $ = require 'jquery'
 module.exports =
 class SymbolsView extends SelectList
 
-  @activate: (rootView) ->
-    @instance = new SymbolsView(rootView)
+  @activate: ->
+    @instance = new SymbolsView
 
   @viewClass: -> "#{super} symbols-view overlay from-top"
 
   filterKey: 'name'
 
-  initialize: (@rootView) ->
+  initialize: ->
     super
 
+    rootView.command 'symbols-view:toggle-file-symbols', => @toggleFileSymbols()
+    rootView.command 'symbols-view:toggle-project-symbols', => @toggleProjectSymbols()
+    rootView.command 'symbols-view:go-to-declaration', => @goToDeclaration()
+
   itemForElement: ({position, name, file}) ->
     $$ ->
       @li =>
@@ -40,7 +44,8 @@ class SymbolsView extends SelectList
   populateFileSymbols: ->
     tags = []
     callback = (tag) -> tags.push tag
-    path = @rootView.getActiveEditor().getPath()
+    path = rootView.getActiveEditor().getPath()
+    @list.empty()
     @setLoading("Generating symbols...")
     new TagGenerator(path, callback).generate().done =>
       if tags.length > 0
@@ -60,8 +65,9 @@ class SymbolsView extends SelectList
       @attach()
 
   populateProjectSymbols: ->
+    @list.empty()
     @setLoading("Loading symbols...")
-    TagReader.getAllTags(@rootView.project).done (tags) =>
+    TagReader.getAllTags(rootView.project).done (tags) =>
       if tags.length > 0
         @miniEditor.show()
         @maxItems = 10
@@ -78,11 +84,11 @@ class SymbolsView extends SelectList
   openTag: (tag) ->
     position = tag.position
     position = @getTagLine(tag) unless position
-    @rootView.open(tag.file, {changeFocus: true, allowActiveEditorChange:true}) if tag.file
+    rootView.open(tag.file, {changeFocus: true, allowActiveEditorChange:true}) if tag.file
     @moveToPosition(position) if position
 
   moveToPosition: (position) ->
-    editor = @rootView.getActiveEditor()
+    editor = rootView.getActiveEditor()
     editor.scrollToBufferPosition(position, center: true)
     editor.setCursorBufferPosition(position)
     editor.moveCursorToFirstCharacterOfLine()
@@ -90,19 +96,19 @@ class SymbolsView extends SelectList
   attach: ->
     super
 
-    @rootView.append(this)
+    rootView.append(this)
     @miniEditor.focus()
 
   getTagLine: (tag) ->
     pattern = $.trim(tag.pattern?.replace(/(^^\/\^)|(\$\/$)/g, '')) # Remove leading /^ and trailing $/
     return unless pattern
-    file = @rootView.project.resolve(tag.file)
+    file = rootView.project.resolve(tag.file)
     return unless fs.isFile(file)
     for line, index in fs.read(file).split('\n')
       return new Point(index, 0) if pattern is $.trim(line)
 
   goToDeclaration: ->
-    editor = @rootView.getActiveEditor()
+    editor = rootView.getActiveEditor()
     matches = TagReader.find(editor)
     return unless matches.length
 

src/packages/symbols-view/package.cson

@@ -0,0 +1,6 @@
+'main': 'lib/symbols-view'
+'activationEvents': [
+  'symbols-view:toggle-file-symbols'
+  'symbols-view:toggle-project-symbols'
+  'symbols-view:go-to-declaration'
+]

src/packages/symbols-view/spec/symbols-view-spec.coffee

@@ -1,14 +1,18 @@
 RootView = require 'root-view'
-SymbolsView = require 'symbols-view/src/symbols-view'
-TagGenerator = require 'symbols-view/src/tag-generator'
+SymbolsView = require 'symbols-view/lib/symbols-view'
+TagGenerator = require 'symbols-view/lib/tag-generator'
 fs = require 'fs'
 
 describe "SymbolsView", ->
-  [rootView, symbolsView, setArraySpy] = []
+  [symbolsView, setArraySpy] = []
 
   beforeEach ->
     rootView = new RootView(require.resolve('fixtures'))
-    symbolsView = atom.loadPackage("symbols-view").getInstance()
+    atom.loadPackage("symbols-view")
+    rootView.trigger "symbols-view:toggle-project-symbols"
+    symbolsView = rootView.find('.symbols-view').view()
+    rootView.trigger "symbols-view:toggle-project-symbols"
+
     rootView.attachToDom()
     setArraySpy = spyOn(symbolsView, 'setArray').andCallThrough()