textbringer 27 → 28

data/lib/textbringer/mode.rb

@@ -78,6 +78,25 @@ module Textbringer
       self.class.mode_name
     end
 
+    # The string that starts a line comment in this mode, or nil if the
+    # mode has no line comments.
+    def comment_start
+      nil
+    end
+
+    # A regexp matching what begins a comment line: the indentation, the
+    # comment leader, and the blanks after it.  indent_new_comment_line
+    # repeats the match on the new line, and fill_paragraph uses it to
+    # tell comment lines from code and to keep the leader on each filled
+    # line.  nil if the mode has no comment lines.  Modes whose block
+    # comments continue with a leader of their own, as C's do with " * ",
+    # override this.
+    def comment_prefix_regexp
+      if comment_start
+        /[ \t]*#{Regexp.quote(comment_start)}+[ \t]*/
+      end
+    end
+
     def syntax_table
       self.class.syntax_table
     end

data/lib/textbringer/modes/c_mode.rb

@@ -38,6 +38,12 @@ module Textbringer
       "//"
     end
 
+    # "//" comments, and the " * " lines of a block comment.  The "/*"
+    # and " */" lines are not matched, so they bound the paragraph.
+    def comment_prefix_regexp
+      /[ \t]*(?:\/\/+|\*+(?![*\/]))[ \t]*/
+    end
+
     def initialize(buffer)
       super(buffer)
       @buffer[:indent_level] = CONFIG[:c_indent_level]

data/lib/textbringer/modes/programming_mode.rb

@@ -98,13 +98,14 @@ module Textbringer
     end
 
     def indent_new_comment_line
-      if comment_start.nil?
+      re = comment_prefix_regexp
+      if re.nil?
         @buffer.newline
         return
       end
       s = @buffer.save_excursion {
         @buffer.beginning_of_line
-        if @buffer.looking_at?(/[ \t]*#{comment_start}+[ \t]*/)
+        if @buffer.looking_at?(re)
           @buffer.match_string(0)
         else
           ""
@@ -113,10 +114,6 @@ module Textbringer
       @buffer.insert("\n" + s)
     end
 
-    def comment_start
-      nil
-    end
-
     private
 
     def calculate_indentation

data/lib/textbringer/modes/ruby_mode.rb

@@ -153,6 +153,7 @@ module Textbringer
       KEYWORD_BEGIN_UPCASE: :keyword, KEYWORD_BREAK: :keyword,
       KEYWORD_CASE: :keyword, KEYWORD_CLASS: :keyword, KEYWORD_DEF: :keyword,
       KEYWORD_DEFINED: :keyword, KEYWORD_DO: :keyword,
+      KEYWORD_DO_BLOCK: :keyword, KEYWORD_DO_LAMBDA: :keyword,
       KEYWORD_DO_LOOP: :keyword, KEYWORD_ELSE: :keyword,
       KEYWORD_ELSIF: :keyword, KEYWORD_END: :keyword,
       KEYWORD_END_UPCASE: :keyword, KEYWORD_ENSURE: :keyword,
@@ -182,7 +183,7 @@ module Textbringer
       SYMBOL_BEGIN: :string, REGEXP_BEGIN: :string, REGEXP_END: :string,
       PERCENT_LOWER_I: :string, PERCENT_UPPER_I: :string,
       PERCENT_LOWER_W: :string, PERCENT_UPPER_W: :string,
-      PERCENT_LOWER_X: :string,
+      PERCENT_LOWER_X: :string, XSTRING_BEGIN: :string,
       HEREDOC_START: :string, HEREDOC_END: :string,
       LABEL: :property,
 
@@ -225,10 +226,12 @@ module Textbringer
       # Punctuation
       DOT: :punctuation, COLON_COLON: :punctuation,
       SEMICOLON: :punctuation, COMMA: :punctuation,
-      PARENTHESIS_LEFT: :punctuation, PARENTHESIS_RIGHT: :punctuation,
+      PARENTHESIS_LEFT: :punctuation, PARENTHESIS_LEFT_GROUPING: :punctuation,
+      PARENTHESIS_RIGHT: :punctuation,
       BRACKET_LEFT: :punctuation, BRACKET_LEFT_ARRAY: :punctuation,
       BRACKET_RIGHT: :punctuation,
-      BRACE_LEFT: :punctuation, BRACE_RIGHT: :punctuation,
+      BRACE_LEFT: :punctuation, BRACE_LEFT_HASH: :punctuation,
+      BRACE_LEFT_ARGUMENT: :punctuation, BRACE_RIGHT: :punctuation,
       QUESTION_MARK: :punctuation, COLON: :punctuation,
       LAMBDA_BEGIN: :punctuation,
 
@@ -268,6 +271,17 @@ module Textbringer
       LAMBDA_BEGIN: :BRACE_RIGHT,
     }
 
+    # Newer versions of Prism split some token types.  Map them to the
+    # original types for indentation.
+    NORMALIZED_TOKEN_TYPES = {
+      BRACE_LEFT_HASH: :BRACE_LEFT,
+      BRACE_LEFT_ARGUMENT: :BRACE_LEFT,
+      PARENTHESIS_LEFT_GROUPING: :PARENTHESIS_LEFT,
+      KEYWORD_DO_BLOCK: :KEYWORD_DO,
+      KEYWORD_DO_LAMBDA: :KEYWORD_DO,
+      NEWLINE_TERMINATOR: :NEWLINE,
+    }.freeze
+
     INDENT_BEG_RE = /^([ \t]*)(class|module|def|if|unless|case|while|until|for|begin)\b/
 
     def space_width(s)
@@ -292,6 +306,7 @@ module Textbringer
       Prism.lex(source).value.filter_map { |token, _state|
         type = token.type
         next if type == :EOF
+        type = NORMALIZED_TOKEN_TYPES.fetch(type, type)
         loc = token.location
         [[loc.start_line, loc.start_column], type, token.value]
       }

data/lib/textbringer/version.rb

@@ -1,3 +1,3 @@
 module Textbringer
-  VERSION = "27"
+  VERSION = "28"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: textbringer
 version: !ruby/object:Gem::Version
-  version: '27'
+  version: '28'
 platform: ruby
 authors:
 - Shugo Maeda
@@ -503,7 +503,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 4.0.20
 specification_version: 4
 summary: An Emacs-like text editor
 test_files: []