arcadia 0.6.0 → 0.7.0

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

@@ -1,5 +1,5 @@
 name=editor
-frames=0.1,0.0
+frames=0.1,0.2
 frames.labels=Editor,Outline
 frames.names=editor,editor_outline
 active=yes
@@ -17,6 +17,8 @@ tab-replace-width-space=2
 ##tabs.side=bottom
 tabs.side=top
 complete-code=yes
+close-last-if-not-modified=yes
+max-file-open=3 #todo
 # editor
 #font=courier 11
 #font.bold=courier 11 bold

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

@@ -68,6 +68,11 @@ class SourceStructure
           end
           if (m[0].strip[0..4] == "class" && m.pre_match.strip.length==0)
             _kind = 'KClass'
+            if m.post_match.strip[0..1]=='<<'
+              hinner_class = true
+            else
+              hinner_class = false
+            end
           elsif (m[0].strip[0..4] == "class" && m.pre_match.strip.length>0)
             _row = _row +1
             _liv = _liv - 1
@@ -96,21 +101,13 @@ class SourceStructure
 #            _row = _row +1
           end
           
-          if  _livs[_liv-1] && _livs[_liv-1].kind != 'KDef'
+          if  _livs[_liv-1] && (_livs[_liv-1].kind != 'KDef' || (_livs[_liv-1].kind == 'KDef' && _kind == 'KClass' && hinner_class))
             TreeNode.new(_parent, _kind){|_node|
               _node.label = _label
               _node.helptext = _helptext
               _node.rif = _row.to_s
               _livs[_pliv + 1]=_node
             }
-#          elsif _kind == 'KDef' && _parent == @root
-#            TreeNode.new(_livs[_liv+1], _kind){|_node|
-#              _node.label = _label
-#              _node.helptext = _helptext
-#              _node.rif = _row.to_s
-#              _livs[_pliv+2]=_node
-#            }
-#            _liv = _liv + 2
           else
             TreeNode.new(_livs[_liv-3], _kind){|_node|
               _node.label = _label
@@ -216,27 +213,12 @@ class SafeCompleteCode
     @col = _col.to_i
     @ss = SourceStructure.new(_source)
     @filter=''
-    #@candidates = Array.new
+    @words = Array.new
     process_source
   end
   
-#  def dot_trip(_var_name)
-#    ret = "_candidates << #{_var_name}.class.to_s.sub('#{self.class.to_s}::','')\n"
-#    ret = ret + "#{_var_name}.class.instance_methods.each{|m|\n"
-#    ret = ret + "meth = #{_var_name}.method(m)\n"
-#    ret = ret + "_candidates << meth.owner.to_s.sub('#{self.class.to_s}::','')+'#'+m+'#'+meth.arity.to_s\n"
-#    ret = ret + "}\n"
-#    #ret = ret + "exit\n"
-#    ret
-#  end
-
   def dot_trip(_var_name)
     ret = "_class=#{_var_name}.class.name\n"
-#    ret = ret +"if _class=='Class'\n"
-#    ret = ret +" _methods=#{_var_name}.singleton_methods\n"
-#    ret = ret +"else\n"
-#    ret = ret +" _methods=#{_var_name}.class.instance_methods\n"
-#    ret = ret +"end\n"
     ret = ret +" _methods=#{_var_name}.methods\n"
     ret = ret +"owner_on = Method.instance_methods.include?('owner')\n"
     ret = ret + "_methods.each{|m|\n"
@@ -306,6 +288,17 @@ class SafeCompleteCode
     @is_dot
   end
 
+  def refresh_words
+    @words.clear
+    _re = /[\s\t\n]#{@filter}[a-zA-Z0-9\-_]*/
+    m = _re.match(@source)
+    while m && (_txt=m.post_match)
+      can = m[0].strip
+      @words << can if can != @filter
+      m = _re.match(_txt)
+    end
+  end
+
   def process_source
     @modified_source = ""
     @modified_row = @row
@@ -329,7 +322,7 @@ class SafeCompleteCode
           end
           focus_segment = focus_segment+seg
         }
