kapusta 0.10.0 → 0.11.1

data/lib/kapusta/lsp/workspace_index.rb

@@ -35,7 +35,7 @@ module Kapusta
       end
 
       def remove(uri)
-        path = uri_to_path(uri)
+        path = LSP.uri_to_path(uri)
         if path && File.file?(path)
           store(uri, File.read(path))
         else
@@ -178,7 +178,7 @@ module Kapusta
       end
 
       def resolve_module_uris(importing_uri, module_label)
-        importing_path = uri_to_path(importing_uri)
+        importing_path = LSP.uri_to_path(importing_uri)
         return [] unless importing_path
 
         base_dir = File.dirname(importing_path)
@@ -209,17 +209,6 @@ module Kapusta
       def path_to_uri(path)
         "file://#{URI::DEFAULT_PARSER.escape(File.expand_path(path))}"
       end
-
-      def uri_to_path(uri)
-        return unless uri.is_a?(String)
-
-        parsed = URI.parse(uri)
-        return URI::DEFAULT_PARSER.unescape(parsed.path) if parsed.scheme == 'file'
-
-        uri
-      rescue URI::InvalidURIError
-        nil
-      end
     end
   end
 end

data/lib/kapusta/lsp.rb

@@ -19,6 +19,17 @@ module Kapusta
       new(input:, output:, log:).run
     end
 
+    def self.uri_to_path(uri)
+      return unless uri.is_a?(String)
+
+      parsed = URI.parse(uri)
+      return URI::DEFAULT_PARSER.unescape(parsed.path) if parsed.scheme == 'file'
+
+      uri
+    rescue URI::InvalidURIError
+      nil
+    end
+
     def initialize(input:, output:, log:)
       @input = input.binmode
       @output = output.binmode
@@ -150,8 +161,8 @@ module Kapusta
 
     def on_initialize(params)
       folders = params['workspaceFolders'] || []
-      roots = folders.filter_map { |f| uri_to_path(f['uri']) }
-      roots << uri_to_path(params['rootUri']) if params['rootUri']
+      roots = folders.filter_map { |f| LSP.uri_to_path(f['uri']) }
+      roots << LSP.uri_to_path(params['rootUri']) if params['rootUri']
       roots.compact!
       roots.uniq!
       debug("initialize: roots=#{roots.inspect}")
@@ -213,7 +224,7 @@ module Kapusta
       entry = @sources[uri]
       return [] unless entry
 
-      Formatting.text_edits(entry[:text], uri_to_path(uri))
+      Formatting.text_edits(entry[:text], LSP.uri_to_path(uri))
     end
 
     def definition(params)
@@ -257,7 +268,8 @@ module Kapusta
                               new_name, workspace_index: @workspace_index)
       if result[:error]
         debug("rename error: #{result[:error].inspect}")
-        reply_error(id, result[:error][:code], result[:error][:message])
+        notify('window/showMessage', { type: 1, message: "Rename: #{result[:error][:message]}" })
+        reply(id, { documentChanges: [] })
       else
         edit = build_workspace_edit(result[:changes])
         debug("rename ok: files=#{result[:changes].keys.length} edits=#{result[:changes].values.sum(&:length)}")
@@ -282,23 +294,12 @@ module Kapusta
     end
 
     def publish_diagnostics(uri, text, version)
-      diagnostics = Diagnostics.collect(text, uri_to_path(uri))
+      diagnostics = Diagnostics.collect(text, LSP.uri_to_path(uri))
       params = { uri:, diagnostics: }
       params[:version] = version unless version.nil?
       notify('textDocument/publishDiagnostics', params)
     end
 
-    def uri_to_path(uri)
-      return unless uri
-
-      parsed = URI.parse(uri)
-      return URI::DEFAULT_PARSER.unescape(parsed.path) if parsed.scheme == 'file'
-
-      uri
-    rescue URI::InvalidURIError
-      uri
-    end
-
     def log(message)
       @log.puts "kapusta-ls: #{message}"
     end

data/lib/kapusta/support.rb

@@ -4,4 +4,12 @@ module Kapusta
   def self.kebab_to_snake(name)
     name.tr('-', '_')
   end
