lsp_router 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4434480350b472e4784e0bc3dcd003f5863eeb5ee25accbcc5491d07ecdac39
-  data.tar.gz: ba46303f99aa22018ade578cf1534ccfb7149b356b43ca262ae65c5cb729eb64
+  metadata.gz: 8723d008f57ebcb4e223047e71c87a08c3584986f69400e251992e9c0a9e28b0
+  data.tar.gz: 881cb222d1b8d5008d761468eeaab85c7cca49d1a8fc522d16b5e690a6218e4b
 SHA512:
-  metadata.gz: 4e5716f9fab94ec450991faf87af92d81544341df78a795c9506a94b7feee39add469211144762b7514f5d46b76128e4c68b21d8ef12f300dbae9c28f3bdd7e4
-  data.tar.gz: 7795648666367d4bada69bfa336c7cdbcf41f3f4039f17e819c0c79a61acbfbd2a3381c44f1b2e222f889cb9df81b32e61bf83b0e34fbfb51862b8009798c069
+  metadata.gz: d4f91f2d6b1d9c495d90304b27c34e840345e7964256b0718b0320d4cc78ad950ea7785125a700ed3d74b6aef21d4ec57549e15d25a0628fdd1a0a2263bc2fb5
+  data.tar.gz: 93cb11230758e15910f9d81e03aa69e561fcaf0babee18d49808099a5fb3b3c5dbf8a2b4062c3ec02feed865ab2a04582ca4e6235173f0fe792461649d213d4c

data/.rubocop.yml

@@ -1,5 +1,7 @@
 AllCops:
   NewCops: enable
+  TargetRubyVersion: 3.1
+  SuggestExtensions: false
 
 Bundler/OrderedGems:
   Enabled: false
@@ -10,9 +12,15 @@ Gemspec/DevelopmentDependencies:
 Layout/EmptyLineAfterGuardClause:
   Enabled: false
 
+Layout/EndAlignment:
+  EnforcedStyleAlignWith: start_of_line
+
 Layout/ExtraSpacing:
   AllowBeforeTrailingComments: true
 
+Layout/LeadingCommentSpace:
+  AllowRBSInlineAnnotation: true
+
 Layout/LineLength:
   Max: 130
 
@@ -45,11 +53,22 @@ Layout/SpaceInsideHashLiteralBraces:
 Layout/SpaceInsidePercentLiteralDelimiters:
   Enabled: false
 
+Lint/AmbiguousBlockAssociation:
+  AllowedPatterns: ['Module.new']
+
+Lint/HashCompareByIdentity:
+  Enabled: false
+
 Lint/SuppressedException:
   AllowComments: true
 
 Metrics/AbcSize:
-  Max: 60
+  Enabled: false
+
+Metrics/BlockLength:
+  Max: 50
+  Exclude:
+    - '**/*_spec.rb'
 
 Metrics/BlockNesting:
   Enabled: false
@@ -69,6 +88,9 @@ Naming/AccessorMethodName:
 Naming/BlockForwarding:
   Enabled: false
 
+Naming/HeredocDelimiterNaming:
+  Enabled: false
+
 Naming/MethodParameterName:
   Enabled: false
 
@@ -78,33 +100,117 @@ Metrics/ParameterLists:
 Metrics/PerceivedComplexity:
   Max: 100
 
+Style/AccessModifierDeclarations:
+  Enabled: false
+
+Style/AccessorGrouping:
+  Enabled: false
+
+Style/Alias:
+  Enabled: false
+
 Style/AndOr:
   Enabled: false
 
+Style/ArgumentsForwarding:
+  Enabled: false
+
+Style/ArrayCoercion:
+  Enabled: false
+
+Style/ArrayFirstLast:
+  Enabled: false
+
+Style/ArrayIntersect:
+  Enabled: false
+
+Style/ArrayJoin:
+  Enabled: false
+
+Style/AsciiComments:
+  Enabled: false
+
+Style/Attr:
+  Enabled: true
+
+Style/AutoResourceCleanup:
+  Enabled: false
+
+Style/BarePercentLiterals:
+  Enabled: false
+
+Style/BeginBlock:
+  Enabled: false
+
+Style/BisectedAttrAccessor:
+  Enabled: true
+
+Style/BlockComments:
+  Enabled: false
+
 Style/BlockDelimiters:
   Enabled: false
 
+Style/CaseEquality:
+  Enabled: false
+
 Style/CaseLikeIf:
   Enabled: false
 
+Style/CharacterLiteral:
+  Enabled: false
+
 Style/ClassAndModuleChildren:
   Enabled: false
 
 Style/ClassCheck:
   Enabled: false
 
+Style/ClassEqualityComparison:
+  Enabled: false
+
 Style/ClassMethods:
   Enabled: false
 
+Style/ClassMethodsDefinitions:
+  Enabled: false
+
+Style/ClassVars:
+  Enabled: true
+
+Style/CollectionCompact:
+  Enabled: false
+
+Style/CollectionMethods:
+  Enabled: false
+
+Style/ColonMethodCall:
+  Enabled: true
+
+Style/ColonMethodDefinition:
+  Enabled: true
+
 Style/CommentedKeyword:
   Enabled: false
 
+Style/ConditionalAssignment:
+  Enabled: false
+
+Style/DocumentDynamicEvalDefinition:
+  Enabled: false
+
+Style/EmptyElse:
+  EnforcedStyle: empty
+
 Style/FormatString:
   Enabled: false
 
 Style/FrozenStringLiteralComment:
   Enabled: false
 
+Style/GlobalVars:
+  Enabled: false
+
 Style/GuardClause:
   Enabled: false
 
@@ -120,6 +226,9 @@ Style/Lambda:
 Style/MethodCallWithoutArgsParentheses:
   Enabled: false
 
+Style/MultipleComparison:
+  Enabled: false
+
 Style/MutableConstant:
   Enabled: false
 
@@ -153,9 +262,15 @@ Style/PreferredHashMethods:
 Style/RedundantReturn:
   Enabled: false
 
+Style/RedundantRegexpArgument:
+  Enabled: false
+
 Style/RedundantSelf:
   Enabled: false
 
+Style/RegexpLiteral:
+  Enabled: false
+
 Style/RescueModifier:
   Enabled: false
 
@@ -174,6 +289,15 @@ Style/StringConcatenation:
 Style/StringLiterals:
   Enabled: false
 
+Style/StringLiteralsInInterpolation:
+  Enabled: false
+
+Style/SuperArguments:
+  Enabled: false
+
+Style/SuperWithArgsParentheses:
+  Enabled: false
+
 Style/TrailingCommaInArrayLiteral:
   EnforcedStyleForMultiline: consistent_comma
 
@@ -183,5 +307,8 @@ Style/TrailingCommaInHashLiteral:
 Style/VariableInterpolation:
   Enabled: false
 
+Style/WhileUntilModifier:
+  Enabled: false
+
 Style/WordArray:
   Enabled: false

data/README.md

@@ -13,7 +13,7 @@ gem install lsp_router
 次のような config ファイルを作成して、`lsp_router config-file` のように実行する。
 
 ```ruby
-logfile '/tmp/lsp_router'
+logfile '/tmp/lsp_router.log'
 loglevel :info
 
 server :rubocop do
@@ -21,13 +21,13 @@ server :rubocop do
   mode :stdio
 end
 
-server :solargraph do
-  command 'solargraph stdio'
+server :ruby_lsp do
+  command 'ruby-lsp'
   mode :stdio
 end
 ```
 
-この例では、`rubocop --lsp` と `solargraph stdio` を起動して、クライアントからの処理を振り分ける。
+この例では、`rubocop --lsp` と `ruby-lsp` を起動して、クライアントからの処理を振り分ける。
 最初に各サーバーの capabilities を確認して、各サーバーにどの機能があるかを確認し、クライアントからの REQUEST は対応しているサーバーに渡す。複数のサーバーが同じ機能を持っていれば上に書いたサーバーが優先される。NOTIFICATION は全サーバーに渡す。
 
 ## Example

data/lib/lsp_router/capability_request.rb

@@ -0,0 +1,132 @@
+class LspRouter
+  CAPABILITY_REQUEST = {
+    textDocumentSync: [
+      'textDocument/willSaveWaitUntil',
+    ],
+    notebookDocumentSync: [
+      # Notification only
+    ],
+    completionProvider: [
+      'textDocument/completion',
+      'completionItem/resolve',
+    ],
+    hoverProvider: [
+      'textDocument/hover',
+    ],
+    signatureHelpProvider: [
+      'textDocument/signatureHelp',
+    ],
+    declarationProvider: [
+      'textDocument/declaration',
+    ],
+    definitionProvider: [
+      'textDocument/definition',
+    ],
+    typeDefinitionProvider: [
+      'textDocument/typeDefinition',
+    ],
+    implementationProvider: [
+      'textDocument/implementation',
+    ],
+    referencesProvider: [
+      'textDocument/references',
+    ],
+    documentHighlightProvider: [
+      'textDocument/documentHighlight',
+    ],
+    documentSymbolProvider: [
+      'textDocument/documentSymbol',
+    ],
+    codeActionProvider: [
+      'textDocument/codeAction',
+      'codeAction/resolve',
+    ],
+    codeLensProvider: [
+      'textDocument/codeLens',
+      'codeLens/resolve',
+      'workspace/codeLens/refresh',
+    ],
+    documentLinkProvider: [
+      'textDocument/documentLink',
+      'documentLink/resolve',
+    ],
+    colorProvider: [
+      'textDocument/documentColor',
+      'textDocument/colorPresentation',
+    ],
+    documentFormattingProvider: [
+      'textDocument/formatting',
+    ],
+    documentRangeFormattingProvider: [
+      'textDocument/rangeFormatting',
+    ],
+    documentOnTypeFormattingProvider: [
+      'textDocument/onTypeFormatting',
+    ],
+    renameProvider: [
+      'textDocument/rename',
+      'textDocument/prepareRename',
+    ],
+    foldingRangeProvider: [
+      'textDocument/foldingRange',
+    ],
+    executeCommandProvider: [
+      'textDocument/selectionRange',
+      'workspace/executeCommand',
+    ],
+    selectionRangeProvider: [
+    ],
+    linkedEditingRangeProvider: [
+      'textDocument/linkedEditingRange',
+    ],
+    callHierarchyProvider: [
+      'textDocument/prepareCallHierarchy',
+      'callHierarchy/incomingCalls',
+      'callHierarchy/outgoingCalls',
+
+    ],
+    semanticTokensProvider: [
+      'textDocument/semanticTokens',
+      'textDocument/semanticTokens/full',
+      'textDocument/semanticTokens/full/delta',
+      'textDocument/semanticTokens/range',
+      'workspace/semanticTokens/refresh',
+    ],
+    monikerProvider: [
+      'textDocument/moniker',
+],
+    typeHierarchyProvider: [
+      'textDocument/prepareTypeHierarchy',
+      'typeHierarchy/supertypes',
+      'typeHierarchy/subtypes',
+    ],
+    inlineValueProvider: [
+      'textDocument/inlineValue',
+      'workspace/inlineValue/refresh',
+    ],
+    inlayHintProvider: [
+      'textDocument/inlayHint',
+      'inlayHint/resolve',
+      'workspace/inlayHint/refresh',
+    ],
+    diagnosticProvider: [
+      'textDocument/diagnostic',
+      'workspace/diagnostic',
+      'workspace/diagnostic/refresh',
+    ],
+    workspaceSymbolProvider: [
+      'workspace/symbol',
+      'workspaceSymbol/resolve',
+    ],
+    workspace: {
+      workspaceFolders: [
+        'workspace/workspaceFolders',
+      ],
+      fileOperations: [
+        'workspace/willCreateFiles',
+        'workspace/willRenameFiles',
+        'workspace/willDeleteFiles',
+      ],
+    },
+  }
+end

data/lib/lsp_router/config.rb

@@ -6,10 +6,11 @@ class LspRouter
     include Singleton
 
     attr_reader :servers
-    attr_accessor :logfile, :loglevel
+    attr_accessor :logfile, :loglevel, :encoding
 
     def initialize
       @servers = []
+      @encoding = 'utf-16'
     end
 
     # @param name [String]
@@ -34,6 +35,11 @@ class LspRouter
         config.loglevel = level
       end
 
