korekto 1.1.210313 → 1.5.210328

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13c8ee5024318dfb63cf663bbcf574c22a98b3e7a86e455a31ce0a79690cecda
-  data.tar.gz: f2b9f9e3b261eb62bdd2b85f7659e459bfda3fe32a20afe22d028aed6b54f395
+  metadata.gz: a36bc0a8ec8d847c96d81ffaa6b6e5a5e2b4d554e3d6f6ab2ea169a5f5f5a33c
+  data.tar.gz: 93ad065ad45a8c4467c506a904873ef6ffa0f8b78e6d1d9c35124997704f09c3
 SHA512:
-  metadata.gz: ba22bf373161134aa32acb1ebf9a0eddfe17384f2b43a1c5311dfeb0ac88423a53056fed8637e87bcf42e3a70f94f798a84d22ddddac98f10c8649e0ebbde1b5
-  data.tar.gz: a4dbdfae0c6c932ef63a86882633cc12a077092173e5b077ff444a29e027c0f4939ab9249e2590599c85beaac202738cad47997e2a97659a34c031bddd3649a0
+  metadata.gz: cae7009cc93cbe9b0d64c47e88a9d4731c0127516ca5d6e5a995f3941b49e3c87e5533f553aec627e392ac57a2bbb85c421da3e36ea1cf40f9c4328a349e2918
+  data.tar.gz: 5865c023419dea802ec58d8ba1ffc11b177ffb7494095d785b47e5bd3d56a2b7830713b9a8250cda702415e3f45be88a2aa639aa7eae587a26298188af738338

data/bin/korekto

@@ -1,12 +1,13 @@
 #!/usr/bin/env ruby
 require 'help_parser'
 
-OPTIONS = HelpParser['1.1.210313', <<HELP]
+OPTIONS = HelpParser['1.5.210328', <<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.1.210313'
+  VERSION = '1.5.210328'
   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'
@@ -113,9 +116,11 @@ class Main
           code,title = @statements.add(md[:statement].strip,
                                        md[:code],
                                        md[:title],
-                                       @filename,
+                                       @section,
                                        statement_number)
-          puts "#{@filename}:#{line_number}:#{code}:#{title}"
+          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/symbols.rb

@@ -37,7 +37,7 @@ class Symbols
       Regexp.new(statement[1..-2])
     else
       pattern,count,seen = '\A',0,{}
-      Regexp.quote(statement).scan(@scanner) do |v|
+      statement.scan(@scanner) do |v|
         if n=seen[v]
           pattern << '\\'+n
         elsif type = @v2t[v]
@@ -50,8 +50,9 @@ class Symbols
             pattern << '('+regex+')'
           end
         else
-          # To avoid collisions with back-references,
-          # isolate digit in square brackets:
+          # Escape Regexp specials
+          v = Regexp.quote v
+          # To avoid collisions with back-references, isolate digit in square brackets:
           '0123456789'.include?(_=v[0]) and v[0]='['+_+']'
           pattern << v
         end

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.1.210313
+  version: 1.5.210328
 platform: ruby
 authors:
 - carlosjhr64
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-13 00:00:00.000000000 Z
+date: 2021-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: help_parser