solargraph 0.32.1 → 0.32.2

data/lib/solargraph/plugin/runtime.rb

@@ -1,134 +1,134 @@
-require 'json'
-
-module Solargraph
-  module Plugin
-    class Runtime < Base
-      attr_writer :executable
-
-      def executable
-        @executable ||= 'solargraph-runtime'
-      end
-
-      def post_initialize
-        start_process
-      end
-
-      # @return [Boolean]
-      def runtime?
-        true
-      end
-
-      # Get an array of method names.
-      #
-      # @return [Array<String>]
-      def get_methods namespace:, root:, scope:, with_private: false
-        response = send_get_methods(namespace, root, scope, with_private)
-        response['data']
-      end
-
-      # Get an array of constant names.
-      #
-      # @return [Array<String>]
-      def get_constants namespace, root
-        response = send_get_constants namespace, root
-        response['data']
-      end
-
-      def get_fqns namespace, root
-        response = send_get_fqns namespace, root
-        response['data']
-      end
-
-      def refresh
-        if api_map.nil?
-          false
-        else
-          if @current_required != api_map.required
-            @io.close unless @io.nil? or @io.closed?
-            start_process
-            true
-          else
-            false
-          end
-        end
-      end
-
-      def stop
-        @io.close
-      end
-
-      protected
-
-      def load_environment
-        return if api_map.nil?
-        send_require api_map.required
-        @current_required = api_map.required.clone
-      end
-
-      private
-
-      def start_process
-        dir = Dir.pwd
-        unless api_map.nil? or api_map.workspace.nil? or api_map.workspace.directory.nil?
-          dir = api_map.workspace.directory
-        end
-        Dir.chdir(dir) do
-          @io = IO.popen(executable, 'r+')
-        end
-        load_environment
-      end
-
-      def send_require paths
-        cmd = {
-          command: 'require',
-          paths: paths
-        }
-        transact cmd
-      end
-
-      def send_get_methods namespace, root, scope, with_private
-        cmd = {
-          command: 'methods',
-          params: {
-            namespace: namespace,
-            root: root,
-            scope: scope,
-            with_private: with_private
-          }
-        }
-        transact cmd
-      end
-
-      def send_get_constants namespace, root
-        cmd = {
-          command: 'constants',
-          params: {
-            namespace: namespace,
-            root: root
-          }
-        }
-        transact cmd
-      end
-
-      def send_get_fqns namespace, root
-        cmd = {
-          command: 'fqns',
-          params: {
-            namespace: namespace,
-            root: root
-          }
-        }
-        transact cmd
-      end
-
-      def transact cmd
-        @io.puts cmd.to_json
-        @io.flush
-        result = @io.gets
-        obj = JSON.parse(result)
-        STDERR.puts obj['message'] if obj['status'] == 'err'
-        obj
-      end
-    end
-  end
-end
+require 'json'
+
+module Solargraph
+  module Plugin
+    class Runtime < Base
+      attr_writer :executable
+
+      def executable
+        @executable ||= 'solargraph-runtime'
+      end
+
+      def post_initialize
+        start_process
+      end
+
+      # @return [Boolean]
+      def runtime?
+        true
+      end
+
+      # Get an array of method names.
+      #
+      # @return [Array<String>]
+      def get_methods namespace:, root:, scope:, with_private: false
+        response = send_get_methods(namespace, root, scope, with_private)
+        response['data']
+      end
+
+      # Get an array of constant names.
+      #
+      # @return [Array<String>]
+      def get_constants namespace, root
+        response = send_get_constants namespace, root
+        response['data']
+      end
+
+      def get_fqns namespace, root
+        response = send_get_fqns namespace, root
+        response['data']
+      end
+
+      def refresh
+        if api_map.nil?
+          false
+        else
+          if @current_required != api_map.required
+            @io.close unless @io.nil? or @io.closed?
+            start_process
+            true
+          else
+            false
+          end
+        end
+      end
+
+      def stop
+        @io.close
+      end
+
+      protected
+
+      def load_environment
+        return if api_map.nil?
+        send_require api_map.required
+        @current_required = api_map.required.clone
+      end
+
+      private
+
+      def start_process
+        dir = Dir.pwd
+        unless api_map.nil? or api_map.workspace.nil? or api_map.workspace.directory.nil?
+          dir = api_map.workspace.directory
+        end
+        Dir.chdir(dir) do
+          @io = IO.popen(executable, 'r+')
+        end
+        load_environment
+      end
+
+      def send_require paths
+        cmd = {
+          command: 'require',
+          paths: paths
+        }
+        transact cmd
+      end
+
+      def send_get_methods namespace, root, scope, with_private
+        cmd = {
+          command: 'methods',
+          params: {
+            namespace: namespace,
+            root: root,
+            scope: scope,
+            with_private: with_private
+          }
+        }
+        transact cmd
+      end
+
+      def send_get_constants namespace, root
+        cmd = {
+          command: 'constants',
+          params: {
+            namespace: namespace,
+            root: root
+          }
+        }
+        transact cmd
+      end
+
+      def send_get_fqns namespace, root
+        cmd = {
+          command: 'fqns',
+          params: {
+            namespace: namespace,
+            root: root
+          }
+        }
+        transact cmd
+      end
+
+      def transact cmd
+        @io.puts cmd.to_json
+        @io.flush
+        result = @io.gets
+        obj = JSON.parse(result)
+        STDERR.puts obj['message'] if obj['status'] == 'err'
+        obj
+      end
+    end
+  end
+end

