vinter 0.6.5 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc87fe083ad2cf26703f0ec71b7848c8417a04a6c5fb46d32192ca7c405788ca
-  data.tar.gz: f5df110e92c6e28e64ab5d8d6669eee580dfb03bed27b61de3c4ba39c43d1b8a
+  metadata.gz: e35b8436cd29035d2d4f78482e343da5cbb88f3972dc47487abdf47b28f4f5ee
+  data.tar.gz: e6ce76acaf998dc56ea09712c90dea53f348445179dd435f9186c98ab8a3f4f7
 SHA512:
-  metadata.gz: 31c5bfb4f9d843a48a51e0111bd2101c6c73392c88aea577d311c37a936d7b19eed39dace56834b97e07363dee873564f8a1d62b759a24b8b7936370776478ee
-  data.tar.gz: 701864470a24ad44a24ab398ce5962d21985caa86e2ce4df961fb8d8e7fa8c53b3be9778a7179a00d1842315e1a038aebbed77aea416cbd80f140ac6a6f0b8c6
+  metadata.gz: 01061b7d58353485bc083c77ca992dc14e8c0395d499d4f9aa704f7efb15fd71c2061464248283b46cda8533a68aca3c8a1d7cf091b029de02a673b86aa7d134
+  data.tar.gz: e2862a606a016a4ea64a1cd38956dacd816c4e96520ffab058529774106e4484e8905cb72350a83bf1f1870bc8a9d56f54f62899ce9be0167dc22b609b9bb410

data/lib/vinter/lexer.rb

@@ -582,6 +582,8 @@ module Vinter
       encodings: /\b(latin1|iso|koi8|macroman|cp437|cp737|cp775|cp850|cp852|cp855|cp857|cp860|cp861|cp862|cp863|cp865|cp866|cp869|cp874|cp1250|cp1251|cp1253|cp1254|cp1255|cp1256|cp1257|cp1258|cp932|euc\-jp|sjis|cp949|euc\-kr|cp936|euc\-cn|cp950|big5|euc\-tw|utf\-8|ucs\-2|ucs\-21e|utf\-16|utf\-16le|ucs\-4|ucs\-4le|ansi|japan|korea|prc|chinese|taiwan|utf8|unicode|ucs2be|ucs\-2be|ucs\-4be|utf\-32|utf\-32le)\b/,
       #builtin_funcs: /\b(highlight||normal!|normal|filter|match|extend|redraw!|setbufline)\b/,
       type: /\b(number|list|dict|void|string)\b/,
