korekto 1.2.210314 → 1.5.210331

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0286890774dd2081acbbf5df67402cc2897f873f3d2b778cdd6b493ddef80558'
-  data.tar.gz: 1f1741821e6d783c496553f22a1649a98d665ddf685e90fdedd032c83f4e3613
+  metadata.gz: 636a9add2c269f979a980cd798f6aae0bc4b624c1b32f979aea02c0b4534c34a
+  data.tar.gz: 72cb33eb156931b0c6e5b5be64093ec9ede966032b36d7933980bed888d9fe94
 SHA512:
-  metadata.gz: ba94530c442c879ff65ddc1876f3a8dc8210c7fb6084581b508640efd2f7b62024c977d11280f0ab0e0206925f0301f10eaf587148fbf1157ed28ad239cee171
-  data.tar.gz: 6ef15ca196921ab9b1fd63f1bc948bdb33040444a31c01095ad0138f142c0388ab425c24f94edd1274779e0137afc21e15ab0e6b2e1b849c6316d852de27fd2a
+  metadata.gz: 426b6d679b487fd95ae073c63a9ad19d25e17081b1e44c691756ec3d53d5257215985977dec1e44263c1348880069b360a6caab0c04d0c9162c9daa97a2afc19
+  data.tar.gz: 530aa7d72c18360b330f39caaaa17d7f1bad6f68f144584a6683fbb44031203fe70652f74967135298fde45e99899ffb63f0310e9c93371de8972bc303fd1928

data/bin/korekto

@@ -1,12 +1,13 @@
 #!/usr/bin/env ruby
 require 'help_parser'
 
-OPTIONS = HelpParser['1.2.210314', <<HELP]
+OPTIONS = HelpParser['1.5.210331', <<HELP]
 Usage:
-  korekto [:options+]
+  korekto [:options]
 Options:
  -h --help
  -v --version
+ --edits     \tShow only needed edits
  --install   \tInstalls the korekto neovim ruby plugin
  --readme    \tOpen korekto github page
 # Example usage:

data/lib/korekto.rb

@@ -1,5 +1,5 @@
 module Korekto
-  VERSION = '1.2.210314'
+  VERSION = '1.5.210331'
   class Error < Exception; end
   require 'korekto/symbols'
   require 'korekto/syntax'

data/lib/korekto/main.rb

@@ -1,6 +1,6 @@
 module Korekto
 class Main
