arcadia 0.4.0 → 0.5.0

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

@@ -1,6 +1,6 @@
 name=editor
-labels=Editor
-frames=0.1
+labels=Editor,Outline
+frames=0.1,0.0
 active=yes
 require=ext/ae-editor/ae-editor
 class=AgMultiEditor

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

@@ -2,17 +2,21 @@
 #   ae-editor.rb - Arcadia Ruby ide
 #   by Antonio Galeone <antonio-galeone@rubyforge.org>
 #
+#   §require_dir_ref=../..
+#   §require_omissis=conf/arcadia.init
 
 require 'tk'
 require 'tktext'
 require 'lib/a-tkcommons'
+#require 'lib/a-commons'
+require 'lib/a-core'
 
 class TreeNode
   attr_reader :sons
   attr_reader :parent
   attr_reader :kind
-  attr_reader :rif, :label, :helptext
-  attr_writer :rif, :label, :helptext
+  attr_reader :rif, :rif_end, :label, :helptext
+  attr_writer :rif, :rif_end, :label, :helptext
   def initialize(parent=nil, kind='KClass')
     @sons = Array.new
     @parent = parent
@@ -28,6 +32,502 @@ class TreeNode
   end
 end
 
+class SourceStructure
+  attr_reader :root
+  attr_reader :injected_row
+  def initialize(_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("\s#{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
+          
+          if  _livs[_liv-1] && _livs[_liv-1].kind != 'KDef'
+            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
+              _node.helptext = _helptext
+              _node.rif = _row.to_s
+              _livs[_pliv-1]=_node
+            }
+            _liv = _liv - 2
+          end
+        else
+          _row = _row +1
+          _liv = _liv - 1
+          next
+        end
+      end
+      m_end = /[\s\n\t\;]+end[\s\n\t\;]+/.match(line)
+      if m_end
+        if _livs[_liv]
+          _livs[_liv].rif_end = _row
+          #p "#{_livs[_liv].helptext} rif_end = #{_livs[_liv].rif_end}"
+        end
+        _liv = _liv - 1
+      end
+      _row = _row +1
+    }
+  end
+  
+  def scheletor_from_node(_node, _source='', _injected_source='', _injected_class='')
+    _hinner_source = ''
+    #_sons = _node.sons.sort
+    _sons = _node.sons
+    for inode in 0.._sons.length - 1
+      _son = _sons[inode]
+      if _son.kind == 'KClass'
+         _hinner_source = "#{_hinner_source}class #{_son.helptext}\n"
+      elsif _son.kind == 'KModule'
+         _hinner_source = "#{_hinner_source}module #{_son.helptext}\n"
+      elsif _son.kind == 'KDef' && _son.helptext != 'initialize'
+         
+         _hinner_source = "#{_hinner_source}  def #{_son.helptext}\n"
+         _hinner_source = "#{_hinner_source}  end\n"
+      elsif _son.kind == 'KDefClass'
+         _hinner_source = "#{_hinner_source}  def #{_son.helptext}\n"
+         _hinner_source = "#{_hinner_source}  end\n"
+      end
+      _hinner_source= scheletor_from_node(_son, _hinner_source, _injected_source, _injected_class)
+    end
+    _source = "#{_source}#{_hinner_source}" if _hinner_source.strip.length>0
+    if _node.kind == 'KClass' && _node.label == _injected_class
+      _source = "#{_source}  def initialize\n  #{_injected_source}  end\n"
+      @injected_row = _source.split("\n").length-2
+    end
+    _source = "#{_source}end\n" if _node.kind == 'KClass' || _node.kind == 'KModule'
+    _source
+  end
+  
+  
+
+  def 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
+    else 
+      _sons = _from_node.sons
+      for inode in 0.._sons.length - 1
+        _son = _sons[inode]
+        _found_node = node_by_line(_son, _line)
+        break if _found_node
+      end
+    end
+    return _found_node
+  end
+  
+  
+  def class_node_by_line(_line)
+    line_node = node_by_line(@root, _line)
+    class_node = line_node
+    while class_node != nil && class_node.kind != "KClass"
+      class_node = class_node.parent
+    end
+    return class_node
+  end
+  
+  def classies
+  end
+  def modules
+  end
+  def class_methods(_class)
+  end
+  
+
+end
+
+class SafeCompleteCode
+  attr_reader :modified_row, :modified_col
+  attr_reader :filter
+  def initialize(_source, _row, _col, _file=nil)
+    @source = _source
+    @file = _file
+    @row = _row.to_i
+    @col = _col.to_i
+    @ss = SourceStructure.new(_source)
+    @filter=''
+    #@candidates = 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"
+    ret = ret + "meth = #{_var_name}.method(m)\n"
+    ret = ret +"if owner_on\n"
+    ret = ret +"_owner=meth.owner.name\n"
+    ret = ret +"else\n"
+    ret = ret +"meth_insp = meth.inspect\n"
+    ret = ret +"to_sub ='#<Method:\s'+_class\n"
+    ret = ret +"_owner=meth_insp.sub(to_sub,'').split('#')[0].strip.sub('(','').sub(')','')\n"
+    ret = ret +"_owner=_class if _owner.strip.length==0\n"
+    ret = ret +"end\n"
+    ret = ret + "if _owner != _class\n"
+    ret = ret + "print _owner+'#'+m+'#'+meth.arity.to_s+'\n'\n"
+    ret = ret +"else\n"
+    ret = ret + "print ''+'#'+m+'#'+meth.arity.to_s+'\n'\n"
+    ret = ret +"end\n"
+    ret = ret + "}\n"
+    ret = ret + "exit\n"
+    ret
+  end
+  
+  def scope_trip
+    ret = "ObjectSpace.each_object(Class){|o|\n"
+    ret = ret + " o_name = o.name\n"
+    ret = ret + " print '#'+o_name+'\n' if o_name && o_name.strip.length>0 \n"
+    ret = ret + "}\n"
+    ret = ret + dot_trip('self')
+    ret
+  end
+  
+  def declaration(_dec_line='')
+    if _dec_line.include?('.new')
+      pre, post = _dec_line.split('.new')
+      dec_line_processed = "#{pre}.new"
+      post.strip!
+      if post && post[0..0]=='('
+        k=0
+        ch = '('
+        while k < post.length && ch != ')'
+          k = k+1
+          ch=post[k..k]
+        end
+        if ch == ')'
+          args = post[1..k-1]
+          args_array = args.split(',')
+          n_args = args_array.length
+          if n_args > 0
+            new_args = ''
+            1.upto( n_args ){
+               if new_args.length > 0
+                 new_args = "#{new_args},"
+               end
+               new_args = "#{new_args}nil"
+            }
+            dec_line_processed = "#{dec_line_processed}(#{new_args})"
+          end
+        end
+      end
+    else
+      dec_line_processed = _dec_line
+    end
+    dec_line_processed
+  end
+  
+  def is_dot?
+    @is_dot
+  end
+
+  def process_source
+    @modified_source = ""
+    @modified_row = @row
+    @modified_col = @col
+    source_array = @source.split("\n")
+    #---------------------------------
+    focus_line = source_array[@row-1]
+    focus_line = '' if focus_line.nil?
+    focus_world = ''
+    if focus_line && focus_line.strip.length > 0
+      if focus_line[@col-1..@col-1] == '.'
+        @is_dot=true
+        focus_segment = focus_line[0..@col-2]
+      elsif focus_line.include?('.')
+        @is_dot=true
+        focus_segment_array = focus_line.split('.')
+        focus_segment = ''
+        focus_segment_array[0..-2].each{|seg|
+          if focus_segment.strip.length > 0
+            focus_segment = focus_segment+'.'
+          end
+          focus_segment = focus_segment+seg
+        }
+        @filter = focus_segment_array[-1].strip
+      else
+        focus_segment = ''
+        @filter = focus_word(focus_line[0..@col-1].strip)
+      end
+      focus_world= focus_word(focus_segment)
+    end
+    @class_node = @ss.class_node_by_line(@row)
+    #---------------------------------
+    @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
+      if line.strip.length > 0 && line.strip[0..0]=='#'
+        @modified_row = @modified_row-1
+        m = /§require_dir_ref=[\s]*(.)*/.match(line)
+        if m 
+          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)
+        if m 
+          require_omissis=line.split('§require_omissis=')[1].strip
+          @modified_source = "#{@modified_source}require '#{require_omissis}'\n"
+          @modified_row = @modified_row+1
+        end   
+        
+             
+      # 1) includiano i require
+      elsif line.strip.length>7 && (line.strip[0..7]=="require " || line.strip[0..7]=="require(")
+        @modified_source = "#{@modified_source}#{line}\n"
+        #@modified_row = @modified_row+1
+        #Arcadia.console(self, 'msg'=>"per require @modified_row=#{@modified_row}")
+      # 2) includiano la riga da evaluare con un $SAFE 3
+      elsif j.to_i == @row-1
+        focus_line = line
+        break
+      # 3) eliminiamo la riga
+      else
+        @modified_row = @modified_row-1
+      end
+      break if j.to_i >= @row - 1
+    }
+    if focus_line
+      # ricerchiamo una eventuale dichiarazione
+        if focus_world && focus_world.strip.length > 0
+          begin
+            re = Regexp::new('[\s\n\t\;]('+focus_world.strip+')[\s\t]*=(.)*')
+            source_array.each_with_index  do |line,j|
+              #m = /[\s\n\t\;](#{focus_world})[\s\t]*=(.)*/.match(line)
+              
+              m = re.match("\s#{line}")
+              if m
+                @dec_line = line
+                @class_dec_line_node = @ss.class_node_by_line(j+1)
+                break
+              end
+            end
+        		rescue Exception => e
+#            Arcadia.console(self, 'msg'=>e.inspect, 'level'=>'error')
+          end
+          
+        end
+
+        if @class_node
+          to_iniect = "$SAFE = 3\n"
+          if @class_dec_line_node && @class_dec_line_node.label == @class_node.label
+            to_iniect = "#{to_iniect}#{declaration(@dec_line)}\n"
+          end
+          if focus_world.length > 0
+            to_iniect = "#{to_iniect}#{dot_trip(focus_world)}\n"
+          else
+            to_iniect = "#{to_iniect}#{scope_trip}\n"
+          end
+          #to_iniect = "#{to_iniect}#{focus_line}\n"
+          to_iniect_class = @class_node.label
+        else
+          to_iniect = ''
+          to_iniect_class = ''
+        end
+
+        ss_source = @ss.scheletor_from_node(@ss.root,'',to_iniect, to_iniect_class)
+        ss_source_array = ss_source.split("\n")
+        ss_len = ss_source_array.length
+        if ss_len>0 && ss_source_array[0].strip != focus_line.strip
+          @modified_source = "#{@modified_source}#{ss_source}"
+          if @class_node
+            @modified_source = "#{@modified_source}#{@class_node.label.downcase} = #{@class_node.label}.new\n"
+          end
+        else
+          ss_len = 0
+          @class_node = nil
+        end
+        if @class_node
+          @modified_row = @modified_row + @ss.injected_row
+        else
+          @modified_source = "#{@modified_source}$SAFE = 3\n"
+          if @dec_line
+            
+            
+            @modified_source = "#{@modified_source}#{declaration(@dec_line)}\n"
+            @modified_row = @modified_row+1
+          end
+          #@modified_source = "#{@modified_source}_candidates=@candidates\n"
+          if focus_world.length > 0
+            @modified_source = "#{@modified_source}#{dot_trip(focus_world)}\n"
+          else
+            @modified_source = "#{@modified_source}#{scope_trip}\n"
+          end
+          #@modified_source = "#{@modified_source}@candidates=_candidates\n"
+
+          
+          #@modified_source = "#{@modified_source}#{focus_line}\n"
+          @modified_row = @modified_row+1+ss_len
+        end
+    end
+
+#    Arcadia.console(self, 'msg'=>@modified_source)
+#    Arcadia.console(self, 'msg'=>"@modified_row=#{@modified_row}")
+#    Arcadia.console(self, 'msg'=>"focus_line=#{focus_line}") if focus_line
+#    Arcadia.console(self, 'msg'=>"focus_world=#{focus_world}") if focus_world
+#    Arcadia.console(self, 'msg'=>"@filter=#{@filter}") if @filter
+#    Arcadia.console(self, 'msg'=>"@dec_line=#{@dec_line}") if @dec_line
+#    Arcadia.console(self, 'msg'=>"declaration(@dec_line)=#{declaration(@dec_line)}") if @dec_line
+  end
+
+  def focus_word(focus_segment)
+      focus_world = ''
+      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
+      end
+      focus_world
+  end
+  
+  def candidates(_show_error = false)
+    temp_file = create_temp_file(@file)
+		begin
+      _cmp_s = "|ruby #{temp_file}"
+      _ret = nil
+      open(_cmp_s,"r") do
+        |f|
+        _ret = f.readlines.collect!{| line | 
+          #line.chomp
+          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
+      _ret.sort
+  		rescue Exception => e
+#      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)
+    if _base_file
+      _file = _base_file+'~~'
+    else
+      _file = 'buffer~~'
+    end
+    f = File.new(_file, "w")
+    begin
+      if f
+        f.syswrite(@modified_source)
+      end
+    ensure
+      f.close unless f.nil?
+    end
+    _file
+  end
+
+end
+
+
 #class TkArcadiaText < TkText
 #  
 #  def insert(insert, chars,*tags)
@@ -37,6 +537,90 @@ end
 #  end
 #end
 
+
+class TkTextListBox < TkScrollText
+  def initialize(parent=nil, keys={})
+    super(parent, keys)
+    wrap  'none'
+    tag_configure('selected','background' =>'#bbd9b1','borderwidth'=>1, 'relief'=>'raised')
+    tag_configure('class', 'foreground' => '#3398cb')
+    @count = 0
+    @selected = -1
+    self.bind_append('KeyPress'){|e| key_press(e)}
+    self.bind_append('KeyRelease'){|e| key_release(e)}
+    self.bind_append("ButtonPress-1", proc{|x,y| button_press(x,y)}, "%x %y")
+  end  
+  
+
+  def insert(index, chars, *tags)
+    super(index, chars, *tags)
+  end  
+  
+  def add(chars)
+    meth_str, class_str = chars.split('-')
+    if meth_str && meth_str.strip.length>0 && class_str
+      insert('end', "#{meth_str}")
+      insert('end', "-#{class_str}\n", 'class')
+    elsif meth_str && meth_str.strip.length==0 && class_str
+      insert('end', "-#{class_str}\n")
+    else
+      insert('end', "#{chars}\n")
+    end
+    @count = @count+1
+  end  
+  
+  def clear
+    delete('1.0','end')
+    @count = 0
+  end
+
+  def button_press(x,y)
+    _index = self.index("@#{x},#{y}")
+    _line = _index.split('.')[0].to_i
+    self.select(_line)
+  end
+  
+  def key_press(_e)
+      case _e.keysym
+        when 'Up'
+          if @selected > 0
+            select(@selected-1)
+          end
+        when 'Down'
+          if @selected < @count
+            select(@selected+1)
+          end
+      end
+  end  
+
+  def key_release(_e)
+      case _e.keysym
+        when 'Next','Prior'
+         index = self.index('@0,0')
+         line = index.split('.')[0].to_i
+         select(line)
+      end
+  end  
+
+  def selected_line
+    if @selected > 0
+      self.get("#{@selected}.0", "#{@selected}.0 lineend")
+    end
+  end
+
+  def select(_row)
+    self.tag_remove('selected', '1.0', 'end')
+    _start_index = "#{_row.to_s}.0"
+    _end_index = "#{_start_index} +1 lines linestart"
+    self.tag_add('selected', _start_index, _end_index)
+    self.set_insert(_start_index)
+    self.see(_start_index)
+    @selected = _row
+  end
+
+end
+
+
 class AgEditor
   include Configurable
   attr_reader :file
@@ -60,37 +644,31 @@ class AgEditor
     @loading=false
   end
   
-  def hide_exp
-    @fm.hide_left if @fm
-  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
+#  def is_exp_hide?
+#    if @fm.nil?
+#      return true
+#    else
+#      @fm.is_left_hide?
+#    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
   end
   
+  
   def initialize_tree(_frame)
-    @classbrowsing = true 
-
-    @nb = Tk::BWidget::NoteBook.new(_frame, Arcadia.style('tabpanel')){
-#      activeforeground 'red'
-#      activebackground 'yellow'
-#      borderwidth 1
-#      font $arcadia['conf']['editor.tabs.font']
-      tabbevelsize 0
-      internalborderwidth 0
-      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', 
-        'background'=> Arcadia.style("tabpanel.background"),
-        'foreground'=> Arcadia.style("tabpanel.foreground")
-    )
-    @nb.raise('exp')
+    @classbrowsing = @is_ruby
     _tree_goto = proc{|_self|
       _line = _self.selection_get[0]
       _index =_line.to_s+'.0'
@@ -98,7 +676,6 @@ class AgEditor
       _editor_line = @text.get(_index, _index+ '  lineend')
       if !_editor_line.include?(_hinner_text)
         Arcadia.console(self, 'msg'=>"... rebuild tree \n")
-        #Arcadia.new_msg(self, "... rebuild tree \n")
         if @tree_thread && @tree_thread.alive?
           @tree_thread.exit
         end
@@ -113,24 +690,16 @@ class AgEditor
       @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(@nb_tab_exp, Arcadia.style('treepanel')){
-      #background Arcadia.conf('edit.background')
-      #relief Arcadia.conf('edit.relief')
-      #highlightbackground Arcadia.conf('edit.highlightbackground')
-      #borderwidth Arcadia.conf('edit.borderwidth')
+    @tree_exp = Tk::BWidget::Tree.new(_frame, Arcadia.style('treepanel')){
       showlines false
       deltay 18
       dragenabled true
       selectcommand proc{ _tree_goto.call(self) } 
-      place('relwidth' => 1,'relx' => 0,'x' => '0','y' => '0','relheight' => '1','rely' => 0,'height' => 1,'bordermode' => 'inside','width' => '50')
     }
-    
-    _c_explo = proc{|*args| @tree_exp.yview(*args)}
-    _s_explo = TkScrollbar.new(@nb_tab_exp, Arcadia.style('scrollbar')){|s|
-      width 8
-      command _c_explo
-    }.pack('side'=>'right', 'fill'=>'y')
-    @tree_exp.yscrollcommand proc{|first,last| _s_explo.set first,last}
+    @tree_scroll_wrapper = TkScrollWidget.new(@tree_exp)
+    @tree_scroll_wrapper.show
+    @tree_scroll_wrapper.show_v_scroll
+    @tree_scroll_wrapper.show_h_scroll
     pop_up_menu_tree
   end
 
@@ -158,34 +727,37 @@ class AgEditor
 
 
   def initialize_text(_frame)
-    @v_scroll = TkScrollbar.new(_frame,{
-      'orient'=>'vertical'}.update(Arcadia.style('scrollbar'))
-    ).pack('side' => 'right', 'fill' => 'y')
-    @text = TkText.new(@fm1.right_frame, Arcadia.style('edit')){|j|
+#    @v_scroll = TkScrollbar.new(_frame,{
+#      'orient'=>'vertical'}.update(Arcadia.style('scrollbar'))
+#    ).pack('side' => 'right', 'fill' => 'y')
+    @text = TkScrollText.new(_frame, Arcadia.style('edit')){|j|
       wrap  'none'
-  #    relief 'flat'
       undo true
       insertofftime 200
       insertontime 200
-#      insertbackground $arcadia['conf']['editor.color.insertbackground']
-#      background $arcadia['conf']['editor.color.background']
-#      foreground $arcadia['conf']['editor.color.foreground']
-#      highlightcolor $arcadia['conf']['editor.color.background']
       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'
-      )
+#      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')
@@ -194,6 +766,11 @@ class AgEditor
     #@text.tag_configure('debug', 'background' =>'#b9c6d9', 'borderwidth'=>1 ,'relief'=>'raise')
     @buffer = text_value
     pop_up_menu
+    @text.show
+    @text.show_v_scroll
+    @text.show_h_scroll
+    @text_cursor = @text.cget('cursor')
+
   end
 
   def create_temp_file
@@ -212,27 +789,333 @@ class AgEditor
     end
     _file
   end
+
+  def create_temp_file_for_completion(_row)
+    _custom_text = ""
+    text_value_array = text_value.split("\n")
+    text_value_array.each_with_index{|line,j|
+      # 1) includiano i require e la riga da includere
+      if line.include?("require") || j.to_i == _row.to_i-1
+        _custom_text = "#{_custom_text}#{line}\n"
+        #p "inserisco=>#{line} alla riga=>#{j}"
+      elsif j.to_i == _row.to_i-2
+        _custom_text = "#{_custom_text}$SAFE = 3\n"
+      else
+        _custom_text = "#{_custom_text}\n"
+        #p "inserisco=>blank alla riga=>#{j}"
+      end
+      #p "riga:#{j}"
+      break if j.to_i >= _row.to_i - 1
+    }
+    Arcadia.console(self, 'msg'=>_custom_text)
+
+    if @file
+      _file = @file+'~~'
+    else
+      _file = 'buffer~~'
+    end
+    f = File.new(_file, "w")
+    begin
+      if f
+        f.syswrite(_custom_text)
+      end
+    ensure
+      f.close unless f.nil?
+    end
+    _file
+  end
+
+  def complete_code_begin
+    @n_complete_task = 1
+    @text.configure('cursor'=> 'hand2')
+    #disactivate_key_binding
+  end
+
+  def complete_code_end
+    @text.configure('cursor'=> @text_cursor)
+    #activate_key_binding
+    @n_complete_task = 0
+  end
+
+
+  def complete_code
+    @do_complete = @do_complete && @controller.accept_complete_code
+    if @do_complete
+      line, col = @text.index('insert').split('.')
+      mss = SafeCompleteCode.new(text_value, line.to_i, col.to_i, @file)
+      candidates = mss.candidates
+      raise_complete_code(candidates, line.to_s, col.to_s, mss.filter) if candidates && candidates.length > 0 
+    end
+  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
+  def arity_to_str(_arity=0)
+    ret = ''
+    jolly_args = _arity < 0
+    if jolly_args 
+      _arity = _arity.abs - 1
+    end
+    j = _arity
+    while j > 0
+      if ret.strip.length > 0
+        ret = "#{ret},"
+      end
+      ret = "#{ret}arg#{_arity-j+1}"
+      j = j-1
+    end
+    if jolly_args 
+      if ret.strip.length > 0
+        ret = "#{ret},"
+      end
+      ret = "#{ret}*"
+    end    
+    ret    
+  end
+
+
+  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 
+      _target = @text.get('insert - 1 chars wordstart','insert')
+      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
-        @controller.raise_complete_code(event) if @do_complete
-    }
+        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
+                  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
+                
+                _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
+              
+              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 + 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
+                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'
+                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
+   
+  
+  def activate_complete_code_key_binding
+    @n_complete_task = 0
+    # key binding for complete code
     @text.bind_append("Control-KeyPress"){|e|
       case e.keysym
       when 'space'
-        @do_complete = true
-        complete_code.call
+        if @n_complete_task == 0
+          @do_complete = true
+          complete_code
+        end
       end
     }
     
@@ -243,38 +1126,23 @@ class AgEditor
     @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})
-
-#    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
-#    }
+          _focus_line = @text.get('insert linestart','insert')
+          if _focus_line.strip[0..0] != '#'
+            Thread.new do
+              @do_complete = true
+              sleep(1)
+              if @do_complete && @n_complete_task == 0
+                complete_code
+              end
+            end
+          end
+      end
+    }
 
