ruby_syntax_lsp 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01b172fd9fd266168fec4edb27dc48600be59db0c556c2e82ed0aea39f1ee019
-  data.tar.gz: 9182a89cde238189af8bf19e406d9fd4f81c055070df08d3f22d133b850f6a7f
+  metadata.gz: 9114e62f671e8af42ee4b110e6bfe439f0032c61ab6ec00e3dd46447552ef965
+  data.tar.gz: e971978cb2c87f1d38e9400b5c44540a2c2363386d922e1cf1bc76af11627ad8
 SHA512:
-  metadata.gz: dd0c79a83a6a6e377b52f4a6e162a8d02bb01fd298953aa1b1516793a7287d5128acd9bc6522cdf9452bb50a961f257b607db6c2e694e6eb1ef5e0f5803f288b
-  data.tar.gz: 85c876f9ef97500414eadb2e4d9ef53e5698e8b9084a37b0ee13a06845f0860d3aab3253d42e69060abba14778d4c59c60b8637ea664fdcfc79e6c0ef4754353
+  metadata.gz: d801d2437481d1a57aa14820808de3a982674ef87f22e5e40d4c0dd0c5e5bee7d1684a072d44ad9111a502cfa54af38938934fc464ac35c926292a050fe44273
+  data.tar.gz: 36925b5c78235015dae614ece3308f41e67e46390589d88dfad830305496cbe6eafba9762fbfbfa6984d9ce17a15418f69ae3ffa4036ff3a5556822769567524

data/exe/ruby_syntax_lsp

@@ -2,8 +2,4 @@
 
 require "ruby_syntax_lsp"
 
-writer = LSP::Transport::Stdio::Writer.new
-reader = LSP::Transport::Stdio::Reader.new
-server = Server.new(writer, reader)
-
-server.start
+RubySyntaxLsp.cli

data/lib/ruby_syntax_lsp/cli.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require "optparse"
+require_relative "core"
+require_relative "version"
+
+class RubySyntaxLsp
+  def self.cli
+    options = {
+      log_level: :info,
+    }
+    opts = OptionParser.new("Usage: ruby_syntax_lsp [options]")
+
+    opts.on("--log LEVEL", "Set log level (debug, info, warn, error, fatal)") do |v|
+      options[:log_level] = level.to_sym
+    end
+
+    opts.on("--verbose", "Set log level to debug") do
+      options[:log_level] = :debug
+    end
+
+    opts.version = RubySyntaxLsp::VERSION
+
+    opts.parse!
+
+    reader = LSP::Transport::Stdio::Reader.new
+    writer = LSP::Transport::Stdio::Writer.new
+
+    RubySyntaxLsp.new(writer, reader, options[:log_level]).start
+  end
+end

data/lib/ruby_syntax_lsp/core.rb

@@ -0,0 +1,110 @@
+# frozen_string_literal: true
+
+require "language_server-protocol"
+require "Logger"
+
+LSP = LanguageServer::Protocol
+
+class RubySyntaxLsp
+  def initialize(writer, reader, level)
+    @writer = writer
+    @reader = reader
+    @logger = Logger.new(STDERR, level: level)
+  end
+
+  def start
+    @logger.info "Started Ruby Syntax LSP server..."
+    @reader.read do |request|
+      break if request[:method] == "shutdown"
+      method_name = ("request_" + request[:method].gsub(/[A-Z]/) { |m| "_#{m.downcase}" }.gsub("/", "_")).to_sym
+      if respond_to?(method_name)
+        @logger.debug "Received supported method: #{method_name}"
+        begin
+          send(method_name, request[:id], request[:params])
+        rescue => e
+          @logger.error "Error: #{e.full_message}"
+          @writer.write(
+            code: -32603,
+            message: e.message,
+          )
+        end
+      elsif request[:method].start_with?("$/")
+        @logger.debug "Received unsupported method: #{request[:method]}"
+      else
+        @writer.write(
+          code: -32601,
+          message: "Method not implemented: #{request[:method]}",
+        )
+      end
+    end
+  end
+
+  def request_initialize(id, params)
+    @writer.write(
+      id: id,
+      result: LSP::Interface::InitializeResult.new(
+        capabilities: LSP::Interface::ServerCapabilities.new(
+          text_document_sync: LSP::Interface::TextDocumentSyncOptions.new(
+            change: LSP::Constant::TextDocumentSyncKind::FULL,
+          ),
+        ),
+      ),
+    )
+  end
+
+  def request_initialized(id, params)
+    # none
+  end
+
+  def request_text_document_did_change(id, params)
+    @writer.write(
+      method: "textDocument/publishDiagnostics",
+      params: {
+        uri: params[:textDocument][:uri],
+        diagnostics: params[:contentChanges].filter_map do |change|
+          text = change[:text]
+          begin
+            RubyVM::InstructionSequence.compile(text)
+          rescue SyntaxError => e
+            @logger.info("SyntaxError detected:\n#{e.message}")
+            lines = text.lines
+            e.message.split(/^<compiled>:(?=\d+: )/m)[1..].map do |error|
+              @logger.info("Parsing this error message:\n#{error}")
+              lineno_s, message = error.split(": ", 2)
+              lineno = lineno_s.strip.to_i
+              @logger.info("Line number: #{lineno}")
+              range = if message.lines.length > 1 # Message has `^`
+                  pos_start = message.lines[2].delete_prefix("...").index("^")
+                  if message.lines[1].start_with?("...")
+                    pos_start += lines[lineno - 1].index(message.lines[1].delete_prefix("...").delete_suffix("..."))
+                  end
+                  pos_end = pos_start + message.lines[2].count("~") + 1
+
+                  @logger.info("line: #{lineno}, position: #{pos_start}-#{pos_end}")
+                  LSP::Interface::Range.new(
+                    start: LSP::Interface::Position.new(line: lineno - 1, character: pos_start),
+                    end: LSP::Interface::Position.new(line: lineno - 1, character: pos_end),
+                  )
+                else
+                  @logger.info("line: #{lineno}, no position")
+                  LSP::Interface::Range.new(
+                    start: LSP::Interface::Position.new(line: lineno - 1, character: 0),
+                    end: LSP::Interface::Position.new(line: lineno - 1, character: lines[lineno - 1].length - 1),
+                  )
+                end
+              LSP::Interface::Diagnostic.new(
+                range: range,
+                severity: LSP::Constant::DiagnosticSeverity::ERROR,
+                message: message.lines[0].strip.sub(/^syntax error, /, ""),
+                source: "Ruby Syntax LSP",
+              )
+            end
+          else
+            @logger.info("No SyntaxError")
+            nil
+          end
+        end.flatten,
+      },
+    )
+  end
+end

