arcadia 0.1.3 → 0.2.0

data/ext/ae-action-dispatcher/ae-action-dispatcher.conf

@@ -0,0 +1,6 @@
+name=action_dispatcher
+labels=Action dispatcher
+#frames=1.1
+active=yes
+require=ext/ae-action-dispatcher/ae-action-dispatcher
+class=ActionDispatcher

data/ext/ae-action-dispatcher/ae-action-dispatcher.rb

@@ -0,0 +1,22 @@
+#
+#   ae-action-dispatcher.rb - Arcadia Ruby ide
+#   by Antonio Galeone <antonio-galeone@rubyforge.org>
+#
+
+class ActionDispatcher < ArcadiaExt
+
+  def on_before_build(_event)
+    Arcadia.add_listener(self, ActionEvent)
+  end
+  
+  def on_action(_event)
+    if _event.receiver != nil && _event.receiver.respond_to?(_event.action)
+      if _event.action_args.nil?
+        _event.receiver.send(_event.action)
+      else
+        _event.receiver.send(_event.action, _event.action_args)
+      end
+    end
+  end
+
+end

data/ext/ae-complete-code/ae-complete-code.conf

@@ -1,6 +1,6 @@
 name=complete_code
-label=Complete code
-frame=1.0
+labels=Complete code
+frames=1.0
 active=yes
 require=ext/ae-complete-code/ae-complete-code
 class=CompleteCode

data/ext/ae-complete-code/ae-complete-code.rb

@@ -1,80 +1,82 @@
-#
-#   ae-complete-code.rb - Arcadia Ruby ide
-#   by Antonio Galeone <antonio-galeone@rubyforge.org>
-#
-
-require "base/a-ext"
-
-
-class CompleteCode < ArcadiaExt
-
-	def before_build
-	end
-	
-	def build
-	end
-	
-	def after_build 
-	  @complete_command=full_command('rct-complete')
-	  @doc_command=full_command('rct-doc')
-	  @ri_command="ri -T -f plain"
-	  @finder_command="rct-meth-args -n"  #  ./a-libs.rb:741:AG#publish (_family, args = nil)
-	  if @complete_command !=nil #system(@rct_complete+" "+__FILE__)
-    		ArcadiaContractListener.new(self, EditorContract, :do_editor_event)
-    else
-   		 MsgContract.instance.out_error(self, "Warning: Extension ae-complete-code depend upon rct-complete(rcodetools) command (install it or update system path!)")
-    end
-	end
-	
-	def full_command(_command='rct-complete')
-		_ret = nil
-		RUBY_PLATFORM.include?('win32') ? _sep = ';':_sep=':'
-		ENV['PATH'].split(_sep).each{|_path|
-			_file = File.join(_path, _command)
-			if FileTest.exist?(_file)
-	  			_ret = _file
-			end
-		}
-		_ret
-	end
-		
-	def do_editor_event(_event)
-     case _event.signature 
-     		when EditorContract::COMPLETE_CODE
-     		  if _event.context.file     		
-     		    _event.context.candidates = candidates(_event.context.file, _event.context.line, _event.context.col)
-     		    _event.handled(self)
-     			 end
-     end
-	end
-
-  def candidates(_file, _line, _col)
-		begin
-		  _options = "--completion-class-info --line="+_line+" --column="+_col
-		  #_options = "--line="+_line+" --column="+_col
-      _cmp_s = "|ruby "+@complete_command+" "+_options+" "+_file
-      _ret = nil
-      open(_cmp_s,"r") do
-        |f|
-        _ret = f.readlines.collect!{| line | line.chomp}
-        #p _ret
-      end
-      if _ret.length == 0
-        _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
-	     			MsgContract.instance.out_error(self, "Syntax error in current source")
-        end
-      end
-      _ret
-  		rescue Exception => e
-  			 MsgContract.instance.out_error(self, e.to_s)
- 	  end
-  end
-  
-end
-
+#
+#   ae-complete-code.rb - Arcadia Ruby ide
+#   by Antonio Galeone <antonio-galeone@rubyforge.org>
+#
+
+
+
+class CompleteCode < ArcadiaExt
+
+	def on_after_build(_event) 
+	  @complete_command=full_command('rct-complete')
+	  @doc_command=full_command('rct-doc')
+	  @ri_command="ri -T -f plain"
+	  @finder_command="rct-meth-args -n"
+	  if @complete_command !=nil #system(@rct_complete+" "+__FILE__)
+    		Arcadia.add_listener(self, CompleteCodeEvent)
+    		#ArcadiaContractListener.new(self, EditorContract, :do_editor_event)
+    else
+   		 Arcadia.new_error_msg(self, "Warning: Extension ae-complete-code depend upon rct-complete(rcodetools) command (install it or update system path!)")
+    end
+	end
+	
+	def full_command(_command='rct-complete')
+		_ret = nil
+		RUBY_PLATFORM.include?('win32') ? _sep = ';':_sep=':'
+		ENV['PATH'].split(_sep).each{|_path|
+			_file = File.join(_path, _command)
+			if FileTest.exist?(_file)
+	  			_ret = _file
+			end
+		}
+		_ret
+	end
+	
+	def on_complete_code(_event)
+	  if _event.file
+	    _event.add_result(self,'candidates'=>candidates(_event.file, _event.row, _event.col))
+#	    _event.results << CompleteCodeEvent::CompleteCodeResult.new(self)
+#	    _event.results[0].candidates = candidates(_event.file, _event.row, _event.col)
+	  end
+	end
+		
+#	def do_editor_event(_event)
+#     case _event.signature 
+#     		when EditorContract::COMPLETE_CODE
+#     		  if _event.context.file     		
+#     		    _event.context.candidates = candidates(_event.context.file, _event.context.line, _event.context.col)
+#     		    _event.handled(self)
+#     			 end
+#     end
+#	end
+
+  def candidates(_file, _line, _col)
+		begin
+		  _options = "--completion-class-info --line="+_line+" --column="+_col
+		  #_options = "--line="+_line+" --column="+_col
+      _cmp_s = "|ruby "+@complete_command+" "+_options+" "+_file
+      _ret = nil
+      open(_cmp_s,"r") do
+        |f|
+        _ret = f.readlines.collect!{| line | line.chomp}
+        #p _ret
+      end
+      if _ret.length == 0
+        _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.new_error_msg(self, "Syntax error in current source")
+        end
+      end
+      _ret
+  		rescue Exception => e
+  			 Arcadia.new_error_msg(self, e.to_s)
+ 	  end
+  end
+  
+end
+

