diakonos 0.9.12 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 785260a5c3a705a4bc2a441d3968b79307396fc559e471593dff06ebe5ff6fc9
-  data.tar.gz: a7b5686d70facc10e5902fe2ed29d27880676cb745ddf19d74abc2712c568cf0
+  metadata.gz: ec473dc61826cd6bbf05d8dac8dada0301027e08d3157f3974e2f26b252d64bc
+  data.tar.gz: 43884c5a26d6d365afd03dbd35a2c2f2f532db8c14098a64228a8a5a82ac95e4
 SHA512:
-  metadata.gz: 9b87711d7f9422dd2f200a644cfd9b573178a4269c3016b4cbacd6cde0b49a618c5d3004548655c54c3e5d34063f3a4d93dbb8e8ff2f82ad5c4285100cc7f51d
-  data.tar.gz: b284dc8cab1fcbeae25ea08e417ffa70e643d4b48dd45c0b8660fd31f247e363e8cfa906bdf7ed0df63cd1e439d09107cc05d79e0a9f82ac7d9b67a5b64771bd
+  metadata.gz: 55ade0e7d34bf4aa080908f79c9bafb45c582872b51eb6ab7d89caae28a7ed997320699d1ac2e4a3f0b7fd68dd7972bb9ea50ad3229094c6a9c5d10e70c6f4e2
+  data.tar.gz: b8d29f7a53609b9ad63a0b3a096c7255343e81192e1ecb6d213a45294b42411378a4731879269f061a81c015f13197e4fd5603c967d4cfd81d9b8996a950ad3c

data/CHANGELOG

@@ -1,6 +1,16 @@
 Diakonos Changelog
 ------------------
 
+0.10.0
+
+- Fix syntax highlighting of multi-line things (e.g. strings, comments)
+- Add preliminary Language Server Protocol support
+  - diagnostics (errors, info) per line
+  - go to definition
+  - hover info
+- Automatically close forgotten buffers
+- Fix automatic indentation
+
 0.9.12
 
 - Fix opening of already-open file

data/diakonos.conf

@@ -6,6 +6,9 @@ logfile ~/.diakonos/diakonos.log
 
 # mouse false
 
+# Interval (in ms) at which the main loop polls for async events (e.g. LSP).
+async_update_interval 100
+
 # ---------------------------------------------------------------------
 # Colour Definitions
 #
@@ -52,10 +55,11 @@ view.wrap.visual true
 view.pairs.highlight true
 
 view.line_numbers false
-view.line_numbers.width 4
+view.line_numbers.diagnostic_marker ●
+view.line_numbers.format white
 # view.line_numbers.number_format is a "printf" style format string
 view.line_numbers.number_format "%3s "
-view.line_numbers.format white
+view.line_numbers.width 4
 
 #view.column_markers.margin.column 80
 view.column_markers.margin.format 9
@@ -175,6 +179,12 @@ context.separator |
 context.separator.format red inverse
 #context.max_segment_width 10
 
+# ---------------------------------------------------------------------
+# Dock Pane
+
+# Maximum height (in lines) of the dock pane, including its separator line.
+dock.max_height 10
+
 # ---------------------------------------------------------------------
 # Interaction Line
 
