arcadia 0.3.1 → 0.4.0

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

@@ -15,14 +15,14 @@ tab-replace-width-space=2
 #win::tabs.font={Courier New} 9
 ##tabs.side=bottom
 tabs.side=top
-
+complete-code=yes
 # editor
 #font=courier 11
 #font.bold=courier 11 bold
 #freebsd::font=courier 12
 #freebsd::font.bold=courier 12 bold
-win::font={Courier New} 9
-win::font.bold={Courier New} 9 bold 
+#win::font={Courier New} 9
+#win::font.bold={Courier New} 9 bold 
 #+--------------------------------------------------
 #color.background=#000000
 #color.foreground=white
@@ -107,7 +107,7 @@ hightlight.debug.relief=>>>hightlight.16.relief
 #line_number_panel.color.foreground=#333333
 #
 #
- tree explorer 
+# tree explorer 
 #explorer_panel.tree.color.background=#ffffff
 #explorer_panel.tree.color.foreground=white
 ##explorer_panel.tabs.side=bottom

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

@@ -7,7 +7,6 @@ require 'tk'
 require 'tktext'
 require 'lib/a-tkcommons'
 
-
 class TreeNode
   attr_reader :sons
   attr_reader :parent
@@ -86,7 +85,11 @@ class AgEditor
       side $arcadia['conf']['editor.explorer_panel.tabs.side']
       pack('fill'=>'both', :padx=>0, :pady=>0, :expand => 'yes')
     }
-    @nb_tab_exp = @nb.insert('end','exp' ,'text'=>'Source Tree' )
+    @nb_tab_exp = @nb.insert('end','exp' ,
+	      'text'=>'Source Tree', 
+        'background'=> Arcadia.style("tabpanel.background"),
+        'foreground'=> Arcadia.style("tabpanel.foreground")
+    )
     @nb.raise('exp')
     _tree_goto = proc{|_self|
       _line = _self.selection_get[0]
@@ -183,9 +186,9 @@ class AgEditor
         'bordermode'=>'outside'
       )
     }
-   # @text.configure('font', @font);
+  # @text.configure('font', @font);
 
-    do_tag_configure_global('debug')
+    #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')
     #@text.tag_configure('debug', 'background' =>'#b9c6d9', 'borderwidth'=>1 ,'relief'=>'raise')
@@ -194,8 +197,12 @@ class AgEditor
   end
 
   def create_temp_file
-    _file = @file+'~~'
-    f = File.new(@file+'~~', "w")
+    if @file
+      _file = @file+'~~'
+    else
+      _file = 'buffer~~'
+    end
+    f = File.new(_file, "w")
     begin
       if f
         f.syswrite(text_value)
@@ -206,29 +213,73 @@ class AgEditor
     _file
   end
   