data/ext/ae-doc-code/ae-doc-code.conf

@@ -1,6 +1,6 @@
 name=doc_code
-label=Doc
-frame=1.0
+labels=Doc
+frames=1.0
 active=yes
 require=ext/ae-doc-code/ae-doc-code
 class=DocCode

data/ext/ae-doc-code/ae-doc-code.rb

@@ -3,27 +3,20 @@
 #   by Antonio Galeone <antonio-galeone@rubyforge.org>
 #
 
-require "base/a-ext"
 
 class DocCode < ArcadiaExt
-
-  def before_build
-  end
-  
-  def build
-  end
-  
-  def after_build 
+  def on_after_build(_event) 
     @doc_command=full_command('rct-doc')
     @doc_command=full_command('RCT-DOC') if @doc_command == nil
     @ri_command=full_command('ri')
     if @ri_command !=nil #system(@rct_complete+" "+__FILE__)
-      ArcadiaContractListener.new(self, EditorContract, :do_editor_event)
+      Arcadia.add_listener(self, DocCodeEvent)
+      #ArcadiaContractListener.new(self, EditorContract, :do_editor_event)
     else
-      MsgContract.instance.out_error(self, "Extension ae-doc-code depend upon ri command!")
+      Arcadia.new_error_msg(self, "Extension ae-doc-code depend upon ri command!")
     end
     if @doc_command == nil #system(@rct_complete+" "+__FILE__)