+  end
+  
+  def activate_key_binding
+    activate_complete_code_key_binding if @is_ruby
     @text.bind_append("Control-KeyPress"){|e|
       case e.keysym
 #      when 'space'
@@ -311,17 +1179,7 @@ class AgEditor
       when 's'
         save
       when 'f'
-        _r = @text.tag_ranges('sel')
-        if _r.length>0
-          _text=@text.get(_r[0][0],_r[0][1])
-          if _text.length > 0
-            @find.e_what.text(_text)
-          end
-        else
-        end
-        @find.use(self)
-        @find.e_what.focus
-        @find.show
+        find
       when 'egrave'
         @text.insert('insert',"{")
       when 'plus'
@@ -329,7 +1187,7 @@ class AgEditor
       end
     }
 
-    @text.bind("Control-Shift-KeyPress"){|e|
+    @text.bind_append("Control-Shift-KeyPress"){|e|
       case e.keysym
       when 'I'
         _r = @text.tag_ranges('sel')
@@ -391,13 +1249,12 @@ class AgEditor
         _row, _col = _index.split('.')
         rehighlightline(_row.to_i) if @highlighting
       when 'F5'
-        save
-        $arcadia['shell'].run(@file.to_s)
+        run_buffer
       when 'F3'
         @find.do_find_next
       when 'F1'
         line, col = @text.index('insert').split('.')
-        _x, _y = @controller.xy_insert
+        _x, _y = xy_insert
         _file = create_temp_file
         begin
           Arcadia.process_event(DocCodeEvent.new(self, 'file'=>_file, 'row'=>line.to_s, 'col'=>col.to_s, 'xdoc'=>_x, 'ydoc'=>_y))
@@ -426,11 +1283,6 @@ class AgEditor
         end
       end
     }
-   
-    
-    @text.bind("<Modified>"){|e|
-      check_modify
-    }
 
     @text.bind_append("KeyRelease"){|e|
       case e.keysym
@@ -469,7 +1321,7 @@ class AgEditor
     }
 
 
-    @text.bind("Shift-KeyPress"){|e|
+    @text.bind_append("Shift-KeyPress"){|e|
       case e.keysym
       when 'Tab'
         _r = @text.tag_ranges('sel')
@@ -493,9 +1345,57 @@ class AgEditor
         end
       end
     }
+  end
+
+  def find
+    _r = @text.tag_ranges('sel')
+    if _r.length>0
+      _text=@text.get(_r[0][0],_r[0][1])
+      if _text.length > 0
+        @find.e_what.text(_text)
+      end
+    else
+    end
+    @find.use(self)
+    @find.e_what.focus
+    @find.show
+  end
+
+  def disactivate_key_binding
+    @text.bind_remove('KeyPress')
+    @text.bind_remove('KeyRelease')
+    @text.bind_remove('Control-KeyPress')
+    @text.bind_remove('Control-Shift-KeyPress')
+    @text.bind_remove('Shift-KeyPress')
+
+  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("<Modified>"){|e|
+      check_modify
+    }
+    activate_key_binding
     @text.bind_append("1",proc{Arcadia.process_event(InputEnterEvent.new(self,'receiver'=>@text))})
+  end
 
+  def run_buffer
+    if !@file
+      _file = create_temp_file
+      begin
+        Arcadia.process_event(RunRubyFileEvent.new(self, 'file'=>_file, 'persistent'=>false))
+      ensure
+        File.delete(_file) if File.exist?(_file)
+      end
+    else
+      save
+      Arcadia.process_event(RunRubyFileEvent.new(self, 'file'=>@file, 'persistent'=>true))
+    end
   end
   
   def initialize_line_number(_frame)
@@ -652,6 +1552,16 @@ class AgEditor
     end
   end
 
+  def reset_highlight
+    @is_line_bold.clear
+    @is_tag_bold.clear
+    @highlight_zone.clear
+    @last_line_begin=0
+    @last_line_end=0
+    @last_zone_begin=0
+    @last_zone_end=0
+  end
+
   def initialize_highlight
     @is_line_bold = Hash.new
     @is_tag_bold = Hash.new
@@ -940,14 +1850,14 @@ class AgEditor
       :command,
       :label=>'Set wrap',
       :hidemargin => false,
-      :command=> proc{@text.configure('wrap'=>'word')}
+      :command=> proc{@text.configure('wrap'=>'word');@text.hide_h_scroll}
     )
 
     _sub_code.insert('end',
       :command,
       :label=>'Set no wrap',
       :hidemargin => false,
-      :command=> proc{@text.configure('wrap'=>'none')}
+      :command=> proc{@text.configure('wrap'=>'none');@text.show_h_scroll}
     )
 
     _sub_code.insert('end',
@@ -1029,87 +1939,87 @@ class AgEditor
   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'
+#  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
-          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
+#            _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)
     
@@ -1145,6 +2055,7 @@ class AgEditor
   end
 
   def build_tree(_sel=nil)
+    #Arcadia.console(self,"msg"=>"build for #{@file}")
     if _sel
       _label_sel = @tree_exp.itemcget(_sel,'text')
     end
@@ -1160,7 +2071,9 @@ class AgEditor
     
     #(re)build tree
     _txt = @text.get('1.0','end')
-    @root = build_tree_from_source(_txt)
+    #@root = build_tree_from_source(_txt)
+    @root = SourceStructure.new(_txt).root
+    
     @selected = nil
     build_tree_from_node(@root, _label_sel)
     if @selected
@@ -1549,7 +2462,7 @@ class AgEditor
 #          real_line_begin = line_begin
 #        end
         
-        if _ry < 0 
+        if _ry && _ry < 0 
           real_line_end = line_end + 1
 #          x = (_heigth+_ry)/_heigth
 #          @text_line_num.yview_scroll(-(_heigth+_ry),"pixels")
@@ -1595,7 +2508,7 @@ class AgEditor
             #add_tag_breakpoint(_index+' -1 lines')
           end
         end
-        if _ry < 0 
+        if _ry && _ry < 0 
           #Arcadia.console(self, 'msg'=>"scrollo -> #{-(_heigth+_ry)}")
           #Arcadia.console(self, 'msg'=>"_coef -> #{_coef}")
 
@@ -1721,6 +2634,7 @@ class AgEditor
             'title' => '(Arcadia) Libs', 'parent' => @text,
             'message' => msg) == 'yes'
             @text.delete('1.0','end')
+            reset_highlight
             load_file(@file)
           else
             @file_last_access_time = ftime
@@ -1757,37 +2671,37 @@ class AgEditor
   end
 
   def init_editing(_ext='rb', _w1=150, _w2=60)
-    # find file lang
-#    _ext='' if _ext.nil?
-#    lang_file = File.dirname(__FILE__)+'/langs/'+_ext+'.lang'
-#    if File.exist?(lang_file)
-#      @lang_hash = properties_file2hash(lang_file)
-#    elsif File.exist?(lang_file+'.bind')
-#      b= properties_file2hash(lang_file+'.bind')
-#      lang_file_bind = File.dirname(__FILE__)+'/langs/'+b['bind']
-#      if b && File.exist?(lang_file_bind)
-#        @lang_hash = properties_file2hash(lang_file_bind)
-#      end
+    @is_ruby = _ext=='rb'||_ext=='rbw'
+    @lang_hash = languages_hash(_ext)
+#    if !_ext.nil? && @is_ruby
+#      @fm = AGTkVSplittedFrames.new(@page_frame,_w1)
+#      @fm1 = AGTkVSplittedFrames.new(@fm.right_frame,_w2)
+#      initialize_tree(@controller.frame(1).hinner_frame)
+#      initialize_tree(@fm.left_frame)
 #    else
-#      @lang = nil
+#      @fm1 = AGTkVSplittedFrames.new(@page_frame,_w2)
 #    end
-    is_ruby = _ext=='rb'||_ext=='rbw'
-    @lang_hash = languages_hash(_ext)
-    if !_ext.nil? && is_ruby
-      @fm = AGTkVSplittedFrames.new(@page_frame,_w1)
-      @fm1 = AGTkVSplittedFrames.new(@fm.right_frame,_w2)
-      initialize_tree(@fm.left_frame)
-    else
-      @fm1 = AGTkVSplittedFrames.new(@page_frame,_w2)
-    end
+    @fm1 = AGTkVSplittedFrames.new(@page_frame,_w2)
     @fm1.splitter_frame.configure('relief'=>'flat')
     initialize_text(@fm1.right_frame)
     initialize_highlight
     initialize_line_number(@fm1.left_frame)
     initialize_text_binding
-    initialize_complete_code if is_ruby
+  end
+  
+  def show_outline
+    if @tree_scroll_wrapper
+      @tree_scroll_wrapper.show
+    else
+      initialize_tree(@controller.frame(1).hinner_frame)
+      build_tree
+    end
   end
 
+  def hide_outline
+    @tree_scroll_wrapper.hide if @tree_scroll_wrapper
+  end
+  
   def file_extension(_filename=nil)
     if _filename
       _m = /(.*\.)(.*$)/.match(File.basename(_filename))
@@ -1835,7 +2749,7 @@ class AgEditor
   end
   
   def refresh
-    build_tree if @classbrowsing && !is_exp_hide?
+    build_tree if @classbrowsing #&& !is_exp_hide?
   end
 end
 
@@ -1857,6 +2771,7 @@ class AgMultiEditorView
   
 end
 
+
 class AgMultiEditor < ArcadiaExt
   include Autils
   attr_reader :breakpoints
@@ -1871,11 +2786,19 @@ class AgMultiEditor < ArcadiaExt
     Arcadia.attach_listener(self, StartDebugEvent)
   end
   
+  
   def on_before_run_ruby_file(_event)
     _filename = _event.file
     if _filename.nil?
       current_editor = self.raised
-      _event.file =current_editor.file if current_editor
+       if current_editor
+         if current_editor.file
+           _event.file = current_editor.file
+           _event.persistent = true
+         else
+           _event.file = current_editor.create_temp_file
+         end
+       end
     end
   end
   
@@ -2083,171 +3006,24 @@ 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')
-    _rx, _ry, _widht, _heigth = _text.bbox(_index_now);
-    _x = _rx + TkWinfo.rootx(_text)  
-    _y = _ry + TkWinfo.rooty(_text)  + TkFont.new(conf('font')).metrics[2][1]
-    _xroot = _x - TkWinfo.rootx(@arcadia.layout.root)  
-    _yroot = _y - TkWinfo.rooty(@arcadia.layout.root)  
-    return _xroot, _yroot
-  end
-
-  def raise_complete_code(_context)
-    # delete the file used for completion 
-    @raised_listbox.destroy if @raised_listbox != nil
-    
-    candidates = _context.results[0].candidates
-    _text = self.raised.text
-    _index_call = _context.row+'.'+_context.col
-    _index_now = _text.index('insert')
-    if _index_call == _index_now 
-      _target = _text.get('insert - 1 chars wordstart','insert')
-        if _target.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)  + TkFont.new(conf('edit.font')).metrics[2][1]
-
-            _xroot = _x - TkWinfo.rootx(@arcadia.layout.root)  
-            _yroot = _y - TkWinfo.rooty(@arcadia.layout.root)  
-            
-            _max_height = TkWinfo.screenheight(@arcadia.layout.root) - _y - 5
-            
-            @raised_listbox = TkListbox.new(@arcadia.layout.root, {
-              :takefocus=>true, 
-              :selectbackground=>Arcadia.conf('hightlight.1.background'),
-              :selectforeground=>Arcadia.conf('hightlight.1.foreground'),
-              :activestyle=>'none'}.update(Arcadia.style('listbox'))
-            )
-    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) })
-            
-            _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
-
   def get_find
     @find
   end
