rtext 0.10.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffae86ba1a7ca648c0b1d81cbe6f35071a1f60ab
-  data.tar.gz: 811cbb7addac61eb840aa6b8ec65290ff2323c88
+  metadata.gz: 5faa974d72aeb5691970df505d698e80f0ea9a56
+  data.tar.gz: f9a3321097146cd6695457bb806c609fee79f308
 SHA512:
-  metadata.gz: 5051b3111eb4537a900d98fabe77f0970e2ec0af6e7be8f61bfa2e6a2f1b74323579d3159b550ca6e08e9c4fd8b68d95b4b3a0071080474a15d325fa3961b30d
-  data.tar.gz: 7d71c71858cf2a5ffb6a6f43e01e50b03fa4bc3fb05a9ff2cdaea5c295134dc4a0d8b3428ef87451ce737204fbb8a3d5116ff60ff72f2d0f0f1b7a11763553c5
+  metadata.gz: 294b78983c8de3f0d5dea3df20b4259d2356a2fce258444d05cf0b8a83eab825abd8b0f05a257791b16040f3d7bd23b252d44c9122a2d734d94593052461b201
+  data.tar.gz: 10f507771eb3efe33214bbed1bf9e11c3030b0b8ee0b650c98fe037edaefa64a2bcbc82a3e11c6f2e2879f73128090d1a1256b47d4cd8b0584bd14fe81e52d2c

data/CHANGELOG

@@ -117,4 +117,13 @@
 
 =0.10.0
 
-* Switch to Ruby 2.7
+* Switch to Ruby 2.7
+
+=0.11.0
+
+* Add support for Ruby up to 3.2
+
+=0.11.1
+
+* Fix column indixes to consistently start at 1
+* Fix algorithm of context creation if inside comment/annotation

data/Project.yaml

@@ -1,5 +1,5 @@
 name: rtext
-version: 0.10.0
+version: 0.11.1
 git: https://github.com/mthiede/rtext.git
 summary: Ruby Textual Modelling
 email: martin dot thiede at gmx de
@@ -8,8 +8,11 @@ description: RText can be used to derive textual languages from an RGen metamode
 authors: [Martin Thiede]
 dependencies:
   http://rubygems.org:
-    - {name: rgen,     version: ['>= 0.9.0', '< 0.10']}
+    - {name: rgen,     version: ['>= 0.10.0', '< 0.11']}
     - {name: filelock, version: ['>= 1.1.1', '< 1.2']}
+    - {name: rake,               version: ['>= 13.0.0', '< 14.0'],    development: true}
+    - {name: minitest,           version: ['>= 5.20.0', '< 6.0'],     development: true}
+    - {name: minitest-fail-fast, version: ['>= 0.1.0', '< 0.2'],      development: true}
 rdoc_options: [--main, README.rdoc, -x, test]
 extra_rdoc_files: [README.rdoc, CHANGELOG, MIT-LICENSE, RText_Users_Guide, RText_Protocol]
 encrypt_sources: false

data/lib/rtext/context_builder.rb

@@ -117,14 +117,15 @@ module ContextBuilder
     if context_lines.empty?
       context_lines << ""
     end
-    position_in_line ||= context_lines.last.size
+    position_in_line ||= context_lines.last.size + 1
     # cut off last line right of cursor
-    if position_in_line < 1
+    # raise "position_in_line starts at index 1!" if position_in_line == 0
+    if position_in_line <= 1
       tail = context_lines.pop
       context_lines << ""
     else