+      # @return [String]
+      def position_encoding(enc)
+        config.encoding = enc
+      end
+
       # @return [LspRouter::Config]
       def config
         Config.instance

data/lib/lsp_router/server_side.rb

@@ -1,12 +1,10 @@
-require 'open3'
-
 class LspRouter
   # server side
   class ServerSide
-    # @return String
+    # @return [String]
     attr_reader :name
     # @return [Hash]
-    attr_reader :capabilities
+    attr_reader :requests
 
     # @param server [LspRouter::Config::Server]
     # @param logger [Logger]
@@ -14,25 +12,42 @@ class LspRouter
       @logger = logger
       @name = server.attr[:name]
       @command = server.attr[:command]
-      @stdin, @stdout, @stderr = Open3.popen3(@command)
-      @capabilities = {}
+      r, @stdin = IO.pipe
+      @stdout, w = IO.pipe
+      spawn(@command, in: r, out: w, err: $stderr)
+      @requests = {}
       @terminated = false
     end
 
     # @param req [Hash]
+    # @return [Hash]
     def init(req)
       write(req)
       while (data = read)
         capa = data.dig('result', 'capabilities')
         next unless capa
-        capa.keys.grep(/Provider/).each do |key|
-          @capabilities[key.sub(/Provider\z/, '')] = true
-        end
+        @requests = capa_to_req(capa, CAPABILITY_REQUEST)
         break
       end
+      @logger.debug "requests: #{name}: #{@requests.inspect}"
       data
     end
 
+    # @param capa [Hash]
+    # @param req [Hash, Array]
+    # @return [Array]
+    def capa_to_req(capa, req)
+      ret = []
+      capa.each_key do |key|
+        if req[key.intern].is_a? Array
+          ret.concat req[key.intern]
+        elsif req[key.intern].is_a? Hash
+          ret.concat capa_to_req(capa[key], req[key.intern])
+        end
+      end
+      ret
+    end
+
     # @param data [Hash]
     def write(data)
       return if @terminated

data/lib/lsp_router/version.rb

@@ -1,3 +1,3 @@
 class LspRouter
-  VERSION = '0.1.4'
+  VERSION = '0.2.0'
 end

data/lib/lsp_router.rb

@@ -2,6 +2,7 @@ require_relative 'lsp_router/version'
 require_relative 'lsp_router/config'
 require_relative 'lsp_router/server_side'
 require_relative 'lsp_router/client_side'
+require_relative 'lsp_router/capability_request'
 
 require 'socket'
 require 'json'
@@ -45,7 +46,7 @@ class LspRouter
     @servers = @config.servers.map{LspRouter::ServerSide.new(_1, logger: @logger)}
     @primary = @servers.first
     @server_map = @servers.map.to_h{[_1.name.to_s, _1]}
-    @capa_server = {}
+    @req_server = {}
 
     initial_packet
     threads = server_loop
@@ -55,6 +56,8 @@ class LspRouter
 
   def initial_packet
     req = @client.read
+    req['params']['capabilities']['general'] ||= {}
+    req['params']['capabilities']['general']['positionEncodings'] = @config.encoding
     res = nil
     @servers.each do |server|
       data = server.init(req)
@@ -63,10 +66,11 @@ class LspRouter
       else
         res = data
       end
-      server.capabilities.each_key do |key|
-        @capa_server[key] ||= server
+      server.requests.each do |req|
+        @req_server[req] ||= server
       end
     end
+    @logger.debug "req_server: #{@req_server.transform_values(&:name).inspect}"
     @client.write(res)
   end
 
@@ -82,9 +86,8 @@ class LspRouter
           next
         end
         if data['id'] # request or response
-          method = data['method']&.split('/')&.last
           if data['method']  # request
-            server = @capa_server[method] || @primary
+            server = @req_server[data['method']] || @primary
           else  # response
             server_name, id = JSON.parse(data['id'])
             data['id'] = id

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lsp_router
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - TOMITA Masahiro
@@ -24,6 +24,7 @@ files:
 - config/example.conf
 - exe/lsp_router
 - lib/lsp_router.rb
+- lib/lsp_router/capability_request.rb
 - lib/lsp_router/cli.rb
 - lib/lsp_router/client_side.rb
 - lib/lsp_router/config.rb