-
+  
+  
   def create_find
     @find = Find.new(@arcadia.layout.root, self)
     @find.on_close=proc{@find.hide}
     @find.hide
   end
 
+  def start_find
+    _e = raised
+    _e.find if _e
+  end
+
   def on_finalize(_event)
+    @batch_files = true
     _files =''
     @tabs_editor.each_value{|editor|
       if editor.file != nil
@@ -2265,6 +3041,7 @@ class AgMultiEditor < ArcadiaExt
 #      end
 #    }
 #    Arcadia.persistent('editor.debug_breakpoints', _breakpoints)
+    @batch_files = true
   end
 
   def raised
@@ -2299,7 +3076,14 @@ class AgMultiEditor < ArcadiaExt
     return result
   end
 
+  def update(_kind,_name)
+    if _kind == 'RAISE' && _name == 'editor'
+      change_outline(raised)
+    end
+  end
+
   def open_last_files
+    @batch_files = true
     if $arcadia['pers']['editor.files.open']
       _files_index =$arcadia['pers']['editor.files.open'].split("|")
       _files_index.each do |value| 
@@ -2309,11 +3093,14 @@ class AgMultiEditor < ArcadiaExt
         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)
     end
+    frame(1)
+    @arcadia.layout.add_observer(self)
     self
   end
   