+
+  def self.copy_position(target, source)
+    return target unless target.respond_to?(:line=) && source.respond_to?(:line)
+
+    target.line ||= source.line
+    target.column ||= source.column
+    target
+  end
 end

data/lib/kapusta/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kapusta
-  VERSION = '0.10.0'
+  VERSION = '0.11.1'
 end

data/spec/examples_errors_spec.rb

@@ -92,6 +92,31 @@ RSpec.describe 'examples-errors' do
       .to eq("destructure-literal-table.kap:4:1: could not destructure literal\n")
   end
 
+  it 'defn-outside-header.kap' do
+    expect(run_error_example('defn-outside-header.kap'))
+      .to eq("defn-outside-header.kap:1:1: defn outside class or module\n")
+  end
+
+  it 'end-outside-header.kap' do
+    expect(run_error_example('end-outside-header.kap'))
+      .to eq("end-outside-header.kap:1:1: end outside class or module\n")
+  end
+
+  it 'end-with-args.kap' do
+    expect(run_error_example('end-with-args.kap'))
+      .to eq("end-with-args.kap:5:1: end takes no arguments\n")
+  end
+
+  it 'extra-end.kap' do
+    expect(run_error_example('extra-end.kap'))
+      .to eq("extra-end.kap:7:1: end outside class or module\n")
+  end
+
+  it 'unclosed-header.kap' do
+    expect(run_error_example('unclosed-header.kap'))
+      .to eq("unclosed-header.kap:1:1: class or module not closed with (end)\n")
+  end
+
   it 'destructure-rest-as-table.kap' do
     expect(run_error_example('destructure-rest-as-table.kap'))
       .to eq("destructure-rest-as-table.kap:6:3: unable to bind table ...\n")

data/spec/examples_spec.rb

@@ -487,6 +487,10 @@ RSpec.describe 'examples' do
     OUT
   end
 
+  it 'signal-harvest.kap' do
+    expect(run_example('signal-harvest.kap')).to eq("40\ntrue\nfalse\n")
+  end
+
   it 'shapes.kap' do
     expect(run_example('shapes.kap')).to eq("78.5\n9\n8\n0\n")
   end
@@ -525,6 +529,19 @@ RSpec.describe 'examples' do
     expect(run_example('two-sum-hash.kap')).to eq("[0, 1]\n[1, 2]\nnil\n")
   end
 
+  it 'bst-iterator.kap' do
+    expect(run_example('bst-iterator.kap')).to eq(<<~OUT)
+      3
+      7
+      true
+      9
+      true
+      15
+      20
+      false
+    OUT
+  end
+
   it 'baseball-game.kap' do
     expect(run_example('baseball-game.kap')).to eq("30\n27\n")
   end
@@ -556,6 +573,10 @@ RSpec.describe 'examples' do
     OUT
   end
 
+  it 'recent-counter.kap' do
+    expect(run_example('recent-counter.kap')).to eq("4\n5\n")
+  end
+
   it 'reverse-integer.kap' do
     expect(run_example('reverse-integer.kap')).to eq("321\n-321\n21\n0\n")
   end

data/spec/lsp_spec.rb

@@ -268,7 +268,8 @@ RSpec.describe Kapusta::LSP do
         frame_rename(uri: uri['a.kap'], **cursor_at(text_a, 'foo'), new_name: 'bar')
       )
 
-      expect(result_for(responses).dig('error', 'message')).to include('already defined')
+      message = responses.find { |m| m['method'] == 'window/showMessage' }
+      expect(message['params']['message']).to include('already defined')
     end
   end
 
@@ -282,7 +283,8 @@ RSpec.describe Kapusta::LSP do
         frame_rename(uri: uri['a.kap'], **cursor_at(text_a, 'Foo'), new_name: 'Bar')
       )
 
-      expect(result_for(responses).dig('error', 'message')).to include('already defined')
+      message = responses.find { |m| m['method'] == 'window/showMessage' }
+      expect(message['params']['message']).to include('already defined')
     end
   end
 
@@ -304,6 +306,71 @@ RSpec.describe Kapusta::LSP do
     )
   end
 