data/lib/solargraph/position.rb

@@ -1,110 +1,110 @@
-module Solargraph
-  # The zero-based line and column numbers of a position in a string.
-  #
-  class Position
-    # @return [Integer]
-    attr_reader :line
-
-    # @return [Integer]
-    attr_reader :character
-
-    alias column character
-
-    # @param line [Integer]
-    # @param character [Integer]
-    def initialize line, character
-      @line = line
-      @character = character
-    end
-
-    # Get a hash of the position. This representation is suitable for use in
-    # the language server protocol.
-    #
-    # @return [Hash]
-    def to_hash
-      {
-        line: line,
-        character: character
-      }
-    end
-
-    def inspect
-      "<Position #{line}, #{character}>"
-    end
-
-    # Get a numeric offset for the specified text and position.
-    #
-    # @param text [String]
-    # @param position [Position]
-    # @return [Integer]
-    def self.to_offset text, position
-      result = 0
-      feed = 0
-      line = position.line
-      column = position.character
-      text.lines.each do |l|
-        line_length = l.length
-        if feed == line
-          result += column
-          break
-        end
-        result += line_length
-        feed += 1
-      end
-      result
-    end
-
-    # Get a numeric offset for the specified text and a position identified
-    # by its line and character.
-    #
-    # @param text [String]
-    # @param line [Integer]
-    # @param character [Integer]
-    # @return [Integer]
-    def self.line_char_to_offset text, line, character
-      to_offset(text, Position.new(line, character))
-    end
-
-    # Get a position for the specified text and offset.
-    #
-    # @param text [String]
-    # @param offset [Integer]
-    # @return [Position]
-    def self.from_offset text, offset
-      cursor = 0
-      line = 0
-      character = nil
-      text.lines.each do |l|
-        line_length = l.length
-        char_length = l.chomp.length
-        if cursor + char_length >= offset
-          character = offset - cursor
-          break
-        end
-        cursor += line_length
-        line += 1
-      end
-      character = 0 if character.nil? and (cursor - offset).between?(0, 1)
-      raise InvalidOffsetError if character.nil?
-      Position.new(line, character)
-    end
-
-    # A helper method for generating positions from arrays of integers. The
-    # original parameter is returned if it is already a position.
-    #
-    # @raise [ArgumentError] if the object cannot be converted to a position.
-    #
-    # @param object [Position, Array(Integer, Integer)]
-    # @return [Position]
-    def self.normalize object
-      return object if object.is_a?(Position)
-      return Position.new(object[0], object[1]) if object.is_a?(Array)
-      raise ArgumentError, "Unable to convert #{object.class} to Position"
-    end
-
-    def == other
-      return false unless other.is_a?(Position)
-      line == other.line and character == other.character
-    end
-  end
-end
+module Solargraph
+  # The zero-based line and column numbers of a position in a string.
+  #
+  class Position
+    # @return [Integer]
+    attr_reader :line
+
+    # @return [Integer]
+    attr_reader :character
+
+    alias column character
+
+    # @param line [Integer]
+    # @param character [Integer]
+    def initialize line, character
+      @line = line
+      @character = character
+    end
+
+    # Get a hash of the position. This representation is suitable for use in
+    # the language server protocol.
+    #
+    # @return [Hash]
+    def to_hash
+      {
+        line: line,
+        character: character
+      }
+    end
+
+    def inspect
+      "<Position #{line}, #{character}>"
+    end
+
+    # Get a numeric offset for the specified text and position.
+    #
+    # @param text [String]
+    # @param position [Position]
+    # @return [Integer]
+    def self.to_offset text, position
+      result = 0
+      feed = 0
+      line = position.line
+      column = position.character
+      text.lines.each do |l|
+        line_length = l.length
+        if feed == line
+          result += column
+          break
+        end
+        result += line_length
+        feed += 1
+      end
+      result
+    end
+
+    # Get a numeric offset for the specified text and a position identified
+    # by its line and character.
+    #
+    # @param text [String]
+    # @param line [Integer]
+    # @param character [Integer]
+    # @return [Integer]
+    def self.line_char_to_offset text, line, character
+      to_offset(text, Position.new(line, character))
+    end
+
+    # Get a position for the specified text and offset.
+    #
+    # @param text [String]
+    # @param offset [Integer]
+    # @return [Position]
+    def self.from_offset text, offset
+      cursor = 0
+      line = 0
+      character = nil
+      text.lines.each do |l|
+        line_length = l.length
+        char_length = l.chomp.length
+        if cursor + char_length >= offset
+          character = offset - cursor
+          break
+        end
+        cursor += line_length
+        line += 1
+      end
+      character = 0 if character.nil? and (cursor - offset).between?(0, 1)
+      raise InvalidOffsetError if character.nil?
+      Position.new(line, character)
+    end
+
+    # A helper method for generating positions from arrays of integers. The
+    # original parameter is returned if it is already a position.
+    #
+    # @raise [ArgumentError] if the object cannot be converted to a position.
+    #
+    # @param object [Position, Array(Integer, Integer)]
+    # @return [Position]
+    def self.normalize object
+      return object if object.is_a?(Position)
+      return Position.new(object[0], object[1]) if object.is_a?(Array)
+      raise ArgumentError, "Unable to convert #{object.class} to Position"
+    end
+
+    def == other
+      return false unless other.is_a?(Position)
+      line == other.line and character == other.character
+    end
+  end
+end