data/lib/ruby_syntax_lsp/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class RubySyntaxLsp
+  VERSION = "0.0.2"
+end

data/lib/ruby_syntax_lsp.rb

@@ -1,107 +1,5 @@
-require "language_server-protocol"
-require "Logger"
+# frozen_string_literal: true
 
-$logger = Logger.new(STDERR)
-LSP = LanguageServer::Protocol
-
-class Server
-  def initialize(writer, reader)
-    @writer = writer
-    @reader = reader
-  end
-
-  def start
-    $logger.info "Started Ruby Syntax LSP server..."
-    @reader.read do |request|
-      break if request[:method] == "shutdown"
-      method_name = ("request_" + request[:method].gsub(/[A-Z]/) { |m| "_#{m.downcase}" }.gsub("/", "_")).to_sym
-      if respond_to?(method_name)
-        $logger.debug "Received supported method: #{method_name}"
-        begin
-          send(method_name, request[:id], request[:params])
-        rescue => e
-          $logger.error "Error: #{e.full_message}"
-          @writer.write(
-            code: -32603,
-            message: e.message,
-          )
-        end
-      elsif request[:method].start_with?("$/")
-        $logger.debug "Received unsupported method: #{request[:method]}"
-      else
-        @writer.write(
-          code: -32601,
-          message: "Method not implemented: #{request[:method]}",
-        )
-      end
-    end
-  end
-
-  def request_initialize(id, params)
-    @writer.write(
-      id: id,
-      result: LSP::Interface::InitializeResult.new(
-        capabilities: LSP::Interface::ServerCapabilities.new(
-          text_document_sync: LSP::Interface::TextDocumentSyncOptions.new(
-            change: LSP::Constant::TextDocumentSyncKind::FULL,
-          ),
-        ),
-      ),
-    )
-  end
-
-  def request_initialized(id, params)
-    # none
-  end
-
-  def request_text_document_did_change(id, params)
-    @writer.write(
-      method: "textDocument/publishDiagnostics",
-      params: {
-        uri: params[:textDocument][:uri],
-        diagnostics: params[:contentChanges].filter_map do |change|
-          text = change[:text]
-          begin
-            RubyVM::InstructionSequence.compile(text)
-          rescue SyntaxError => e
-            $logger.info("SyntaxError detected:\n#{e.message}")
-            lines = text.lines
-            e.message.split(/^<compiled>:(?=\d+: )/m)[1..].map do |error|
-              $logger.info("Parsing this error message:\n#{error}")
-              lineno_s, message = error.split(": ", 2)
-              lineno = lineno_s.to_i
-              range = if message.lines.length > 1 # Message has `^`
-                  pos_start = message.lines[2].index("^")
-                  if message.lines[1].start_with?("...")
-                    pos_start += lines[lineno - 1].index(message.lines[1].delete_prefix("...").delete_suffix("...")) - 3
-                  end
-                  pos_end = pos_start + message.lines[2].count("~") + 1
-
-                  $logger.info("line: #{lineno}, position: #{pos_start}-#{pos_end}")
-                  LSP::Interface::Range.new(
-                    start: LSP::Interface::Position.new(line: lineno - 1, character: pos_start),
-                    end: LSP::Interface::Position.new(line: lineno - 1, character: pos_end),
-                  )
-                else
-                  $logger.info("line: #{lineno}, no position")
-                  LSP::Interface::Range.new(
-                    start: LSP::Interface::Position.new(line: lineno - 1, character: 0),
-                    end: LSP::Interface::Position.new(line: lineno - 1, character: lines[lineno - 1].length - 1),
-                  )
-                end
-              LSP::Interface::Diagnostic.new(
-                range: range,
-                severity: LSP::Constant::DiagnosticSeverity::ERROR,
-                message: message.lines[0].strip.sub(/^syntax error, /, ""),
-                source: "Ruby Syntax LSP",
-              )
-            end
-          else
-            $logger.info("No SyntaxError")
-            nil
-          end
-        end.flatten,
-      },
-    )
-  end
-end
+require_relative "ruby_syntax_lsp/cli"
+require_relative "ruby_syntax_lsp/core"
+require_relative "ruby_syntax_lsp/version"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_syntax_lsp
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - sevenc-nanashi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-20 00:00:00.000000000 Z
+date: 2022-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: language_server-protocol
@@ -34,6 +34,9 @@ extra_rdoc_files: []
 files:
 - exe/ruby_syntax_lsp
 - lib/ruby_syntax_lsp.rb
+- lib/ruby_syntax_lsp/cli.rb
+- lib/ruby_syntax_lsp/core.rb
+- lib/ruby_syntax_lsp/version.rb
 homepage: https://github.com/sevenc-nanashi/ruby_syntax_lsp
 licenses:
 - MIT