plugins/edit_view/lib/wrapper.rb @@ -6,6 +6,9 @@ New features, enhancements: * Fuzzy file finder notices new files and runs MUCH faster. * Undo close tab (Ctrl+Shift+T) + * Type " or ( or [ etc to wrap selection in pair. + * Warm startup 3 times faster. + * Added Incremental Search menu item. * Now prompts to save if file is modified when closed. * HtmlTab now uses Webkit instead of Mozilla * Convert case commands CHANGES @@ -1,4 +1,5 @@ +require 'monitor' require 'gtk2' module Gtk lib/gtk.rb @@ -31,15 +31,17 @@ module Redcar dialog.destroy case response when Gtk::Dialog::RESPONSE_OK - if tab.filename - tab.save - close_tab + if @tab.filename + if @tab.save + close_tab + end else Redcar::Dialog.save_as(win) do |filename| if filename - tab.filename = filename - tab.save - close_tab + @tab.filename = filename + if @tab.save + close_tab + end end end end @@ -57,7 +59,8 @@ module Redcar end def execute - if tab.is_a?(Redcar::EditTab) and tab.modified? + @tab ||= tab + if @tab.is_a?(Redcar::EditTab) and @tab.modified? prompt_then_close else close_tab plugins/core/commands/close_tab.rb @@ -38,6 +38,7 @@ module Redcar Command.load Keymap.load Bundle.load + Zerenity::Base.no_main_loop = true plugin.transition(FreeBASE::LOADED) end plugins/core/lib/core.rb @@ -125,6 +125,41 @@ module Redcar @dir + "/info.plist" end + def self.best_preference(scope, setting_name) + @preference_lookup_cache ||= {} + hierarchy_names = scope.hierarchy_names(true) + if setting_lookup = @preference_lookup_cache[setting_name] + if setting = setting_lookup[hierarchy_names] + return setting + elsif setting = setting_lookup[nil] + return setting + end + end + best_match, best_setting = nil, nil + Bundle.bundles.each do |bundle| + bundle.preferences.each do |_, preference| + if setting = preference['settings'][setting_name] + if scope_selector = preference["scope"] + if match = Gtk::Mate::Matcher.get_match(scope_selector, hierarchy_names) + if best_match == nil or + Gtk::Mate::Matcher.compare_match(scope_selector, best_match, match) > 1 + best_match = match + best_setting = setting + end + end + else + if best_match == nil + best_match = match + best_setting = setting + end + end + end + end + end + @preference_lookup_cache[setting_name] ||= {} + @preference_lookup_cache[setting_name][scope] = best_setting + end + # A hash of all Bundle preferences. def preferences @preferences ||= load_preferences plugins/core/lib/core/bundles.rb @@ -29,8 +29,9 @@ module Redcar def self.make_gtk_menuitem_hbox(c, keybinding) child = c.child c.remove(child) - hbox = Gtk::HBox.new - child.set_size_request(200, 0) + hbox = Gtk::HBox.new(false, 10) + size = child.size_request + child.set_size_request([size[0], 150].max, size[1]) hbox.pack_start(child, false) accel = keybinding.to_s l = Gtk::Label.new(accel) @@ -320,7 +321,7 @@ module Redcar def connect_item_signal(command, gtk_menuitem) gtk_menuitem.signal_connect("activate") do begin - if command.bundle + if command.is_a?(ShellCommand) and command.bundle command.new(command.bundle).do else command.new.do plugins/core/lib/core/menu.rb @@ -7,6 +7,10 @@ module Redcar attr_accessor(:tm_uuid, :bundle, :shell_script, :name, :key, :range, :scope, :input_type, :fallback_input_type, :output_type, :menu, :menu_item) + + def initialize(bundle) + @bundle = bundle + end def range=(val) @range = val @@ -19,8 +23,8 @@ module Redcar end def new(bundle=nil) - @bundle = bundle - Instance.new(self, bundle) + @bundle = bundle if bundle + Instance.new(self, @bundle) end def get(iv) plugins/core/lib/core/shell_command.rb @@ -1,4 +1,3 @@ - module Redcar class Speedbar include FreeBASE::DataBusHelper @@ -141,7 +140,7 @@ module Redcar def add_toggle(name, text, key) toggle = Gtk::CheckButton.new(text) add_key(key) { toggle.active = !toggle.active? } if key - @value[name] = fn { toggle.active } + @value[name] = fn { toggle.active? } pack_start(toggle, false) @focus_widget ||= toggle end @@ -162,11 +161,21 @@ module Redcar def add_button(text, icon, key, block=nil, &blk) raise "Two blocks given to Speedbar#add_button" if block and blk - label = Gtk::HBox.new - label.pack_start(i=Gtk::Icon.get_image(icon, Gtk::IconSize::MENU)) if icon - label.pack_start(l=Gtk::Label.new(text)) if text b = Gtk::Button.new + if key + normalized_key = Keymap.normalize(key) + add_key(normalized_key) { b.activate } + end b.relief = Gtk::RELIEF_NONE + label = Gtk::HBox.new + label.pack_start(i=Gtk::Icon.get_image(icon, Gtk::IconSize::MENU)) if icon + if text + if normalized_key + text += " (" + normalized_key + ")" + l = Gtk::Label.new(text) + label.pack_start(l) + end + end b.child = label b.signal_connect("clicked") do if block @@ -175,7 +184,6 @@ module Redcar blk.call(@spbar) end end - add_key(Keymap.normalize(key)) { b.activate } if key pack_start(b, false) @focus_widget ||= b end plugins/core/lib/core/speedbar.rb @@ -1,4 +1,3 @@ - module Redcar class Find < Redcar::EditTabCommand key "Super+F" @@ -8,8 +7,9 @@ module Redcar class FindSpeedbar < Redcar::Speedbar label "Find:" textbox :query_string + toggle :wrap, "Wrap?", "Ctrl+Space" button "Go", nil, "Return" do |sb| - FindNextRegex.new(Regexp.new(sb.query_string)).do + FindNextRegex.new(Regexp.new(sb.query_string), sb.wrap).do end end plugins/edit_tab/commands/find_next.rb @@ -1,11 +1,12 @@ module Redcar class FindNextRegex < Redcar::EditTabCommand - def initialize(re) + def initialize(re, wrap=nil) @re = re + @wrap = wrap end def to_s - "#{self.class}: @re=#{@re.inspect}" + "<#{self.class}: @re:#{@re.inspect} wrap:#{!!@wrap}>" end def execute @@ -34,6 +35,10 @@ module Redcar tab.view.scroll_mark_onscreen(doc.cursor_mark) end end + if !doc.get_line(line_num) and @wrap + doc.cursor = 0 + execute + end end end end plugins/edit_tab/commands/find_next_regex.rb @@ -4,7 +4,46 @@ module Redcar def execute if doc.selection? + #convert selection to lowercase doc.replace_selection((doc.selection).downcase) + else + #convert current word to lowercase + low = high = 0 + line_cursor = doc.cursor_line_offset + doc_cursor = doc.cursor_offset + + line_start = doc.line_start(doc.cursor_line).line_index + line_end = doc.line_end1(doc.cursor_line).line_index + line_start_offset = line_cursor - line_start + line_end_offset = line_end - line_cursor + + doc_line_start = doc_cursor - line_start_offset + doc_line_end = doc_cursor + line_end_offset + + doc_cursor.downto(doc_line_start){|i| + doc.select(i, i+1) + if (doc.selection == ' ' && i != doc_cursor) + low = i+1 + break + elsif(i == doc_line_start) + low = doc_line_start + break + end + } + + doc_cursor.upto(doc_line_end){|i| + doc.select(i-1, i) + if (doc.selection == ' ' && i != doc_cursor) + high = i-1 + break + elsif (i == doc_line_end) + high = doc_line_end + break + end + } + doc.select(low,high) + doc.replace_selection((doc.selection).downcase) + doc.select(doc_cursor,doc_cursor) end end end plugins/edit_tab/commands/to_lowercase.rb @@ -4,10 +4,22 @@ module Redcar def execute if doc.selection? + #convert current selection to titlecase curr_sel = doc.selection conv = String.new() curr_sel.each(' '){|word| conv += word.capitalize} doc.replace_selection(conv) + else + #convert current line to titlecase + n = doc.cursor_line + c = doc.cursor_offset + doc.select(doc.iter(doc.line_start(n)), + doc.iter(doc.line_end(n))) + curr_sel = doc.selection + conv = String.new() + curr_sel.each(' '){|word| conv += word.capitalize} + doc.replace_selection(conv) + doc.cursor = c end end end plugins/edit_tab/commands/to_titlecase.rb @@ -4,7 +4,47 @@ module Redcar def execute if doc.selection? + #convert selection to uppercase doc.replace_selection((doc.selection).upcase) + else + #convert current word to uppercase + low = high = 0 + + line_cursor = doc.cursor_line_offset + doc_cursor = doc.cursor_offset + + line_start = doc.line_start(doc.cursor_line).line_index + line_end = doc.line_end1(doc.cursor_line).line_index + line_start_offset = line_cursor - line_start + line_end_offset = line_end - line_cursor + + doc_line_start = doc_cursor - line_start_offset + doc_line_end = doc_cursor + line_end_offset + + doc_cursor.downto(doc_line_start){|i| + doc.select(i, i+1) + if (doc.selection == ' ' && i != doc_cursor) + low = i+1 + break + elsif(i == doc_line_start) + low = doc_line_start + break + end + } + + doc_cursor.upto(doc_line_end){|i| + doc.select(i-1, i) + if (doc.selection == ' ' && i != doc_cursor) + high = i-1 + break + elsif (i == doc_line_end) + high = doc_line_end + break + end + } + doc.select(low,high) + doc.replace_selection((doc.selection).upcase) + doc.select(doc_cursor,doc_cursor) end end end plugins/edit_tab/commands/to_uppercase.rb @@ -65,12 +65,24 @@ Feature: Edit Text And I press "Ctrl+U" Then I should see "SOME TEXT" in the EditTab + Scenario: Convert current word to uppercase + When I type "Some Text" + And I press "Ctrl+A" + And I press "Ctrl+U" + Then I should see "<c>SOME Text" in the EditTab + Scenario: Convert selected text to lowercase When I type "Some Text" And I press "Ctrl+Shift+L" And I press "Ctrl+Shift+U" Then I should see "some text" in the EditTab + Scenario: Convert current word to lowercase + When I type "Some Text" + And I press "Ctrl+E" + And I press "Ctrl+Shift+U" + Then I should see "Some text<c>" in the EditTab + Scenario: Convert selected uppercase text to titlecase When I type "SOME TEXT" And I press "Ctrl+Shift+L" @@ -82,4 +94,9 @@ Feature: Edit Text And I press "Ctrl+Shift+L" And I press "Ctrl+Alt+U" Then I should see "Some Text" in the EditTab + + Scenario: Convert current line to titlecase + When I type "some text" + And I press "Ctrl+Alt+U" + Then I should see "Some Text" in the EditTab plugins/edit_tab/features/editing.feature @@ -32,6 +32,12 @@ Feature: Create, Open and Save files And I save the EditTab Then the label of the EditTab should say "file1.rb" + Scenario: Undoing all the way removes * from the label + Given I have opened the file "plugins/edit_tab/features/fixtures/file1.rb" + When I type "a" + And I press "Ctrl+Z" + Then the label of the EditTab should say "file1.rb" + Scenario: Change a file and save it changes the file on disk Given I have opened the file "plugins/edit_tab/features/fixtures/file1.rb" When I type "changed " @@ -89,8 +95,9 @@ Feature: Create, Open and Save files And I press "Ctrl+Shift+T" Then there should be two EditTabs open - - - - - + Scenario: Save a file you do not have permission to modify + Given I do not have permission to write to "/etc/X11/xorg.conf" + When I open the file "/etc/X11/xorg.conf" + And I type "Haha changes can't get saved" + And I press "Ctrl+S" + Then I should see "don't have permission" in a dialog plugins/edit_tab/features/files.feature @@ -7,18 +7,44 @@ Feature: Search through a document And I have typed "astral_queen1\nastral_queen2\n" And I have pressed "Page_Up" - Scenario: Search forward + Scenario: Find forward + When I press "Super+F" + And I type "queen" + And I press "Return" + Then I should see "<s>queen<c>1" in the EditTab + + Scenario: Find forward twice + When I press "Super+F" + And I type "queen" + And I press "Return" then "Return" + Then I should see "<s>queen<c>2" in the EditTab + + Scenario: Find forward many times + When I press "Super+F" + And I type "queen" + And I press "Return" then "Return" + And I press "Return" then "Return" + Then I should see "<s>queen<c>2" in the EditTab + + Scenario: Wrap around + When I press "Super+F" + And I type "queen" + And I press "Ctrl+Space" then "Return" + And I press "Return" then "Return" + Then I should see "<s>queen<c>1" in the EditTab + + Scenario: Incremental Search forward When I press "Super+S" And I type "queen" Then I should see "<s>queen<c>1" in the EditTab - Scenario: Search forward again + Scenario: Incremental Search forward again When I press "Super+S" And I type "queen" And I press "Super+S" Then I should see "<s>queen<c>2" in the EditTab - Scenario: Search backward + Scenario: Incremental Search backward When I press "Super+S" And I type "queen" And I press "Super+S" plugins/edit_tab/features/search.feature @@ -1,14 +1,12 @@ -# When /^I (?:open|have opened) the file #{FeaturesHelper::STRING_RE}$/ do |filename| -# When "I press \"Ctrl+O\"" -# When "I set the \"Open\" dialog's filename to \"#{filename}\"" -# When "I click the button \"Open\" in the dialog \"Open\"" -# end - Given /^I (?:open|have opened) the file #{FeaturesHelper::STRING_RE}$/ do |filename| Redcar::OpenTabCommand.new(filename).do end +Given /^I do not have permission to write to #{FeaturesHelper::STRING_RE}$/ do |filename| + File.writable?(filename).should be_false +end + When /^I save the EditTab$/ do When "I press \"Ctrl+S\"" end plugins/edit_tab/features/step_definitions/file_steps.rb @@ -1,12 +1,29 @@ Feature: Type " or ( to wrap selection with parentheses - Background: + Scenario: Type " to wrap selection Given there is an EditTab open + When I type "Ah" + And I press "Shift+Left" then "Shift+Left" + And I press "\"" + Then I should see "\"Ah\"<c>" in the EditTab - Scenario: Type " to wrap selection + Scenario: Type ( to wrap selection + Given there is an EditTab open When I type "Ah" And I press "Shift+Left" then "Shift+Left" - Then I should see "<c>Ah<s>" in the EditTab + And I press "(" + Then I should see "(Ah)<c>" in the EditTab - Scenario: T - When I type "asdf" + Scenario: Type < should do nothing in Plain Text mode + Given there is an EditTab open + When I type "Ah" + And I press "Shift+Left" then "Shift+Left" + And I press "<" + Then I should see "<<c>" in the EditTab + + Scenario: Type < should do everything in HTML mode + Given there is an EditTab open with syntax "HTML" + When I type "Ah" + And I press "Shift+Left" then "Shift+Left" + And I press "<" + Then I should see "<Ah><c>" in the EditTab plugins/edit_tab/features/wrap_with_brackets.feature @@ -199,8 +199,10 @@ module Redcar (!File.exists?(@filename) and File.writable?(File.dirname(@filename))) File.open(@filename, "w") {|f| f.puts document.text} self.modified = false + true else - Zerenity::Error(:text => "You don't have the permissions to write to this file.") + Zerenity::Error(:text => "You don't have permission to write to this file.") + false end end end plugins/edit_tab/tabs/edit_tab.rb @@ -50,7 +50,7 @@ class Redcar::EditView def quit_cycling @i = 0 - puts "quitting cycling" + # puts "quitting cycling" statemachine.state = :no_completion_state end plugins/edit_view/lib/autocompleter/completion_state_machine.rb @@ -128,7 +128,7 @@ class Redcar::EditView # as the new text could change them. (ex: HTML incomplete.illegal. # tag) @buffer.signal_connect("insert_text") do |_, iter, text, length| - if cursor_scope = @buffer.cursor_scope + if not @buffer.selection? and cursor_scope = @buffer.cursor_scope current_scope = cursor_scope.hierarchy_names(true) # Type over ends if @rules = AutoPairer.autopair_rules_for_scope(current_scope) plugins/edit_view/lib/autopairer.rb @@ -5,13 +5,13 @@ module Redcar def initialize(options={}) super() - set_gtk_cursor_colour self.buffer = Document.new self.modify_font(Pango::FontDescription.new(Redcar::Preference.get("Appearance/Tab Font"))) h = self.signal_connect_after("expose-event") do |_, ev| if ev.window == self.window if self.buffer.parser self.set_theme_by_name(Redcar::Preference.get("Appearance/Tab Theme")) + set_gtk_cursor_colour self.signal_handler_disconnect(h) end end @@ -34,15 +34,19 @@ module Redcar create_autopairer create_snippet_inserter create_autocompleter + create_wrapper end def set_gtk_cursor_colour - Gtk::RC.parse_string(<<-EOR) - style "green-cursor" { - GtkTextView::cursor-color = "grey" - } - class "GtkWidget" style "green-cursor" - EOR + # p :setting_colour + # self.modify_cursor(Gdk::Color.parse('#FF0000'), Gdk::Color.parse('#0000FF')) + # self.modify_fg(Gtk::STATE_NORMAL, Gdk::Color.parse('#FF0000')) + # Gtk::RC.parse_string(<<-EOR) + # style "green-cursor" { + # GtkTextView::cursor-color = "grey" + # } + # class "GtkWidget" style "green-cursor" + # EOR end def setup_bookmark_assets @@ -99,6 +103,10 @@ module Redcar @autocompleter = AutoCompleter.new(buffer) end + def create_wrapper + @wrapper = Wrapper.new(self) + end + def indent_line(line_num) @indenter.indent_line(line_num) end plugins/edit_view/lib/edit_view.rb @@ -52,6 +52,9 @@ After do while dialog = Gtk::Dialog._cucumber_running_dialogs.pop dialog.close end + while dialog = Zerenity::Base.open_dialogs.pop + dialog.destroy + end Redcar.win.tabs.each(&:close) Redcar::UnifyAll.new.do Redcar::CommandHistory.clear plugins/redcar/features/env.rb @@ -26,7 +26,8 @@ module Redcar item "Copy", Copy item "Paste", Paste separator - item "Find", Find + item "Find", Find + item "Incremental Search", AskIncrementalSearch submenu "Move" do item "Forward Character", ForwardCharacterCommand item "Backward Character", BackwardCharacterCommand plugins/redcar/redcar.rb b495f3616c064edc379269847c272748f54a55bb Daniel Lucraft dan@fluentradical.com http://github.com/danlucraft/redcar/commit/338202f35314643677b981cae5722bf047b782ca 338202f35314643677b981cae5722bf047b782ca 2009-05-29T05:55:22-07:00 2009-05-29T05:50:01-07:00 Restored code from bad merge 649b17e6aeb6f504207aee22291d0cc9d21764f5 Daniel Lucraft dan@fluentradical.com