@@ -2433,7 +3220,7 @@ class AgMultiEditor < ArcadiaExt
     #debug_reset
     @editors_in_debug.each{|e|
       close_editor(e)
-      p "close editor #{e.file}"
+      #p "close editor #{e.file}"
     }
   end
 
@@ -2460,6 +3247,14 @@ class AgMultiEditor < ArcadiaExt
     end
   end
   
+  def change_outline(_e)
+    if !@batch_files && frame(1).raised?
+      @last_outline_e.hide_outline if @last_outline_e
+      _e.show_outline
+      @last_outline_e = _e
+    end
+  end
+  
   def do_buffer_raise(_name, _title='...')
     _index = @main_frame.enb.index(_name)
     _new_caption = '...'
@@ -2468,6 +3263,7 @@ class AgMultiEditor < ArcadiaExt
       #_tab = get_tab_from_name(_name)
       #@main_frame.enb.raise(_name)
       _e = @tabs_editor[_name]
+      change_outline(_e) if _e
       if _e && _e.file != nil
         _new_caption = _e.file
         @find.use(_e)
@@ -2577,15 +3373,19 @@ class AgMultiEditor < ArcadiaExt
   end
 
   def close_others_editor(_editor, _mod=true)
+    @batch_files = true
   		@tabs_editor.values.each do |_e|
   		    close_editor(_e) if _e != _editor
   		end