-      tail = context_lines.last[position_in_line..-1]
-      context_lines << context_lines.pop[0..position_in_line-1]
+      tail = context_lines.last[position_in_line-1..-1]
+      context_lines << context_lines.pop[0..position_in_line-2]
     end
     before_brace = !tail.nil? && !tail.match(/^\s*\{/).nil?
     before_bracket = !tail.nil? && !tail.match(/^\s*\[/).nil?

data/lib/rtext/frontend/connector.rb

@@ -120,7 +120,12 @@ def ensure_process_cleanup(process_id, out_file, timeout)
     ensure
       unless process_id.nil?
         begin
-          Process.kill('QUIT', process_id)
+          begin
+            Process.kill('QUIT', process_id)
+          rescue ArgumentError
+            # SIGQUIT not supported in Ruby 2.7 on Windows
+            Process.kill('KILL', process_id)
+          end
         rescue Errno::ESRCH => _
         end
       end

data/lib/rtext/frontend/context.rb

@@ -8,6 +8,7 @@ class Context
 # returns the extracted lines and the new position in the last line
 def extract(lines, pos)
   lines = filter_lines(lines)
+  return nil if lines.nil?
   lines, new_pos = join_lines(lines, pos)
   non_ignored_lines = 0
   array_nesting = 0
@@ -49,10 +50,16 @@ def extract(lines, pos)
 end
 
 def filter_lines(lines)
-  lines.reject { |l| 
-    ls = l.strip
-    ls[0..0] == "@" || ls[0..0] == "#"
-  }
+  ret = []
+  lines.each_with_index do |line, i|
+    ls = line.strip
+    if ls.start_with?("@") || ls.start_with?("#")
+      return nil if i+1 == lines.length
+    else
+      ret << line
+    end
+  end
+  ret
 end
 
 # when joining two lines, all whitespace is preserved in order to simplify the algorithm

data/lib/rtext/instantiator.rb

@@ -112,18 +112,18 @@ class Instantiator
     element = clazz.new
     @env << element if @env
     @root_elements << element if is_root
-    unlabled_args = @lang.unlabled_arguments(clazz.ecore).name
+    unlabeled_args = @lang.unlabled_arguments(clazz.ecore).name
     di_index = 0
     defined_args = {}
     arg_list.each do |a|
       if is_labeled(a) 
         set_argument(element, a[0].value, a[1], defined_args, command.line)
       else
-        if di_index < unlabled_args.size 
-          set_argument(element, unlabled_args[di_index], a, defined_args, command.line)
+        if di_index < unlabeled_args.size
+          set_argument(element, unlabeled_args[di_index], a, defined_args, command.line)
           di_index += 1
         elsif a != nil
-          problem("Unexpected unlabled argument, #{unlabled_args.size} unlabled arguments expected", command.line)
+          problem("Unexpected unlabeled argument, #{unlabeled_args.size} unlabeled arguments expected", command.line)
         end
       end
     end
@@ -249,9 +249,9 @@ class Instantiator
         begin
           v_value = v.value
           feature_instance_class = feature.eType.instanceClass
-          if feature_instance_class == String && (v_value.is_a?(Float) || v_value.is_a?(Fixnum))
+          if feature_instance_class == String && (v_value.is_a?(Float) || v_value.is_a?(Integer))
             element.setOrAddGeneric(feature.name, v_value.to_s)
-          elsif feature_instance_class == Float && v_value.is_a?(Fixnum)
+          elsif feature_instance_class == Float && v_value.is_a?(Integer)
             element.setOrAddGeneric(feature.name, v_value.to_f)
           else
             element.setOrAddGeneric(feature.name, v_value)

data/lib/rtext/link_detector.rb

@@ -19,7 +19,7 @@ def detect(lines, column)
   # context model since the context builder removes it as "just being completed"
   lines.last.concat(" ")
   current_line = lines.last
-  context = ContextBuilder.build_context(@lang, lines, lines.last.size)
+  context = ContextBuilder.build_context(@lang, lines, lines.last.size + 1)
   tokens = tokenize(lines.last, @lang.reference_regexp)
   token = tokens.find{|t| t.scol && t.scol <= column && t.ecol && t.ecol >= column}
   if context && context.element && token &&
@@ -29,7 +29,7 @@ def detect(lines, column)
     else
       line_prefix = ""
     end
-    context2 = ContextBuilder.build_context(@lang, lines, line_prefix.size) 
+    context2 = ContextBuilder.build_context(@lang, lines, line_prefix.size + 1) 
     # for command prefixes nested below a lable, the context element and feature are
     # the parent element and feature, this is not what's expected here
     if line_prefix =~ /^\s*\w*$/

data/lib/rtext/service.rb

@@ -188,7 +188,7 @@ class Service
 
   def content_complete(sock, request, response)
     # column numbers start at 1
-    linepos = request["column"]-1 
+    linepos = request["column"] 
     lines = request["context"]
     version = request["version"].to_i
     lang = @service_provider.language

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rtext
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Martin Thiede
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-30 00:00:00.000000000 Z
+date: 2023-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgen
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: filelock
   requirement: !ruby/object:Gem::Requirement
@@ -50,6 +50,66 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 13.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '14.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 13.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '14.0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.20.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.20.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: minitest-fail-fast
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 description: RText can be used to derive textual languages from an RGen metamodel
   with very little effort.
 email: