arcadia 0.7.0 → 0.8.0

data/ext/ae-breakpoints/ae-breakpoints.rb

@@ -365,4 +365,4 @@ class Breakpoints < ArcadiaExt
   end
   
   
-end
+end

data/ext/ae-dir-projects/ae-dir-projects.rb

@@ -2,11 +2,11 @@
 #   ae-dir-projects.rb - Arcadia Ruby ide
 #   by Antonio Galeone <antonio-galeone@rubyforge.org>
 #
-#   §require_dir_ref=../..
-#   §require_omissis=conf/arcadia.init
-#   §require_omissis=lib/a-commons
-#   §require_omissis=lib/a-tkcommons
-#   §require_omissis=lib/a-core
+#   &require_dir_ref=../..
+#   &require_omissis=conf/arcadia.init
+#   &require_omissis=lib/a-commons
+#   &require_omissis=lib/a-tkcommons
+#   &require_omissis=lib/a-core
 
 
 
@@ -102,14 +102,14 @@ class DirProjects < ArcadiaExt
           _sync_val = @sync
           @sync = false
           begin
-  	        Arcadia.process_event(OpenBufferTransientEvent.new(self,'file'=>node2file(_selected)))
-  	      ensure
+  	         Arcadia.process_event(OpenBufferTransientEvent.new(self,'file'=>node2file(_selected)))
+  	       ensure
             @sync = _sync_val
-  	      end
-        elsif !_selected.nil? && @htree.open?(_selected)
-          @htree.close_tree(_selected)
-        elsif !_selected.nil?
-          @htree.open_tree(_selected,false) 
+  	       end
+#        elsif !_selected.nil? && @htree.open?(node2file(_selected))
+#          @htree.close_tree(node2file(_selected))
+#        elsif !_selected.nil?
+#          @htree.open_tree(node2file(_selected),false) 
         end
       else
         shure_delete_node(_selected)
@@ -170,16 +170,29 @@ class DirProjects < ArcadiaExt
     _wrapper.show_v_scroll
     _wrapper.show_h_scroll
     self.pop_up_menu_tree
-    @image_kdir = TkPhotoImage.new('dat' => BOOK_GIF)
+    @image_kdir = TkPhotoImage.new('dat' => ICON_FOLDER_OPEN_GIF)
     @image_kdir_closed = TkPhotoImage.new('dat' => FOLDER_GIF)
-    @image_kfile_rb = TkPhotoImage.new('dat' => RUBY_DOCUMENT_GIF)
-    @image_kfile = TkPhotoImage.new('dat' => DOCUMENT_GIF)
 	  self.load_projects
-    @htree.areabind_append('KeyPress'){|e| key_press(e[1])}
+    @htree.areabind_append('KeyPress',proc{|k| 
+        key_press(k)
+    },"%K")
+
+    do_double_click = proc{
+        _selected = @htree.selection_get[0]
+        if File.ftype(node2file(_selected)) == 'directory'
+          if !_selected.nil? && @htree.open?(node2file(_selected))
+            @htree.close_tree(node2file(_selected))
+          elsif !_selected.nil?
+            @htree.open_tree(node2file(_selected),false) 
+          end
+        end
+    }
+    
+    @htree.textbind_append('Double-1',do_double_click)
 	end
 	
-	def key_press(_e)
-      case _e.keysym
+	def key_press(_keysym)
+      case _keysym
         when 'F5'
         _selected = self.selected
         do_refresh(_selected)
@@ -199,7 +212,7 @@ class DirProjects < ArcadiaExt
   end
 
   def file2node(_file)
-    if _file.include?("\s")
+    if _file.include?("\s") && _file[0..0]!='{'
       return "{#{_file}}"
     else
       return _file
@@ -297,7 +310,6 @@ class DirProjects < ArcadiaExt
       :hidemargin => false,
       :command=> proc{
         _selected = self.selected
-        p _selected
         if _selected
           do_new_folder(_selected)
         end
@@ -362,6 +374,47 @@ class DirProjects < ArcadiaExt
     )
     
     
+    #-----------------
+    #----- search submenu
+    sub_ref_search = TkMenu.new(
+      :parent=>@pop_up,
+      :tearoff=>0,
+      :title => 'Ref'
+    )
+    sub_ref_search.configure(Arcadia.style('menu'))
+    sub_ref_search.insert('end',
+      :command,
+      :label=>'Find in files...',
+      :hidemargin => false,
+      :command=> proc{
+        _target = self.selected
+        if _target
+          _target = File.dirname(_target) if File.ftype(_target) == 'file'
+          Arcadia.process_event(SearchInFilesEvent.new(self,'dir'=>_target))
+        end
+      }
+    )
+    
+    sub_ref_search.insert('end',
+      :command,
+      :label=>'Act in files...',
+      :hidemargin => false,
+      :command=> proc{
+        _target = self.selected
+        if _target
+          _target = File.dirname(_target) if File.ftype(_target) == 'file'
+          Arcadia.process_event(AckInFilesEvent.new(self,'dir'=>_target))
+        end
+      }
+    )
+    @pop_up_tree.insert('end',
+      :cascade,
+      :label=>'Search from here',
+      :menu=>sub_ref_search,
+      :hidemargin => false
+    )
+    
+    
     #-----------------
     
     @pop_up_tree.insert('end',
@@ -412,21 +465,28 @@ class DirProjects < ArcadiaExt
   end
 
   def selected
-    if @htree.selection_get[0].length >0
-     	_selected = ""
-      @htree.selection_get[0].each{|_block|
-        _selected = _selected + _block.to_s + "\s" 
-      }
-      _selected = _selected.strip
-    else
-      _selected = @htree.selection_get[0]
+    if @htree.selection_get[0]
+      if @htree.selection_get[0].length >0
+       	_selected = ""
+        if String.method_defined?(:lines)
+      	   selection_lines = @htree.selection_get[0].lines
+        else
+      	   selection_lines = @htree.selection_get[0].split("\n")
+        end
+        selection_lines.each{|_block|
+          _selected = _selected + _block.to_s + "\s" 
+        }
+        _selected = _selected.strip
+      else
+        _selected = @htree.selection_get[0]
+      end
     end
     return _selected
   end
 
   def do_new_project(_parent_folder_node=nil)
     if _parent_folder_node.nil?
-      _parent_folder_node=Tk.chooseDirectory 
+      _parent_folder_node=Tk.chooseDirectory 'initialdir' =>  MonitorLastUsedDir.get_last_dir
     end
     if _parent_folder_node && File.exists?(node2file(_parent_folder_node)) && File.ftype(node2file(_parent_folder_node)) == 'directory'
       tmp_node_name = "#{node2file(_parent_folder_node)}#{File::SEPARATOR}_new_project_"
@@ -444,7 +504,7 @@ class DirProjects < ArcadiaExt
         ensure
           @htree.delete(file2node(tmp_node_name))
         end
-        return _ret
+        _ret
       }
 #      @htree.textbind('KeyPress', proc{|e| 
 #      p 'pippo'})
@@ -455,13 +515,13 @@ class DirProjects < ArcadiaExt
   
   def do_open_project(_proj_name=nil)
     if _proj_name.nil?
-      _proj_name=Tk.chooseDirectory 
+      _proj_name=Tk.chooseDirectory 'initialdir' =>  MonitorLastUsedDir.get_last_dir
       add_project(_proj_name) if _proj_name && File.exists?(_proj_name)
     end
   end
 
   def do_close_project(_proj_name)
-    if _proj_name 
+    if _proj_name && is_project?(_proj_name)
       del_project(_proj_name)
     end
   end
@@ -484,7 +544,7 @@ class DirProjects < ArcadiaExt
           @htree.delete(file2node(tmp_node_name))
           shure_select_node(new_dir_name)
         end
-        return _ret
+        _ret
       }
       @htree.edit(tmp_node_name, tmp_node_name.split(File::SEPARATOR)[-1], _verify_cmd, 1)
     end
@@ -508,7 +568,7 @@ class DirProjects < ArcadiaExt
         ensure
           @htree.delete(file2node(tmp_node_name))
         end
-        return _ret
+        _ret
       }
       @htree.edit(tmp_node_name, tmp_node_name.split(File::SEPARATOR)[-1], _verify_cmd, 1)
     end
@@ -604,12 +664,16 @@ class DirProjects < ArcadiaExt
           shure_delete_node(_source)
           do_refresh(source_dir)
         end
-        return _ret
+        _ret
       }
       @htree.edit(_source, _source.split(File::SEPARATOR)[-1], _verify_cmd, 1)
     end
   end
 
+  def is_project?(_node)
+    @htree.exist?(_node) && @htree.parent(_node)=='root'
+  end
+
   def do_delete(_node, _interactive = true)
     if File.exists?(node2file(_node)) 
       type = File.ftype(node2file(_node))
@@ -624,7 +688,7 @@ class DirProjects < ArcadiaExt
           entries = Dir.entries(node2file(_node))
           entries.delete('.')
           entries.delete('..')
