add small features

go-to-declaration support column
catch crag command stderr
use -R instead of (fs-plus).traverseTreeSync
better log
search tag limit max

README.md

@@ -31,3 +31,9 @@ autocomplete with ctags dependent on [autocomplete-plus](https://github.com/sasc
 * Writing Tests
 * Auto check package of autocomplete-plus installed
 * ~~Auto disable package of symbols-view~~
+* use Activation Events to speed up load time
+* ~~use ctags command args -R~~
+
+
+#Changelog
+*go-to-declaration support column

lib/ctags-cache.coffee

@@ -1,93 +1,66 @@
 
 TagGenerator = require './tag-generator'
 fs = require 'fs-plus'
-minimatch = require "minimatch"
 
-{Point} = require "atom"
+matchOpt = {matchBase: true}
 
 module.exports =
-  activate: (build) ->
+  activate: () ->
     @cachedTags = {}
 
-    if build
-      @rebuild()
-
   deactivate: ->
     @cachedTags = null
 
-  #options = { partialMatch: true }
+  #options = { partialMatch: true, maxItems }
   findTags: (prefix, options) ->
     tags = []
+    empty = true
     for key, value of @cachedTags
-      tags.push (value.filter (x) ->
-        if options and options.partialMatch == true
-          return x.name.indexOf(prefix) == 0
-        else
-         return x.name == prefix
-      )...
+      empty = false
+      for tag in value
+        if options?.partialMatch and tag.name.indexOf(prefix) == 0
+            tags.push tag
+        else if tag.name == prefix
+          tags.push tag
+        return tags if options?.maxItems and tags.length == options.maxItems
+
+    #TODO: prompt in editor
+    console.warn("[atom-ctags:findTags] tags empty, did you RebuildTags?") if empty
     return tags
 
-  # Private: Checks whether the file is blacklisted
-  #
-  # Returns {Boolean} that defines whether the file is blacklisted
-  FileBlacklisted: (blacklist, f, opt) ->
-    for blacklistGlob in blacklist
-      if minimatch(f, blacklistGlob, opt)
-        return true
-    return false
-
-  listTreeSync: (rootPath) ->
-    blacklist = (atom.config.get("atom-ctags.fileBlacklist") or "")
-      .split ","
-      .map (s) -> s.trim()
-
-    opt = {matchBase: true}
-    paths = []
-
-    onPath = (filePath) =>
-      if @FileBlacklisted(blacklist, filePath, opt)
-        return false
-      paths.push(filePath)
-      return true
-
-    onDirectory = (dirPath) =>
-      return not @FileBlacklisted(blacklist, dirPath, opt)
-
-    fs.traverseTreeSync(rootPath, onPath, onDirectory)
-    return paths
-
-  rebuild: ->
-
-    list = @listTreeSync(atom.project.getPath())
-    @generateTags(f) for f in list
-
-  getScopeName: -> atom.workspace.getActiveEditor()?.getGrammar()?.scopeName
-
   getTagLine: (tag) ->
-    return unless tag.pattern
     file = atom.project.resolve(tag.file)
-    return unless fs.isFileSync(file)
+    if not fs.isFileSync(file)
+      console.error "[atom-ctags:getTagLine] @#{tag.file}@ not exist?"
+      return
+
     debug = []
     for line, index in fs.readFileSync(file, 'utf8').split('\n')
       if line.indexOf(tag.pattern) == 0
-        return new Point(index, 0)
+        tag.position.row = index
+        return true
+
+    console.error "[atom-ctags:getTagLine] @#{tag.pattern}@ not find in @#{tag.file}@?"
+    return true
 
-  generateTags:(filePath, callback) ->
-    new TagGenerator(filePath, @getScopeName()).generate().done (matches) =>
-      tags = []
-      for match in matches
-        match.position = @getTagLine(match)
-        if match.position
-          tags.push(match)
+  generateTags:(path, callback) ->
+    delete @cachedTags[path]
 
-      @cachedTags[filePath] = tags
-      if callback
-        callback(tags)
+    scopeName = atom.workspace.getActiveEditor()?.getGrammar()?.scopeName
+    new TagGenerator(path, scopeName).generate().done (tags) =>
+      ret = [] if callback
+      for tag in tags
+        if @getTagLine(tag)
+            ret.push tag if callback
+          data = @cachedTags[tag.file]
+          if not data
+            data = []
+            @cachedTags[tag.file] = data
+          data.push tag
+
+      callback?(ret)
 
   getOrCreateTags: (filePath, callback) ->
     tags = @cachedTags[filePath]
-    if tags
-      if callback
-        callback(tags)
-      return
-    generateTags(filePath, callback)
+    return callback?(tags) if tags
+    @generateTags(filePath, callback)

lib/ctags-provider.coffee

@@ -1,11 +1,12 @@
 
 module.exports =
 ProviderClass: (Provider, Suggestion, ctagsCache)  ->
-  options = { partialMatch: true }
+  #maxItems = autocomplete-plus:SimpleSelectListView.maxItems
+  options = { partialMatch: true, maxItems: 10 }
   basepath = atom.project.getPath()+"/"
+
   class CtagsProvider extends Provider
     buildSuggestions: ->
-      console.error("buildSuggestions")
 
       selection = @editor.getSelection()
       prefix = @prefixOfSelection selection

lib/symbols-view.coffee

@@ -1,11 +1,8 @@
-path = require 'path'
 {$$, SelectListView} = require 'atom'
 fs = require 'fs-plus'
 
 module.exports =
 class SymbolsView extends SelectListView
-  @activate: ->
-    new SymbolsView
 
   initialize: (@stack) ->
     super
@@ -15,8 +12,6 @@ class SymbolsView extends SelectListView
     @cancel()
     @remove()
 
-  getFilterKey: -> 'name'
-
   viewForItem: ({position, name, file}) ->
     $$ ->
       @li class: 'two-lines', =>
@@ -55,12 +50,11 @@ class SymbolsView extends SelectListView
 
     @stack.push(previous)
 
-  moveToPosition: (position, beginningOfLine=true) ->
+  moveToPosition: (position) ->
     editorView = atom.workspaceView.getActiveView()
     if editor = editorView.getEditor?()
       editorView.scrollToBufferPosition(position, center: true)
       editor.setCursorBufferPosition(position)
-      editor.moveCursorToFirstCharacterOfLine() if beginningOfLine
 
   attach: ->
     @storeFocusedElement()

lib/tag-generator.coffee

@@ -1,6 +1,7 @@
 {BufferedProcess, Point} = require 'atom'
 Q = require 'q'
 path = require 'path'
+{Point} = require "atom"
 
 module.exports =
 class TagGenerator
@@ -21,9 +22,9 @@ class TagGenerator
         tag.pattern = pattern.match(/^\/\^(.*)(\/;")/)?[1]
 
       if tag.pattern
-        tag.pattern = tag.pattern.replace(/\\\\/g, "\\")
-        tag.pattern = tag.pattern.replace(/\\\//g, "/")
-
+        tag.position = new Point(0, tag.pattern.indexOf(tag.name))
+      else
+        return null
       return tag
     else
       return null
@@ -64,15 +65,37 @@ class TagGenerator
       if language = @getLanguage()
         args.push("--language-force=#{language}")
 
-    args.push('-f', '-', @path)
+    args.push('-R', '-f', '-', @path)
 
     stdout = (lines) =>
-      for line in lines.split('\n')
+      lines = lines.replace(/\\\\/g, "\\")
+      lines = lines.replace(/\\\//g, "/")
+
+      lines = lines.split('\n')
+      if lines[lines.length-1] == ""
+        lines.pop()
+
+      for line in lines
         tag = @parseTagLine(line)
-        tags.push(tag) if tag
+        if tag
+          tags.push(tag)
+        else
+          console.error """
+          [atom-ctags:TagGenerator] please create a new issue:
+             failed to parseTagLine, @#{line}@
+             command: @#{command} #{args.join(' ')}@
+          """
+    stderr = (lines) =>
+      alert """
+      [atom-ctags:TagGenerator]
+       please create a new issue:
+         failed to excute command: @#{command} #{args.join(' ')}@
+         lines: @#{lines}@
+      """
+
     exit = ->
       deferred.resolve(tags)
 
-    new BufferedProcess({command, args, stdout, exit})
+    new BufferedProcess({command, args, stdout, stderr, exit})
 
     deferred.promise