@@ -321,6 +331,9 @@ key alt+b alt+5;goToNamedBookmark 5
 key alt+t;goToTag
 key alt+);goToTagUnderCursor
 key alt+(;popTag
+# Ctrl-]
+key keycode29;go_to_definition
+key alt+/;hover
 
 key backspace      backspace
 key ctrl+h         backspace
@@ -772,6 +785,7 @@ lang.xml.surround.pair "<!--" "<!-- " " -->"
 lang.xml.surround.pair "/^<(.+?)>$/" "<\1>" "</\1>"
 
 lang.html.filemask \.([rx]?html?|php|asp|erb|handlebars|mustache)$
+# lang.html.lsp.command vscode-html-language-server --stdio
 lang.html.format.default white
 lang.html.format.selection inverse
 lang.html.format.found yellow inverse
@@ -846,6 +860,7 @@ lang.html.surround.pair "/^<(.+?)>$/" "<\1>" "</\1>"
 # CSS
 
 lang.css.filemask \.(?:s?css|less)$
+# lang.css.lsp.command vscode-css-language-server --stdio
 lang.css.format.default white
 lang.css.format.selection inverse
 lang.css.format.found yellow inverse
@@ -880,7 +895,8 @@ lang.css.tokens.variables.format cyan bold
 
 # Javascript, ES6
 
-lang.javascript.filemask \.(?:[cm]?jsx?|es6|tsx?|json)$
+lang.javascript.filemask \.(?:[cm]?jsx?|es6|tsx?)$
+# lang.javascript.lsp.command typescript-language-server --stdio
 lang.javascript.format.default white bold
 lang.javascript.format.selection inverse
 lang.javascript.format.found yellow inverse
@@ -928,10 +944,44 @@ lang.javascript.closers.for.regexp for$
 lang.javascript.closers.for.closer { |m| "( $i = 0; $i < limit; $i++ ) {\n%_\n}" }
 lang.javascript.column_delimiters =|:|,
 
+lang.json.filemask \.json$
+# lang.json.lsp.command vscode-json-language-server --stdio
+lang.json.format.default white bold
+lang.json.format.selection inverse
+lang.json.format.found yellow inverse
+lang.json.tokens.doublequoted_strings (\".*?[^\\]?\")
+lang.json.tokens.doublequoted_strings.format green bold
+lang.json.tokens.singlequoted_strings ('.*?[^\\]')
+lang.json.tokens.singlequoted_strings.format green bold
+lang.json.tokens.comments (\/\/.*)
+# Comments not allowed in JSON
+lang.json.tokens.comments.format = red inverse
+lang.json.comment_string "/* "
+lang.json.comment_close_string " */"
+lang.json.tokens.long_comments.open \/\*
+lang.json.tokens.long_comments.close \*\/
+# Comments not allowed in JSON
+lang.json.tokens.long_comments.format = red inverse
+lang.json.tokens.non_alphanum ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
+lang.json.tokens.non_alphanum.format white
+lang.json.indent.size 2
+lang.json.indent.auto true
+lang.json.indent.roundup false
+#lang.json.indent.using_tabs true
+lang.json.indent.indenters ([{(])
+lang.json.indent.unindenters ([})])
+lang.json.indent.preventers (\".+?[^\\]\")|('.+?[^\\]')|(\/\/.*)
+lang.json.indent.ignore ^(.+:|\s*?)$
+lang.json.indent.closers true
+lang.json.context.ignore ^(.+:|\s*\{?)$
+
+
 # Ruby
 
 lang.ruby.filemask (?:[Rr]akefile)|Gemfile|(?:\.(?:r[bu]|gem(?:spec)?|rake)$)
 lang.ruby.bangmask #!.*ruby
+# lang.ruby.lsp.command solargraph stdio
+# lang.ruby.lsp.command rvm use 3.4.8 && solargraph stdio
 lang.ruby.format.default = lang.shared.format.default
 lang.ruby.format.selection = lang.shared.format.selection
 lang.ruby.format.pair = lang.shared.format.pair
@@ -1602,6 +1652,7 @@ lang.bind.indent.roundup true
 lang.bind.indent.using_tabs false
 
 lang.markdown.filemask \.(?:md|markdown)
+# lang.markdown.lsp.command vscode-markdown-language-server --stdio
 lang.markdown.format.default white
 lang.markdown.format.selection inverse
 lang.markdown.format.found yellow inverse
@@ -1855,6 +1906,113 @@ lang.go.closers.for.regexp for$
 lang.go.closers.for.closer { |m| "( $i = 0; $i < limit; $i++ ) {\n%_\n}" }
 lang.go.column_delimiters =|:|,
 
+lang.scheme.filemask \.scm$
+lang.scheme.format.default white bold
+lang.scheme.format.selection inverse
+lang.scheme.format.found yellow inverse
+lang.scheme.tokens.comments (;.*)
+lang.scheme.tokens.comments.format = lang.shared.tokens.comments.format
+lang.scheme.comment_string "; "
+lang.scheme.tokens.number \s(\d+)(?:[^0-9.mhdw]|$)
+lang.scheme.tokens.number.format blue bold
+lang.scheme.tokens.doublequoted_strings (\".*?[^\\]?\")
+lang.scheme.tokens.doublequoted_strings.format green bold
+lang.scheme.indent.size 2
+lang.scheme.indent.auto true
+lang.scheme.indent.roundup true
+lang.scheme.indent.using_tabs false
+
+# Zig
+
+lang.zig.filemask \.(?:zig)$
+lang.zig.format.default white bold
+lang.zig.format.selection inverse
+lang.zig.format.found yellow inverse
+lang.zig.tokens.doublequoted_strings (\".*?[^\\]?\")
+lang.zig.tokens.doublequoted_strings.format green bold
+lang.zig.tokens.singlequoted_strings ('.*?[^\\]')
+lang.zig.tokens.singlequoted_strings.format green bold
+# lang.zig.tokens.backquoted_strings (`.*?[^\\]`)
+# lang.zig.tokens.backquoted_strings.format green bold
+lang.zig.tokens.interpolated_string.open (`)
+lang.zig.tokens.interpolated_string.close (`)
+lang.zig.tokens.interpolated_string.format green bold
+lang.zig.tokens.interpolated_string.change_to javascript_template_literal
+lang.zig_template_literal.format.default green bold
+lang.zig_template_literal.tokens.interpolation.open (\$\{)
+lang.zig_template_literal.tokens.interpolation.close (\})
+lang.zig_template_literal.tokens.interpolation.format 12 bold
+lang.zig_template_literal.tokens.interpolation.change_to javascript
+lang.zig.tokens.reserved_words \b(addrspace|align|allowzero|and|anyframe|anytype|asm|async|await|break|callconv|catch|comptime|const|continue|defer|else|enum|errdefer|error|export|extern|fn|for|if|inline|noalias|nosuspend|noinline|opaque|or|orelse|packed|pub|resume|return|linksection|struct|suspend|switch|test|threadlocal|try|union|unreachable|usingnamespace|var|volatile|while)\b
+lang.zig.tokens.reserved_words.format white
+lang.zig.tokens.constants \b([A-Z_]+|[A-Z_][A-Z0-9_]+)\b
+lang.zig.tokens.constants.format yellow bold
+lang.zig.tokens.comments (\/\/.*)
+lang.zig.tokens.comments.format = lang.shared.tokens.comments.format
+lang.zig.comment_string "// "
+lang.zig.comment_close_string ""
+lang.zig.tokens.long_comments.open \/\*
+lang.zig.tokens.long_comments.close \*\/
+lang.zig.tokens.long_comments.format = lang.shared.tokens.comments.format
+lang.zig.tokens.regular_expressions (\/.+?[^\\]\/)
+lang.zig.tokens.regular_expressions.format red bold
+lang.zig.tokens.non_alphanum ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
+lang.zig.tokens.non_alphanum.format white
+lang.zig.indent.size 4
+lang.zig.indent.auto true
+lang.zig.indent.roundup false
+#lang.zig.indent.using_tabs true
+lang.zig.indent.indenters (\{)
+lang.zig.indent.unindenters (\})
+lang.zig.indent.preventers (\".+?[^\\]\")|('.+?[^\\]')|(\/\/.*)
+lang.zig.indent.ignore ^(.+:|\s*?)$
+lang.zig.indent.closers true
+lang.zig.context.ignore ^(.+:|\s*\{?)$
+lang.zig.closers.for.regexp for$
+lang.zig.closers.for.closer { |m| "( $i = 0; $i < limit; $i++ ) {\n%_\n}" }
+lang.zig.column_delimiters =|:|,
+
+# Clojure
+
+lang.clojure.filemask \.clj[csx]?$|\.edn$
+lang.clojure.bangmask #!.*clojure
+
+lang.clojure.format.default = lang.shared.format.default
+lang.clojure.format.selection = lang.shared.format.selection
+lang.clojure.format.pair = lang.shared.format.pair
+lang.clojure.format.found = lang.shared.format.found
+
+lang.clojure.tokens.reserved_words \b(case|catch|cond|condp|def|defmacro|defmethod|defmulti|defn|defn-|defonce|defprotocol|defrecord|deftype|do|doseq|dosync|dotimes|doto|finally|fn|for|if|if-let|if-not|import|in-ns|let|letfn|loop|monitor-enter|monitor-exit|new|ns|quote|recur|refer|require|set!|throw|try|use|var|when|when-let|when-not|while)\b
+lang.clojure.tokens.reserved_words.format = lang.shared.tokens.reserved_words.format
+lang.clojure.tokens.constants \b(false|nil|true)\b
+lang.clojure.tokens.constants.format = lang.shared.tokens.constants.format
+lang.clojure.tokens.keywords (:[a-zA-Z_!?*+\-][a-zA-Z0-9_!?*+\-/.]*)
+lang.clojure.tokens.keywords.format white bold
+lang.clojure.tokens.comments (;.*)
+lang.clojure.tokens.comments.format = lang.shared.tokens.comments.format
+lang.clojure.comment_string "; "
+lang.clojure.tokens.doublequoted_strings (\".*?[^\\]?\")
+lang.clojure.tokens.doublequoted_strings.format green bold
+lang.clojure.tokens.regular_expressions (#\".*?[^\\]\")
+lang.clojure.tokens.regular_expressions.format red bold
+lang.clojure.tokens.characters (\\(?:newline|space|tab|backspace|formfeed|return|\S))
+lang.clojure.tokens.characters.format magenta bold
+lang.clojure.tokens.metadata (\^[:{]\S*)
+lang.clojure.tokens.metadata.format cyan bold
+lang.clojure.tokens.reader_macros (#['_^])
+lang.clojure.tokens.reader_macros.format 9 bold
+lang.clojure.tokens.non_alphanum ([!@#$%^&*()\[\]{}/?=+\-\\|,<.>;~])
+lang.clojure.tokens.non_alphanum.format white
+
+lang.clojure.indent.size 2
+lang.clojure.indent.auto true
+lang.clojure.indent.roundup false
+lang.clojure.tabsize 2
+lang.clojure.indent.indenters ([\[{(])
+lang.clojure.indent.unindenters ([\]})])
+lang.clojure.indent.preventers (\".+?[^\\]\")|(\;.*)
+lang.clojure.indent.ignore ^\s*$
+lang.clojure.column_delimiters \s
 
 # Other configuration files can be included.
 # If a setting is specified again, it overrides the previous setting given

data/help/ruby.dhf

@@ -1,5 +1,9 @@
 # Ruby Compatibility
 
+## Ruby 3.1
+
+Ruby 0.10.0 and later require at least Ruby 3.1.
+
 ## Ruby 1.9
 
 Usage to date has shown that Diakonos is fully compatible with Ruby 1.9.
@@ -14,4 +18,4 @@ Support for Ruby 1.8 was dropped as of Diakonos version 0.8.8.
 
 
 
-Tags: ruby 1.9 1.8 19 18 compatible compatibility problems issues version
+Tags: ruby 1.9 1.8 19 18 compatible compatibility problems issues version

data/lib/diakonos/bookmark.rb

@@ -11,30 +11,30 @@ module Diakonos
       @name = name
     end
 
-    def == (other)
+    def ==(other)
       return false if other.nil?
+
       ( @buffer == other.buffer && @row == other.row && @col == other.col )
     end
 
-    def <=> (other)
+    def <=>(other)
       return nil if other.nil?
+
       comparison = ( $diakonos.buffer_to_number( @buffer ) <=> $diakonos.buffer_to_number( other.buffer ) )
       return comparison if comparison != 0
+
       comparison = ( @row <=> other.row )
       return comparison if comparison != 0
+
       @col <=> other.col
     end
 
-    def < (other)
+    def <(other)
       ( ( self <=> other ) < 0 )
     end
-    def > (other)
-      ( ( self <=> other ) > 0 )
-    end
 
-    def shift( row_inc, col_inc )
-      row += row_inc
-      col += col_inc
+    def >(other)
+      ( ( self <=> other ) > 0 )
     end
 
     def to_s
@@ -43,4 +43,4 @@ module Diakonos
 
   end
 
-end
+end

data/lib/diakonos/buffer/bookmarking.rb

@@ -4,9 +4,9 @@ module Diakonos
 
     def go_to_next_bookmark
       cur_pos = Bookmark.new( self, @last_row, @last_col )
-      next_bm = @bookmarks.find do |bm|
+      next_bm = @bookmarks.find { |bm|
         bm > cur_pos
-      end
+      }
       if next_bm
         cursor_to( next_bm.row, next_bm.col, DO_DISPLAY )
       end
@@ -29,19 +29,19 @@ module Diakonos
 
     def toggle_bookmark
       bookmark = Bookmark.new( self, @last_row, @last_col )
-      existing = @bookmarks.find do |bm|
+      existing = @bookmarks.find { |bm|
         bm == bookmark
-      end
+      }
       if existing
         @bookmarks.delete existing
-        $diakonos.set_iline "Bookmark #{existing.to_s} deleted."
+        $diakonos.set_iline "Bookmark #{existing} deleted."
       else
         @bookmarks.push bookmark
         @bookmarks.sort
-        $diakonos.set_iline "Bookmark #{bookmark.to_s} set."
+        $diakonos.set_iline "Bookmark #{bookmark} set."
       end
     end
 
   end
 
-end
+end

data/lib/diakonos/buffer/cursor.rb

@@ -105,7 +105,7 @@ module Diakonos
         else
           col = 0
         end
-        #when BOL_ALT_FIRST_CHAR
+      # when BOL_ALT_FIRST_CHAR
       else
         first_char_col = ( ( @lines[ row ] =~ /\S/ ) || 0 )
         if @last_col == first_char_col
@@ -146,6 +146,7 @@ module Diakonos
     def cursor_to_tov
       cursor_to( row_of( 0 ), @last_col, DO_DISPLAY )
     end
+
     # Bottom of view
     def cursor_to_bov
       cursor_to( row_of( 0 + $diakonos.main_window_height - 1 ), @last_col, DO_DISPLAY )
@@ -159,20 +160,20 @@ module Diakonos
 
       while row < @top_line + @settings[ "view.margin.y" ]
         amount = (-1) * @settings[ "view.jump.y" ]
-        break if( pitch_view( amount, DONT_PITCH_CURSOR, DONT_DISPLAY ) != amount )
+        break  if ( pitch_view( amount, DONT_PITCH_CURSOR, DONT_DISPLAY ) != amount )
       end
       while row > @top_line + $diakonos.main_window_height - 1 - @settings[ "view.margin.y" ]
         amount = @settings[ "view.jump.y" ]
-        break if( pitch_view( amount, DONT_PITCH_CURSOR, DONT_DISPLAY ) != amount )
+        break  if ( pitch_view( amount, DONT_PITCH_CURSOR, DONT_DISPLAY ) != amount )
       end
 
       while col < @left_column + @settings[ "view.margin.x" ]
         amount = (-1) * @settings[ "view.jump.x" ]
-        break if( pan_view( amount, DONT_DISPLAY ) != amount )
+        break  if ( pan_view( amount, DONT_DISPLAY ) != amount )
       end
       while col > @left_column + $diakonos.main_window_width - @settings[ "view.margin.x" ] - 2
         amount = @settings[ "view.jump.x" ]
-        break if( pan_view( amount, DONT_DISPLAY ) != amount )
+        break  if ( pan_view( amount, DONT_DISPLAY ) != amount )
       end
 
       @top_line != old_top_line || @left_column != old_left_column
@@ -189,17 +190,16 @@ module Diakonos
       new_level = initial_level
       ( 0...@last_row ).reverse_each do |row|
         next  if @lines[ row ].strip.empty?
+
         level = indentation_level( row )
         if ! passed
           passed = ( level < initial_level )
           new_level = level
-        else
-          if level < new_level
-            new_row = ( row+1..@last_row ).find { |r|
-              ! @lines[ r ].strip.empty?
-            }
-            break
-          end
+        elsif level < new_level
+          new_row = ( row+1..@last_row ).find { |r|
+            ! @lines[ r ].strip.empty?
+          }
+          break
         end
       end
       go_to_line( new_row, @lines[ new_row ].index( /\S/ ) )
@@ -210,6 +210,7 @@ module Diakonos
       new_row = @lines.length
       ( @last_row...@lines.length ).each do |row|
         next  if @lines[ row ].strip.empty?
+
         level = indentation_level( row )
         if level > initial_level
           new_row = row
@@ -228,18 +229,17 @@ module Diakonos
       passed = false
       ( @last_row+1...@lines.length ).each do |row|
         next  if @lines[ row ].strip.empty?
+
         level = indentation_level( row )
         if ! passed
           if level < initial_level
             passed = true
           end
-        else
-          if level == initial_level
-            new_row = row
-            break
-          elsif level < initial_level - 1
-            break
-          end
+        elsif level == initial_level
+          new_row = row
+          break
+        elsif level < initial_level - 1
+          break
         end
       end
       go_to_line( new_row, @lines[ new_row ].index( /\S/ ) )
@@ -252,28 +252,25 @@ module Diakonos
       passed2 = false  # search for reindent
       ( 0...@last_row ).reverse_each do |row|
         next  if @lines[ row ].strip.empty?
+
         level = indentation_level( row )
         if ! passed
           if level < initial_level
             passed = true
           end
-        else
-          if ! passed2
-            if level >= initial_level
-              new_row = row
-              passed2 = true
-            elsif level <= initial_level - 2
-              # No previous block
-              break
-            end
-          else
-            if level < initial_level
-              new_row = ( row+1..@last_row ).find { |r|
-                ! @lines[ r ].strip.empty?
-              }
-              break
-            end
+        elsif ! passed2
+          if level >= initial_level
+            new_row = row
+            passed2 = true
+          elsif level <= initial_level - 2
+            # No previous block
+            break
           end
+        elsif level < initial_level
+          new_row = (row+1..@last_row).find { |r|
+            ! @lines[ r ].strip.empty?
+          }
+          break
         end
       end
       go_to_line( new_row, @lines[ new_row ].index( /\S/ ) )

data/lib/diakonos/buffer/delete.rb

@@ -18,9 +18,9 @@ module Diakonos
               cursor_to( @last_row, @last_col )
             end
           else
-            take_snapshot( TYPING )
-            @lines[ row ] = line[ 0...col ] + line[ (col + 1)..-1 ]
-            set_modified
+            take_snapshot(typing: true)
+            @lines[ row ] = line[ 0...col ] + line[ (col + 1).. ]
+            set_modified modified_from_line: row
           end
         end
       end
@@ -40,7 +40,7 @@ module Diakonos
         @lines.delete_at row
       end
       cursor_to( row, 0 )
-      set_modified
+      set_modified modified_from_line: row
 
       retval
     end
@@ -57,10 +57,10 @@ module Diakonos
         @lines[ row ] << next_line
         retval = [ "\n" ]
       else
-        retval = [ @lines[ row ][ col..-1 ] ]
+        retval = [ @lines[ row ][ col.. ] ]
         @lines[ row ] = @lines[ row ][ 0...col ]
       end
-      set_modified
+      set_modified modified_from_line: row
 
       retval
     end
@@ -71,13 +71,13 @@ module Diakonos
         retval = [ @lines[ row_to ].slice!( col_from, col_to - col_from ) ]
       else
         pre_head = @lines[ row_from ][ 0...col_from ]
-        post_tail = @lines[ row_to ][ col_to..-1 ]
+        post_tail = @lines[ row_to ][ col_to.. ]
         head = @lines[ row_from ].slice!( col_from..-1 )
         tail = @lines[ row_to ].slice!( 0...col_to )
         retval = [ head ] + @lines.slice!( row_from + 1, row_to - row_from ) + [ tail ]
         @lines[ row_from ] = pre_head + post_tail
       end
-      set_modified
+      set_modified modified_from_line: row_from
       retval
     end
 
@@ -120,22 +120,22 @@ module Diakonos
 
       start_char = end_char = char
       case char
-        when '('
-          end_char = ')'
-        when '{'
-          end_char = '}'
-        when '['
-          end_char = ']'
-        when '<'
-          end_char = '>'
-        when ')'
-          end_char = '('
-        when '}'
-          end_char = '{'
-        when ']'
-          end_char = '['
-        when '>'
-          end_char = '<'
+      when '('
+        end_char = ')'
+      when '{'
+        end_char = '}'
+      when '['
+        end_char = ']'
+      when '<'
+        end_char = '>'
+      when ')'
+        end_char = '('
+      when '}'
+        end_char = '{'
+      when ']'
+        end_char = '['
+      when '>'
+        end_char = '<'
       end
 
       row = @last_row