-      MsgContract.instance.out_error(self, "Warning: Extension ae-doc-code depend upon rct-doc command!")
+      Arcadia.new_error_msg(self, "Warning: Extension ae-doc-code depend upon rct-doc command!")
     end
   end
   
@@ -38,34 +31,117 @@ class DocCode < ArcadiaExt
     }
     _ret
   end
-    
-  def do_editor_event(_event)
-     case _event.signature 
-       when EditorContract::DOC_CODE
-         if _event.context.file && @doc_command != nil    
-           _event.context.doc = doc(_event.context)
-           if  _event.context.doc != nil &&  _event.context.doc.length >0    		
-             raise_doc_code(_event.context)
-#           else
-#             build_doc_tree
-           end
-         elsif _event.context.doc_entry
-           _event.context.doc = doc_entry(_event.context.doc_entry)
-           _event.context.text = _event.context.doc_entry
-           if  _event.context.doc != nil &&  _event.context.doc.length >0    		
-             raise_doc_code(_event.context)
-#           else
-#             build_doc_tree
-           end
-#         elsif _event.context.file && @doc_command == nil    
-#           build_doc_tree
-         end
-         _event.handled(self)
-       when EditorContract::BUILD_DOC_TREE
-         build_doc_tree
-     end
+  
+  def on_doc_code(_event)
+    if _event.file && @doc_command != nil 
+      res = _event.add_result(self)
+      res.doc = doc(_event)
+    elsif _event.doc_entry
+      _event.add_result(self, 'doc'=>doc_entry(_event.doc_entry),'title'=>_event.doc_entry)
+    end
+  end
+
+  def on_after_doc_code(_event)
+    res = _event.results[0]
+    if res !=nil &&  res.doc != nil &&  res.doc.length >0    		
+      raise_doc_code(_event)
+    end
+  end
+
+  def raise_doc_code(_context)
+    if @docFrame
+      @docFrame.tkText.delete('1.0','end')
+    else
+      _height = 140
+      _width = 550
+      _context.xdoc =  TkWinfo.screenwidth(@arcadia.layout.root)/2  if !_context.xdoc 
+      _context.ydoc =  TkWinfo.screenheight(@arcadia.layout.root)/2  if !_context.ydoc 
+      _x = _context.xdoc - _width/2
+      _y = _context.ydoc - _height -20
+      _x = 0 if _x < 0
+      _y = 0 if _y < 0
+      @docFrame = TkDocframe.new(@arcadia.layout.root).place('x'=>_x, 'y'=>_y, 'width'=>_width, 'height'=>_height)
+      do_close = proc{
+         @docFrame.destroy
+         @docFrame = nil
+         Tk.callback_break
+      }
+      @docFrame.on_close = do_close
+      @docFrame.tkText.bind_append('KeyPress'){|e|
+        case e.keysym
+          when 'Escape'
+            do_close.call
+          end
+       }
+       @docFrame.tkText.font(conf('font'))
+       @docFrame.tkText.foreground(conf('color.foreground'))
+       @docFrame.tkText.background(conf('color.background'))
+    end
+    res = _context.results[0]
+    if res.doc
+      @docFrame.tkText.insert('end', res.doc.to_s)
+      @docFrame.title(res.title) if res.title
+    else
+      Arcadia.new_msg(self, 'nulla di dire !')
+    end
   end
 
