diakonos 0.9.10 → 0.9.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4545c77e496e0e0c6ff937533229561af94ab385d972e3496909a4fe5005065d
-  data.tar.gz: d29e22867110489b76e8bb3c1c6472313d101d7ad6fe4056950b693a10888fa8
+  metadata.gz: 785260a5c3a705a4bc2a441d3968b79307396fc559e471593dff06ebe5ff6fc9
+  data.tar.gz: a7b5686d70facc10e5902fe2ed29d27880676cb745ddf19d74abc2712c568cf0
 SHA512:
-  metadata.gz: d879ffec3cbb1b929e933c8787285ecd94bf86f18942e9ffde6de4cef72eab7916f870ea4609c7802eafa0768fa7d23a8d855e0bb376b5044da89ed7bbf2773f
-  data.tar.gz: 7bd4318931af575436d9816ae1bb58f5656ad44095ba2877fb5dfef877153908d3f034a0bc09846d80a8ba137c531c3be8ae33fbeed15886f7a3b9a49c54d45b
+  metadata.gz: 9b87711d7f9422dd2f200a644cfd9b573178a4269c3016b4cbacd6cde0b49a618c5d3004548655c54c3e5d34063f3a4d93dbb8e8ff2f82ad5c4285100cc7f51d
+  data.tar.gz: b284dc8cab1fcbeae25ea08e417ffa70e643d4b48dd45c0b8660fd31f247e363e8cfa906bdf7ed0df63cd1e439d09107cc05d79e0a9f82ac7d9b67a5b64771bd

data/CHANGELOG

@@ -1,6 +1,19 @@
 Diakonos Changelog
 ------------------
 
+0.9.12
+
+- Fix opening of already-open file
+
+0.9.11
+
+- Fix installation on OSX (re: curses 1.4.5)
+- Add GraphQL and Go syntax highlighting
+
+0.9.10
+
+- (neglected to document)
+
 0.9.9
 
 - List main culprits (directories) when fuzzy file finder encounters too many files

data/diakonos.conf

@@ -880,7 +880,7 @@ lang.css.tokens.variables.format cyan bold
 
 # Javascript, ES6
 
-lang.javascript.filemask \.(?:js|es6)$
+lang.javascript.filemask \.(?:[cm]?jsx?|es6|tsx?|json)$
 lang.javascript.format.default white bold
 lang.javascript.format.selection inverse
 lang.javascript.format.found yellow inverse
@@ -1788,6 +1788,73 @@ lang.vue.closers.tag.closer </\1>
 lang.vue.surround.pair "<!--" "<!-- " " -->"
 lang.vue.surround.pair "/^<(.+?)>$/" "<\1>" "</\1>"
 