-        @filter = focus_segment_array[-1].strip
+        @filter = focus_word(focus_segment_array[-1].strip)
       else
         focus_segment = ''
         @filter = focus_word(focus_line[0..@col-1].strip)
@@ -446,6 +439,10 @@ class SafeCompleteCode
           @modified_row = @modified_row+1+ss_len
         end
     end
+    if @filter.strip.length > 0
+#        refresh_words(source_array)
+        refresh_words
+    end
 
 #    Arcadia.console(self, 'msg'=>@modified_source)
 #    Arcadia.console(self, 'msg'=>"@modified_row=#{@modified_row}")
@@ -458,26 +455,22 @@ class SafeCompleteCode
 
   def focus_word(focus_segment)
       focus_world = ''
+      char = focus_segment[-1..-1]
+      while [")","]","}"].include?(char) 
+        char=focus_segment[-2..-2]
+        focus_segment = focus_segment[0..-2]
+      end
       j = focus_segment.length - 1
-      char = focus_segment[j..j]
-      if char != ')'
-        while !["\s","\t",";",",","(","[","{",">"].include?(char) && j >= 0
-          focus_world = "#{char}#{focus_world}"
-          j=j-1
-          char = focus_segment[j..j]
-        end
-      else
-        while !["\s","\t",";"].include?(char) && j >= 0
-          focus_world = "#{char}#{focus_world}"
-          j=j-1
-          char = focus_segment[j..j]
-        end
+      while !["\s","\t",";",",","(","[","{",">"].include?(char) && j >= 0
+        focus_world = "#{char}#{focus_world}"
+        j=j-1
+        char = focus_segment[j..j]
       end
       focus_world
   end
   
   def candidates(_show_error = false)
-    temp_file = create_temp_file(@file)
+    temp_file = create_modified_temp_file(@file)
 		begin
       _cmp_s = "|ruby '#{temp_file}'"
       _ret = nil
@@ -488,27 +481,22 @@ class SafeCompleteCode
           line
         } 
       end
-#      if _ret.length == 0 && _show_error
-#        _cmp_s_d = _cmp_s+" 2>&1"
-#	      _error = nil
-#	      open(_cmp_s_d,"r") do
-# 		       |f|
-# 		       _error = f.readlines.collect!{| line | line.chomp}
-#     		 end
-#     		 if _error != nil && _error.length > 0
-#          Arcadia.console(self, 'msg'=>_error.to_s, 'level'=>'error')
-#        end
-#      end
+      if @filter.strip.length > 0
+        @words.each{|w| 
+          if !_ret.include?(w) # && w[0..@filter.length-1] == @filter 
+            _ret << w
+          end
+        }
+      end
       _ret.sort
   		rescue Exception => e
-#      Arcadia.console(self, 'msg'=>e.to_s, 'level'=>'error')
+      #Arcadia.console(self, 'msg'=>e.to_s, 'level'=>'error')
  	  ensure
  	    File.delete(temp_file) if File.exist?(temp_file)
  	  end
   end
-  
 
-  def create_temp_file(_base_file=nil)
+  def create_modified_temp_file(_base_file=nil)
     if _base_file
       _file = _base_file+'~~'
     else
@@ -623,7 +611,7 @@ end
 
 class AgEditor
   include Configurable
-  attr_reader :file
+  attr_accessor :file
   attr_reader :read_only 
   attr_reader :page_frame
   attr_reader :text, :root
@@ -631,6 +619,7 @@ class AgEditor
     @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')
@@ -655,6 +644,10 @@ class AgEditor
 #      @fm.is_left_hide?
 #    end
 #  end
+
+  def modified_from_opening?
+    @modified_from_opening
+  end
   
   def xy_insert
     _index_now = @text.index('insert')
@@ -727,38 +720,18 @@ class AgEditor
 
 
   def initialize_text(_frame)