+  def initialize_complete_code
+    complete_code = proc{
+        if @do_complete
+          line, col = @text.index('insert').split('.')
+          _file = create_temp_file
+          #EditorContract.instance.complete_code(self, 'file'=>_file, 'line'=>line.to_s, 'col'=>col.to_s)
+          begin
+            event = Arcadia.process_event(CompleteCodeEvent.new(self, 'file'=>_file, 'row'=>line.to_s, 'col'=>col.to_s))
+          ensure
+            File.delete(_file) if File.exist?(_file)
+          end
+        end
+        @controller.raise_complete_code(event) if @do_complete
+    }
+
+    @text.bind_append("Control-KeyPress"){|e|
+      case e.keysym
+      when 'space'
+        @do_complete = true
+        complete_code.call
+      end
+    }
+    
+    @text.bind_append("KeyPress"){|e|
+      @do_complete = false
+    }    
+
+    @text.bind_append("KeyRelease"){|e|
+      case e.keysym
+        when 'period'
+          @do_complete = true
+          complete_code.call
+      end
+    }
+  end
+  
   def initialize_text_binding
     @v_scroll.command(proc{|*args|
       @text.yview *args
     })
     @text.yscrollcommand(proc{|first,last| @v_scroll.set(first,last)
+      #Arcadia.console(self, 'msg'=>"eseguo ---> do_line_update")
       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("Control-KeyPress"){|e|
+#    complete_code = proc{
+#        if @do_complete
+#          line, col = @text.index('insert').split('.')
+#          _file = create_temp_file
+#          #EditorContract.instance.complete_code(self, 'file'=>_file, 'line'=>line.to_s, 'col'=>col.to_s)
+#          begin
+#            event = Arcadia.process_event(CompleteCodeEvent.new(self, 'file'=>_file, 'row'=>line.to_s, 'col'=>col.to_s))
+#          ensure
+#            File.delete(_file) if File.exist?(_file)
+#          end
+#        end
+#        @controller.raise_complete_code(event) if @do_complete
+#    }
+
+    @text.bind_append("Control-KeyPress"){|e|
       case e.keysym
-      when 'space'
-        line, col = @text.index('insert').split('.')
-        _file = create_temp_file
-        #EditorContract.instance.complete_code(self, 'file'=>_file, 'line'=>line.to_s, 'col'=>col.to_s)
-        begin
-          event = Arcadia.process_event(CompleteCodeEvent.new(self, 'file'=>_file, 'row'=>line.to_s, 'col'=>col.to_s))
-        ensure
-          File.delete(_file) if File.exist?(_file)
-        end
-        @controller.raise_complete_code(event)
+#      when 'space'
+#        @do_complete = true
+#        complete_code.call
       when 'z'
         _b = @text.index('insert').split('.')[0].to_i
         @text.edit_undo
@@ -327,7 +378,8 @@ class AgEditor
       end
     }
     
-    @text.bind("KeyPress"){|e|
+    @text.bind_append("KeyPress"){|e|
+      #@do_complete = false
       case e.keysym
       #when 'Return'
       when 'BackSpace'
@@ -380,8 +432,13 @@ class AgEditor
       check_modify
     }
 
-    @text.bind("KeyRelease"){|e|
+    @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
@@ -453,12 +510,6 @@ class AgEditor
       cursor nil
       insertwidth 0
       font Arcadia.conf('edit.font')
-      #background Arcadia.conf('panel.background')
-      #foreground Arcadia.conf('panel.foreground')
-      #background $arcadia['conf']['editor.line_number_panel.color.background']
-      #foreground $arcadia['conf']['editor.line_number_panel.color.foreground']
-      #highlightcolor $arcadia['conf']['editor.line_number_panel.color.background']
-      #highlightthickness 0
       place(
         'x'=>0,
         'y'=>0,
@@ -467,26 +518,32 @@ class AgEditor
         'bordermode'=>'outside'
       )
     }
-    delta = @font_metrics_bold[2][1]-@font_metrics[2][1]
-    @text_line_num.tag_configure('bold_case', 'spacing1'=>delta)
+    delta = (@font_metrics_bold[2][1]-@font_metrics[2][1])
+    @text_line_num.tag_configure('normal_case', 'justify'=>'right')
+    @text_line_num.tag_configure('bold_case', 'spacing3'=>delta, 'justify'=>'right')
     @text_line_num.tag_configure('breakpoint', 'background'=>'red','foreground'=>'yellow','borderwidth'=>1, 'relief'=>'raised')
-    @text_line_num.tag_configure('sel', 
-      'background'=>$arcadia['conf']['editor.line_number_panel.color.background'],
-      'foreground'=>$arcadia['conf']['editor.line_number_panel.color.foreground'],
+    @text_line_num.tag_configure('current', 
+      'background'=>Arcadia.conf("activebackground"),
+      'foreground'=>Arcadia.conf("activeforeground"),
       'relief'=>'flat'
     )
-    @text_line_num.bind("Double-ButtonPress-1", proc{|x,y|
+    
+    @text_line_num.bind("Double-ButtonPress-1", 
+      proc{|x,y| 
+        _index = @text_line_num.index("@#{x},#{y}")
+        _line = @text_line_num.get(_index+' linestart',_index+' lineend').strip
+        toggle_breakpoint(_index)
+      }, "%x %y")
+
+    @text_line_num.bind("ButtonPress-1", proc{|x,y|
       _index = @text_line_num.index("@#{x},#{y}")
       _line = @text_line_num.get(_index+' linestart',_index+' lineend').strip
-      if @controller.breakpoint_lines_on_file(@file).include?(_line)
-        @text_line_num.tag_remove('breakpoint',_index+' linestart',_index+' lineend')
-        @controller.breakpoint_del(@file, _line)
-      else
-        @text_line_num.tag_add('breakpoint',_index+' linestart',_index+' lineend')
-       # @text_line_num.tag_add('breakpoint',_index+' linestart',_index+' linestart + 1 chars')
-        @controller.breakpoint_add(@file, _line)
-      end
-    },
+      @text_line_num_current_index = _index
+      @text_line_num_current_line = _line
+      @text_line_num.tag_remove('current',"0.1","end")
+      @text_line_num.tag_add('current',_index+' linestart',_index+' lineend')
+      @text_line_num.tag_raise('breakpoint')
+      },
     "%x %y")
     
     #@text_line_num.configure('font', @font);
@@ -496,9 +553,109 @@ class AgEditor
       'borderwidth'=>2,
       'relief'=>'raised'
     )
+    
+    #--- menu
+    _pop_up = TkMenu.new(
+      :parent=>@text_line_num,
+      :tearoff=>0,
+      :title => 'Menu'
+    )
+    _pop_up.configure(Arcadia.style('menu'))
+    #Arcadia.instance.main_menu.update_style(@pop_up)
+    _title_item = _pop_up.insert('end',
+      :command,
+      :label=>'...',
+      :state=>'disabled',
+      :background=>Arcadia.conf('titlelabel.background'),
+      :hidemargin => true
+    )
+
+    _pop_up.insert('end',
+      :command,
+      :label=>'Toggle breakpoint',
+      :hidemargin => false,
+      :command=> proc{ 
+        if defined?(@text_line_num_current_index)
+          toggle_breakpoint(@text_line_num_current_index)
+        end
+      }
+    )
+
+    @text_line_num.bind("Button-3",
+      proc{|*x|
+        _x = TkWinfo.pointerx(@text_line_num)
+        _y = TkWinfo.pointery(@text_line_num)
+        _pop_up.entryconfigure(0,'label'=>"line #{@text_line_num_current_line}")
+
+        _pop_up.popup(_x,_y)
+      })
+    
+  end
+
+  def file_line_to_text_line_num_line(_line)
+    rel_line = nil
+    line_begin = @text_line_num.get('1.0','1.end').strip.to_i
+    line_end = @text_line_num.index('end').split('.')[0].to_i+line_begin
+    if _line.to_i >= line_begin && _line.to_i <= line_end
+      rel_line = _line.to_i - line_begin +1
+    end  
+    rel_line
+  end
+  
+  def add_tag_breakpoint(_line)
+      rel_line = file_line_to_text_line_num_line(_line)
+      if rel_line
+        i1 = "#{rel_line}.0"
+        i2 = i1+' + 2 chars'
+        @text_line_num.tag_add('breakpoint',i1,i2)
+      end
+  end
+
+  def remove_tag_breakpoint(_line)
+      rel_line = file_line_to_text_line_num_line(_line)
+      if rel_line
+        i1 = "#{rel_line}.0"
+        i2 = i1+' lineend'
+        @text_line_num.tag_remove('breakpoint',i1,i2)
+      end
+  end
+
+
+
+#  def add_tag_breakpoint(_index=nil)
+#      _i1 = _index+' linestart'
+#      _i2 = _i1+' + 2 chars'
+#      @text_line_num.tag_add('breakpoint',_i1,_i2)
+#  end
+  
+#  def remove_tag_breakpoint(_index=nil)
+#      _i1 = _index+' linestart'
+#      _i2 = _index+' lineend'
+#      #p "Editor: _i1:#{_i1}  _i2:#{_i2}"
+#      @text_line_num.tag_remove('breakpoint',_i1,_i2)
+#  end
+
+  def toggle_breakpoint(_index=nil)
+    if !_index.nil?
+      _line = @text_line_num.get(_index+' linestart',_index+' lineend').strip
+      _i1 = _index+' linestart'
+      _i2 = _i1+' + 2 chars'
+      
+      if @controller.breakpoint_lines_on_file(@file).include?(_line)
+        #remove_tag_breakpoint(_index)
+        @controller.breakpoint_del(@file, _line)
+      else
+        @text_line_num.tag_remove('current',_i1,_i2)
+        #add_tag_breakpoint(_index)
+        @controller.breakpoint_add(@file, _line)
+      end
+    end
   end
 
   def initialize_highlight
+    @is_line_bold = Hash.new
+    @is_tag_bold = Hash.new
+    do_tag_configure_global('debug')
     if @lang_hash.nil?
       @highlighting = false
       return
@@ -511,9 +668,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
-
+    #@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
@@ -547,6 +703,8 @@ class AgEditor
     if @lang_hash['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']
@@ -569,6 +727,8 @@ class AgEditor
     if $arcadia['conf']['editor.hightlight.'+_name+'.style']== 'bold'
       h['font']=@font_bold
       @is_tag_bold[_name]= true
+    else
+      @is_tag_bold[_name]= false
     end
     if $arcadia['conf']['editor.hightlight.'+_name+'.relief']
       h['relief']=$arcadia['conf']['editor.hightlight.'+_name+'.relief']
@@ -1084,12 +1244,12 @@ class AgEditor
         if @op_only_first.include?(_tag) && _txt
           #eliminino la prima riga a partire dal risultato
           _p = _txt.index("\n")+1
-           if _p
+          if _p
               _txt = _txt[_p..-1]
               _offset = _offset + _p
-           else
-             m = nil
-           end
+          else
+            m = nil
+          end
         end
         m = _re.match(_txt)
         
@@ -1347,17 +1507,21 @@ 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 = @text.index('@0,0').split('.')[0].to_i
+        line_begin_index = @text.index('@0,0')
+        line_begin = line_begin_index.split('.')[0].to_i
         line_end = @text.index('@0,'+TkWinfo.height(@text).to_s).split('.')[0].to_i + 1
+        wrap_on = @text.cget("wrap") != 'none'
         # breakpoint
         b = @controller.breakpoint_lines_on_file(@file)
         if @highlighting
           _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| 
@@ -1368,21 +1532,77 @@ class AgEditor
           @last_zone_begin = _zone_begin
           @last_zone_end = _zone_end
         end
-  
+        
         @text_line_num.delete('1.0','end')
-        for j in line_begin...line_end
-          #nline = j.to_s.rjust(6)
-          nline = j.to_s.rjust(7)
+
+        _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 < 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
+
+        _tags = Array.new
+        for j in line_begin...real_line_end
+          nline = j.to_s.rjust(line_end.to_s.length+2)
           _index = @text_line_num.index('end')
+          _tags.clear
           if @highlighting && @is_line_bold[j]
-            @text_line_num.insert('end', "#{nline}\n",'bold_case')
+            _tags << 'bold_case'
           else
-            @text_line_num.insert('end', "#{nline}\n")
+            _tags << 'normal_case'
           end
+          
+          if wrap_on
+            w_rx_b, w_ry_b, w_widht_b, w_heigth_b = @text.bbox("#{(j).to_s}.0");
+            w_rx_e, w_ry_e, w_widht_e, w_heigth_e = @text.bbox("#{(j).to_s}.0 lineend");
+            if w_ry_e && w_ry_b 
+              delta = w_ry_e - w_ry_b
+              if delta > 1   
+                _tag = "wrap_case_#{j}"
+                @text_line_num.tag_configure(_tag, 'spacing3'=>delta)  
+                _tags << _tag
+              end
+            end
+          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)
-            @text_line_num.tag_add('breakpoint',_index+' -1 lines',_index+' -1 lines  lineend')
+            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 < 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")
+        end
       end
   end
 
@@ -1551,8 +1771,9 @@ class AgEditor
 #    else
 #      @lang = nil
 #    end
+    is_ruby = _ext=='rb'||_ext=='rbw'
     @lang_hash = languages_hash(_ext)
-    if !_ext.nil? && (_ext=='rb'||_ext=='rbw')
+    if !_ext.nil? && is_ruby
       @fm = AGTkVSplittedFrames.new(@page_frame,_w1)
       @fm1 = AGTkVSplittedFrames.new(@fm.right_frame,_w2)
       initialize_tree(@fm.left_frame)
@@ -1564,6 +1785,7 @@ class AgEditor
     initialize_highlight
     initialize_line_number(@fm1.left_frame)
     initialize_text_binding
+    initialize_complete_code if is_ruby
   end
 
   def file_extension(_filename=nil)
@@ -1623,6 +1845,7 @@ class AgMultiEditorView
     @enb = Tk::BWidget::NoteBook.new(parent,Arcadia.style('tabpanel')){
       tabbevelsize 0
       internalborderwidth 2
+#      arcradius 4
 #      activeforeground 'red'
 #      activebackground 'yellow'
       #borderwidth 1
@@ -1639,9 +1862,9 @@ class AgMultiEditor < ArcadiaExt
   attr_reader :breakpoints
   attr_reader :splitted_frame
   def on_before_build(_event)
-    #ArcadiaContractListener.new(self, DebugContract, :do_debug_event)
-    #ArcadiaContractListener.new(self, EditorContract, :do_editor_event)
-    #ArcadiaContractListener.new(self, MainContract, :do_main_event)
+    @breakpoints =Array.new
+    @tabs_file =Hash.new
+    @tabs_editor =Hash.new
     Arcadia.attach_listener(self, BufferEvent)
     Arcadia.attach_listener(self, DebugEvent)
     Arcadia.attach_listener(self, RunRubyFileEvent)
@@ -1666,15 +1889,13 @@ class AgMultiEditor < ArcadiaExt
 
   def on_build(_event)
     @main_frame = AgMultiEditorView.new(self.frame.hinner_frame)
-    @tabs_file =Hash.new
-    @tabs_editor =Hash.new
-    @breakpoints =Array.new
     create_find
     pop_up_menu
   end
 
   def on_after_build(_event)
     self.open_last_files
+    #self.load_persistent_breakpoints
   end
 
   def pop_up_menu
@@ -1766,7 +1987,7 @@ class AgMultiEditor < ArcadiaExt
 #  end
 
   def on_before_step_debug(_event)
-     debug_reset
+    debug_reset
   end
 
   def on_after_debug(_event)
@@ -1780,17 +2001,28 @@ class AgMultiEditor < ArcadiaExt
           @last_e.mark_debug(@last_index) if @last_e
         end
       when SetBreakpointEvent
-        @breakpoints << {:file=>_event.file,:line=>_event.row}
+        if _event.active == 1
+          @breakpoints << {:file=>_event.file,:line=>_event.row}
+          _e = @tabs_editor[tab_file_name(_event.file)]
+          _e.add_tag_breakpoint(_event.row) if _e
+          #_e.add_tag_breakpoint("#{_event.row}.0") if _e
+        end
       when UnsetBreakpointEvent
+        #p "ae-editor : UnsetBreakpointEvent file : #{_event.file}"
+        #p "ae-editor : UnsetBreakpointEvent _event.row : #{_event.row}"
         @breakpoints.delete_if{|b| (b[:file]==_event.file && b[:line]==_event.row)}
+        _e = @tabs_editor[tab_file_name(_event.file)]
+        _e.remove_tag_breakpoint(_event.row) if _e
     end
   end
   
   def on_debug_step_info(_event)
     #Arcadia.new_debug_msg(self, "file: #{_event.file}:#{_event.row}")
+    #Arcadia.console(self, :msg=> "ae-editor -> DebugStepInfoEvent")
     if _event.file
       self.open_file_in_debug(_event.file, _event.row)
     end
+    Tk.update
   end
 
 #  def on_before_buffer(_event)
@@ -1804,19 +2036,19 @@ class AgMultiEditor < ArcadiaExt
         self.open_buffer
       when OpenBufferEvent
         if _event.file 
-           if _event.row
-             _index = _event.row.to_s+'.0' 
-           end
-           self.open_file(_event.file, _index)
+          if _event.row
+            _index = _event.row.to_s+'.0' 
+          end
+          self.open_file(_event.file, _index)
         elsif _event.text
           if _event.title 
-             _tab_name = self.tab_name(_event.title)
-             self.open_buffer(_tab_name, _event.title)
-             _e = @tabs_editor[_tab_name]
-             _e.text_insert('end',_event.text)
-             _e.reset
-             _e.refresh
-             #add_reverse_item(_e)
+            _tab_name = self.tab_name(_event.title)
+            self.open_buffer(_tab_name, _event.title)
+            _e = @tabs_editor[_tab_name]
+            _e.text_insert('end',_event.text)
+            _e.reset
+            _e.refresh
+            #add_reverse_item(_e)
           end
         else
           _event.file = Tk.getOpenFile
@@ -1824,7 +2056,7 @@ class AgMultiEditor < ArcadiaExt
         end
       when CloseBufferEvent
         if _event.file 
-           self.close_file(_event.file)
+          self.close_file(_event.file)
         end
       when SaveAsBufferEvent
         if _event.file == nil
@@ -1851,6 +2083,19 @@ class AgMultiEditor < ArcadiaExt
     end
   end
 
+#  def load_persistent_breakpoints
+#    b = Arcadia.persistent('editor.debug_breakpoints')
+#    if b
+#      _files_list =b.split("|")
+#      _files_list.each do |value| 
+#        _file,_line = value.split('@@@')
+#        if _file && _line
+#          breakpoint_add(_file,_line)
+#        end
+#      end
+#    end
+#  end
+
   def xy_insert
     _text = self.raised.text
     _index_now = _text.index('insert')
@@ -1888,54 +2133,107 @@ class AgMultiEditor < ArcadiaExt
             _xroot = _x - TkWinfo.rootx(@arcadia.layout.root)  
             _yroot = _y - TkWinfo.rooty(@arcadia.layout.root)  
             
-        				_max_height = TkWinfo.screenheight(@arcadia.layout.root) - _y - 5
+            _max_height = TkWinfo.screenheight(@arcadia.layout.root) - _y - 5
             
             @raised_listbox = TkListbox.new(@arcadia.layout.root, {
-   					  :takefocus=>true, 
+              :takefocus=>true, 
               :selectbackground=>Arcadia.conf('hightlight.1.background'),
               :selectforeground=>Arcadia.conf('hightlight.1.foreground'),
               :activestyle=>'none'}.update(Arcadia.style('listbox'))
-   					 	)
-  						_font = TkFont.new(conf('edit.font'))
-  						_char_height = _font.metrics[2][1]
-  						_width = 0
-  						_docs_entries = Hash.new
-  						candidates.each{|value|
-        				   			_key, _doc = value.split
-        				   			_docs_entries[_key]= _doc
-        				   			@raised_listbox.insert('end', _key)
-        				   			_temp_width = _font.measure(_key) + _font.measure('X')*3
-        				   			_width = _temp_width if _temp_width > _width 
-      						}
-      						_height = (candidates.length+1)*_char_height
-      						_height = _max_height if _height > _max_height
-            @raised_listbox.place('x'=>_xroot,'y'=>_yroot, 'width'=>_width, 'height'=>_height)
+            )
+    v_scroll = TkScrollbar.new(@raised_listbox,{
+      'orient'=>'vertical'}.update(Arcadia.style('scrollbar'))
+    ).pack('side' => 'right', 'fill' => 'y')
+
+    v_scroll.command(proc{|*args|
+      @raised_listbox.yview *args
+    })
+    @raised_listbox.yscrollcommand(proc{|first,last| v_scroll.set(first,last) })
             
-          			@raised_listbox.focus
-  						@raised_listbox.bind_append('KeyPress'){|e|
-        			   			case e.keysym
- 	         						when 'Escape'
-  	        						  @raised_listbox.destroy
-   	       						  #_menu.destroy
-    	      						  Tk.callback_break
-    			           when 'Return'
-      									_value = @raised_listbox.get('active')
-      									_text.delete(_begin_index,'insert')
-      									_text.insert('insert',_value)
-      									@raised_listbox.destroy
-      									#_menu.destroy
-      									Tk.callback_break
-      								 when 'F1'
-      								 	_key = @raised_listbox.get('active')
-                        _x, _y = xy_insert
-           	            Arcadia.process_event(DocCodeEvent.new(self, 'doc_entry'=>_docs_entries[_key], 'xdoc'=>_x, 'ydoc'=>_y))
-           	            #EditorContract.instance.doc_code(self, 'doc_entry'=>_docs_entries[_key], 'xdoc'=>_x, 'ydoc'=>_y)
-      								end
-  					   }
-       			 elsif candidates.length == 1 && candidates[0].length>0
-       					   _text.delete(_begin_index,'insert');
-     					   _text.insert('insert',candidates[0].split[0])
-         end
+            _font = TkFont.new(conf('edit.font'))
+            _char_height = _font.metrics[2][1]
+            _width = 0
+            _docs_entries = Hash.new
+            _update_list = proc{|_in|
+                @raised_listbox.delete('0','end')
+                candidates.each{|value|
+                  _key, _doc = value.split
+                  if _in.nil? || _in.strip.length == 0 || _key[0.._in.length-1] == _in
+                    _docs_entries[_key]= _doc
+                    @raised_listbox.insert('end', _key)
+                    _temp_width = _font.measure(_key) + _font.measure('X')*3
+                    _width = _temp_width if _temp_width > _width 
+                  end
+                }
+                Tk.event_generate(@raised_listbox, "1") if TkWinfo.mapped?(@raised_listbox)
+            }
+            _update_list.call
+            _width = _width + 15
+            #_height = (candidates.length+1)*_char_height
+            _height = 15*_char_height
+            _height = _max_height if _height > _max_height
+            
+            _buffer = _text.get(_begin_index, 'insert')
+            _buffer_ini_length = _buffer.length
+#            i2 = _begin_index
+#            i1 =  _text.index("#{i2} -1 chars")
+#            xchar = _text.get(i1, i2)
+#            while xchar != '.' && xchar != "\s" && xchar != "\n"
+#              _buffer = xchar + _buffer
+#              i2 = i1
+#              i1 =  _text.index("#{i2} -1 chars")
+#              xchar = _text.get(i1, i2)
+#            end
+            @raised_listbox.place('x'=>_xroot,'y'=>_yroot, 'width'=>_width, 'height'=>_height)
+            @raised_listbox.focus
+            @raised_listbox.activate(0)
+            @raised_listbox.grab("set")
+            Tk.event_generate(@raised_listbox, "1")
+            _insert_selected_value = proc{
+              _value = @raised_listbox.get('active')
+              _text.delete(_begin_index,'insert')
+              _text.insert('insert',_value)
+              @raised_listbox.grab("release")
+              @raised_listbox.destroy
+              _text.focus
+              #_menu.destroy
+              Tk.callback_break
+            }
+            @raised_listbox.bind_append("Double-ButtonPress-1"){|e|
+               _insert_selected_value.call
+            }
+            @raised_listbox.bind_append('KeyPress'){|e|
+              case e.keysym
+                when 'Escape'
+                  @raised_listbox.grab("release")
+                  @raised_listbox.destroy
+                  _text.focus
+                  #_menu.destroy
+                  Tk.callback_break
+                when 'Return'
+                  _insert_selected_value.call
+                when 'F1'
+                  _key = @raised_listbox.get('active')
+                  _x, _y = xy_insert
+                  Arcadia.process_event(DocCodeEvent.new(self, 'doc_entry'=>_docs_entries[_key], 'xdoc'=>_x, 'ydoc'=>_y))
+                  #EditorContract.instance.doc_code(self, 'doc_entry'=>_docs_entries[_key], 'xdoc'=>_x, 'ydoc'=>_y)
+                when 'a'..'z'
+                  _text.insert('insert',e.keysym)
+                  _buffer = _buffer + e.keysym
+                  _update_list.call(_buffer)
+                when 'BackSpace'
+                  if _buffer.length > _buffer_ini_length
+                    _text.delete("#{_begin_index} + #{_buffer.length-1} chars" ,'insert')
+                    _buffer = _buffer[0..-2]
+                    Tk.update
+                    _update_list.call(_buffer)
+                  end
+              end
+            }
+          elsif candidates.length == 1 && candidates[0].length>0
+            _text.delete(_begin_index,'insert');
+            _text.insert('insert',candidates[0].split[0])
+          end
       end
   end
 
@@ -1952,10 +2250,21 @@ class AgMultiEditor < ArcadiaExt
   def on_finalize(_event)
     _files =''
     @tabs_editor.each_value{|editor|
-      _files=_files+'|'+ editor.file if editor.file != nil
+      if editor.file != nil
+        _files=_files+'|' if _files.strip.length > 0
+        _files=_files + editor.file
+      end
       close_editor(editor)
     }
-    @arcadia['pers']['editor.files.open']=_files
+    Arcadia.persistent('editor.files.open', _files)
+#    _breakpoints = '';
+#    @breakpoints.each{|point|
+#      if point[:file] != nil
+#        _breakpoints=_breakpoints+'|' if _breakpoints.strip.length > 0
+#        _breakpoints=_breakpoints + "#{point[:file]}@@@#{point[:line]}"
+#      end
+#    }
+#    Arcadia.persistent('editor.debug_breakpoints', _breakpoints)
   end
 
   def raised
@@ -1973,15 +2282,11 @@ class AgMultiEditor < ArcadiaExt
   end
 
   def breakpoint_add(_file,_line)
-    Arcadia.process_event(SetBreakpointEvent.new(self, 'file'=>_file, 'row'=>_line))
-    #EditorContract.instance.breakpoint_created(self, 'file'=>_file, 'line'=>_line)
-    #@breakpoints << {:file=>_file,:line=>_line}
+    Arcadia.process_event(SetBreakpointEvent.new(self, 'file'=>_file, 'row'=>_line, 'active'=>1))
   end
 
   def breakpoint_del(_file,_line)
     Arcadia.process_event(UnsetBreakpointEvent.new(self, 'file'=>_file, 'row'=>_line))
-    #EditorContract.instance.breakpoint_deleted(self, 'file'=>_file, 'line'=>_line)
-    #@breakpoints.delete_if{|b| (b[:file]==_file && b[:line]==_line)}
   end
 
   def breakpoint_lines_on_file(_file)
@@ -2149,6 +2454,7 @@ class AgMultiEditor < ArcadiaExt
       if !_editor_exist
         @editors_in_debug <<  @last_e
         # workaround for hightlight
+        #p "add editor for close #{_filename}"
         @last_e.do_line_update
       end
     end
@@ -2183,7 +2489,7 @@ class AgMultiEditor < ArcadiaExt
     _basefilename = File.basename(_filename)
     #_basename = _basefilename.split('.')[0]+'_'+_basefilename.split('.')[1]
     
-    _name = self.tab_name(_filename)
+    _name = self.tab_file_name(_filename)
     _index = @main_frame.enb.index(_name)
     if _index == -1
       _index = @main_frame.enb.index(name_read_only(_name))
@@ -2253,10 +2559,14 @@ class AgMultiEditor < ArcadiaExt
       end
       _tab = @main_frame.enb.insert('end', _buffer_name ,
         'text'=> _title,
+        'background'=> Arcadia.style("tabpanel.background"),
+        'foreground'=> Arcadia.style("tabpanel.foreground"),
         'raisecmd'=>proc{do_buffer_raise(_buffer_name, _title)}
       )
       _e = AgEditor.new(self, _tab)
-      _e.init_editing(_e.file_extension(_title), w1)
+      ext = _e.file_extension(_title)
+      ext='rb' if ext.nil?
+      _e.init_editing(ext, w1)
       #@tabs_file[_buffer_name]= nil
       @tabs_editor[_buffer_name]=_e
     end
@@ -2327,11 +2637,11 @@ class Findview < TkFloatTitledFrame
     #stop_resizing
  	  y0 = 10
     d = 23    
-   TkLabel.new(self.frame, Arcadia.style('label')){
+  TkLabel.new(self.frame, Arcadia.style('label')){
    	text 'Find what:'
    	place('x' => 8,'y' => y0,'height' => 19)
-   }
-   y0 = y0 + d
+  }
+  y0 = y0 + d
   @e_what = Tk::BWidget::ComboBox.new(self.frame, Arcadia.style('combobox')){
       editable true
       justify  'left'
@@ -2346,12 +2656,12 @@ class Findview < TkFloatTitledFrame
 
   @e_what_entry.bind_append("1",proc{Arcadia.process_event(InputEnterEvent.new(self,'receiver'=>@e_what_entry))})
 
-   y0 = y0 + d
-   TkLabel.new(self.frame, Arcadia.style('label')){
+  y0 = y0 + d
+  TkLabel.new(self.frame, Arcadia.style('label')){
    	text 'Replace with:'
    	place('x' => 8,'y' => y0,'height' => 19)
-   }
-   y0 = y0 + d
+  }
+  y0 = y0 + d
    
   @e_with = Tk::BWidget::ComboBox.new(self.frame, Arcadia.style('combobox')){
       editable true
@@ -2385,7 +2695,7 @@ class Findview < TkFloatTitledFrame
     
   y0 = y0 + d
   y0 = y0 + d
-   @buttons_frame = TkFrame.new(self.frame, Arcadia.style('panel')).pack('fill'=>'x', 'side'=>'bottom')	
+  @buttons_frame = TkFrame.new(self.frame, Arcadia.style('panel')).pack('fill'=>'x', 'side'=>'bottom')	
 
     @b_replace_all = TkButton.new(@buttons_frame, Arcadia.style('button')){|_b_go|
     		state 'disabled'
@@ -2662,11 +2972,11 @@ class GoToLine < TkFloatTitledFrame
     #stop_resizing
  	  y0 = 10
     d = 23    
-   TkLabel.new(self.frame, Arcadia.style('label')){
+  TkLabel.new(self.frame, Arcadia.style('label')){
    	text 'Go to line:'
    	place('x' => 8,'y' => y0,'height' => 19)
-   }
-   y0 = y0 + d
+  }
+  y0 = y0 + d
    	@e_line = TkEntry.new(self.frame, Arcadia.style('edit')){
       justify  'left'
       #relief  'ridge'
@@ -2676,7 +2986,7 @@ class GoToLine < TkFloatTitledFrame
     
    	y0 = y0 + d
    	y0 = y0 + d
-   @buttons_frame = TkFrame.new(self.frame, Arcadia.style('panel')).pack('fill'=>'x', 'side'=>'bottom')	
+  @buttons_frame = TkFrame.new(self.frame, Arcadia.style('panel')).pack('fill'=>'x', 'side'=>'bottom')	
     
     @b_go = TkButton.new(@buttons_frame, Arcadia.style('button')){|_b_go|
       compound  'none'