+  def doc_entry(_entry=nil)
+    _ret = nil
+    if _entry
+      _cmp_doc = "|ruby "+@ri_command+" -T -f plain "+_entry
+      open (_cmp_doc) do |f|
+         _ret = f.readlines 
+      end
+    end
+    _ret
+  end
+  
+  def doc(_context)
+    begin
+      _options = "--line="+_context.row+" --column="+_context.col
+      _cmp_s = "|ruby " + @doc_command +" --use-method-analyzer "+_options +" " +_context.file
+      _ret = nil
+      _doc = nil
+      open(_cmp_s,"r") do
+        |f|
+        _doc = f.readlines.collect!{| line | line.chomp}.to_s.strip
+      end
+      if _doc.length > 0
+        _context.results[0].title = _doc.to_s if _context.results[0]
+        _ret = doc_entry(_context.results[0].title)
+      end
+      _ret
+  
+    rescue Exception => e
+      _msg = e.to_s + "\n"
+      e.backtrace.each{|line| _msg = _msg + line + "\n"}
+      Arcadia.new_error_msg(self, _msg)
+    end
+  end
+
+    
+#  def do_editor_event(_event)
+#     case _event.signature 
+#       when EditorContract::DOC_CODE
+#         if _event.context.file && @doc_command != nil    
+#           _event.context.doc = doc(_event.context)
+#           if  _event.context.doc != nil &&  _event.context.doc.length >0    		
+#             raise_doc_code(_event.context)
+#           end
+#         elsif _event.context.doc_entry
+#           _event.context.doc = doc_entry(_event.context.doc_entry)
+#           _event.context.text = _event.context.doc_entry
+#           if  _event.context.doc != nil &&  _event.context.doc.length >0    		
+#             raise_doc_code(_event.context)
+#           end
+#         end
+#         _event.handled(self)
+#       when EditorContract::BUILD_DOC_TREE
+#         build_doc_tree
+#     end
+#  end
+
   def build_doc_tree
     if !@doc_tree
       @image_class =  TkPhotoImage.new('dat' => ARROW_RIGHT_GIF)
@@ -194,79 +270,6 @@ class DocCode < ArcadiaExt
        )
       @level = @level + 1
   end
-
-  def raise_doc_code(_context)
-    if @docFrame
-      @docFrame.tkText.delete('1.0','end')
-    else
-      _height = 140
-      _width = 550
-      _context.xdoc =  TkWinfo.screenwidth(@arcadia.layout.root)/2  if !_context.xdoc 
-      _context.ydoc =  TkWinfo.screenheight(@arcadia.layout.root)/2  if !_context.ydoc 
-      _x = _context.xdoc - _width/2
-      _y = _context.ydoc - _height -20
-      @docFrame = TkDocframe.new(@arcadia.layout.root).place('x'=>_x, 'y'=>_y, 'width'=>_width, 'height'=>_height)
-      do_close = proc{
-         @docFrame.destroy
-         @docFrame = nil
-         Tk.callback_break
-      }
-      @docFrame.on_close = do_close
-      @docFrame.tkText.bind_append('KeyPress'){|e|
-        case e.keysym
-          when 'Escape'
-            do_close.call
-          end
-       }
-       @docFrame.tkText.font(conf('font'))
-       @docFrame.tkText.foreground(conf('color.foreground'))
-       @docFrame.tkText.background(conf('color.background'))
-    end
-    
-    if _context.doc
-      @docFrame.tkText.insert('end', _context.doc.to_s)
-      @docFrame.title(_context.text) if _context.text
-    else
-      MsgContract.instance.out_simple(self, 'nulla di dire !')
-    end
-  end
-
-
-
-  def doc_entry(_entry=nil)
-    _ret = nil
-    if _entry
-      _cmp_doc = "|ruby "+@ri_command+" -T -f plain "+_entry
-      open (_cmp_doc) do |f|
-         _ret = f.readlines 
-      end
-    end
-    _ret
-  end
-  
-  def doc(_context)
-    begin
-      _options = "--line="+_context.line+" --column="+_context.col
-      _cmp_s = "|ruby " + @doc_command +" --use-method-analyzer "+_options +" " +_context.file
-      _ret = nil
-      _doc = nil
-      open(_cmp_s,"r") do
-        |f|
-        _doc = f.readlines.collect!{| line | line.chomp}.to_s.strip
-      end
-      if _doc.length > 0
-        _context.text = _doc.to_s
-        _ret = doc_entry(_context.text)
-      end
-      _ret
-  
-    rescue Exception => e
-      _msg = e.to_s + "\n"
-      e.backtrace.each{|line| _msg = _msg + line + "\n"}
-      MsgContract.instance.out_error(self, _msg)
-    end
-  end
-  
 end
 
 class TkDocframe < TkFloatTitledFrame