+      mode_command: /\b(?:normal|norm)(?:!)?(?!\w).*$/,
+      exec_command: /\b(?:execute|exec).*$/,
       builtin_funcs: /\b(#{Regexp.union(BUILTINS).source})\b/,
       # Identifiers can include # and special characters
       heredoc: /=<</,
@@ -614,6 +616,7 @@ module Vinter
     def initialize(input)
       @input = input
       @tokens = []
+      @variables = []
       @position = 0
       @line_num = 1
       @column = 1
@@ -847,19 +850,6 @@ module Vinter
           next
         end
 
-        # Check for keywords first, before other token types
-        if match = chunk.match(/\A\b(if|else|elseif|endif|while|endwhile|for|endfor|def|enddef|function|endfunction|endfunc|return|const|var|final|import|export|class|extends|static|enum|vim9script|abort|autocmd|echoerr|echohl|echomsg|let|unlet|var|setlocal|syntax|highlight|sleep|source)\b/)
-          @tokens << {
-            type: :keyword,
-            value: match[0],
-            line: @line_num,
-            column: @column
-          }
-          @column += match[0].length
-          @position += match[0].length
-          next
-        end
-
         # Handle Vim scoped option variables with &l: or &g: prefix
         if match = chunk.match(/\A&[lg]:[a-zA-Z_][a-zA-Z0-9_]*/)
           @tokens << {
@@ -1006,6 +996,9 @@ module Vinter
 
         # Handle compound assignment operators
         if match = chunk.match(/\A(\+=|-=|\*=|\/=|\.\.=|\.=)/)
+          if @tokens.last[:type] == :keyword && @variables.include?(@tokens.last[:value])
+            @tokens.last[:type] = :identifier
+          end
           @tokens << {
             type: :compound_operator,
             value: match[0],
@@ -1136,52 +1129,6 @@ module Vinter
           next
         end
 
-        # Handle backslash for line continuation
-        if chunk.start_with?('\\')
-          @tokens << {
-            type: :line_continuation,
-            value: '\\',
-            line: @line_num,
-            column: @column
-          }
-          @column += 1
-          @position += 1
-
-          # If followed by a newline, advance to the next line
-          if @position < @input.length && @input[@position] == "\n"
-            @line_num += 1
-            @column = 1
-            @position += 1
-          end
-
-          # Skip whitespace after the continuation
-          while @position < @input.length && @input[@position] =~ /\s/
-            if @input[@position] == "\n"
-              @line_num += 1
-              @column = 1
-            else
-              @column += 1
-            end
-            @position += 1
-          end
-
-          next
-        end
-
-        # Check for special case where 'function' is followed by '('
-        # which likely means it's used as a built-in function
-        if chunk =~ /\Afunction\s*\(/
-          @tokens << {
-            type: :identifier,  # Treat as identifier, not keyword
-            value: 'function',
-            line: @line_num,
-            column: @column
-          }
-          @column += 'function'.length
-          @position += 'function'.length
-          next
-        end
-
         match_found = false
 
         TOKEN_TYPES.each do |type, pattern|
@@ -1193,6 +1140,16 @@ module Vinter
               line: @line_num,
               column: @column
             }
+
+            # handling variable names that are also keywords
+            if !@tokens.empty? && @tokens.last[:value] == 'var'
+              @variables << value
+              token[:type] = :identifier
+            end
+
+            #if type != :whitespace
+              #@tokens << token
+            #end
             @tokens << token unless type == :whitespace
 
             # Update position

data/lib/vinter/linter.rb

@@ -24,19 +24,6 @@ module Vinter
         end
       end)
 
-      # Rule: Prefer def over function in Vim9 script
-      register_rule(Rule.new("prefer-def-over-function", "Use def instead of function in Vim9 script") do |ast|
-        issues = []
-
-        traverse_ast(ast) do |node|
-          if node[:type] == :legacy_function
-            issues << { message: "Use def instead of function for #{node[:name]}", line: node[:line] || 0, column: node[:column] || 0 }
-          end
-        end
-
-        issues
-      end)
-
       # Rule: Variables should have type annotations
       register_rule(Rule.new("missing-type-annotation", "Variable declaration is missing type annotation") do |ast|
         issues = []
@@ -79,6 +66,21 @@ module Vinter
 
         issues
       end)
+
+      # Rule: should use the full name of commands that have abbreviations
+      register_rule(Rule.new("use-full-name", "Dont use partial names for commands") do |ast|
+        issues = []
+
+        traverse_ast(ast) do |node|
+          if node[:type] == :exec_command
+            unless node[:value].start_with?("execute")
+              issues << { message: "Use of execute command should use the full name", line: node[:line] }
+            end
+          end
+        end
+
+        issues
+      end)
     end
 
     def traverse_ast(node, &block)

data/lib/vinter/parser.rb

@@ -1,4 +1,3 @@
-require 'pry'
 module Vinter
   class Parser
     def initialize(tokens, source_text = nil)
@@ -409,8 +408,6 @@ module Vinter
           parse_autocmd_statement
         elsif current_token[:value] == "filter" || current_token[:value] == "filt"
           parse_filter_command
-        elsif current_token[:value] == "command"
-          parse_command_definition
         else
           parse_expression_statement
         end
@@ -462,6 +459,10 @@ module Vinter
         end
       elsif [:bracket_open, :bracket_close, :operator, :question_mark].include?(current_token[:type])
         advance
+      elsif current_token[:type] == :mode_command
+        advance
+      elsif current_token[:type] == :exec_command
+        advance
       else
         @warnings << {
           message: "Unexpected token type: #{current_token[:type]}",
@@ -1476,7 +1477,7 @@ module Vinter
           advance
           name += current_token[:value]
         end
-      elsif !current_token || ![:identifier, :keyword].include?(current_token[:type])
+      elsif !current_token || current_token[:type] != :identifier
         add_error("Expected variable name: #{current_token[:type]}")
         return nil
       else

data/lib/vinter.rb

@@ -5,5 +5,5 @@ require "vinter/cli"
 require "vinter/ast_printer"
 
 module Vinter
-  VERSION = "0.6.5"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vinter
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.7.0
 platform: ruby
 authors:
 - Dan Bradbury
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-12-29 00:00:00.000000000 Z
+date: 2026-01-08 00:00:00.000000000 Z
 dependencies: []
 description: A linter for vim9script
 email: dan.luckydaisy@gmail.com