+lang.graphql.filemask \.g(raph)?ql$
+lang.graphql.format.default white bold
+lang.graphql.format.selection inverse
+lang.graphql.format.found yellow inverse
+lang.graphql.tokens.doublequoted_strings (\".*?[^\\]?\")
+lang.graphql.tokens.doublequoted_strings.format green bold
+lang.graphql.tokens.singlequoted_strings ('.*?[^\\]')
+lang.graphql.tokens.singlequoted_strings.format green bold
+lang.graphql.tokens.block_strings (""".*?[^\\]""")
+lang.graphql.tokens.block_strings.format green bold
+lang.graphql.tokens.reserved_words \b(mutation|query|subscription)\b
+lang.graphql.tokens.reserved_words.format white
+lang.graphql.tokens.comments (#.*)
+lang.graphql.tokens.comments.format = lang.shared.tokens.comments.format
+lang.graphql.comment_string "# "
+lang.graphql.tokens.non_alphanum ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
+lang.graphql.tokens.non_alphanum.format white
+lang.graphql.tabsize 2
+lang.graphql.indent.size 2
+lang.graphql.indent.auto true
+lang.graphql.indent.roundup false
+lang.graphql.indent.indenters (\{)
+lang.graphql.indent.unindenters (\})
+lang.graphql.indent.preventers (\".+?[^\\]\")|('.+?[^\\]')|(\/\/.*)
+lang.graphql.indent.ignore ^(.+:|\s*?)$
+lang.graphql.indent.closers true
+lang.graphql.context.ignore ^(.+:|\s*\{?)$
+lang.graphql.column_delimiters =|:|,
+
+lang.go.filemask \.(?:go)$
+lang.go.format.default white bold
+lang.go.format.selection inverse
+lang.go.format.found yellow inverse
+lang.go.tokens.doublequoted_strings (\".*?[^\\]?\")
+lang.go.tokens.doublequoted_strings.format green bold
+lang.go.tokens.singlequoted_strings ('.*?[^\\]')
+lang.go.tokens.singlequoted_strings.format green bold
+lang.go.tokens.backquoted_strings (`.*?[^\\]`)
+lang.go.tokens.backquoted_strings.format green bold
+lang.go.tokens.constants \b([A-Z_]+|[A-Z_][A-Z0-9_]+)\b
+lang.go.tokens.constants.format yellow bold
+lang.go.tokens.comments (\/\/.*)
+lang.go.tokens.comments.format = lang.shared.tokens.comments.format
+lang.go.comment_string "/* "
+lang.go.comment_close_string " */"
+lang.go.tokens.long_comments.open \/\*
+lang.go.tokens.long_comments.close \*\/
+lang.go.tokens.long_comments.format = lang.shared.tokens.comments.format
+lang.go.tokens.regular_expressions (\/.+?[^\\]\/)
+lang.go.tokens.regular_expressions.format red bold
+lang.go.tokens.non_alphanum ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
+lang.go.tokens.non_alphanum.format white
+lang.go.tabsize 4
+lang.go.indent.size 4
+lang.go.indent.auto true
+lang.go.indent.roundup false
+#lang.go.indent.using_tabs true
+lang.go.indent.indenters (\{)
+lang.go.indent.unindenters (\})
+lang.go.indent.preventers (\".+?[^\\]\")|('.+?[^\\]')|(\/\/.*)
+lang.go.indent.ignore ^(.+:|\s*?)$
+lang.go.indent.closers true
+lang.go.context.ignore ^(.+:|\s*\{?)$
+lang.go.closers.for.regexp for$
+lang.go.closers.for.closer { |m| "( $i = 0; $i < limit; $i++ ) {\n%_\n}" }
+lang.go.column_delimiters =|:|,
+
 
 # Other configuration files can be included.
 # If a setting is specified again, it overrides the previous setting given

data/lib/diakonos/buffer/display.rb

@@ -32,9 +32,6 @@ module Diakonos
         end
       end
 
-      if open_match_text
-        # $diakonos.debug_log "OPEN\t" + [ open_index, open_token_class, open_match_text ].inspect
-      end
       [ open_index, open_token_class, open_match_text ]
     end
 
@@ -58,9 +55,6 @@ module Diakonos
         end
       end
 
-      if close_match_text
-        # $diakonos.debug_log "CLOSE\t" + [close_index, close_match_text].inspect
-      end
       [close_index, close_match_text]
     end
 

data/lib/diakonos/functions/buffers.rb

@@ -184,8 +184,10 @@ module Diakonos
           filename = nil
           do_open = false
         else
-          # TODO: Maybe a bug here, re: paths relative to session dir (external file find)
-          existing_buffer = @buffers.find { |b| b.name == filename }
+          existing_buffer = @buffers.find { |b|
+            b.name == filename ||
+            b.name == File.expand_path(filename, @session.dir)
+          }
         end
 
         if filename

data/lib/diakonos/readline.rb

@@ -120,7 +120,6 @@ module Diakonos
     end
 
     def redraw_input
-      # TODO: Gracefully handle when `input` is nil
       input = @input[ @view_y...(@view_y + Curses::cols) ]
 
       curx = @window.curx

data/lib/diakonos/version.rb

@@ -1,6 +1,6 @@
 module Diakonos
-  VERSION       = '0.9.10'
-  LAST_MODIFIED = '2023-09-14'
+  VERSION       = '0.9.12'
+  LAST_MODIFIED = '2024-06-20'
 
   def self.parse_version( s )
     if s

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diakonos
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.12
 platform: ruby
 authors:
 - Pistos
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-15 00:00:00.000000000 Z
+date: 2024-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: 1.4.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: 1.4.6
 description: Diakonos is a console text editor for the masses.
 email: diakonos dawt pistos aet purepistos dawt net
 executables:
@@ -165,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Console text editor for the masses