arcadia 0.11.1.2 → 0.11.1.4

data/README

@@ -1,8 +1,8 @@
 = Arcadia Ide
-version 0.11.1.2
+version 0.11.1.4
 
 by Antonio Galeone
-on Jun 29, 2012
+on Jul 11, 2012
 
 
 == About
@@ -16,8 +16,8 @@ Some of Arcadia ide project features include:
 * Debugging support
 * Highly extensibility architecture.
 
-== In this release 0.11.1.2
- - A Bug fixed : error in string encoding on file loading
+== In this release 0.11.1.4
+ - A Bug fixed : problem  after typing "Enter" in confirmation of  a selected chinese symbol
   
 == Dependencies
   - rubygems

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

@@ -1766,23 +1766,35 @@ class AgEditor
         end
       when 'Return' #,'Control_L', 'Control_V', 'BackSpace', 'Delete'
         _index = @text.index('insert')
+        _previous_index = @text.index('insert -2 chars')
         _row, _col = _index.split('.')
-        _txt = @text.get((_row.to_i-1).to_s+'.0',_index)
-        if _txt.length > 0
-          m = /\s*/.match(_txt)
-          if m
-            if (m[0] != "\n")
-              _sm = m[0]
-              _sm = _sm.sub(/\n/,"")
-              @text.insert('insert',_sm)
+        _previous_row, _previous_col = _previous_index.split('.')
+        if _previous_row != _row
+          _txt = @text.get((_row.to_i-1).to_s+'.0',_index)
+          if _txt.length > 0
+            m = /\s*/.match(_txt)
+            if m
+              if (m[0] != "\n")
+                _sm = m[0]
+                _sm = _sm.sub(/\n/,"")
+                if _col.strip != '0'
+                  i0 = "#{_row.strip}.0"
+                  i1 = "#{_index} lineend"
+                  dirty = @text.get(i0,i1)
+                  if dirty && dirty.strip.length == 0
+                    @text.delete(i0,i1)
+                  end
+                end    
+                @text.insert('insert',_sm)
+              end
             end
           end
-        end
-        if _row.to_i + 1  ==  @text.index('end').split('.')[0].to_i
-          do_line_update
-        end
-        if @highlighting
-          rehighlightlines(_row.to_i, _row.to_i)
+          if _row.to_i + 1  ==  @text.index('end').split('.')[0].to_i
+            do_line_update
+          end
+          if @highlighting
+            rehighlightlines(_row.to_i, _row.to_i)
+          end
         end
       when 'Shift_L','Shift_R','Control_L','Control_R' ,'Prior', 'Next', 'Up','Down'
         # do nothing because od do_line_update
@@ -5087,7 +5099,7 @@ class AgMultiEditor < ArcadiaExtPlus
       editor.text_see(_text_index)
       editor.mark_selected(_text_index) if _mark_selected 
     end
-    editor.do_line_update if !editor.highlighted?
+    editor.do_line_update if editor && !editor.highlighted?
     return editor
   end
 

data/lib/a-core.rb

@@ -23,7 +23,7 @@ class Arcadia < TkApplication
     super(
       ApplicationParams.new(
         'arcadia',
-        '0.11.1.2',
+        '0.11.1.4',
         'conf/arcadia.conf',
         'conf/arcadia.pers'
       )

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 11
   - 1
-  - 2
-  version: 0.11.1.2
+  - 4
+  version: 0.11.1.4
 platform: ruby
 authors: 
 - Antonio Galeone
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-29 00:00:00 +02:00
+date: 2012-07-11 00:00:00 +02:00
 default_executable: arcadia
 dependencies: 
 - !ruby/object:Gem::Dependency