@@ -7,6 +7,7 @@ <key>command</key> <string>#!/usr/bin/env ruby require ENV['TM_BUNDLE_SUPPORT'] + "/lib/easyopen/next_bookmark" +next_bookmark </string> <key>input</key> <string>none</string> Commands/next_bookmark.tmCommand @@ -16,10 +16,10 @@ selected = bookmarks.select{ |node| node[:file] == file and node[:line] == line } if (selected.empty?) - bookmarks.insert(0, { :file=>file, :line=>line }) + bookmarks.insert(0, {:file=>file, :line=>line}) puts "add bookmark" else - bookmarks.delete_if {|node| + bookmarks.delete_if { |node| node[:file] == file and node[:line] == line } puts "remove bookmark" Support/lib/easyopen/add_remove_bookmark.rb @@ -2,25 +2,34 @@ require File.dirname(__FILE__) + '/ui' require File.dirname(__FILE__) + '/config' require File.dirname(__FILE__) + '/repository' -file = ENV['TM_FILEPATH'] -line = ENV['TM_LINE_NUMBER'] - -bookmarks = EasyOpen::BookmarkRepository.load - -bookmark = bookmarks.shift -bookmarks << bookmark -if (file == bookmark[:file] and line == bookmark[:line]) - bookmark = bookmarks.shift - bookmarks << bookmark +def next_bookmark + bookmarks = EasyOpen::BookmarkRepository.load + exit_if_bookmarks_is_empty bookmarks + bookmarks = rotate_bookmarks(bookmarks) + EasyOpen::BookmarkRepository.save bookmarks + include EasyOpen::UI + go_to(bookmarks.last) end +def exit_if_bookmarks_is_empty bookmarks + if bookmarks.empty? + puts "bookmarks is empty" + exit + end +end -EasyOpen::BookmarkRepository.save bookmarks +def rotate_bookmarks(bookmarks) -unless bookmark - puts "bookmark is nil" - exit + # TODO case "not found bookmark[:file]" + # TODO case "found bookmark[:file], but not found bookmark[:line]" + file = ENV['TM_FILEPATH'] + line = ENV['TM_LINE_NUMBER'] + bookmark = bookmarks.shift + bookmarks << bookmark + if (file == bookmark[:file] and line == bookmark[:line]) + bookmark = bookmarks.shift + bookmarks << bookmark + end + return bookmarks end -include EasyOpen::UI -go_to(bookmark) \ No newline at end of file Support/lib/easyopen/next_bookmark.rb 2207ae8cc151a2ac3ea9b8d7718bef1ac6beafb6 haru01 ienaga@ienaga-no-macbook.local http://github.com/haru01/easy-open-tmbundle/commit/5d9febda9b3ef693c692a6708674bb0ba3b6788c 5d9febda9b3ef693c692a6708674bb0ba3b6788c 2009-03-22T02:14:41-07:00 2009-03-22T02:14:41-07:00 refactoring next_bookmark cf2e4338e5713aa2df33d3fa65033ff4dcdec36a haru01 ienaga@ienaga-no-macbook.local