-#    @v_scroll = TkScrollbar.new(_frame,{
-#      'orient'=>'vertical'}.update(Arcadia.style('scrollbar'))
-#    ).pack('side' => 'right', 'fill' => 'y')
-    @text = TkScrollText.new(_frame, Arcadia.style('edit')){|j|
+    @text = TkScrollText.new(_frame, Arcadia.style('text')){|j|
       wrap  'none'
       undo true
-      insertofftime 200
-      insertontime 200
-      highlightthickness 0
-      insertwidth 3
+#      insertofftime 200
+#      insertontime 200
+#      highlightthickness 0
+#      insertwidth 3
       exportselection true
       autoseparators true
       padx 0
       tabs $arcadia['conf']['editor.tabs']
-#      place(
-#        'x'=>0,
-#        'y'=>0,
-#        'width' => -15,
-#        'relheight'=>1,
-#        'relwidth'=>1,
-#        'bordermode'=>'outside'
-#      )
     }
-    
-#    class << @text
-#        def do_yscrollcommand(first,last)
-#          super
-#          do_line_update()
-#        end
-#    end
-
-  # @text.configure('font', @font);
 
     #do_tag_configure_global('debug')
     @text.tag_configure('eval','foreground' => 'yellow', 'background' =>'red','borderwidth'=>1, 'relief'=>'raised')
@@ -770,7 +743,6 @@ class AgEditor
     @text.show_v_scroll
     @text.show_h_scroll
     @text_cursor = @text.cget('cursor')
-
   end
 
   def create_temp_file
@@ -874,7 +846,6 @@ class AgEditor
 
   def raise_complete_code(_candidates, _row, _col, _filter='')
     @raised_listbox_frame.destroy if @raised_listbox_frame != nil
-    #@raised_listbox.destroy if @raised_listbox != nil
     _index_call = _row+'.'+_col
     _index_now = @text.index('insert')
     if _index_call == _index_now 
@@ -882,227 +853,233 @@ class AgEditor
       if _target.strip == '('
         _target = @text.get('insert - 2 chars wordstart','insert')
       end
-        if _target.strip.length > 0 && _target != '.'
-          extra_len = _target.length.+@
-          _begin_index = _index_now<<' - '<<extra_len.to_s<<' chars'
-          @text.tag_add('sel', _begin_index, _index_now)
-        else
-          _begin_index = _index_now
-          extra_len = 0
-        end
-        if _candidates.length >= 1 
-            _rx, _ry, _widht, heigth = @text.bbox(_begin_index);
-            _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)  
-            
-            _max_height = TkWinfo.screenheight(Arcadia.instance.layout.root) - _y - 5
-            self.complete_code_begin
-            
-        #    @raised_listbox_frame = TkResizingTitledFrame.new(Arcadia.instance.layout.root)
-            @raised_listbox_frame = TkFrame.new(Arcadia.instance.layout.root, {
-              :padx=>"1",
-              :pady=>"1",
-              :background=> Arcadia.conf("foreground")
-            })
-            
-            @raised_listbox = TkTextListBox.new(@raised_listbox_frame, {
-              :takefocus=>true, 
-              :selectbackground=>Arcadia.conf('hightlight.1.background'),
-              :selectforeground=>Arcadia.conf('hightlight.1.foreground')}.update(Arcadia.style('listbox'))
-            )
-            _char_height = @font_metrics[2][1]
-            _width = 0
-            _docs_entries = Hash.new
-            _item_num = 0
-            _update_list = proc{|_in|
-                _in.strip!
-                @raised_listbox.clear
-                _length = 0
-                _candidates.each{|value|
-                  _doc = value.strip
-                  _class, _key, _arity = _doc.split('#')
-                  if _key && _arity
-                    args = arity_to_str(_arity.to_i)
-                    if args.length > 0
-                      _key = "#{_key}(#{args})"
-                    end
-                  end
-                  
-                  if _key && _class && _key.strip.length > 0 && _class.strip.length > 0 
-                    _item = "#{_key.strip} - #{_class.strip}"
-                  elsif _key && _key.strip.length > 0
-                    _item = "#{_key.strip}"
-                  else
-                    _key = "#{_doc.strip}"
-                    _item = "#{_doc.strip}"
-                  end
-                  if _in.nil? || _in.strip.length == 0 || _item[0.._in.length-1] == _in 
-                  #|| _item[0.._in.length-1].downcase == _in
-                    _docs_entries[_item]= _doc
-           #         @raised_listbox.insert('end', _item)
-                    @raised_listbox.add(_item)
-                    _temp_length = _item.length
-                    _length = _temp_length if _temp_length > _length 
-                    _item_num = _item_num+1 
-                    _last_valid_key = _key
+      if _target.strip.length > 0 && _target != '.'
+        extra_len = _target.length.+@
+        _begin_index = _index_now<<' - '<<extra_len.to_s<<' chars'
+        @text.tag_add('sel', _begin_index, _index_now)
+      else
+        _begin_index = _index_now
+        extra_len = 0
+      end
+      if _candidates.length >= 1 
+          _rx, _ry, _widht, heigth = @text.bbox(_begin_index);
+          _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)  
+          
+          _max_height = TkWinfo.screenheight(Arcadia.instance.layout.root) - _y - 5
+          self.complete_code_begin
+          
+      #    @raised_listbox_frame = TkResizingTitledFrame.new(Arcadia.instance.layout.root)
+          @raised_listbox_frame = TkFrame.new(Arcadia.instance.layout.root, {
+            :padx=>"1",
+            :pady=>"1",
+            :background=> Arcadia.conf("foreground")
+          })
+          
+          @raised_listbox = TkTextListBox.new(@raised_listbox_frame, {
+            :takefocus=>true, 
+            :selectbackground=>Arcadia.conf('hightlight.1.background'),
+            :selectforeground=>Arcadia.conf('hightlight.1.foreground')}.update(Arcadia.style('listbox'))
+          )
+          _char_height = @font_metrics[2][1]
+          _width = 0
+          _docs_entries = Hash.new
+          _item_num = 0
+          _update_list = proc{|_in|
+              _in.strip!
+              @raised_listbox.clear
+              _length = 0
+              _candidates.each{|value|
+                _doc = value.strip
+                _class, _key, _arity = _doc.split('#')
+                if _key && _arity
+                  args = arity_to_str(_arity.to_i)
+                  if args.length > 0
+                    _key = "#{_key}(#{args})"
                   end
-                }
-                _width = _length*8
-                @raised_listbox.select(1)
-   #             p "_update_list end-->#{Time.new}"
-
-                Tk.event_generate(@raised_listbox, "1") if TkWinfo.mapped?(@raised_listbox)
-            }
-
-            _insert_selected_value = proc{
-              #_value = @raised_listbox.get('active').split('-')[0].strip
-              if @raised_listbox.selected_line && @raised_listbox.selected_line.strip.length>0
-                _value = @raised_listbox.selected_line.split('-')[0].strip
-                @raised_listbox_frame.grab("release")
-                @raised_listbox_frame.destroy
-                #_menu.destroy
-                @text.focus
-                @text.delete(_begin_index,'insert')
-                @text.insert('insert',_value.strip)
-                complete_code_end
+                end
                 
-                _to_search = 'arg1'
-                _argindex = @text.search(_to_search,_begin_index)
-                if !(_argindex && _argindex.length>0)
-                  _to_search = '*'
-                  _argindex = @text.search(_to_search,_begin_index)
+                if _key && _class && _key.strip.length > 0 && _class.strip.length > 0 
+                  _item = "#{_key.strip} - #{_class.strip}"
+                elsif _key && _key.strip.length > 0
+                  _item = "#{_key.strip}"
+                else
+                  _key = "#{_doc.strip}"
+                  _item = "#{_doc.strip}"
                 end
-                if _argindex && _argindex.length>0
-                  _argrow, _argcol = _argindex.split('.')
-                  if _argrow.to_i == _row.to_i
-                    _argindex_sel_end = _argrow.to_i.to_s+'.'+(_argcol.to_i+_to_search.length).to_i.to_s
-                    @text.tag_add('sel', _argindex,_argindex_sel_end)
-                    @text.set_insert(_argindex)
-                  end
+                if _in.nil? || _in.strip.length == 0 || _item[0.._in.length-1] == _in 
+                #|| _item[0.._in.length-1].downcase == _in
+                  _docs_entries[_item]= _doc
+         #         @raised_listbox.insert('end', _item)
+                  @raised_listbox.add(_item)
+                  _temp_length = _item.length
+                  _length = _temp_length if _temp_length > _length 
+                  _item_num = _item_num+1 
+                  _last_valid_key = _key
                 end
+              }
+              _width = _length*8
+              @raised_listbox.select(1)
+ #             p "_update_list end-->#{Time.new}"
+
+              Tk.event_generate(@raised_listbox, "1") if TkWinfo.mapped?(@raised_listbox)
+          }
+
+          _insert_selected_value = proc{
+            #_value = @raised_listbox.get('active').split('-')[0].strip
+            if @raised_listbox.selected_line && @raised_listbox.selected_line.strip.length>0
+              _value = @raised_listbox.selected_line.split('-')[0].strip
+              @raised_listbox_frame.grab("release")
+              @raised_listbox_frame.destroy
+              #_menu.destroy
+              @text.focus
+              @text.delete(_begin_index,'insert')
+
+              # workaround for @ char
+              _value = _value.strip
+              if _value[0..0] !=_target[0..0] && _value[1..1] == _target[0..0]
+                _value = _value[1..-1]
               end
+              @text.insert('insert',_value)
+              complete_code_end
               
-              Tk.callback_break
-            }
-            _update_list.call(_filter)
-            if _item_num == 0
-              @raised_listbox_frame.destroy
-              self.complete_code_end
-              return
-            elsif _item_num == 1 
-              _insert_selected_value.call
-              return
+              _to_search = 'arg1'
+              _argindex = @text.search(_to_search,_begin_index)
+              if !(_argindex && _argindex.length>0)
+                _to_search = '*'
+                _argindex = @text.search(_to_search,_begin_index)
+              end
+              if _argindex && _argindex.length>0
+                _argrow, _argcol = _argindex.split('.')
+                if _argrow.to_i == _row.to_i
+                  _argindex_sel_end = _argrow.to_i.to_s+'.'+(_argcol.to_i+_to_search.length).to_i.to_s
+                  @text.tag_add('sel', _argindex,_argindex_sel_end)
+                  @text.set_insert(_argindex)
+                end
+              end
             end