+  it 'rejects renaming a class to a lowercase name with a clear message' do
+    text = "(class Accumulator)\n\n(end)\n"
+    responses = run(
+      frame_initialize,
+      frame_did_open('file:///x.kap', text),
+      frame_rename(uri: 'file:///x.kap', **cursor_at(text, 'Accumulator'), new_name: 'fff')
+    )
+
+    response = result_for(responses)
+    expect(response['error']).to be_nil
+    expect(response['result']).to eq('documentChanges' => [])
+
+    show_message = responses.find { |m| m['method'] == 'window/showMessage' }
+    expect(show_message).not_to be_nil
+    expect(show_message['params']['type']).to eq(1)
+    expect(show_message['params']['message']).to include('uppercase letter')
+  end
+
+  it 'renames a class declared with a bodyless header closed by (end) and its usages after (end)' do
+    text = "(class Accumulator)\n\n(fn add! [n] n)\n\n(end)\n\n(let [acc (Accumulator.new 10)]\n  (acc.add! 5))\n"
+    with_workspace('a.kap' => text) do |root_uri, uri|
+      responses = run(
+        frame_initialize([root_uri]),
+        frame_did_open(uri['a.kap'], text),
+        frame_rename(uri: uri['a.kap'], **cursor_at(text, 'Accumulator'), new_name: 'Foo')
+      )
+      result = result_for(responses)['result']
+
+      expect(result).not_to be_nil
+      edits = result['documentChanges'].first['edits']
+      expect(edits.map { |e| e['range']['start']['line'] }).to contain_exactly(0, 6)
+      expect(edits.map { |e| e['newText'] }).to all(eq('Foo'))
+    end
+  end
+
+  it 'jumps from (end) to the class header that opened the file scope' do
+    text = "(class Foo)\n\n(fn hi [] 1)\n\n(end)\n"
+    responses = run(
+      frame_initialize,
+      frame_did_open('file:///x.kap', text),
+      frame_definition(uri: 'file:///x.kap', **cursor_at(text, 'end'))
+    )
+    result = result_for(responses)['result']
+
+    expect(result).to eq(
+      'uri' => 'file:///x.kap',
+      'range' => {
+        'start' => { 'line' => 0, 'character' => 7 },
+        'end' => { 'line' => 0, 'character' => 10 }
+      }
+    )
+  end
+
+  it 'jumps from (end) to the matching module header for nested headers' do
+    text = "(module Outer)\n\n(module Inner)\n(fn self.go [] 1)\n(end)\n\n(end)\n"
+    responses = run(
+      frame_initialize,
+      frame_did_open('file:///x.kap', text),
+      frame_definition(uri: 'file:///x.kap', line: 4, character: 1)
+    )
+    result = result_for(responses)['result']
+
+    expect(result['range']['start']).to eq('line' => 2, 'character' => 8)
+  end
+
   it 'jumps to a top-level fn definition across files' do
     text_a = "(fn greet [n] (print n))\n"
     text_b = "(greet 42)\n"
@@ -583,7 +650,8 @@ RSpec.describe Kapusta::LSP do
         frame_rename(uri: uri['a.kap'], **cursor_at(text_a, 'swap!'), new_name: 'flip!')
       )
 
-      expect(result_for(responses).dig('error', 'message')).to include('already defined')
+      message = responses.find { |m| m['method'] == 'window/showMessage' }
+      expect(message['params']['message']).to include('already defined')
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kapusta
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Evgenii Morozov
@@ -38,6 +38,7 @@ files:
 - examples/binary-to-decimal.kap
 - examples/block-sort.kap
 - examples/blocks-and-kwargs.kap
+- examples/bst-iterator.kap
 - examples/calc.kap
 - examples/circle.kap
 - examples/classify-wallet.kap
@@ -101,6 +102,7 @@ files:
 - examples/power-of-three.kap
 - examples/primes.kap
 - examples/raindrops.kap
+- examples/recent-counter.kap
 - examples/record.kap
 - examples/regex.kap
 - examples/reverse-integer.kap
@@ -110,6 +112,7 @@ files:
 - examples/scopes.kap
 - examples/shapes.kap
 - examples/shared-macros.kapm
+- examples/signal-harvest.kap
 - examples/single-number.kap
 - examples/squares.kap
 - examples/stack.kap