-  MD_STATEMENT_CODE_TITLE = %r{^(?<statement>.*)\s#(?<code>[A-Z](\d+(/[\w,.]+)?)?)( (?<title>\S.*?\S))?$}
+  MD_STATEMENT_CODE_TITLE = %r{^(?<statement>.*)\s#(?<code>[A-Z](\d+(\.\w+)?(/[\w,.]+)?)?)( (?<title>\S.*?\S))?$}
   MD_FILENAME = %r{^< (?<filename>[/\w\-.]+)$}
   MD_KLASS_METHOD_DEFINITION = /^(?<klass>::[A-Z]\w+)#(?<method>\w+)(?<definition>[^=]*=.+)$/ # patch
   MD_RULE = /^[?] (?<rule>\S.*)$/
@@ -15,8 +15,9 @@ class Main
 
   def initialize(filename='-', statements: Statements.new, imports: [])
     @filename,@statements,@imports = filename,statements,imports
-    @imports.push @filename
+    @imports.push @filename.freeze
     @line,@active = nil,false
+    @section = File.basename(@filename,'.*')
     @m_fence_korekto = /^```korekto$/
   end
 
@@ -65,6 +66,8 @@ class Main
       @statements.symbols.set_scanner value
     when 'fence'
       @m_fence_korekto = Regexp.new "^```#{value}$"
+    when 'section'
+      @section = value
     when 'save'
       BACKUPS[value] = Marshal.dump(@statements)
     when 'restore'
@@ -109,13 +112,13 @@ class Main
         next unless active?
         next if preprocess?
         if md = MD_STATEMENT_CODE_TITLE.match(@line)
-          statement_number += 1
           code,title = @statements.add(md[:statement].strip,
                                        md[:code],
                                        md[:title],
-                                       @filename,
-                                       statement_number)
-          puts "#{@filename}:#{line_number}:#{code}:#{title}"
+                                       @section){ statement_number += 1 }
+          if not OPTIONS.edits? or (@filename=='-' and not (md[:code]==code and md[:title]==title))
+            puts "#{@filename}:#{line_number}:#{code}:#{title}"
+          end
         else
           raise Error, 'unrecognized korekto line'
         end

data/lib/korekto/statement.rb

@@ -1,10 +1,10 @@
 module Korekto
 class Statement
-  attr_reader :code,:title,:regexp,:filename,:statement_number
-  def initialize(statement,code,title,filename,statement_number,context)
-    @statement,@code,@title,@statement_number,@context = statement,code,title,statement_number,context
-    @filename = File.basename(filename,'.*')
-    @statement.freeze; @filename.freeze; @statement_number.freeze
+  attr_reader :code,:title,:regexp,:section,:statement_number
+  def initialize(statement,code,title,section,statement_number,context)
+    @statement,@code,@title,@section,@statement_number,@context =
+      statement,code,title,section,statement_number,context
+    @statement.freeze; @section.freeze; @statement_number.freeze
     syntax_check unless @statement[0]=='/' and @statement[-1]=='/' and ['A','L','M','E','I'].include?(@code[0])
     @regexp = nil
     set_acceptance_code
@@ -73,6 +73,7 @@ class Statement
 
   def set_statement(support=nil, title=nil)
     @code = "#{@code[0]}#{@statement_number}"
+    @code += '.' + @section unless @section=='-'
     @code += "/#{support}" if support
     @title = title.split(':',2).first if title
   end
@@ -81,7 +82,6 @@ class Statement
     support = []
     s.each do |s|
       c = s.code.split('/',2)[0]
-      c = s.filename+'.'+c unless s.filename=='-'
       support.push(c)
     end
     return support.join(',')

data/lib/korekto/statements.rb

@@ -11,7 +11,7 @@ class Statements
   def type(c) = @statements.select{_1.type==c}
   def length = @statements.length
 
-  def add(statement,code,title,filename,statement_number)
+  def add(statement,code,title,filename)
     c = code[0]; w = c=='W'
     if restatement = @statements.detect{(w or _1.type==c) and _1.to_s==statement}
       case restatement.type
@@ -24,6 +24,7 @@ class Statements
       title ||= restatement.title
       return code, title
     end
+    statement_number = yield
     statement = Statement.new(statement,code,title,filename,statement_number,self)
     @statements.push statement
     case statement.type

data/rplugin/ruby/korekto.rb

@@ -1,6 +1,6 @@
 Neovim.plugin do |plug|
   plug.command(:Korekto) do |nvim|
-    validations = nvim.command_output('w !korekto').strip.split("\n").map(&:strip)
+    validations = nvim.command_output('w !korekto --edits').strip.split("\n").map(&:strip)
     msg = 'OK'
     unless validations.empty?
       buf = nvim.get_current_buf

data/start/korekto/syntax/korekto.vim

@@ -1,12 +1,21 @@
+syntax match Unsup   /#[A-Z]\d\+\(\.\w\+\)\?/ contained containedin=Type
+syntax match Sup     /#[A-Z]\d\+\(\.\w\+\)\?\/\S\+/ contained containedin=Type
+syntax match Title   / [^:]\+/ contained containedin=Type
+syntax match Undef   /:[^#]\+$/ contained containedin=Type
+syntax match Type    /\s#[A-Z][^#]\+/ contains=Unsup,Sup,Title,Undef
 syntax match Comment /^\s*#.\+$/
-syntax match Pass    /\s#[A-Z][^#]*$/
-syntax match Syntax  /^[?] \w.\+$/
+syntax match Syntax  /^[?] \S.\+$/
 syntax match Patch   /^::[A-Z]\w\+#\w\+[^=]\+=.\+$/
 syntax match Import  /^< [\/A-Za-z\_\-\.]\+$/
+syntax match Setting /^! \S.*$/
+highlight Unsup   ctermfg=brown
+highlight Sup     ctermfg=darkgreen
+highlight Title   ctermfg=darkblue
+highlight Undef   ctermfg=red
 highlight Comment ctermfg=darkblue
-highlight Pass    ctermfg=darkgreen
-highlight Syntax  ctermfg=darkmagenta
+highlight Import  ctermfg=brown
 highlight Patch   ctermfg=darkgrey
-highlight Import  ctermfg=darkyellow
+highlight Syntax  ctermfg=darkgrey
+highlight Setting ctermfg=darkmagenta
 setlocal tabstop=23
 map <F7> :Korekto<CR>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: korekto
 version: !ruby/object:Gem::Version
-  version: 1.2.210314
+  version: 1.5.210331
 platform: ruby
 authors:
 - carlosjhr64
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-14 00:00:00.000000000 Z
+date: 2021-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: help_parser