-            _width = _width + 10
-            #_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
-            @raised_listbox_frame.place('x'=>_xroot,'y'=>_yroot, 'width'=>_width, 'height'=>_height)
-            @raised_listbox.show(0,0,'inside')
-            @raised_listbox.show_v_scroll
-            @raised_listbox.focus
-            #@raised_listbox.activate(0)
-            @raised_listbox.select(1)
-            @raised_listbox_frame.grab("set")
-         #   Tk.event_generate(@raised_listbox, "1")
-         
-         
-            @raised_listbox.bind_append("Double-ButtonPress-1", 
-              proc{|x,y| 
-                _index = @raised_listbox.index("@#{x},#{y}")
-                _line = _index.split('.')[0].to_i
-                @raised_listbox.select(_line)
-                _insert_selected_value.call
-                  }, "%x %y")
-            @raised_listbox.bind_append('Shift-KeyPress'){|e|
-              # todo
-              case e.keysym
-                when 'parenleft'
-                  @text.insert('insert','(')
-                  _buffer = _buffer + '('
-                  _item_num = 0
-                  _update_list.call(_buffer)
-                  if _item_num == 1
-                    _insert_selected_value.call
-                  end
-                  Tk.callback_break
-                when 'A'..'Z','equal','greater'
-                  if e.keysym == 'equal'
-                    ch = '='
-                  elsif e.keysym == 'greater'
-                    ch = '>'
-                  else
-                    ch = e.keysym
-                  end
-                  @text.insert('insert',ch)
-                  _buffer = _buffer + ch
-                  _update_list.call(_buffer)
-                  Tk.callback_break
+            Tk.callback_break
+          }
+          _update_list.call(_filter)
+          if _item_num == 0
+            @raised_listbox_frame.destroy
+            self.complete_code_end
+            return
+          elsif _item_num == 1 
+            _insert_selected_value.call
+            return
+          end
+          _width = _width + 30
+          #_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
+          @raised_listbox_frame.place('x'=>_xroot,'y'=>_yroot, 'width'=>_width, 'height'=>_height)
+          @raised_listbox.show(0,0,'inside')
+          @raised_listbox.show_v_scroll
+          @raised_listbox.focus
+          #@raised_listbox.activate(0)
+          @raised_listbox.select(1)
+          @raised_listbox_frame.grab("set")
+       #   Tk.event_generate(@raised_listbox, "1")
+       
+       
+          @raised_listbox.bind_append("Double-ButtonPress-1", 
+            proc{|x,y| 
+              _index = @raised_listbox.index("@#{x},#{y}")
+              _line = _index.split('.')[0].to_i
+              @raised_listbox.select(_line)
+              _insert_selected_value.call
+                }, "%x %y")
+          @raised_listbox.bind_append('Shift-KeyPress'){|e|
+            # todo
+            case e.keysym
+              when 'parenleft'
+                @text.insert('insert','(')
+                _buffer = _buffer + '('
+                _item_num = 0
+                _update_list.call(_buffer)
+                if _item_num == 1
+                  _insert_selected_value.call
+                end
+                Tk.callback_break
+              when 'A'..'Z','equal','greater'
+                if e.keysym == 'equal'
+                  ch = '='
+                elsif e.keysym == 'greater'
+                  ch = '>'
                 else
-                  if e.keysym.length > 1 
-                    p ">#{e.keysym}<"
-                    Tk.callback_break
-                  end
-              end
-            }
-            @raised_listbox.bind_append('KeyPress'){|e|
-              case e.keysym
-                when 'Escape'
-                  @raised_listbox.grab("release")
-                  @raised_listbox_frame.destroy
-                  complete_code_end
-                  @text.focus
-                  #_menu.destroy
+                  ch = e.keysym
+                end
+                @text.insert('insert',ch)
+                _buffer = _buffer + ch
+                _update_list.call(_buffer)
+                Tk.callback_break
+              else
+                if e.keysym.length > 1 
+                  p ">#{e.keysym}<"
                   Tk.callback_break
+                end
+            end
+          }
+          @raised_listbox.bind_append('KeyPress'){|e|
+            case e.keysym
+              when 'Escape'
+                @raised_listbox.grab("release")
+                @raised_listbox_frame.destroy
+                complete_code_end
+                @text.focus
+                #_menu.destroy
+                Tk.callback_break
 #                when 'Return'
 #                  _insert_selected_value.call
-                when 'F1'
-                  _key = @raised_listbox.selected_line.split('-')[0].strip
-                  _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','less','space'
-                  if e.keysym == 'less'
-                    ch = '<'
-                  elsif e.keysym == 'space'
-                    ch = ''
-                  else
-                    ch = e.keysym
-                  end
-                  @text.insert('insert',ch)
-                  _buffer = _buffer + ch
-                  _update_list.call(_buffer)
-                  Tk.callback_break
-                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)
-                    Tk.callback_break
-                  end
-                when 'Next', 'Prior'
+              when 'F1'
+                _key = @raised_listbox.selected_line.split('-')[0].strip
+                _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','less','space'
+                if e.keysym == 'less'
+                  ch = '<'
+                elsif e.keysym == 'space'
+                  ch = ''
                 else
+                  ch = e.keysym
+                end
+                @text.insert('insert',ch)
+                _buffer = _buffer + ch
+                _update_list.call(_buffer)
+                Tk.callback_break
+              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)
                   Tk.callback_break
-              end
-            }
-            @raised_listbox.bind_append('KeyRelease'){|e|
-              case e.keysym
-                when 'Return'
-                  _insert_selected_value.call
-              end
-            }
-          elsif _candidates.length == 1 && _candidates[0].length>0
-            @text.delete(_begin_index,'insert');
-            @text.insert('insert',_candidates[0].split[0])
-            complete_code_end
-          end
-      end
+                end
+              when 'Next', 'Prior'
+              else
+                Tk.callback_break
+            end
+          }
+          @raised_listbox.bind_append('KeyRelease'){|e|
+            case e.keysym
+              when 'Return'
+                _insert_selected_value.call
+            end
+          }
+        elsif _candidates.length == 1 && _candidates[0].length>0
+          @text.delete(_begin_index,'insert');
+          @text.insert('insert',_candidates[0].split[0])
+          complete_code_end
+        end
+    end
   end
    
   
@@ -1120,7 +1097,14 @@ class AgEditor
     }
     
     @text.bind_append("KeyPress"){|e|
-      @do_complete = false
+      if e.keysym == "Escape"
+        if @n_complete_task == 0
+          @do_complete = true
+          complete_code
+        end
+      else
+        @do_complete = false
+      end
     }    
 
     @text.bind_append("KeyRelease"){|e|
@@ -1158,6 +1142,14 @@ class AgEditor
           end
         end
         break
+      when 'o'  
+        if @file
+          _dir = File.dirname(@file)
+        else
+          _dir = Dir.pwd
+        end
+        Arcadia.process_event(OpenBufferEvent.new(self,'file'=>Tk.getOpenFile('initialdir'=>_dir)))
+        break
       when 'c'
         @text.text_copy
         break
@@ -1769,7 +1761,7 @@ class AgEditor
     
     @pop_up.insert('end',
       :command,
-      :label=>'Data image',
+      :label=>'Data image from file',
       :hidemargin => false,
       :command=> proc{
         file = Tk.getOpenFile
@@ -1795,7 +1787,6 @@ class AgEditor
         if _r.length>0
           _data=@text.get(_r[0][0],_r[0][1])
           if _data.length > 0
-
             _b = TkButton.new(@text, 
               'command'=>proc{_b.destroy},
               'image'=> TkPhotoImage.new('data' => _data),
@@ -1806,6 +1797,33 @@ class AgEditor
       }
     )
 
+    @pop_up.insert('end',
+      :command,
+      :label=>'Data image to file',
+      :hidemargin => false,
+      :command=> proc{
+        _r = @text.tag_ranges('sel')
+        if _r.length>0
+          _data=@text.get(_r[0][0],_r[0][1])
+          if _data.length > 0
+            file = Tk.getSaveFile("filetypes"=>[["Image", [".gif"]],["All Files", [".*"]]])
+            if file
+              require 'base64'
+              decoded = Base64.decode64(_data)
+              f = File.new(file, "w")
+              begin
+                if f
+                  f.syswrite(decoded)
+                end
+              ensure
+                f.close unless f.nil?
+              end
+            end
+          end
+        end
+      }
+    )
+
     @pop_up.insert('end', :separator)
 
     #---- debug menu
@@ -1860,6 +1878,40 @@ class AgEditor
       :command=> proc{@text.configure('wrap'=>'none');@text.show_h_scroll}
     )
 
+    _sub_code.insert('end',
+      :command,
+      :label=>'Selection to uppercase',
+      :hidemargin => false,
+      :command=> proc{
+        _r = @text.tag_ranges('sel')
+        if _r.length>0
+          _text=@text.get(_r[0][0],_r[0][1])
+          if _text.length > 0
+            @text.delete(_r[0][0],_r[0][1])
+            @text.insert(_r[0][0],_text.upcase)
+          end
+        end
+      }
+    )
+
+    _sub_code.insert('end',
+      :command,
+      :label=>'Selection to downcase',
+      :hidemargin => false,
+      :command=> proc{
+        _r = @text.tag_ranges('sel')
+        if _r.length>0
+          _text=@text.get(_r[0][0],_r[0][1])
+          if _text.length > 0
+            @text.delete(_r[0][0],_r[0][1])
+            @text.insert(_r[0][0],_text.downcase)
+          end
+        end
+      }
+    )
+
+
+
     _sub_code.insert('end',
       :command,
       :label=>'Show tabs',
@@ -2294,6 +2346,7 @@ class AgEditor
   def set_modify
     if !@set_mod
       @set_mod = true
+      @modified_from_opening = true
       @controller.change_tab_set_modify(@page_frame)
     end
   end
@@ -2617,6 +2670,7 @@ class AgEditor
   end
 
   def check_modify
+    return  if @loading
     if modified? 
       set_modify if !@set_mod
     else
@@ -2634,7 +2688,7 @@ class AgEditor
             'title' => '(Arcadia) Libs', 'parent' => @text,
             'message' => msg) == 'yes'
             @text.delete('1.0','end')
-            reset_highlight
+            reset_highlight if @highlighting
             load_file(@file)
           else
             @file_last_access_time = ftime
@@ -2846,7 +2900,7 @@ class AgMultiEditor < ArcadiaExt
       :command=> proc{
         if @selected_tab_name_from_popup != nil
           _e = @tabs_editor[@selected_tab_name_from_popup]
-          self.close_editor(_e)
+          self.close_editor(_e) if _e
         end
       }
     )
@@ -2981,6 +3035,19 @@ class AgMultiEditor < ArcadiaExt
           if _event.row
             _index = _event.row.to_s+'.0' 
           end
+          if _event.kind_of?(OpenBufferTransientEvent) && conf('close-last-if-not-modified')=="yes"
+            if defined?(@last_transient_file) && !@last_transient_file.nil? && @last_transient_file != _event.file
+              _e = @tabs_editor[tab_name(@last_transient_file)]
+              if _e && !_e.modified_from_opening?
+                close_editor(_e)
+              end
+            end
+            if !editor_exist?(_event.file)
+              @last_transient_file = _event.file
+            else
+              @last_transient_file = nil
+            end
+          end
           self.open_file(_event.file, _index)
         elsif _event.text
           if _event.title 
@@ -3022,6 +3089,11 @@ class AgMultiEditor < ArcadiaExt
         if _event.line == nil
           @find.show_go_to_line_dialog
         end
+      when MoveBufferEvent
+        if _event.old_file && _event.new_file && editor_exist?(_event.old_file)
+          #close_file(_event.old_file)
+          change_file(_event.old_file, _event.new_file)          
+        end
     end
   end
 
@@ -3049,6 +3121,7 @@ class AgMultiEditor < ArcadiaExt
         _files=_files+'|' if _files.strip.length > 0
         _files=_files + editor.file
       end
