rstfilter 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 493aaf26c129bbac2f2e56a62a59575e0805be44d4c48e2707da454cd51d2972
-  data.tar.gz: 164cbf3204c18b09c8dca6cb78c9059f13e49cd255c77fa793721479b337237a
+  metadata.gz: 7748145a8ee9d8b7d736f9aa80f640f34559033cf62d46cc862dde7d20a670b2
+  data.tar.gz: 77c94519079d2df1ad8dcbc9d5421536b5b40f92e30bee805b9e2007ea65f818
 SHA512:
-  metadata.gz: 0ff94c098b3f781a767c0887b30b8b24ebb58e909930ee70865d666f920d1ff50e9de7ed47a0072bd667d39da285682ef83591d81078c6f1d5cca63cc2b07a5c
-  data.tar.gz: 62b140c8dfde2082e39a132403f34d81b89a34c4993e814a3e847fed949ff5bf78e64125e3e7770268c4ee1d47d326252dbe25a9469a46cbb5a667bc360362e9
+  metadata.gz: 50bb4bbecccddec785a08aedff8a1bffcf11a9d02541e11998677e8d5b7e7979467393d33615e2776fde1c7f0468e8f3cb4ec3fafd3a2200ef1225654867e0b7
+  data.tar.gz: 1e020aa1db7a99c7ad82eb1c0c941b87c935bf0f603d63bba24c0173ad045232b27981e530367369a0fe8befe7dab81f017736ded1ab78d6790294660bbde1a0

data/lib/rstfilter/exec.rb

@@ -198,7 +198,9 @@ module RstFilter
           ensure
             begin
               Process.kill(:KILL, io.pid)
-            rescue Errno::ESRCH
+            rescue Errno::ESRCH, Errno::ECHILD
+            else
+              Process.waitpid(io.pid)
             end
           end
 

data/lib/rstfilter/lsp/handler.rb

@@ -4,6 +4,9 @@ require_relative '../rewriter'
 require_relative '../exec'
 
 module RstFilter
+  class CancelRequest < StandardError
+  end
+
   class LSP
     def initialize input: $stdin, output: $stdout, err: $stderr, indent: 50
       @input   = input
@@ -13,7 +16,7 @@ module RstFilter
       @records = {} # {filename => [record, line_record, src]}
       @server_request_id = 0
       @exit_status = 1
-      @running = {} # id for cancel
+      @running = {} # {filename => Thread}
     end
 
     def self.reload
@@ -238,7 +241,7 @@ module RstFilter
       send_notice 'rstfilter/start', {
         uri: filename,
       }
-      Thread.new do
+      @running[filename] = Thread.new do
         filter = RstFilter::Exec.new
         filter.optparse! ['--pp', '-eruby']
         records, src, _comments = filter.record_records(filename)
@@ -249,11 +252,25 @@ module RstFilter
           send_notice 'rstfilter/output', output: "# Output for #{filename}\n\n#{filter.output}"
         end
         send_request 'workspace/inlayHint/refresh'
+      rescue CancelRequest
+        # canceled
+      rescue SyntaxError => e
+        send_notice 'rstfilter/output', output: "SyntaxError on #{filename}:\n#{e.inspect}"
+        send_notice 'rstfilter/done'
+      rescue Exception => e
+        send_notice 'rstfilter/output', output: "Error on #{filename}:\n#{e.inspect}\n#{e.backtrace.join("\n")}#{filter.output}"
+        send_notice 'rstfilter/done'
+      ensure
+        @running[filename] = nil
       end
     end
 
     def clear_record filename
       @records[filename] = nil
+      if th = @running[filename]
+        @running[filename] = nil
+        th.raise CancelRequest
+      end
     end
 
     def uri2filename uri
@@ -280,7 +297,7 @@ module RstFilter
         filename = uri2filename req.dig(:params, :textDocument, :uri)
         clear_record filename
       when '$/cancelRequest'
-        # TODO: cancel
+        # ignore
       when 'exit'
         exit(@exit_code)
       else

data/lib/rstfilter/rewriter.rb

@@ -151,15 +151,11 @@ module RstFilter
     end
 
     def rewrite src, filename
-      begin
-        prev_v, $VERBOSE = $VERBOSE, false
-        ast = RubyVM::AbstractSyntaxTree.parse(src)
-        $VERBOSE = prev_v
-        last_lineno = ast.last_lineno
-      rescue SyntaxError => e
-        err e.inspect
-        exit 1
-      end
+      # check syntax
+      prev_v, $VERBOSE = $VERBOSE, false
+      ast = RubyVM::AbstractSyntaxTree.parse(src)
+      $VERBOSE = prev_v
+      last_lineno = ast.last_lineno
 
       # rewrite
       src           = src.lines[0..last_lineno].join # remove __END__ and later

data/lib/rstfilter/version.rb

@@ -1,3 +1,3 @@
 module RstFilter
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rstfilter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Koichi Sasada