-          is_project = @htree.exist?(_node) && @htree.parent(_node)=='root'
+          #is_project = @htree.exist?(_node) && @htree.parent(_node)=='root'
           if entries.length > 0
             _msg2 = "#{_node} isn't empty. Shure to delete all sub entries ?"
             entries.each{|en|
@@ -641,7 +705,7 @@ class DirProjects < ArcadiaExt
           else
             Dir.delete(node2file(_node))
           end
-          if  is_project && delete_node
+          if  is_project?(_node) && delete_node
             delete_node = false
             del_project(_node)
           end
@@ -703,8 +767,8 @@ class DirProjects < ArcadiaExt
   end
 
   def add_project(_dir)
-    add_node('root', _dir, "project")
     @projects[_dir] = Project.new(_dir)
+    add_node('root', _dir, "project")
     add_project_to_file(_dir) 
   end
 
@@ -713,7 +777,7 @@ class DirProjects < ArcadiaExt
       _sc = @htree.cget('selectcommand')
       begin
         @htree.configure('selectcommand'=>nil)
-        @htree.delete(_node)
+        @htree.delete(file2node(_node))
       ensure
         @htree.configure('selectcommand'=>_sc)
       end
@@ -834,7 +898,7 @@ class DirProjects < ArcadiaExt
         path = File::SEPARATOR
       end
       path = path + steps[j]
-      if @htree.exist?(path)
+      if @htree.exist?(path) 
         @htree.open_tree(path, false)
       end
       j=j+1
@@ -869,12 +933,16 @@ class DirProjects < ArcadiaExt
         return @image_kdir
       elsif _kind == 'project'
         return @image_kdir_closed
-      elsif _kind == 'file' && _label.include?('.rb')
-        return @image_kfile_rb
-      else
-        return @image_kfile
+      elsif _kind == 'file'
+        return Arcadia.file_icon(_label)
       end
+
+#      elsif _kind == 'file' && _label.include?('.rb')
+#        return @image_kfile_rb
+#      else
+#        return @image_kfile
+#      end
   end
 
 
-end
+end

data/ext/ae-editor/ae-editor.conf

@@ -2,10 +2,14 @@ name=editor
 frames=0.1,0.2
 frames.labels=Editor,Outline
 frames.names=editor,editor_outline
+# attention : editor_outline name is used in code. Do no change it
 active=yes
 require=ext/ae-editor/ae-editor
 class=AgMultiEditor
-
+#gems=coderay
+gems=coderay,rdp-rbeautify
+gems.rdp-rbeautify.repository=http://gems.github.com
+gems.rdp-rbeautify.events=PrettifyTextEvent
 tabs=0.5c left
 # to use tab key set tab-replace-width-space=0
 tab-replace-width-space=2
@@ -131,4 +135,4 @@ explorer_panel.tabs.side=top
 
 #:::::::::::::::: Editor group    ::::::::::::::::::::::<end>
 popup.bind.shortcut=Button-3
-arm::popup.bind.shortcut=F4
+arm::popup.bind.shortcut=F4

data/ext/ae-editor/ae-editor.rb

@@ -2,13 +2,13 @@
 #   ae-editor.rb - Arcadia Ruby ide
 #   by Antonio Galeone <antonio-galeone@rubyforge.org>
 #
-#   §require_dir_ref=../..
-#   §require_omissis=conf/arcadia.init
+#   &require_dir_ref=../..
+#   &require_omissis=conf/arcadia.init
 
 require 'tk'
 require 'tktext'
 require 'lib/a-tkcommons'
-#require 'lib/a-commons'
+#require 'lib/a-commons' 
 require 'lib/a-core'
 
 class TreeNode
@@ -183,6 +183,19 @@ class SourceStructure
     return _found_node
   end
   
+  def deep_node_by_line(_from_node, _line, _found_node=nil)
+    _begin = _from_node.rif.to_i
+    _end = _from_node.rif_end.to_i
+    if _line.to_i <= _end && _line.to_i >= _begin
+      _found_node = _from_node
+    end
+    _sons = _from_node.sons
+    for inode in 0.._sons.length - 1
+      _son = _sons[inode]
+      _found_node = deep_node_by_line(_son, _line, _found_node)
+    end
+    return _found_node
+  end
   
   def class_node_by_line(_line)
     line_node = node_by_line(@root, _line)
@@ -254,7 +267,7 @@ class SafeCompleteCode
     if _dec_line.include?('.new')
       pre, post = _dec_line.split('.new')
       dec_line_processed = "#{pre}.new"
-      post.strip!
+      post.strip! if post
       if post && post[0..0]=='('
         k=0
         ch = '('
@@ -290,10 +303,13 @@ class SafeCompleteCode
 
   def refresh_words
     @words.clear
-    _re = /[\s\t\n]#{@filter}[a-zA-Z0-9\-_]*/
+    _re = /[\s\t\n"'(\[\{=><]#{@filter}[a-zA-Z0-9\-_]*/
     m = _re.match(@source)
     while m && (_txt=m.post_match)
       can = m[0].strip
+      if  ['"','(','[','{',"'",'=','>','<'].include?(can[0..0])
+        can = can[1..-1]
+      end
       @words << can if can != @filter
       m = _re.match(_txt)
     end
@@ -334,18 +350,18 @@ class SafeCompleteCode
     @modified_source = "#{@modified_source}Dir.chdir('#{File.dirname(@file)}')\n" if @file
     @modified_row = @modified_row+1
     source_array.each_with_index{|line,j|
-      # 0) se è un commento non lo prendo in considerazione
+      # 0) if a comment I do not consider it
       if line.strip.length > 0 && line.strip[0..0]=='#'
         @modified_row = @modified_row-1
-        m = /§require_dir_ref=[\s]*(.)*/.match(line)
+        m = /&require_dir_ref=[\s]*(.)*/.match(line)
         if m 
-          require_dir_ref=line.split('§require_dir_ref=')[1].strip
+          require_dir_ref=line.split('&require_dir_ref=')[1].strip
           @modified_source = "#{@modified_source}Dir.chdir('#{require_dir_ref}')\n"
           @modified_row = @modified_row+1
         end   
-        m = /§require_omissis=[\s]*(.)*/.match(line)
+        m = /&require_omissis=[\s]*(.)*/.match(line)
         if m 
-          require_omissis=line.split('§require_omissis=')[1].strip
+          require_omissis=line.split('&require_omissis=')[1].strip
           @modified_source = "#{@modified_source}require '#{require_omissis}'\n"
           @modified_row = @modified_row+1
         end   
@@ -439,7 +455,7 @@ class SafeCompleteCode
           @modified_row = @modified_row+1+ss_len
         end
     end
-    if @filter.strip.length > 0
+    if @filter.strip.length > 0 && !is_dot?
 #        refresh_words(source_array)
         refresh_words
     end
@@ -472,18 +488,19 @@ class SafeCompleteCode
   def candidates(_show_error = false)
     temp_file = create_modified_temp_file(@file)
 		begin
-      _cmp_s = "|ruby '#{temp_file}'"
+		 Arcadia.is_windows??ruby='rubyw':ruby='ruby'
+      _cmp_s = "|#{ruby} '#{temp_file}'"
       _ret = nil
       open(_cmp_s,"r") do
         |f|
         _ret = f.readlines.collect!{| line | 
           #line.chomp
-          line
+          line.strip
         } 
       end
-      if @filter.strip.length > 0
+      if @filter.strip.length > 0 && !is_dot?
         @words.each{|w| 
-          if !_ret.include?(w) # && w[0..@filter.length-1] == @filter 
+          if !(_ret.include?(w) || _ret.include?("##{w}")) 
             _ret << w
           end
         }
@@ -608,80 +625,133 @@ class TkTextListBox < TkScrollText
 
 end
 
-
-class AgEditor
-  include Configurable
-  attr_accessor :file
-  attr_reader :read_only 
-  attr_reader :page_frame
-  attr_reader :text, :root
-  def initialize(_controller, _page_frame)
+class AgEditorOutlineToolbar
+  attr_accessor :sync
+  def initialize(_frame, _controller)
     @controller = _controller
-    @page_frame = _page_frame
-    @set_mod = false
-    @modified_from_opening=false
-#    @font = @controller.conf('font')
-#    @font_bold = @controller.conf('font.bold')
-    @font = Arcadia.conf('edit.font')
-    @font_bold = "#{Arcadia.conf('edit.font')} bold"
-    @font_metrics = TkFont.new(@font).metrics
-    @font_metrics_bold = TkFont.new(@font_bold).metrics
-    @highlighting = false
-    @classbrowsing = false
-    @find = @controller.get_find
-    @read_only=false
-    @loading=false
+    @cb_sync = TkCheckButton.new(_frame, Arcadia.style('checkbox')){
+      text  'Sync'
+      justify  'left'
+      indicatoron 0
+      offrelief 'raised'
+      image TkPhotoImage.new('dat' => SYNCICON20_GIF)
+      place('x' => 0,'y' => 0,'height' => 26)
+    }
+    Tk::BWidget::DynamicHelp::add(@cb_sync, 
+      'text'=>'Link open editors with content in the Navigator')
+
+    do_check = proc {
+      if @cb_sync.cget('onvalue')==@cb_sync.cget('variable').value.to_i
+        sync_on
+      else
+        sync_off
+      end
+    }
+    @sync = false
+    @cb_sync.command(do_check)
   end
-  
-#  def hide_exp
-#    @fm.hide_left if @fm
-#  end
-  
-#  def is_exp_hide?
-#    if @fm.nil?
-#      return true
-#    else
-#      @fm.is_left_hide?
-#    end
-#  end
 
-  def modified_from_opening?
-    @modified_from_opening
+  def sync_on
+    @sync = true
+    e = @controller.raised
+    if e
+      e.outline.select_without_event(e.outline.last_row) if e.outline.last_row
+    end
   end
-  
-  def xy_insert
-    _index_now = @text.index('insert')
-    _rx, _ry, _widht, _heigth = @text.bbox(_index_now);
-    _x = _rx + TkWinfo.rootx(@text)  
-    _y = _ry + TkWinfo.rooty(@text)  + @font_metrics[2][1]
-    _xroot = _x - TkWinfo.rootx(Arcadia.instance.layout.root)  
-    _yroot = _y - TkWinfo.rooty(Arcadia.instance.layout.root)  
-    return _xroot, _yroot
+
+  def sync_off
+    @sync = false
+  end
+
+  def is_sync_on?
+    @sync
+  end
+
+end
+
+class AgEditorOutline
+  attr_reader :last_row
+  attr_reader :tree_exp
+  def initialize(_editor, _frame, _bar)
+    @editor = _editor
+    @frame = _frame
+    @bar = _bar
+    initialize_tree(_frame)
+  end
+
+  def update_row(_row=0)
+    @last_row=_row
+    if @bar.is_sync_on?
+      select_without_event(_row)
+    end
   end
   
-  
+  # I think this is "if synced expand out the outline for the current selection"
+  def shure_select_node(_node)
+    return if @selecting_node
+    #return if @tree_exp.exist?(_node.rif)
+    @selecting_node = true
+    _proc = @tree_exp.selectcommand
+    @tree_exp.selectcommand(nil)
+    begin
+      @tree_exp.selection_clear
+      @tree_exp.selection_add(_node.rif)
+      @opened = false
+      to_open = @last_open_node
+      parent = _node.parent
+      while !parent.nil? && parent.rif != 'root'
+        @tree_exp.open_tree(parent.rif, false)
+        @opened = to_open==parent.rif || @opened
+        @last_open_node=parent.rif
+        parent = parent.parent
+      end
+
+      @tree_exp.close_tree(to_open) if to_open && !@opened
+
+      @tree_exp.see(_node.rif)
+    ensure
+      @tree_exp.selectcommand(_proc)
+      @selecting_node = false
+    end
+  end
+
+  def select_without_event(_line)
+    if @ss
+      _node=@ss.deep_node_by_line(@ss.root, _line)
+      if _node && @tree_exp.exist?(_node.rif) && _node.rif!='root'
+        shure_select_node(_node)
+      end
+    end
+  end
+
   def initialize_tree(_frame)
-    @classbrowsing = @is_ruby
     _tree_goto = proc{|_self|
-      _line = _self.selection_get[0]
-      _index =_line.to_s+'.0'
-      _hinner_text = @tree_exp.itemcget(_line,'text').strip
-      _editor_line = @text.get(_index, _index+ '  lineend')
-      if !_editor_line.include?(_hinner_text)
-        Arcadia.console(self, 'msg'=>"... rebuild tree \n")
-        if @tree_thread && @tree_thread.alive?
-          @tree_thread.exit
-        end
-        @tree_thread = Thread.new{
-          build_tree(_line)
-          Tk.update
-        }
+      sync_val = @bar.sync
+      @bar.sync=false
+      begin
         _line = _self.selection_get[0]
         _index =_line.to_s+'.0'
+        _hinner_text = @tree_exp.itemcget(_line,'text').strip
+        _editor_line = @editor.text.get(_index, _index+ '  lineend')
+        if !_editor_line.include?(_hinner_text)
+          Arcadia.console(self, 'msg'=>"... rebuild tree \n")
+          if @tree_thread && @tree_thread.alive?
+            @tree_thread.exit # kill the old tree
+          end
+          @tree_thread = Thread.new{
+            build_tree(_line)
+            Tk.update
+          }
+          _line = _self.selection_get[0]
+          _index =_line.to_s+'.0'
+        end
+        @editor.text.set_focus
+        @editor.text.see(_index)
+        @editor.text.tag_remove('selected','1.0','end')
+        @editor.text.tag_add('selected',_line.to_s+'.0',(_line+1).to_s+'.0')
+      ensure
+        @bar.sync = sync_val
       end
-      @text.see(_index)
-      @text.tag_remove('selected','1.0','end')
-      @text.tag_add('selected',_line.to_s+'.0',(_line+1).to_s+'.0')
     }
     @tree_exp = Tk::BWidget::Tree.new(_frame, Arcadia.style('treepanel')){
       showlines false
@@ -690,12 +760,87 @@ class AgEditor
       selectcommand proc{ _tree_goto.call(self) } 
     }
     @tree_scroll_wrapper = TkScrollWidget.new(@tree_exp)
-    @tree_scroll_wrapper.show
+    self.show
     @tree_scroll_wrapper.show_v_scroll
     @tree_scroll_wrapper.show_h_scroll
     pop_up_menu_tree
   end
 
+  def destroy
+    @tree_scroll_wrapper.destroy
+    @tree_exp.destroy
+  end
+  
+  def show
+    @tree_scroll_wrapper.show(0,26)
+    Tk.update
+  end
+
+  def hide
+    @tree_scroll_wrapper.hide
+  end
+
+  def build_tree_from_node(_node, _label_match=nil)
+    @image_kclass = TkPhotoImage.new('dat' => TREE_NODE_CLASS_GIF)
+    @image_kmodule =  TkPhotoImage.new('dat' => TREE_NODE_MODULE_GIF)
+    @image_kdef =  TkPhotoImage.new('dat' => TREE_NODE_DEF_GIF)
+    @image_kdefclass =  TkPhotoImage.new('dat' => TREE_NODE_DEFCLASS_GIF)
+    
+    _sorted_sons = _node.sons.sort
+    for inode in 0.._sorted_sons.length - 1
+      _son = _sorted_sons[inode]
+      if _son.kind == 'KClass'
+          _image = @image_kclass
+      elsif _son.kind == 'KModule'
+          _image = @image_kmodule
+      elsif _son.kind == 'KDef'
+          _image = @image_kdef
+      elsif _son.kind == 'KDefClass'
+          _image = @image_kdefclass
+      end
+      @tree_exp.insert('end', _son.parent.rif ,_son.rif, {
+        'text' =>  _son.label ,
+        'helptext' => _son.helptext,
+        #'font'=>$arcadia['conf']['editor.explorer_panel.tree.font'],
+        'image'=> _image
+      }.update(Arcadia.style('treeitem'))
+      )
+      if (_label_match) && (_label_match.strip == _son.label.strip)
+        @selected = _son
+      end
+      build_tree_from_node(_son, _label_match) # recursion -- if there are no sons it will do nothing
+    end
+  end
+
+  def build_tree(_sel=nil)
+    #Arcadia.console(self,"msg"=>"build for #{@file}")
+    if _sel
+      _label_sel = @tree_exp.itemcget(_sel,'text')
+    end
+    
+    #clear tree
+    begin
+      @tree_exp.delete(@tree_exp.nodes('root'))
+    rescue Exception
+      # workaround on windows
+      @tree_exp.delete(@tree_exp.nodes('root'))
+    end
+    
+    
+    #(re)build tree
+    _txt = @editor.text.get('1.0','end')
+    #@root = build_tree_from_source(_txt)
+    @ss = SourceStructure.new(_txt)
+    #@root = @ss.root
+    @selected = nil
+    build_tree_from_node(@ss.root, _label_sel)
+    if @selected
+      @tree_exp.selection_add(@selected.rif)
+      @tree_exp.open_tree(@selected.parent.rif)
+      @tree_exp.see(@selected.rif)
+    end
+  end
+  
   def pop_up_menu_tree
     @pop_up_tree = TkMenu.new(
       :parent=>@tree_exp,
@@ -717,7 +862,48 @@ class AgEditor
       },
     "%x %y")
   end
+  
+end
 
+class AgEditor
+  attr_accessor :file
+  attr_reader :read_only 
+  attr_reader :page_frame
+  attr_reader :text, :root
+  attr_reader :outline
+  attr_reader :highlighting
+  def initialize(_controller, _page_frame)
+    @controller = _controller
+    @page_frame = _page_frame
+    @set_mod = false
+    @modified_from_opening=false
+    @font = Arcadia.conf('edit.font')
+    @font_bold = "#{Arcadia.conf('edit.font')} bold"
+    @font_metrics = TkFont.new(@font).metrics
+    @font_metrics_bold = TkFont.new(@font_bold).metrics
+    @highlighting = false
+    @classbrowsing = false
+    @find = @controller.get_find
+    @read_only=false
+    @loading=false
+    @tabs_show = false
+    @spaces_show = false
+  end
+  
+  def modified_from_opening?
+    @modified_from_opening
+  end
+  
+  def xy_insert
+    _index_now = @text.index('insert')
+    _rx, _ry, _widht, _heigth = @text.bbox(_index_now);
+    _x = _rx + TkWinfo.rootx(@text)  
+    _y = _ry + TkWinfo.rooty(@text)  + @font_metrics[2][1]
+    _xroot = _x - TkWinfo.rootx(Arcadia.instance.layout.root)  
+    _yroot = _y - TkWinfo.rooty(Arcadia.instance.layout.root)  
+    return _xroot, _yroot
+  end
+  
 
   def initialize_text(_frame)
     @text = TkScrollText.new(_frame, Arcadia.style('text')){|j|
@@ -733,6 +919,14 @@ class AgEditor
       tabs $arcadia['conf']['editor.tabs']
     }
 
+    class << @text
+      def tag_adds(tag, *args)
+        tk_send_without_enc('tag', 'add', _get_eval_enc_str(tag), 
+                            *args.flatten)
+        self
+      end
+    end
+
     #do_tag_configure_global('debug')
     @text.tag_configure('eval','foreground' => 'yellow', 'background' =>'red','borderwidth'=>1, 'relief'=>'raised')
     @text.tag_configure('errline','borderwidth'=>1, 'relief'=>'groove')
@@ -749,7 +943,11 @@ class AgEditor
     if @file
       _file = @file+'~~'
     else
-      _file = File.join(Arcadia.instance.local_dir,'buffer~~')
+      n=0
+      while File.exist?(File.join(Arcadia.instance.local_dir,"buffer#{n}~~"))
+        n+=1
+      end
+      _file = File.join(Arcadia.instance.local_dir,"buffer#{n}~~")
     end
     f = File.new(_file, "w")
     begin
@@ -1125,6 +1323,9 @@ class AgEditor
 
   end
   
+  #
+  # setup all key bindings (normal, +control, etc)
+  #
   def activate_key_binding
     activate_complete_code_key_binding if @is_ruby
     @text.bind_append("Control-KeyPress"){|e|
@@ -1133,20 +1334,25 @@ class AgEditor
 #        @do_complete = true
 #        complete_code.call
       when 'z'
-        _b = @text.index('insert').split('.')[0].to_i
-        @text.edit_undo
-        _e = @text.index('insert').split('.')[0].to_i
+        #_b = @text.index('insert').split('.')[0].to_i
+        begin
+          @text.edit_undo
+        rescue RuntimeError => e
+          throw e unless e.to_s.include? "nothing to undo" # this is ok--we've done undo back to the beginning
+          break
+        end
+        #_e = @text.index('insert').split('.')[0].to_i
         if @highlighting
-          for j in _b..._e
-            rehighlightline(j)
-          end
+          _b = @text.index('@0,0').split('.')[0].to_i
+          _e = @text.index('@0,'+TkWinfo.height(@text).to_s).split('.')[0].to_i + 1
+          rehighlightlines(_b,_e)
         end
         break
       when 'o'  
         if @file
           _dir = File.dirname(@file)
         else
-          _dir = Dir.pwd
+          _dir = MonitorLastUsedDir.get_last_dir
         end
         Arcadia.process_event(OpenBufferEvent.new(self,'file'=>Tk.getOpenFile('initialdir'=>_dir)))
         break
@@ -1161,9 +1367,10 @@ class AgEditor
         @text.text_paste
         _e = @text.index('insert').split('.')[0].to_i
         if @highlighting
-          for j in _b..._e
-            rehighlightline(j)
-          end
+          rehighlightlines(_b,_e)
+#          for j in _b..._e
+#            rehighlightline(j)
+#          end
         end
         break
       end
@@ -1176,6 +1383,12 @@ class AgEditor
         @text.insert('insert',"{")
       when 'plus'
         @text.insert('insert',"}")
+      when 'g'
+        Arcadia.process_event(GoToLineBufferEvent.new(self))
+      when 'n'
+        $arcadia['main.action.new_file'] # necessary? Is there an event for this?
+      when 'w'
+        Arcadia.process_event(CloseCurrentTabEvent.new(self))
       end
     }
 
@@ -1222,9 +1435,11 @@ class AgEditor
           else
             @text.insert(_row.to_s+'.0',"#")
           end
-          rehighlightline(_row) if @highlighting
+          #rehighlightline(_row) if @highlighting
         end
-
+        rehighlightlines(_row_begin, _row_end) if @highlighting
+      when 'F'
+        Arcadia.process_event(AckInFilesEvent.new(self))
       end
     }
     
@@ -1235,11 +1450,13 @@ class AgEditor
       when 'BackSpace'
         _index = @text.index('insert')
         _row, _col = _index.split('.')
-        rehighlightline(_row.to_i) if @highlighting
+        rehighlightlines(_row.to_i,_row.to_i) if @highlighting
+  #      rehighlightline(_row.to_i) if @highlighting
       when 'Delete'
         _index = @text.index('insert')
         _row, _col = _index.split('.')
-        rehighlightline(_row.to_i) if @highlighting
+        rehighlightlines(_row.to_i, _row.to_i) if @highlighting
+  #      rehighlightline(_row.to_i) if @highlighting
       when 'F5'
         run_buffer
       when 'F3'
@@ -1278,16 +1495,11 @@ class AgEditor
 
     @text.bind_append("KeyRelease"){|e|
       case e.keysym
-#        when 'period'
-#          @do_complete = true
-#          #Thread.new do
-#            complete_code.call
-#          #end
-        when 'Control_L','Return', 'Control_V', 'BackSpace', 'Delete'
-          do_line_update
-      end
-      case e.keysym
-      when 'Return'
+      when 'Up','Down'
+          refresh_outline
+      when 'Left', 'Right'
+      
+      when 'Return' #,'Control_L', 'Control_V', 'BackSpace', 'Delete'
         _index = @text.index('insert')
         _row, _col = _index.split('.')
         _txt = @text.get((_row.to_i-1).to_s+'.0',_index)
@@ -1305,8 +1517,13 @@ class AgEditor
           do_line_update
         end
       else 
+        if ['Control_L', 'Control_V', 'BackSpace', 'Delete'].include?(e.keysym)
+          do_line_update
+        end
         if @highlighting && /\w/.match(e.keysym)
-          rehighlightline(@text.index('insert').split('.')[0].to_i)
+    #      rehighlightline(@text.index('insert').split('.')[0].to_i)
+          row = @text.index('insert').split('.')[0].to_i
+          rehighlightlines(row, row)
         end
       end
       check_modify
@@ -1339,6 +1556,7 @@ class AgEditor
     }
   end
 
+  # show the "find in file" dialog
   def find
     _r = @text.tag_ranges('sel')
     if _r.length>0
@@ -1362,27 +1580,41 @@ class AgEditor
 
   end
   
+  def do_enter
+    check_file_last_access_time
+  end
+  
   def initialize_text_binding
     @text.add_yscrollcommand(proc{|first,last| self.do_line_update()})
     
     @text.tag_bind('selected', 'Enter', proc{@text.tag_remove('selected','1.0','end')})
 
-    @text.bind("Enter", proc{check_file_last_access_time})
+    @text.bind("Enter", proc{do_enter})
 
     @text.bind("<Modified>"){|e|
       check_modify
     }
     activate_key_binding
-    @text.bind_append("1",proc{Arcadia.process_event(InputEnterEvent.new(self,'receiver'=>@text))})
+    @text.bind_append("1"){
+      Arcadia.process_event(InputEnterEvent.new(self,'receiver'=>@text))
+      refresh_outline
+    }
+  end
+
+  def refresh_outline
+    if @outline
+      Tk.after(1,proc{ @outline.update_row(self.row)})
+    end
   end
 
   def run_buffer
     if !@file
       _file = create_temp_file
       begin
-        Arcadia.process_event(RunRubyFileEvent.new(self, 'file'=>_file, 'persistent'=>false))
+        _event = Arcadia.process_event(RunRubyFileEvent.new(self, 'file'=>_file, 'persistent'=>false))
       ensure
-        File.delete(_file) if File.exist?(_file)
+        _event.add_finalize_callback(proc{File.delete(_file) if File.exist?(_file)})
+       # File.delete(_file) if File.exist?(_file)
       end
     else
       save if !@read_only
@@ -1546,19 +1778,40 @@ class AgEditor
 
   def reset_highlight
     @is_line_bold.clear
-    @is_tag_bold.clear
-    @highlight_zone.clear
+    @highlight_zone.clear if @highlighting
     @last_line_begin=0
     @last_line_end=0
     @last_zone_begin=0
     @last_zone_end=0
   end
+  
+  def change_highlight(_ext)
+    new_highlight_scanner = @controller.highlight_scanner(_ext)
+    if new_highlight_scanner != @highlight_scanner
+      @highlight_scanner.classes.each{|c|
+        @text.tag_remove(c,'1.0', 'end')
+        @text.tag_delete(c)
+        @is_tag_bold.delete(c)
+      }
+      @highlight_scanner = new_highlight_scanner
+      reset_highlight
+      if @highlight_scanner
+        @highlight_scanner.classes.each{|c|
+          do_tag_configure(c)
+        }
+        @highlighting = true
+      else
+        @highlighting = false
+      end
+    end
+  end
 
-  def initialize_highlight
+  def initialize_highlight(_ext)
+    @highlight_scanner = @controller.highlight_scanner(_ext)
     @is_line_bold = Hash.new
     @is_tag_bold = Hash.new
     do_tag_configure_global('debug')
-    if @lang_hash.nil?
+    if @lang_hash.nil? || @highlight_scanner.nil?
       @highlighting = false
       return
     end
@@ -1570,19 +1823,8 @@ class AgEditor
     @last_line_end = 0
     @last_zone_begin=0;
     @last_zone_end=0;
-    #@is_line_bold = Hash.new
-    #@is_tag_bold = Hash.new
-    @h_classes = @lang_hash['classes'].split(',')
-    @h_re = Hash.new
-    @op_to_end_line = Array.new
-    @op_to_end_line.concat(@lang_hash['re_op.to_line_end'].split(',')) if @lang_hash['re_op.to_line_end']
-
-    @op_only_first = Array.new
-    @op_only_first.concat(@lang_hash['re_op.only_first'].split(',')) if @lang_hash['re_op.only_first']
-    
-    @h_classes.each{|c|
+    @highlight_scanner.classes.each{|c|
       do_tag_configure(c)
-      @h_re[c]=Regexp::new(@lang_hash["re.#{c}"].strip) if @lang_hash["re.#{c}"]
     }
 
     ['sel','selected','tabs','spaces'].each{|_name|
@@ -1596,23 +1838,23 @@ class AgEditor
 
   def do_tag_configure(_name)
     h = Hash.new
-    if @lang_hash['hightlight.'+_name+'.foreground']
-      h['foreground']=@lang_hash['hightlight.'+_name+'.foreground']
+    if @lang_hash["#{@lang_hash['scanner']}.hightlight."+_name+'.foreground']
+      h['foreground']=@lang_hash["#{@lang_hash['scanner']}.hightlight."+_name+'.foreground']
     end
-    if @lang_hash['hightlight.'+_name+'.background']
-      h['background']=@lang_hash['hightlight.'+_name+'.background']
+    if @lang_hash["#{@lang_hash['scanner']}.hightlight."+_name+'.background']
+      h['background']=@lang_hash["#{@lang_hash['scanner']}.hightlight."+_name+'.background']
     end
-    if @lang_hash['hightlight.'+_name+'.style']== 'bold'
+    if @lang_hash["#{@lang_hash['scanner']}.hightlight."+_name+'.style']== 'bold'
       h['font']=@font_bold
       @is_tag_bold[_name]= true
     else
       @is_tag_bold[_name]= false
     end
-    if @lang_hash['hightlight.'+_name+'.relief']
-      h['relief']=@lang_hash['hightlight.'+_name+'.relief']
+    if @lang_hash["#{@lang_hash['scanner']}.hightlight."+_name+'.relief']
+      h['relief']=@lang_hash["#{@lang_hash['scanner']}.hightlight."+_name+'.relief']
     end
-    if @lang_hash['hightlight.'+_name+'.borderwidth']
-      h['borderwidth']=@lang_hash['hightlight.'+_name+'.borderwidth']
+    if @lang_hash["#{@lang_hash['scanner']}.hightlight."+_name+'.borderwidth']
+      h['borderwidth']=@lang_hash["#{@lang_hash['scanner']}.hightlight."+_name+'.borderwidth']
     end
     @text.tag_configure(_name, h)
   end
@@ -1763,8 +2005,8 @@ class AgEditor
       :command,
       :label=>'Data image from file',
       :hidemargin => false,
-      :command=> proc{
-        file = Tk.getOpenFile
+      :command=>       proc{
+        file = Arcadia.open_file_dialog
         if file
           require 'base64'
           f = File.open(file,"rb")
@@ -1990,154 +2232,9 @@ class AgEditor
     @text.tag_add('selected',_index +' linestart', _index +' +1 lines linestart')
   end
 
-
-#  def build_tree_from_source(_source)
-#    _row = 1
-#    _liv = 0
-#    _livs = Array.new
-#    root = TreeNode.new(nil, 'KRoot'){|_node|
-#      _node.rif= 'root'
-#      _node.label=''
-#    }
-#    _livs[_liv]=root
-#    _source.each_line{|line|
-#      line = "\s"+line.split("#")[0]+"\s"
-#      m = /[\s\n\t\;]+(module|class|def|if|unless|begin|case|for|while|do)[\s\n\t\;]+/.match(line)
-#      if m
-#        index = m.post_match.strip.length - 1
-#        if m.post_match.strip[index,index]=='{'
-#          _row = _row +1
-#          next
-#        end
-#        _liv>=0? _liv = _liv + 1:_liv=1
-#        _pliv = _liv
-#        _parent = nil
-#        while (_parent == nil && _pliv>=0)
-#          _pliv = _pliv -1
-#          _parent = _livs[_pliv]
-#        end
-#        if _parent
-#          _helptext = m.post_match.strip
-#          _label = _helptext.split('<')[0]
-#          if _label == nil || _label.strip.length==0
-#            _label = _helptext
-#          end
-#          if (m[0].strip[0..4] == "class" && m.pre_match.strip.length==0)
-#            _kind = 'KClass'
-#          elsif (m[0].strip[0..4] == "class" && m.pre_match.strip.length>0)
-#            _row = _row +1
-#            _liv = _liv - 1
-#            next
-#          elsif (m[0].strip[0..5] == "module" && m.pre_match.strip.length==0)
-#            _kind = 'KModule'
-#          elsif (m[0].strip[0..5] == "module" && m.pre_match.strip.length>0)
-#            _row = _row +1
-#            _liv = _liv - 1
-#            next
-#          elsif ((m[0].strip[0..4] == "begin")||(m[0].strip[0..3] == "case") ||(m[0].strip[0..4] == "while") || (m[0].strip[0..2] == "for") || (m[0].strip[0..1] == "do") || ((m[0].strip[0..1] == "if" || m[0].strip[0..5] == "unless") && m.pre_match.strip.length==0))
-#            _row = _row +1
-#            next
-#          elsif ((m[0].strip[0..1] == "if" || m[0].strip[0..5] == "unless") && m.pre_match.strip.length>0)
-#            _row = _row +1
-#            _liv = _liv - 1
-#            next
-#          elsif (m[0].strip[0..2] == "def" && m.pre_match.strip.length==0)
-#            _kind = 'KDef'
-#            if _label.include?(_parent.label + '.')
-#              _kind = 'KDefClass'
-#            end
-# #          elsif (m[0].strip[0..10] == "attr_reader" && m.pre_match.strip.length==0)
-# #            _kind = 'KAttr_reader'
-# #            _liv = _liv - 1
-# #            _row = _row +1
-#          end
-#
-#          TreeNode.new(_parent, _kind){|_node|
-#            _node.label = _label
-#            _node.helptext = _helptext
-#            _node.rif = _row.to_s
-#            _livs[_pliv + 1]=_node
-#          }
-#        else
-#          _row = _row +1
-#          _liv = _liv - 1
-#          next
-#        end
-#      end
-#      m_end = /[\s\n\t\;]+end[\s\n\t\;]+/.match(line)
-#      if m_end
-#        _liv = _liv - 1
-#      end
-#      _row = _row +1
-#    }
-#    return root
-#  end
-
-  def build_tree_from_node(_node, _label_match=nil)
-    
-    @image_kclass = TkPhotoImage.new('dat' => TREE_NODE_CLASS_GIF)
-    @image_kmodule =  TkPhotoImage.new('dat' => TREE_NODE_MODULE_GIF)
-    @image_kdef =  TkPhotoImage.new('dat' => TREE_NODE_DEF_GIF)
-    @image_kdefclass =  TkPhotoImage.new('dat' => TREE_NODE_DEFCLASS_GIF)
-    
-    _sorted_sons = _node.sons.sort
-    for inode in 0.._sorted_sons.length - 1
-      _son = _sorted_sons[inode]
-      if _son.kind == 'KClass'
-          _image = @image_kclass
-      elsif _son.kind == 'KModule'
-          _image = @image_kmodule
-      elsif _son.kind == 'KDef'
-          _image = @image_kdef
-      elsif _son.kind == 'KDefClass'
-          _image = @image_kdefclass
-      end
-      @tree_exp.insert('end', _son.parent.rif ,_son.rif, {
-        'text' =>  _son.label ,
-        'helptext' => _son.helptext,
-        #'font'=>$arcadia['conf']['editor.explorer_panel.tree.font'],
-        'image'=> _image
-      }.update(Arcadia.style('treeitem'))
-      )
-      if (_label_match) && (_label_match.strip == _son.label.strip)
-        @selected = _son
-      end
-      build_tree_from_node(_son, _label_match)
-    end
-  end
-
-  def build_tree(_sel=nil)
-    #Arcadia.console(self,"msg"=>"build for #{@file}")
-    if _sel
-      _label_sel = @tree_exp.itemcget(_sel,'text')
-    end
-    
-    #clear tree
-    begin
-      @tree_exp.delete(@tree_exp.nodes('root'))
-    rescue Exception
-      # workaround on windows
-      @tree_exp.delete(@tree_exp.nodes('root'))
-    end
-    
-    
-    #(re)build tree
-    _txt = @text.get('1.0','end')
-    #@root = build_tree_from_source(_txt)
-    @root = SourceStructure.new(_txt).root
-    
-    @selected = nil
-    build_tree_from_node(@root, _label_sel)
-    if @selected
-      @tree_exp.selection_add(@selected.rif)
-      @tree_exp.open_tree(@selected.parent.rif)
-      @tree_exp.see(@selected.rif)
-    end
-  end
-
-  def insert_popup_menu_item(_where, *args)
-    @pop_up.insert(_where,*args)
-  end
+  def insert_popup_menu_item(_where, *args)
+    @pop_up.insert(_where,*args)
+  end
 
   def text_value
     return @text.value
@@ -2180,85 +2277,94 @@ class AgEditor
     return (_riga.to_i + _gap_row).to_s + '.'+ (_colonna.to_i + _gap_col).to_s
   end
 
-  def find_and_set_tag_ml(_re, _row, _txt, _tag, _tag_rem = nil)
-    m = _re.match(_txt)
-    _offset = 0
-    _s_txt = _txt
-    #_old_txt = ''
-    while m && (_txt=m.post_match)
-      if !defined?(_old_txt) || _txt != _old_txt
+#  def find_and_set_tag_ml(_re, _row, _txt, _tag, _tag_rem = nil)
+#    m = _re.match(_txt)
+#    _offset = 0
+#    _s_txt = _txt
+#    #_old_txt = ''
+#    while m && (_txt=m.post_match)
+#      if !defined?(_old_txt) || _txt != _old_txt
+#
+#        apos =  pos_to_index(_s_txt, _offset+m.begin(0))
+#        _offset = _offset + m.end(0)
+#        
+#        
+#        _old_txt = _txt
+#        _r = _row + apos[0]
+#        _ibegin = _r.to_s+'.'+apos[1].to_s
+#        _iend = _r.to_s+'.'+(apos[1]+m.end(0)-m.begin(0)).to_s
+#        if _tag_rem
+#          _tag_rem.each {|value|
+#            @text.tag_remove(value,_ibegin, _iend)
+#          }
+#        end
+#        @text.tag_add(_tag,_ibegin, _iend)
+#        if @is_tag_bold[_tag]
+#          @is_line_bold[_r]=true
+#        end
+#
+#        if @op_only_first.include?(_tag) && _txt
+#          #eliminino la prima riga a partire dal risultato
+#          _p = _txt.index("\n")+1
+#          if _p
+#              _txt = _txt[_p..-1]
+#              _offset = _offset + _p
+#          else
+#            m = nil
+#          end
+#        end
+#        m = _re.match(_txt)
+#        
+#      else
+#        m = nil
+#      end
+#    end
+#  end
 
-        apos =  pos_to_index(_s_txt, _offset+m.begin(0))
-        _offset = _offset + m.end(0)
-        
-        
-        _old_txt = _txt
-        _r = _row + apos[0]
-        _ibegin = _r.to_s+'.'+apos[1].to_s
-        _iend = _r.to_s+'.'+(apos[1]+m.end(0)-m.begin(0)).to_s
-        if _tag_rem
-          _tag_rem.each {|value|
-            @text.tag_remove(value,_ibegin, _iend)
-          }
-        end
-        @text.tag_add(_tag,_ibegin, _iend)
-        if @is_tag_bold[_tag]
-          @is_line_bold[_r]=true
-        end
 
-        if @op_only_first.include?(_tag) && _txt
-          #eliminino la prima riga a partire dal risultato
-          _p = _txt.index("\n")+1
-          if _p
-              _txt = _txt[_p..-1]
-              _offset = _offset + _p
-          else
-            m = nil
-          end
-        end
-        m = _re.match(_txt)
-        
-      else
-        m = nil
-      end
-    end
-  end
+#  def find_and_set_tag(_re, _row, _txt, _tag, _tag_rem = nil)
+#    m = _re.match(_txt)
+#    _end = 0
+#    if m && @is_tag_bold[_tag]
+#      @is_line_bold[_row]=true
+#    end
+#    #_old_txt = ''
+#    while m && (_txt=m.post_match)
+#      if !defined?(_old_txt) || _txt != _old_txt
+#        _old_txt = _txt 
+#        _ibegin = _row.to_s+'.'+(m.begin(0)+_end).to_s
+#        _end = m.end(0) + _end
+#        _iend = _row.to_s+'.'+(_end.to_s)
+#        if _tag_rem
+#          _tag_rem.each {|value|
+#            @text.tag_remove(value,_ibegin, _iend)
+#          }
+#        end
+#        @text.tag_add(_tag,_ibegin, _iend)
+#        if @op_only_first.include?(_tag)
+#          m = nil
+#        else
+#          m = _re.match(_txt)
+#        end
+#      else
+#        m = nil
+#      end
+#    end
+#  end
 
 
-  def find_and_set_tag(_re, _row, _txt, _tag, _tag_rem = nil)
-    m = _re.match(_txt)
-    _end = 0
-    if m && @is_tag_bold[_tag]
-      @is_line_bold[_row]=true
-    end
-    #_old_txt = ''
-    while m && (_txt=m.post_match)
-      if !defined?(_old_txt) || _txt != _old_txt
-        _old_txt = _txt 
-        _ibegin = _row.to_s+'.'+(m.begin(0)+_end).to_s
-        _end = m.end(0) + _end
-        _iend = _row.to_s+'.'+(_end.to_s)
-        if _tag_rem
-          _tag_rem.each {|value|
-            @text.tag_remove(value,_ibegin, _iend)
-          }
-        end
-        @text.tag_add(_tag,_ibegin, _iend)
-        if @op_only_first.include?(_tag)
-          m = nil
-        else
-          m = _re.match(_txt)
-        end
-      else
-        m = nil
-      end
+  def text_value_lines
+    if String.method_defined?(:lines)
+      return @text.value.lines
+    else
+      return @text.value
     end
   end
 
   def show_spaces
     @spaces_show = true
     _row = 1
-    @text.value.each{|_line|
+    text_value_lines.each{|_line|
       show_chars_line(_row, _line, /[ ^\t]\s*/, 'spaces')
       _row = _row+1
     }
@@ -2268,7 +2374,7 @@ class AgEditor
   def show_tabs
     @tabs_show = true
     _row = 1
-    @text.value.each{|_line|
+    text_value_lines.each{|_line|
       show_chars_line(_row, _line, /\t/, 'tabs')
       _row = _row+1
     }
@@ -2290,7 +2396,7 @@ class AgEditor
 
   def indentation_space_2_tabs(_n_space=2)
     _row = 1
-    @text.value.each{|_line|
+    text_value_lines.each{|_line|
       m = /\s*/.match(_line)
       _end = 0
       if m && m.begin(0)==0
@@ -2310,7 +2416,7 @@ class AgEditor
 
   def indentation_tabs_2_space(_n_space=2)
     _row = 1
-    @text.value.each{|_line|
+    text_value_lines.each{|_line|
       m = /\t*/.match(_line)
       _end = 0
       if m && m.begin(0)==0
@@ -2339,6 +2445,7 @@ class AgEditor
   end
 
 
+  # modify in this instance means the (...) in the tab header of each file
   def modified?
     return !(@buffer === text_value)
   end
@@ -2372,98 +2479,16 @@ class AgEditor
     end
   end
 
-  def highlightlines(_row, _lines, _check_mod = false)
-    if _check_mod 
-      check_modify
-    end
-    _txt = _lines
-    _end = 0
-    
-#    @op_to_end_line.each{|c|
-#      if @h_re[c]
-#        m_c = @h_re[c].match(_txt)
-#        if m_c then
-#          _ibegin = _row.to_s+'.'+(m_c.begin(0)).to_s
-#          _iend = _row.to_s+'.'+(_line.length - 1).to_s
-#          @text.tag_add(c,_ibegin, _iend)
-#          _txt = m_c.pre_match
-#        end
-#      end
-#    } if @lang_hash['re_op.to_line_end']
-
-    arem = Array.new
-    
-      
-    @h_classes.each{|c|
-      if !@op_to_end_line.include?(c) && @h_re[c]
-        find_and_set_tag_ml(@h_re[c], _row, _txt, c, arem)
-        arem << c
-      end
-    } if _txt.strip.length > 0  
 
-    find_and_set_tag_ml(/\t/, _row, _txt, 'tabs', arem) if @tabs_show 
-    find_and_set_tag_ml(/[ ^\t]\s*/, _row, _txt, 'spaces', arem) if @spaces_show 
-  end
-
-
-  def highlightline(_row, _line, _check_mod = false)
-    #p "highlightline #{_row} _line=#{_line}"
-    if _check_mod 
-      check_modify
-    end
-    _txt = _line
-    _end = 0
-    
-    @op_to_end_line.each{|c|
-      if @h_re[c]
-        m_c = @h_re[c].match(_txt)
-        if m_c then
-          _ibegin = _row.to_s+'.'+(m_c.begin(0)).to_s
-          _iend = _row.to_s+'.'+(_line.length - 1).to_s
-          @text.tag_add(c,_ibegin, _iend)
-          #p "tag_add  found #{c}"
-          _txt = m_c.pre_match
-        end
-      end
-    } if @lang_hash['re_op.to_line_end']
-
-    arem = Array.new
-    
-      
-    @h_classes.each{|c|
-      if !@op_to_end_line.include?(c) && @h_re[c]
-        find_and_set_tag(@h_re[c], _row, _txt, c, arem)
-        arem << c
-      end
-    } if _txt.strip.length > 0  
-
-    find_and_set_tag(/\t/, _row, _txt, 'tabs', arem) if @tabs_show 
-    find_and_set_tag(/[ ^\t]\s*/, _row, _txt, 'spaces', arem) if @spaces_show 
-  end
-
-  def rehighlightline(_row)
-    _ibegin = _row.to_s+'.0'
-    _iend = (_row+1).to_s+'.0'
-    #p "rehighlightline _ibegin=#{_ibegin}"
-    #p "rehighlightline _iend=#{_iend}"
-    #p "_line = #{@text.get(_ibegin, _iend)}"
-    @h_classes.each{|c| @text.tag_remove(c,_ibegin, _iend)}
-    _line = @text.get(_ibegin, _iend)
-    highlightline(_row, _line)
-  end
-
-  def rehighlightlines(_row_begin, _row_end)
+  def rehighlightlines(_row_begin, _row_end, _check_mod=false)
     _ibegin = _row_begin.to_s+'.0'
     _iend = (_row_end+1).to_s+'.0'
-    @h_classes.each{|c| @text.tag_remove(c,_ibegin, _iend)}
-    _lines = @text.get(_ibegin, _iend)
-    highlightlines(_row_begin, _lines)
+    @highlight_scanner.classes.each{|c| @text.tag_remove(c,_ibegin, _iend)}
+    highlightlines(_row_begin, _row_end, _check_mod)
   end
 
-
   def row(_index='insert')
     _row = @text.index(_index).split('.')[0].to_i
-    #print "def row(_index='insert')",_row.to_s,"\n"
     return _row
   end
   
@@ -2473,9 +2498,7 @@ class AgEditor
   
   def do_line_update
     #re num in @text_line_num the portion of visibled screen  of @text
-      #Arcadia.console(self, 'msg'=>"do_line_update loading ..")
       return if @loading
-      #Arcadia.console(self, 'msg'=>"do_line_update")
       if @text_line_num
         line_begin_index = @text.index('@0,0')
         line_begin = line_begin_index.split('.')[0].to_i
@@ -2487,7 +2510,7 @@ class AgEditor
           _zone_begin = ((line_begin) / @highlight_zone_length).to_i + 1
           _zone_end = ((line_end) / @highlight_zone_length).to_i + 1
           #Arcadia.new_msg(self, "for lines #{line_begin}..#{line_end} \n
-          _zone_begin=#{_zone_begin} ; _zone_end=#{_zone_end}")
+          #_zone_begin=#{_zone_begin} ; _zone_end=#{_zone_end}")
           (_zone_begin >=@last_zone_begin)?_zone_begin.upto(_zone_end+1){|_zone| 
             highlight_zone(_zone)
           }:_zone_end.downto(_zone_begin-1){|_zone| 
@@ -2498,28 +2521,13 @@ class AgEditor
           @last_zone_begin = _zone_begin
           @last_zone_end = _zone_end
         end
-        
         @text_line_num.delete('1.0','end')
+        
 
         _rx, _ry, _widht, _heigth = @text.bbox(line_begin_index);
-#          _rx2, _ry2, _widht2, _heigth2 = @text.bbox(line_begin_index+" +1 lines");
-#        if _rx2
-#          _coef = _ry2-_ry-_heigth       
-#        end
-#        if _ry < 0 
-#          nline = (line_begin + 1).to_s.rjust(line_end.to_s.length+2)
-#          @text_line_num.tag_configure('start_case', 'spacing1'=>(_heigth+_ry))
-#          @text_line_num.insert('end', "#{nline}\n",'normal_case','start_case')
-#          real_line_begin = line_begin + 2
-#        else
-#          real_line_begin = line_begin
-#        end
         
         if _ry && _ry < 0 
           real_line_end = line_end + 1
-#          x = (_heigth+_ry)/_heigth
-#          @text_line_num.yview_scroll(-(_heigth+_ry),"pixels")
-          
         else
           real_line_end = line_end
         end
@@ -2549,46 +2557,73 @@ class AgEditor
           end
 
           @text_line_num.insert(_index, "#{nline}\n",_tags)
-#          if @highlighting && @is_line_bold[j]
-#            @text_line_num.insert('end', "#{nline}\n",'bold_case')
-#          else
-#            @text_line_num.insert('end', "#{nline}\n",'normal_case')
-#          end
           if b.include?(j.to_s)
             add_tag_breakpoint(j)
-            #add_tag_breakpoint(_index)
-            #p "aggiungo tag break on line #{j} on index ->#{_index}"
-            #add_tag_breakpoint(_index+' -1 lines')
           end
         end
         if _ry && _ry < 0 
-          #Arcadia.console(self, 'msg'=>"scrollo -> #{-(_heigth+_ry)}")
-          #Arcadia.console(self, 'msg'=>"_coef -> #{_coef}")
-
-#          @text_line_num.yview_scroll((_heigth+_ry),"pixels")
-#          @text_line_num.yview_scroll((-_ry+3),"pixels")
-          @text_line_num.yview_scroll(_ry.abs+3,"pixels")
+          @text_line_num.yview_scroll(_ry.abs+2,"pixels")
         end
       end
+      refresh_outline if Tk.focus==@text
+#      if TkWinfo.mapped?(@text_line_num)
+#        x,y,w,h = @text.bbox("#{(line_end).to_s}.3");
+#        @fm1.splitter_frame.go(w,0)
+#        @fm1.do_resize
+#      end
   end
 
-  def highlight_zone_new(_zone)
-    if !@highlight_zone[_zone]
-      _b = @highlight_zone_length*(_zone - 1) 
-      _e = @highlight_zone_length*(_zone) #+ 1
-      rehighlightlines(_b,_e)
-      @highlight_zone[_zone] = true
+  def highlightlines(_row_begin, _row_end, _check_mod = false)
+    if _check_mod 
+      check_modify
+    end
+    #_row_begin = _row_begin+1
+    _ibegin = _row_begin.to_s+'.0'
+    _iend = (_row_end+1).to_s+'.0'
+    @highlight_scanner.classes.each{|c| @text.tag_remove(c,_ibegin, _iend)}
+    _lines = @text.get(_ibegin, _iend)
+    tags_map = @highlight_scanner.highlight_tags(_row_begin,_lines)
+    tags_map.each do |key,value|      
+      to_tag = Array.new
+      value.each{|ite|
+        to_tag.concat(ite)
+        if @is_tag_bold[key.to_s]
+          if ite.length==2
+            row_begin = ite[0].split('.')[0].to_i
+            row_end = ite[1].split('.')[0].to_i
+            for row in row_begin..row_end 
+              @is_line_bold[row]=true
+            end
+          end
+#          ite.each{|p|
+#            row_begin = p[0].split('.')[0].to_i
+#            row_end = p[1].split('.')[0].to_i
+#            for row in row_begin...row_end 
+#              @is_line_bold[row]=true
+#            end
+#          }
+        end
+      }
+      @text.tag_adds(key.to_s,to_tag)
+    end
+    if @tabs_show || @spaces_show
+      if !defined?(@rescanner)
+        if @lang_hash['scanner']!='re'
+          @rescanner = ReHighlightScanner.new(@lang_hash) if !defined?(@rescanner)
+        else
+          @rescanner = @highlight_scanner
+        end
+      end
+      @rescanner.highlight_tags(_row_begin,_lines,['tabs']) if @tabs_show
+      @rescanner.highlight_tags(_row_begin,_lines,['spaces']) if @spaces_show
     end
   end
 
-
   def highlight_zone(_zone, _force_highlight=false)
     if !@highlight_zone[_zone] || _force_highlight
-      _b = @highlight_zone_length*(_zone - 1) 
+      _b = @highlight_zone_length*(_zone - 1) +1
       _e = @highlight_zone_length*(_zone) #+ 1
-      for j in _b..._e
-        rehighlightline(j)
-      end
+      rehighlightlines(_b,_e)
       @highlight_zone[_zone] = true
     end
   end
@@ -2621,7 +2656,8 @@ class AgEditor
           _iend = _row+'.'+(line.length - 1).to_s
           @text.tag_add('comment',_ibegin, _iend)
         else
-          highlightline(_row.to_i, line, false)
+          #highlightline(_row.to_i, line, false)
+          highlightlines(_row.to_i, _row.to_i, false)
         end
       end
       _row = (_row.to_i + 1).to_s
@@ -2634,21 +2670,31 @@ class AgEditor
       @text.edit_reset
     end
   end
-
-  def save
+  
+  
+  def save ignore_read_only = false
     if !@file
       save_as
-    elsif @read_only
-      Arcadia.dialog(self, 
-        'type' => 'ok',
-        'title' =>"#{@file}:read-only", 
-        'msg' =>"The file : #{@file} is read-only!",
-        'level' =>'warning')
+    elsif @read_only && !ignore_read_only
+      r=Arcadia.dialog(self,
+      'type' => 'yes_no_cancel',
+      'title' =>"#{@file}:read-only",
+      'msg' =>"The file : #{@file} is read-only! -- save anyway?",
+      'level' =>'warning')
+      if r=="yes"
+        save true
+      end
     else
-      f = File.new(@file, "w")
+      f = File.new(@file, "wb")
       begin
         if f
-          f.syswrite(text_value)
+	  to_write = text_value
+	  if @dos_line_endings
+	    # we stripped these out, previously...
+	    # for now assume they want them all this way, no mixing and matching...
+	    to_write = to_write.gsub("\n", "\r\n")
+	  end
+          f.syswrite(to_write)
           @buffer = text_value
           reset_modify
         end
@@ -2660,15 +2706,24 @@ class AgEditor
   end
 
   def save_as
-    @file = Tk.getSaveFile("filetypes"=>[["Ruby Files", [".rb", ".rbw"]],["All Files", [".*"]]])
-    @file = nil if @file == ""  # cancelled
-    if @file
+    file = Tk.getSaveFile("filetypes"=>[["Ruby Files", [".rb", ".rbw"]],["All Files", [".*"]]])
+    file = nil if file == ""  # cancelled
+    if file
+      new_file_name(file)
       save
-      @controller.change_file_name(@page_frame, @file)
+      @controller.change_file_name(@page_frame, file)
       #EditorContract.instance.file_created(self, 'file'=>@file)
     end
   end
 
+  def new_file_name(_new_file)
+    @file =_new_file
+    base_name= File.basename(_new_file)
+    if base_name.include?('.')
+      self.change_highlight(base_name.split('.')[-1])
+    end
+  end
+
   def check_modify
     return  if @loading
     if modified? 
@@ -2679,54 +2734,50 @@ class AgEditor
   end
 
   def check_file_last_access_time
-    if @file && @file_last_access_time
-   
-    ftime = File.mtime(@file)
-      if @file_last_access_time != ftime
-        msg = 'File "'+@file+'" is changed! Reload?'
+    if @file
+      file_exist = File.exist?(@file)
+      if @file_last_access_time && file_exist
+        ftime = File.mtime(@file)
+        if @file_last_access_time != ftime
+          msg = 'File "'+@file+'" is changed! Reload?'
           if Tk.messageBox('icon' => 'error', 'type' => 'yesno',
             'title' => '(Arcadia) Libs', 'parent' => @text,
             'message' => msg) == 'yes'
-            @text.delete('1.0','end')
-            reset_highlight if @highlighting
-            load_file(@file)
+            reload
+            
           else
             @file_last_access_time = ftime
           end
+        end
+      elsif !file_exist
+        msg = 'Appears that file "'+@file+'" was deleted by other process! Do you want to resave it?'
+        if Tk.messageBox('icon' => 'error', 'type' => 'yesno',
+          'title' => '(Arcadia) editor', 'parent' => @text,
+          'message' => msg) == 'yes'
+          save
+        else
+          @file = nil
+          @buffer = ''
+          set_modify
+        end
       end
     end
   end
   
-  def languages_hash(_ext=nil)
-    @@langs_hash = Hash.new if !defined?(@@langs_hash)
-    return nil if _ext.nil?
-    if @@langs_hash[_ext].nil?
-      #_ext='' if _ext.nil?
-      lang_file = File.dirname(__FILE__)+'/langs/'+_ext+'.lang'
-      if File.exist?(lang_file)
-        @@langs_hash[_ext] = properties_file2hash(lang_file)
-      elsif File.exist?(lang_file+'.bind')
-        b= properties_file2hash(lang_file+'.bind')
-        if b 
-          if @@langs_hash[b['bind']].nil?
-            lang_file_bind = File.dirname(__FILE__)+'/langs/'+b['bind']+".lang"
-            if File.exist?(lang_file_bind)
-              @@langs_hash[b['bind']]=properties_file2hash(lang_file_bind)
-              @@langs_hash[_ext]=@@langs_hash[b['bind']]
-            end
-          else
-            @@langs_hash[_ext]=@@langs_hash[b['bind']]
-          end
-        end
-      end
-      self.resolve_properties_link(@@langs_hash[_ext], Arcadia.instance['conf']) if @@langs_hash[_ext]
-    end
-    @@langs_hash[_ext]
+  def reload
+    pos_index = @text.index('insert') 
+    @text.delete('1.0','end')
+    reset_highlight if @highlighting
+    load_file(@file)
+    @text.see(pos_index)
+    @text.set_insert(pos_index)
   end
 
   def init_editing(_ext='rb', _w1=150, _w2=60)
-    @is_ruby = _ext=='rb'||_ext=='rbw'
-    @lang_hash = languages_hash(_ext)
+    @is_ruby = _ext=='rb'|| _ext=='rbw'
+    @classbrowsing = @is_ruby
+    @lang_hash = @controller.languages_hash(_ext)
+#    @highlight_scanner = @controller.highlight_scanner(_ext)
 #    if !_ext.nil? && @is_ruby
 #      @fm = AGTkVSplittedFrames.new(@page_frame,_w1)
 #      @fm1 = AGTkVSplittedFrames.new(@fm.right_frame,_w2)
@@ -2738,22 +2789,27 @@ class AgEditor
     @fm1 = AGTkVSplittedFrames.new(@page_frame,@page_frame,_w2)
     @fm1.splitter_frame.configure('relief'=>'flat')
     initialize_text(@fm1.right_frame)
-    initialize_highlight
+    initialize_highlight(_ext)
     initialize_line_number(@fm1.left_frame)
     initialize_text_binding
   end
   
   def show_outline
-    if @tree_scroll_wrapper
-      @tree_scroll_wrapper.show
+    if @outline
+      @outline.show
     else
-      initialize_tree(@controller.frame(1).hinner_frame)
-      build_tree
+      @outline=AgEditorOutline.new(self,@controller.frame(1).hinner_frame,@controller.outline_bar)
+      @outline.build_tree
     end
   end
 
   def hide_outline
-    @tree_scroll_wrapper.hide if @tree_scroll_wrapper
+    @outline.hide if @outline
+  end
+
+  def destroy_outline
+    @outline.destroy if @outline
+    @outline = nil
   end
   
   def file_extension(_filename=nil)
@@ -2766,14 +2822,18 @@ class AgEditor
   def load_file(_filename = nil)
     #if filename is nil then open a new tab
     @loading=true
+    @dos_line_endings=false
     begin
       @file = _filename
       if _filename
         #init_editing(file_extension(_filename))
-        File::open(_filename,'r'){ |file|
-          @text.insert('end',file.readlines.collect!{| line | line.chomp+"\n" }.to_s)
+        File::open(_filename,'rb'){ |file|
+          @text.insert('end',file.readlines.collect!{| line | line.chomp}.join("\n"))
           #@text.insert('end',file.read)
         }
+	      File.open(_filename, 'rb') { |file|
+	        @dos_line_endings=true if file.read.include?("\r\n") # pesky windows line endings
+	      }
       end
       set_read_only(!File.stat(_filename).writable?)
       reset
@@ -2803,7 +2863,7 @@ class AgEditor
   end
   
   def refresh
-    build_tree if @classbrowsing #&& !is_exp_hide?
+    @outline.build_tree if @outline && @classbrowsing #&& !is_exp_hide?
   end
 end
 
@@ -2821,15 +2881,179 @@ class AgMultiEditorView
       font Arcadia.conf('editor.tabs.font')
       pack('fill'=>'both', :padx=>0, :pady=>0, :expand => 'yes')
     }
+    refresh_after_map = proc{
+      if !@enb.pages.empty?
+        if @enb.raise.nil? || @enb.raise.strip.length == 0
+          @enb.raise(@enb.pages[0]) 
+          @enb.see(@enb.pages[0])
+        end
+      end
+    }
+    @enb.bind_append("Map",refresh_after_map)
+
+  end
+  
+end
+
+class HighlightScanner
+  
+  def initialize(_langs_conf)
+    @langs_conf = _langs_conf
+    @lang=@langs_conf['language'].to_sym if @langs_conf['language']
+  end
+  
+  def highlight_tags(_row_begin,_code)
+  end
+  
+  def classes
+    if !defined?(@h_classes)
+      @h_classes = @langs_conf["#{@langs_conf['scanner']}.classes"].split(',')
+    end
+    @h_classes
+  end
+end
+
+class ReHighlightScanner < HighlightScanner
+  def initialize(_langs_conf)
+    super(_langs_conf)
+    @h_re = Hash.new
+    @op_to_end_line = Array.new
+    @op_to_end_line.concat(@langs_conf['re_op.to_line_end'].split(',')) if @langs_conf['re_op.to_line_end']
+
+    @op_only_first = Array.new
+    @op_only_first.concat(@langs_conf['re_op.only_first'].split(',')) if @langs_conf['re_op.only_first']
+    
+    self.classes.each{|c|
+      @h_re[c]=Regexp::new(@langs_conf["re.#{c}"].strip) if @langs_conf["re.#{c}"]
+    }
+  end
+
+
+  def find_tag(_tag, _row, _txt)
+    to_ret = []
+    _re = @h_re[_tag]
+    m = _re.match(_txt)
+    _end = 0
+    while m && (_txt=m.post_match)
+      if !defined?(_old_txt) || _txt != _old_txt
+        _old_txt = _txt 
+        _ibegin = _row.to_s+'.'+(m.begin(0)+_end).to_s
+        _end = m.end(0) + _end
+        _iend = _row.to_s+'.'+(_end.to_s)
+        to_ret << [_ibegin, _iend]
+        if @op_only_first.include?(_tag)
+          m = nil
+        else
+          m = _re.match(_txt)
+        end
+      else
+        m = nil
+      end
+    end
+    to_ret
+  end
+  
+  def highlight_tags(_row_begin,_code,_classes=self.classes)
+    super(_row_begin,_code)
+    tags_map = Hash.new 
+    lines = _code.split("\n")
+    lines.each_with_index{|_line,_i|
+      _line+="\n"
+      _row = _row_begin+_i
+      #p "_row=#{_row}-_line=#{_line}"
+      _txt = _line
+      _end = 0
+      @op_to_end_line.each{|c|
+        if _classes.include?(c) && @h_re[c]
+          m_c = @h_re[c].match(_txt)
+          if m_c then
+            _ibegin = _row.to_s+'.'+(m_c.begin(0)).to_s
+            _iend = _row.to_s+'.'+(_line.length - 1).to_s
+            tags_map[c] = [] if tags_map[c].nil?
+            tags_map[c] << [_ibegin, _iend]
+            _txt = m_c.pre_match
+          end
+        end
+      } if @langs_conf['re_op.to_line_end']
+  
+      _classes.each{|c|
+        if !@op_to_end_line.include?(c) && @h_re[c]
+          _tags = find_tag(c, _row, _txt)
+          if _tags.length >0
+            tags_map[c] = [] if tags_map[c].nil?
+            tags_map[c].concat(_tags)
+          end
+        end
+      } if _txt.strip.length > 0  
+    }
+    tags_map
   end
+end
   
+class CoderayHighlightScanner < HighlightScanner
+  def initialize(_langs_conf)
+    super(_langs_conf)
+    require 'coderay'
+  end
+#  def highlight_tags(_row_begin,_code)
+#    super(_row_begin,_code)
+#    case @lang
+#      when :ruby
+#        _highlight_tags_ruby(_row_begin,_code)
+#    end
+#  end
+  def highlight_tags(_row_begin,_code)
+    super(_row_begin,_code)
+    c_scanner = CodeRay::Scanners[@lang].new _code
+    row=_row_begin
+    col=0
+    tags_map = Hash.new 
+    c_scanner.tokens.each{|tok|
+      #p tok
+      if tok[1]==:space && tok[0].include?("\n")
+        row+=tok[0].count("\n")
+        begin_gap = tok[0].split("\n")[-1]
+        if begin_gap && tok[0][-1..-1]!="\n"
+          col = begin_gap.length
+        else
+          col = 0
+        end
+      elsif !([:open,:close].include?(tok[0])&& tok[1].class==Symbol)
+        toklength = tok[0].length
+        t_begin="#{row}.#{col}"
+        if tok[0].include?("\n")
+          ar = tok[0].split
+          row+=tok[0].count("\n")
+
+          begin_gap = ar[-1]
+          if begin_gap && tok[0][-1..-1]!="\n"
+            col = begin_gap.length
+          else
+            col = 0
+          end
+        else
+          col+=toklength
+        end
+        t_end="#{row}.#{col}"
+        if tok[1]!=:space
+          tags_map[tok[1]] = [] if tags_map[tok[1]].nil?
+          tags_map[tok[1]] << [t_begin,t_end]
+          #Arcadia.console(self, 'msg'=>"#{tok[1]}=#{[t_begin,t_end]}", 'level'=>'error')          
+          #p [t_begin,t_end]
+        end
+      end  
+    }
+    tags_map
+  end
 end
 
 
 class AgMultiEditor < ArcadiaExt
   include Autils
+  include Configurable
   attr_reader :breakpoints
   attr_reader :splitted_frame
+  attr_reader :outline_bar
   def on_before_build(_event)
     @breakpoints =Array.new
     @tabs_file =Hash.new
@@ -2837,7 +3061,8 @@ class AgMultiEditor < ArcadiaExt
     Arcadia.attach_listener(self, BufferEvent)
     Arcadia.attach_listener(self, DebugEvent)
     Arcadia.attach_listener(self, RunRubyFileEvent)
-    Arcadia.attach_listener(self, StartDebugEvent)
+   # Arcadia.attach_listener(self, StartDebugEvent)
+    Arcadia.attach_listener(self, FocusEvent)
   end
   
   
@@ -2856,18 +3081,20 @@ class AgMultiEditor < ArcadiaExt
     end
   end
   
-  def on_before_start_debug(_event)
-    _filename = _event.file
-    if _filename.nil?
-      current_editor = self.raised
-      _event.file =current_editor.file if current_editor
-    end
-  end
+#  def on_before_start_debug(_event)
+#    _filename = _event.file
+#    if _filename.nil?
+#      current_editor = self.raised
+#      _event.file =current_editor.file if current_editor
+#    end
+#  end
 
   def on_build(_event)
     @main_frame = AgMultiEditorView.new(self.frame.hinner_frame)
-    create_find
+    @outline_bar = AgEditorOutlineToolbar.new(self.frame(1).hinner_frame, self)
+    create_find # this is the "find within current file" one
     pop_up_menu
+    
     #self.open_last_files
   end
 
@@ -2875,6 +3102,86 @@ class AgMultiEditor < ArcadiaExt
     self.open_last_files
   end
 
+  def on_exit_query(_event)
+    _event.can_exit=true
+    @tabs_editor.each_value{|editor|
+      _event.can_exit = can_close_editor?(editor)
+      if !_event.can_exit
+        _event.break
+        break 
+      end
+    }
+  end
+
+  def on_after_focus(_event)
+    if raised && _event.focus_widget == raised.text
+      if [CutTextEvent, PasteTextEvent].include?(_event.class)
+        if raised.highlighting
+          line_begin_index = raised.text.index('@0,0')
+          line_begin = line_begin_index.split('.')[0].to_i
+          line_end = raised.text.index('@0,'+TkWinfo.height(raised.text).to_s).split('.')[0].to_i + 1
+          raised.rehighlightlines(line_begin,line_end,true)
+        else
+          raised.check_modify
+        end      
+      end
+    end
+  end
+
+  def highlight_scanner(_ext=nil)
+    return nil if _ext.nil?
+    scanner = nil
+    @highlight_scanner_hash = Hash.new if !defined?(@highlight_scanner_hash)
+    lh = languages_hash(_ext)
+    if lh && lh['language'] && lh['scanner']  
+      if @highlight_scanner_hash[lh['language']].nil?
+        case lh['scanner']
+          when 'coderay'
+            @highlight_scanner_hash[lh['language']]=CoderayHighlightScanner.new(lh)
+          when 're'
+            @highlight_scanner_hash[lh['language']]=ReHighlightScanner.new(lh)
+        end
+      end
+      scanner = @highlight_scanner_hash[lh['language']]
+    end
+    scanner
+  end
+
+  def languages_hash(_ext=nil)
+    @@langs_hash = Hash.new if !defined?(@@langs_hash)
+    return nil if _ext.nil?
+    if @@langs_hash[_ext].nil?
+      #_ext='' if _ext.nil?
+      lang_file = File.dirname(__FILE__)+'/langs/'+_ext+'.lang'
+      if File.exist?(lang_file)
+        @@langs_hash[_ext] = properties_file2hash(lang_file)
+      elsif File.exist?(lang_file+'.bind')
+        b= properties_file2hash(lang_file+'.bind')
+        if b 
+          if @@langs_hash[b['bind']].nil?
+            lang_file_bind = File.dirname(__FILE__)+'/langs/'+b['bind']+".lang"
+            if File.exist?(lang_file_bind)
+              @@langs_hash[b['bind']]=properties_file2hash(lang_file_bind)
+              @@langs_hash[_ext]=@@langs_hash[b['bind']]
+            end
+          else
+            @@langs_hash[_ext]=@@langs_hash[b['bind']]
+          end
+        end
+      end
+      if @@langs_hash[_ext] && @@langs_hash[_ext]['@include'] != nil
+        include_file = "#{File.dirname(__FILE__)}/langs/#{@@langs_hash[_ext]['@include']}"
+        if File.exist?(include_file)
+          include_hash = properties_file2hash(include_file)
+          @@langs_hash[_ext] = include_hash.merge(@@langs_hash[_ext])
+        end
+      end 
+      self.resolve_properties_link(@@langs_hash[_ext], Arcadia.instance['conf']) if @@langs_hash[_ext]
+    end
+    @@langs_hash[_ext]
+  end
+
+
   def pop_up_menu
     @pop_up = TkMenu.new(
       :parent=>@main_frame.enb,
@@ -2883,14 +3190,7 @@ class AgMultiEditor < ArcadiaExt
     )
     @pop_up.configure(Arcadia.style('menu'))
     #Arcadia.instance.main_menu.update_style(@pop_up)
-    @pop_up.insert('end',
-      :command,
-      :label=>'...',
-      :state=>'disabled',
-      :background=>Arcadia.conf('titlelabel.background'),
-      :font => "#{Arcadia.conf('menu.font')} bold",
-      :hidemargin => true
-    )
+
 
     @c = @pop_up.insert('end',
       :command,
@@ -2929,6 +3229,15 @@ class AgMultiEditor < ArcadiaExt
       }
     )
 
+    @pop_up.insert('end',
+      :command,
+      :label=>'...',
+      :state=>'disabled',
+      :background=>Arcadia.conf('titlelabel.background'),
+      :font => "#{Arcadia.conf('menu.font')} bold",
+      :hidemargin => false
+    )
+
     @main_frame.enb.tabbind("Button-3",
       proc{|*x|
         _x = TkWinfo.pointerx(@main_frame.enb)
@@ -2939,10 +3248,11 @@ class AgMultiEditor < ArcadiaExt
           @selected_tab_name_from_popup = 'ff'+@selected_tab_name_from_popup
           _index = @main_frame.enb.index(@selected_tab_name_from_popup)
         end
+
         if _index != -1 
-          _file =  @main_frame.enb.itemcget(@selected_tab_name_from_popup, 'text')
-          @pop_up.entryconfigure(0, 'label'=>_file)
-          @pop_up.popup(_x,_y)
+          _file = @tabs_file[(@selected_tab_name_from_popup)] # full path of file
+          @pop_up.entryconfigure(3, 'label'=> _file)
+          @pop_up.popup(_x,_y+10)
         end
       })
   end
@@ -2968,7 +3278,15 @@ class AgMultiEditor < ArcadiaExt
   end
 
   def on_before_debug(_event)
+    "on_before_debug #{_event}"
     case _event
+      when StartDebugEvent
+        _filename = _event.file
+        if _filename.nil?
+          current_editor = self.raised
+          _event.file=current_editor.file if current_editor
+        end
+        self.debug_begin
       when SetBreakpointEvent
         if _event.active == 1
           @breakpoints << {:file=>_event.file,:line=>_event.row}
@@ -2988,9 +3306,8 @@ class AgMultiEditor < ArcadiaExt
   end
   
   def on_after_debug(_event)
+    "on_after_debug #{_event}"
     case _event
-      when StartDebugEvent
-        self.debug_begin
       when StepDebugEvent
         if _event.command == :quit_yes 
           self.debug_end
@@ -3031,7 +3348,7 @@ class AgMultiEditor < ArcadiaExt
       when NewBufferEvent
         self.open_buffer
       when OpenBufferEvent
-        if _event.file 
+        if _event.file
           if _event.row
             _index = _event.row.to_s+'.0' 
           end
@@ -3060,7 +3377,7 @@ class AgMultiEditor < ArcadiaExt
             #add_reverse_item(_e)
           end
         else
-          _event.file = Tk.getOpenFile
+          _event.file = Arcadia.open_file_dialog
           self.open_file(_event.file)
         end
       when CloseBufferEvent
@@ -3071,8 +3388,9 @@ class AgMultiEditor < ArcadiaExt
         if _event.file == nil
           self.raised.save_as
         else
-          self.save_as_file(_event.file)
+          self.save_as_file(_event.file)          
         end
+        _event.new_file = self.raised.file
       when SaveBufferEvent
         if _event.file == nil && _event.title == nil 
           self.raised.save
@@ -3089,6 +3407,14 @@ class AgMultiEditor < ArcadiaExt
         if _event.line == nil
           @find.show_go_to_line_dialog
         end
+      when CloseCurrentTabEvent
+         close_raised
+      when PrettifyTextEvent
+        require 'rbeautify.rb' # gem
+        self.raised.save # so we can beautify it kludgely here...
+        path = raised.file
+        RBeautify.beautify_file(path)
+        self.raised.reload
       when MoveBufferEvent
         if _event.old_file && _event.new_file && editor_exist?(_event.old_file)
           #close_file(_event.old_file)
@@ -3101,9 +3427,8 @@ class AgMultiEditor < ArcadiaExt
     @find
   end
   
-  
   def create_find
-    @find = Find.new(@arcadia.layout.root, self)
+    @find = Finder.new(@arcadia.layout.root, self)
     @find.on_close=proc{@find.hide}
     @find.hide
   end
@@ -3116,13 +3441,17 @@ class AgMultiEditor < ArcadiaExt
   def on_finalize(_event)
     @batch_files = true
     _files =''
+    _raised = self.raised
+    Arcadia.persistent('editor.files.last', _raised.file) if _raised
     @tabs_editor.each_value{|editor|
       if editor.file != nil
+        #_insert_index = editor.text.index('insert')
+        _insert_index = editor.text.index('@0,0')
         _files=_files+'|' if _files.strip.length > 0
-        _files=_files + editor.file
+        _files=_files + "#{editor.file};#{_insert_index}"
       end
       #p editor.text.dump_tag('0.1',editor.text.index('end'))
-      close_editor(editor)
+      close_editor(editor,true)
     }
     Arcadia.persistent('editor.files.open', _files)
 #    _breakpoints = '';
@@ -3185,20 +3514,27 @@ class AgMultiEditor < ArcadiaExt
 
   def open_last_files
     @batch_files = true
-    if $arcadia['pers']['editor.files.open']
-      _files_index =$arcadia['pers']['editor.files.open'].split("|")
+    if Arcadia.persistent('editor.files.open')
+      _files_index =Arcadia.persistent('editor.files.open').split("|")
       _files_index.each do |value| 
         _file,_index = value.split(';')
-        if _file
-          open_file(_file,_index)
+        if _file && _index
+          open_file(_file,_index,false)
+        else
+          open_file(_file)
         end
       end
     end
     @batch_files = false
-    _first_page = @main_frame.enb.pages(0) if @main_frame.enb.pages.length > 0
-    if _first_page
-      @main_frame.enb.raise(_first_page)
-      @main_frame.enb.see(_first_page)
+    to_raise_file = Arcadia.persistent('editor.files.last')
+    if to_raise_file
+      raise_file(to_raise_file,0)
+    else
+      _first_page = @main_frame.enb.pages(0) if @main_frame.enb.pages.length > 0
+      if _first_page
+        @main_frame.enb.raise(_first_page) if frame_def_visible?
+        @main_frame.enb.see(_first_page)
+      end
     end
     frame(1)
     #@arcadia.layout.add_observer(self)
@@ -3304,17 +3640,22 @@ class AgMultiEditor < ArcadiaExt
     @main_frame.enb.itemconfigure(page_name(_tab), 'text'=> _new_text)
   end
 
+  def change_tab_icon(_tab, _new_text)
+    @main_frame.enb.itemconfigure(page_name(_tab), 'image'=> Arcadia.file_icon(_new_text))
+  end
+
   def change_file(_old_file, _new_file)
     _tab_name=tab_file_name(_old_file)
     _tab = @main_frame.enb.get_frame(_tab_name)
     e =  @tabs_editor[_tab_name]
-    e.file =_new_file if e
+    e.new_file_name(_new_file) if e
     change_file_name(_tab, _new_file)
   end
 
   def change_file_name(_tab, _new_file)
     _new_label = File.basename(_new_file)
     change_tab_title(_tab, _new_label)
+    change_tab_icon(_tab, _new_label)
     @tabs_file[page_name(_tab)] = _new_file
   end
 
@@ -3415,6 +3756,15 @@ class AgMultiEditor < ArcadiaExt
     tab_name(_fstr)
   end
   
+  def raise_file(_filename=nil, _pos=nil)
+    if _filename && frame_def_visible?
+      tab_name=self.tab_file_name(_filename)
+      @main_frame.enb.move(tab_name,_pos) if _pos
+      @main_frame.enb.raise(tab_name)
+      @main_frame.enb.see(tab_name)
+    end    
+  end
+  
   def open_file(_filename = nil, _text_index='1.0', _mark_selected=true, _exp=true)
     return if _filename == nil || !File.exist?(_filename) || File.ftype(_filename) != 'file'
     _basefilename = File.basename(_filename)
@@ -3431,7 +3781,7 @@ class AgMultiEditor < ArcadiaExt
       else
         open_buffer(_tab_name, _basefilename,0)
       end
-      #@tabs_file[_tab_name]= _filename
+      @tabs_editor[_tab_name].reset_highlight
       @tabs_editor[_tab_name].load_file(_filename)
     end
     
@@ -3453,7 +3803,7 @@ class AgMultiEditor < ArcadiaExt
     
     if _index != -1
       _tab = @main_frame.enb.get_frame(_buffer_name)
-      @main_frame.enb.raise(_buffer_name)
+      @main_frame.enb.raise(_buffer_name) if frame_visible?
     else
       _n = 1
       while @main_frame.enb.index(_buffer_name) != -1
@@ -3466,6 +3816,7 @@ class AgMultiEditor < ArcadiaExt
       end
       _tab = @main_frame.enb.insert('end', _buffer_name ,
         'text'=> _title,
+        'image'=> Arcadia.file_icon(_title),
         'background'=> Arcadia.style("tabpanel.background"),
         'foreground'=> Arcadia.style("tabpanel.foreground"),
         'raisecmd'=>proc{do_buffer_raise(_buffer_name, _title)}
@@ -3479,7 +3830,7 @@ class AgMultiEditor < ArcadiaExt
       @tabs_editor[_buffer_name]=_e
     end
     @main_frame.enb.move(_buffer_name, 1)
-    @main_frame.enb.raise(_buffer_name)
+    @main_frame.enb.raise(_buffer_name) if frame_visible?
     @main_frame.enb.see(_buffer_name)
     return _tab
   end
@@ -3499,24 +3850,54 @@ class AgMultiEditor < ArcadiaExt
   		end
     @batch_files = false
   end
-
-  def close_editor(_editor, _mod=true)
-    if ((_mod)&&(_editor.modified?))
-      _message = @main_frame.enb.itemcget(page_name(_editor.page_frame), 'text')+"\n modified. Save?"
-      _r = TkDialog2.new('message'=>_message, 'buttons'=>['Ok','No','Cancel']).show()
-      if _r == 0
+  
+  def can_close_editor?(_editor)
+    ret = true
+    if _editor.modified?
+      filename = page_name(_editor.page_frame)
+      message = @main_frame.enb.itemcget(filename, 'text')+"\n modified. Save?"
+      r=Arcadia.dialog(self,
+          'type'=>'yes_no_cancel', 
+          'level'=>'warning',
+          'title'=> 'Confirm saving', 
+          'msg'=>message)
+      if r=="yes"
         _editor.save
-      elsif _r == 1
-        close_tab(_editor.page_frame)
-      elsif _r == 2
-        return
+        ret = !_editor.modified?
+      elsif r=="cancel"
+        ret = false
       end
-    else
+    end
+    ret
+  end
+
+  def close_editor(_editor, _force=false)
+    if _force || can_close_editor?(_editor)
+      _editor.destroy_outline
       close_tab(_editor.page_frame)
+    else
+      return
     end
-    #EditorContract.instance.file_closed(self, 'file'=>_editor.file)
   end
 
+
+#  def close_editor(_editor, _mod=true)
+#    if ((_mod)&&(_editor.modified?))
+#      _message = @main_frame.enb.itemcget(page_name(_editor.page_frame), 'text')+"\n modified. Save?"
+#      _r = TkDialog2.new('message'=>_message, 'buttons'=>['Ok','No','Cancel']).show()
+#      if _r == 0
+#        _editor.save
+#      elsif _r == 1
+#        close_tab(_editor.page_frame)
+#      elsif _r == 2
+#        return
+#      end
+#    else
+#      close_tab(_editor.page_frame)
+#    end
+#    #EditorContract.instance.file_closed(self, 'file'=>_editor.file)
+#  end
+
   def close_tab(_page_frame)
     _name = page_name(_page_frame)
     @tabs_editor.delete(_name)
@@ -3626,7 +4007,16 @@ class Findview < TkFloatTitledFrame
       #pack('side'=>'left', 'anchor'=>'e')
       place('x' => 8,'y' => y0,'height' => 22)
     }
+    y0 = y0 + d
+    @cb_ignore_case = TkCheckButton.new(self.frame, Arcadia.style('checkbox')){|_cb_reg|
+      text  'Ignore case'
+      justify  'left'
+      #relief  'flat'
+      #pack('side'=>'left', 'anchor'=>'e')
+      place('x' => 8,'y' => y0,'height' => 22)
+    }
     
+    y0 = y0 + d
     y0 = y0 + d
     y0 = y0 + d
     @buttons_frame = TkFrame.new(self.frame, Arcadia.style('panel')).pack('fill'=>'x', 'side'=>'bottom')	
@@ -3669,7 +4059,7 @@ class Findview < TkFloatTitledFrame
       #place('width' => 50,'x' => 0,'y' => y0,'height' => 23,'bordermode' => 'inside')
     }
     #place('x'=>0,'y'=>0,'relheight'=> 1,'relwidth'=> 1)
-    place('x'=>100,'y'=>100,'height'=> 220,'width'=> 300)
+    place('x'=>100,'y'=>100,'height'=> 240,'width'=> 300)
     
   end
 
@@ -3683,7 +4073,7 @@ class Findview < TkFloatTitledFrame
   
 end
 
-class Find < Findview
+class Finder < Findview
   attr_reader :e_what
   def initialize(_frame, _controller)
     super(_frame)
@@ -3774,15 +4164,18 @@ class Find < Findview
   end
 
   def show_go_to_line_dialog
+    use(@controller.raised)
     @goto_line_dialog.show
   end
 
   def go_line
     if @goto_line_dialog.e_line.value.length > 0
       _row = @goto_line_dialog.e_line.value
-      _index = _row+'.1'
+      _index = _row.strip+'.1'
       self.editor.text.see(_index)
-      self.editor.text.tag_add('sel', _index,_index+' lineend')
+      self.editor.text.tag_remove('selected','1.0','end')
+      self.editor.text.tag_add('selected',_index,_index+' lineend')
+      #self.editor.text.tag_add('sel', _index,_index+' lineend')
       self.editor.text.set_insert(_index)
       @controller.bookmark_add(self.editor.file, _index)
     @goto_line_dialog.hide
@@ -3826,20 +4219,20 @@ class Find < Findview
       else
         _istart = '1.0'
       end
-      if @forwards
-        if @cb_reg.cget('onvalue')==@cb_reg.cget('variable').value.to_i
-          _index = self.editor.text.tksearch(['regexp'],@e_what.text,_istart)
-        else
-          _index = self.editor.text.search(@e_what.text,_istart)
-        end
-      else
-
-        if @cb_reg.cget('onvalue')==@cb_reg.cget('variable').value.to_i
-          _index = self.editor.text.tksearch(['regexp','backwards'],@e_what.text,_istart)
-        else
-          _index = self.editor.text.tksearch(['backwards'],@e_what.text,_istart)
-        end
+      
+      # propagate some search options
+      options = []
+      if !@forwards
+        options << 'backwards'
+      end
+      if @cb_reg.cget('onvalue')==@cb_reg.cget('variable').value.to_i
+        options << 'regexp'
       end
+      if @cb_ignore_case.cget('onvalue')==@cb_ignore_case.cget('variable').value.to_i
+        options << 'nocase'
+      end
+      _index = self.editor.text.tksearch(options,@e_what.text,_istart)
+      
       if _index && _index.length>0
         self.editor.text.see(_index)
         _row, _col = _index.split('.')
@@ -3852,7 +4245,7 @@ class Find < Findview
         self.editor.text.tag_add('sel', _index,_index_sel_end)
         self.editor.text.set_insert(_index)
         @idx1 =_index
-        @idx2 =_index_sel_end
+                @idx2 =_index_sel_end
         _found = true
         @controller.bookmark_add(self.editor.file, _index)
       else
@@ -3922,4 +4315,4 @@ class GoToLine < TkFloatTitledFrame
     @e_line.focus
     @e_line.selection_range(0,'end')
   end
-end
+end