+      #p editor.text.dump_tag('0.1',editor.text.index('end'))
       close_editor(editor)
     }
     Arcadia.persistent('editor.files.open', _files)
@@ -3069,7 +3142,8 @@ class AgMultiEditor < ArcadiaExt
   end
 
   def close_raised
-    close_editor(@tabs_editor[@main_frame.enb.raise])
+    _e = @tabs_editor[@main_frame.enb.raise]
+    close_editor(_e) if _e
   
     #_page = @main_frame.enb.raise
     #_editor = @tabs_editor[_page]
@@ -3230,6 +3304,14 @@ class AgMultiEditor < ArcadiaExt
     @main_frame.enb.itemconfigure(page_name(_tab), 'text'=> _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
+    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)
@@ -3392,6 +3474,7 @@ class AgMultiEditor < ArcadiaExt
       ext = _e.file_extension(_title)
       ext='rb' if ext.nil?
       _e.init_editing(ext, w1)
+      _e.text.set_focus
       #@tabs_file[_buffer_name]= nil
       @tabs_editor[_buffer_name]=_e
     end
@@ -3447,7 +3530,8 @@ class AgMultiEditor < ArcadiaExt
   end
 
   def close_file(_filename)
-    close_editor(@tabs_editor[tab_name(_filename)])
+    _e = @tabs_editor[tab_name(_filename)]
+    close_editor(_e) if _e
   end
 
   def save_file(_filename)