+    @batch_files = false
   end
 
   def close_all_editor(_editor, _mod=true)
+    @batch_files = true
   		@tabs_editor.values.each do |_e|
   		    close_editor(_e)
   		end
+    @batch_files = false
   end
 
   def close_editor(_editor, _mod=true)
@@ -2629,6 +3429,27 @@ class AgMultiEditor < ArcadiaExt
     @tabs_editor[tab_name(_filename)].save_as
   end
 
+  def accept_complete_code
+    @ok_complete = true
+    if !defined?(@ok_complete)
+    
+msg =<<EOS
+"Complete code" is actually based on rcodetools 
+that exec code for retreave candidades. 
+So it can be dangerous for example if you write system call. 
+Do you want to activate it?
+EOS
+      @ok_complete = Arcadia.dialog(self, 
+        'level'=>'warning',
+        'type'=>'yes_no', 
+        'title' => '(Arcadia) Complete code', 
+        'msg'=>msg.upcase)=='yes'
+      
+    end
+    return @ok_complete
+  end
+
+
 end
 
 class Findview < TkFloatTitledFrame
@@ -2637,12 +3458,12 @@ class Findview < TkFloatTitledFrame
     #stop_resizing
  	  y0 = 10
     d = 23    
-  TkLabel.new(self.frame, Arcadia.style('label')){
-   	text 'Find what:'
-   	place('x' => 8,'y' => y0,'height' => 19)
-  }
-  y0 = y0 + d
-  @e_what = Tk::BWidget::ComboBox.new(self.frame, Arcadia.style('combobox')){
+    TkLabel.new(self.frame, Arcadia.style('label')){
+   	  text 'Find what:'
+   	  place('x' => 8,'y' => y0,'height' => 19)
+    }
+    y0 = y0 + d
+    @e_what = Tk::BWidget::ComboBox.new(self.frame, Arcadia.style('combobox')){
       editable true
       justify  'left'
       #relief  'ridge'
@@ -2651,19 +3472,19 @@ class Findview < TkFloatTitledFrame
       takefocus 'true'
       #pack('padx'=>10, 'fill'=>'x')
       place('relwidth' => 1, 'width'=>-16,'x' => 8,'y' => y0,'height' => 19)
-  }
-  @e_what_entry = TkWinfo.children(@e_what)[0]
+    }
+    @e_what_entry = TkWinfo.children(@e_what)[0]
 
-  @e_what_entry.bind_append("1",proc{Arcadia.process_event(InputEnterEvent.new(self,'receiver'=>@e_what_entry))})
+    @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')){
-   	text 'Replace with:'
-   	place('x' => 8,'y' => y0,'height' => 19)
-  }
-  y0 = y0 + d
+    y0 = y0 + d
+    TkLabel.new(self.frame, Arcadia.style('label')){
+   	  text 'Replace with:'
+   	  place('x' => 8,'y' => y0,'height' => 19)
+    }
+    y0 = y0 + d
    
-  @e_with = Tk::BWidget::ComboBox.new(self.frame, Arcadia.style('combobox')){
+    @e_with = Tk::BWidget::ComboBox.new(self.frame, Arcadia.style('combobox')){
       editable true
       justify  'left'
       autocomplete 'true'
@@ -2672,9 +3493,9 @@ class Findview < TkFloatTitledFrame
       #pack('padx'=>10, 'fill'=>'x')
       place('relwidth' => 1, 'width'=>-16,'x' => 8,'y' => y0,'height' => 19)
     }
-  @e_with_entry = TkWinfo.children(@e_with)[0]
+    @e_with_entry = TkWinfo.children(@e_with)[0]
 
-  @e_with_entry.bind_append("1",proc{Arcadia.process_event(InputEnterEvent.new(self,'receiver'=>@e_with_entry))})
+    @e_with_entry.bind_append("1",proc{Arcadia.process_event(InputEnterEvent.new(self,'receiver'=>@e_with_entry))})
     
     y0 = y0 + d
     @cb_reg = TkCheckButton.new(self.frame, Arcadia.style('checkbox')){|_cb_reg|
@@ -2693,9 +3514,9 @@ class Findview < TkFloatTitledFrame
       place('x' => 8,'y' => y0,'height' => 22)
     }
     
-  y0 = y0 + d
-  y0 = y0 + d
-  @buttons_frame = TkFrame.new(self.frame, Arcadia.style('panel')).pack('fill'=>'x', 'side'=>'bottom')	
+    y0 = y0 + d
+    y0 = y0 + d
+    @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'
@@ -2860,10 +3681,17 @@ class Find < Findview
     if (_editor != @editor_caller)
       @last_index='insert'
       @editor_caller = _editor
-      title(_editor.file)
+      _title = File.basename(_editor.file) 
+      title(_title)
+      @goto_line_dialog.title(_title) if @goto_line_dialog
     end
   end
 
+  def show
+    super
+    use(@controller.raised)
+  end
+
   def update_combo(_txt)
     values = @e_what.cget('values')
     if (values != nil && !values.include?(_txt))
@@ -2935,31 +3763,6 @@ class Find < Findview
 end
 
 
-class KeyTestView < TkToplevel
-  attr_reader :ttest
-  def initialize
-    super
-
-    Tk.tk_call('wm', 'title', self, '...hello' )
-    Tk.tk_call('wm', 'geometry', self, '638x117+200+257' )
-
-    @ttest = TkText.new(self){
-      background  '#FFF454'
-      place('relwidth' => '1','relx' => 0,'x' => '0','y' => '0','relheight' => '1','rely' => 0,'height' => '0','bordermode' => 'inside','width' => '0')
-    }
-
-  end
-end
-
-class KetTest
-  def initialize
-    kt = KeyTestView.new
-    kt.ttest.bind("KeyPress"){|e|
-      kt.ttest.insert('end'," [ "+e.keysym+" ] ")
-      break
-    }
-  end
-end
 
 class CodeInsight
 end
@@ -2972,11 +3775,11 @@ class GoToLine < TkFloatTitledFrame
     #stop_resizing
  	  y0 = 10
     d = 23    
-  TkLabel.new(self.frame, Arcadia.style('label')){
-   	text 'Go to line:'
-   	place('x' => 8,'y' => y0,'height' => 19)
-  }
-  y0 = y0 + d
+    TkLabel.new(self.frame, Arcadia.style('label')){
+   	  text 'Go to line:'
+   	  place('x' => 8,'y' => y0,'height' => 19)
+    }
+    y0 = y0 + d
    	@e_line = TkEntry.new(self.frame, Arcadia.style('edit')){
       justify  'left'
       #relief  'ridge'
@@ -2986,7 +3789,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'
@@ -2996,7 +3799,7 @@ class GoToLine < TkFloatTitledFrame
       #justify  'center'
       pack('side'=>'right','ipadx'=>5, 'padx'=>5)
     }
-    place('x'=>150,'y'=>150,'height'=> 120,'width'=> 100)
+    place('x'=>150,'y'=>150,'height'=> 120,'width'=> 240)
     
   end