kapusta 0.7.0 → 0.8.0

data/spec/lsp_spec.rb

@@ -4,6 +4,7 @@ require 'spec_helper'
 require 'kapusta/lsp'
 require 'json'
 require 'stringio'
+require 'tmpdir'
 
 RSpec.describe Kapusta::LSP do
   def frame(payload)
@@ -30,29 +31,81 @@ RSpec.describe Kapusta::LSP do
     parse_responses(output.string)
   end
 
+  def frame_initialize(folders = [])
+    workspace_folders = folders.map { |uri| { uri:, name: 'tmp' } }
+    frame(jsonrpc: '2.0', id: 1, method: 'initialize',
+          params: { workspaceFolders: workspace_folders })
+  end
+
+  def frame_did_open(uri, text, version: 1)
+    frame(jsonrpc: '2.0', method: 'textDocument/didOpen',
+          params: { textDocument: { uri:, version:, text: } })
+  end
+
+  def frame_rename(uri:, line:, character:, new_name:, id: 2)
+    frame(jsonrpc: '2.0', id:, method: 'textDocument/rename',
+          params: { textDocument: { uri: }, position: { line:, character: }, newName: new_name })
+  end
+
+  def frame_prepare_rename(uri:, line:, character:, id: 2)
+    frame(jsonrpc: '2.0', id:, method: 'textDocument/prepareRename',
+          params: { textDocument: { uri: }, position: { line:, character: } })
+  end
+
+  def frame_definition(uri:, line:, character:, id: 2)
+    frame(jsonrpc: '2.0', id:, method: 'textDocument/definition',
+          params: { textDocument: { uri: }, position: { line:, character: } })
+  end
+
+  def frame_formatting(uri:, id: 2)
+    frame(jsonrpc: '2.0', id:, method: 'textDocument/formatting',
+          params: { textDocument: { uri: } })
+  end
+
+  def cursor_at(text, marker)
+    idx = text.index(marker) or raise "marker #{marker.inspect} not found in text"
+    prefix = text[0...idx]
+    last_nl = prefix.rindex("\n")
+    { line: prefix.count("\n"), character: last_nl ? idx - last_nl - 1 : idx }
+  end
+
+  def result_for(responses, id = 2)
+    responses.find { |m| m['id'] == id }
+  end
+
+  def with_workspace(files)
+    Dir.mktmpdir do |dir|
+      uris = files.to_h do |name, text|
+        path = File.join(dir, name)
+        File.write(path, text)
+        [name, "file://#{File.expand_path(path)}"]
+      end
+      root_uri = "file://#{File.expand_path(dir)}"
+      yield(root_uri, uris)
+    end
+  end
+
   it 'advertises diagnostics and formatting capabilities on initialize' do
-    responses = run(frame(jsonrpc: '2.0', id: 1, method: 'initialize', params: {}))
+    responses = run(frame_initialize)
     capabilities = responses.first.dig('result', 'capabilities')
 
     expect(capabilities).to include('textDocumentSync', 'documentFormattingProvider')
+    expect(capabilities['definitionProvider']).to be(true)
   end
 
   it 'publishes diagnostics for invalid source' do
     responses = run(
-      frame(jsonrpc: '2.0', id: 1, method: 'initialize', params: {}),
-      frame(jsonrpc: '2.0', method: 'textDocument/didOpen',
-            params: { textDocument: { uri: 'file:///x.kap', version: 1, text: '(let [x 1] (+ x ()))' } })
+      frame_initialize,
+      frame_did_open('file:///x.kap', '(let [x 1] (+ x ()))')
     )
-    diagnostics = responses.last.dig('params', 'diagnostics')
 
-    expect(diagnostics).not_to be_empty
+    expect(responses.last.dig('params', 'diagnostics')).not_to be_empty
   end
 
   it 'publishes no diagnostics for valid source' do
     responses = run(
-      frame(jsonrpc: '2.0', id: 1, method: 'initialize', params: {}),
-      frame(jsonrpc: '2.0', method: 'textDocument/didOpen',
-            params: { textDocument: { uri: 'file:///x.kap', version: 1, text: '(print "hi")' } })
+      frame_initialize,
+      frame_did_open('file:///x.kap', '(print "hi")')
     )
 
     expect(responses.last.dig('params', 'diagnostics')).to be_empty
@@ -60,13 +113,11 @@ RSpec.describe Kapusta::LSP do
 
   it 'returns a TextEdit for formatting' do
     responses = run(
-      frame(jsonrpc: '2.0', id: 1, method: 'initialize', params: {}),
-      frame(jsonrpc: '2.0', method: 'textDocument/didOpen',
-            params: { textDocument: { uri: 'file:///x.kap', version: 1, text: "(fn  greet  [x]  (print  x))\n" } }),
-      frame(jsonrpc: '2.0', id: 2, method: 'textDocument/formatting',
-            params: { textDocument: { uri: 'file:///x.kap' } })
+      frame_initialize,
+      frame_did_open('file:///x.kap', "(fn  greet  [x]  (print  x))\n"),
+      frame_formatting(uri: 'file:///x.kap')
     )
-    edits = responses.find { |m| m['id'] == 2 }['result']
+    edits = result_for(responses)['result']
 
     expect(edits).to be_an(Array).and(be_one)
     expect(edits.first).to include('range', 'newText')
@@ -80,4 +131,473 @@ RSpec.describe Kapusta::LSP do
 
     expect(responses.first.dig('error', 'code')).to eq(-32_002)
   end
+
+  it 'renames a let binding within a single file' do
+    text = '(let [x 1] (+ x x))'
+    responses = run(
+      frame_initialize,
+      frame_did_open('file:///x.kap', text),
+      frame_rename(uri: 'file:///x.kap', **cursor_at(text, 'x'), new_name: 'y')
+    )
+    changes = result_for(responses)['result']['documentChanges']
+
+    expect(changes.length).to eq(1)
+    expect(changes.first['edits'].map { |e| e['newText'] }).to eq(%w[y y y])
+  end
+
+  it 'renames a let binding referenced inside an accumulate iterator with multiple binders' do
+    text = "(let [xs [1 2 3]\n      total (accumulate [s 0 _ x (ipairs xs)] (+ s x))]\n  (print total))\n"
+    idx = text.index('(ipairs xs)') + 'ipairs '.length + 1
+    prefix = text[0...idx]
+    last_nl = prefix.rindex("\n")
+    position = { line: prefix.count("\n"), character: last_nl ? idx - last_nl - 1 : idx }
+    responses = run(
+      frame_initialize,
+      frame_did_open('file:///x.kap', text),
+      frame_rename(uri: 'file:///x.kap', **position, new_name: 'ys')
+    )
+    changes = result_for(responses)['result']['documentChanges']
+
+    expect(changes.length).to eq(1)
+    expect(changes.first['edits'].map { |e| e['newText'] }).to eq(%w[ys ys])
+  end
+
+  it 'renames a for-loop counter referenced inside &until' do
+    text = "(for [d 2 10 &until (>= d 5)] (print d))\n"
+    responses = run(
+      frame_initialize,
+      frame_did_open('file:///x.kap', text),
+      frame_rename(uri: 'file:///x.kap', **cursor_at(text, 'd'), new_name: 'k')
+    )
+    edits = result_for(responses)['result']['documentChanges'].first['edits']
+
+    expect(edits.map { |e| e['newText'] }).to eq(%w[k k k])
+  end
+
+  it 'renames a top-level fn across files' do
+    text_a = "(fn greet [n] (print n))\n(greet \"x\")\n"
+    text_b = "(greet 42)\n"
+    with_workspace('a.kap' => text_a, 'b.kap' => text_b) do |root_uri, uri|
+      responses = run(
+        frame_initialize([root_uri]),
+        frame_did_open(uri['a.kap'], text_a),
+        frame_rename(uri: uri['a.kap'], **cursor_at(text_a, 'greet'), new_name: 'hello')
+      )
+      changes = result_for(responses)['result']['documentChanges']
+
+      expect(changes.map { |c| c['textDocument']['uri'] }).to include(uri['a.kap'], uri['b.kap'])
+    end
+  end
+
+  it 'renames a module constant rewriting only the matching segment in dotted references' do
+    text_a = "(module Foo (fn bar [] 1))\n"
+    text_b = "(Foo.bar)\n(Foo.new)\n"
+    with_workspace('a.kap' => text_a, 'b.kap' => text_b) do |root_uri, uri|
+      responses = run(
+        frame_initialize([root_uri]),
+        frame_did_open(uri['a.kap'], text_a),
+        frame_rename(uri: uri['a.kap'], **cursor_at(text_a, 'Foo'), new_name: 'Bar')
+      )
+      b_edits = result_for(responses)['result']['documentChanges']
+                .find { |c| c['textDocument']['uri'] == uri['b.kap'] }['edits']
+
+      expect(b_edits.map { |e| [e['range']['start']['character'], e['range']['end']['character'], e['newText']] })
+        .to contain_exactly([1, 4, 'Bar'], [1, 4, 'Bar'])
+    end
+  end
+
+  it 'returns null from prepareRename on a dotted method segment' do
+    text = '(Foo.bar 1)'
+    responses = run(
+      frame_initialize,
+      frame_did_open('file:///x.kap', text),
+      frame_prepare_rename(uri: 'file:///x.kap', **cursor_at(text, 'bar'))
+    )
+
+    expect(result_for(responses)['result']).to be_nil
+  end
+
+  it 'renames a constant when the workspace contains hash patterns and the .. special form' do
+    text_a = "(class Foo)\n"
+    text_b = "(let [{:x x} {:x 1}] (print (.. \"value=\" x)))\n(Foo.new)\n"
+    with_workspace('a.kap' => text_a, 'b.kap' => text_b) do |root_uri, uri|
+      responses = run(
+        frame_initialize([root_uri]),
+        frame_did_open(uri['a.kap'], text_a),
+        frame_rename(uri: uri['a.kap'], **cursor_at(text_a, 'Foo'), new_name: 'Bar')
+      )
+      response = result_for(responses)
+
+      expect(response['error']).to be_nil
+      uris = response['result']['documentChanges'].map { |c| c['textDocument']['uri'] }
+      expect(uris).to include(uri['a.kap'], uri['b.kap'])
+    end
+  end
+
+  it 'does not offer rename for method definitions after a bodyless class header' do
+    text = "(class Counter)\n(fn initialize [start] start)\n"
+    responses = run(
+      frame_initialize,
+      frame_did_open('file:///x.kap', text),
+      frame_prepare_rename(uri: 'file:///x.kap', **cursor_at(text, 'initialize'))
+    )
+
+    expect(result_for(responses)['result']).to be_nil
+  end
+
+  it 'does not let class methods shadow top-level function references' do
+    text = "(fn helper [] 2)\n(class Foo (fn helper [] 1))\n(fn main [] (helper))\n"
+    responses = run(
+      frame_initialize,
+      frame_did_open('file:///x.kap', text),
+      frame_rename(uri: 'file:///x.kap', **cursor_at(text, 'helper'), new_name: 'renamed')
+    )
+    edits = result_for(responses)['result']['documentChanges'].first['edits']
+
+    expect(edits.map { |e| e['range']['start']['line'] }).to contain_exactly(0, 2)
+  end
+
+  it 'rejects top-level rename when the new name exists elsewhere in the workspace' do
+    text_a = "(fn foo [] 1)\n"
+    text_b = "(foo)\n"
+    text_c = "(fn bar [] 2)\n"
+    with_workspace('a.kap' => text_a, 'b.kap' => text_b, 'c.kap' => text_c) do |root_uri, uri|
+      responses = run(
+        frame_initialize([root_uri]),
+        frame_did_open(uri['a.kap'], text_a),
+        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')
+    end
+  end
+
+  it 'rejects constant rename when the new constant prefix exists' do
+    text_a = "(class Foo)\n"
+    text_b = "(class Bar)\n"
+    with_workspace('a.kap' => text_a, 'b.kap' => text_b) do |root_uri, uri|
+      responses = run(
+        frame_initialize([root_uri]),
+        frame_did_open(uri['a.kap'], text_a),
+        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')
+    end
+  end
+
+  it 'jumps to a let binder from a usage in the same file' do
+    text = '(let [x 1] (+ x x))'
+    responses = run(
+      frame_initialize,
+      frame_did_open('file:///x.kap', text),
+      frame_definition(uri: 'file:///x.kap', line: 0, character: 14)
+    )
+    result = result_for(responses)['result']
+
+    expect(result).to eq(
+      'uri' => 'file:///x.kap',
+      'range' => {
+        'start' => { 'line' => 0, 'character' => 6 },
+        'end' => { 'line' => 0, 'character' => 7 }
+      }
+    )
+  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"
+    with_workspace('a.kap' => text_a, 'b.kap' => text_b) do |root_uri, uri|
+      responses = run(
+        frame_initialize([root_uri]),
+        frame_did_open(uri['b.kap'], text_b),
+        frame_definition(uri: uri['b.kap'], **cursor_at(text_b, 'greet'))
+      )
+      result = result_for(responses)['result']
+
+      expect(result).to be_an(Array).and(be_one)
+      expect(result.first['uri']).to eq(uri['a.kap'])
+      expect(result.first['range']['start']).to eq('line' => 0, 'character' => 4)
+    end
+  end
+
+  it 'jumps to a module definition from a dotted reference across files' do
+    text_a = "(module Foo (fn bar [] 1))\n"
+    text_b = "(Foo.bar)\n"
+    with_workspace('a.kap' => text_a, 'b.kap' => text_b) do |root_uri, uri|
+      responses = run(
+        frame_initialize([root_uri]),
+        frame_did_open(uri['b.kap'], text_b),
+        frame_definition(uri: uri['b.kap'], **cursor_at(text_b, 'Foo'))
+      )
+      result = result_for(responses)['result']
+
+      expect(result).to be_an(Array).and(be_one)
+      expect(result.first['uri']).to eq(uri['a.kap'])
+      expect(result.first['range']['start']).to eq('line' => 0, 'character' => 8)
+    end
+  end
+
+  it 'jumps to a macro definition from a call site in the same file' do
+    text = "(macro unless [c & body] `(if (not ,c) (do ,(unpack body))))\n(unless false (print 1))\n"
+    with_workspace('a.kap' => text) do |root_uri, uri|
+      responses = run(
+        frame_initialize([root_uri]),
+        frame_did_open(uri['a.kap'], text),
+        frame_definition(uri: uri['a.kap'], line: 1, character: 1)
+      )
+      result = result_for(responses)['result']
+
+      expect(result).to eq(
+        'uri' => uri['a.kap'],
+        'range' => {
+          'start' => { 'line' => 0, 'character' => 7 },
+          'end' => { 'line' => 0, 'character' => 13 }
+        }
+      )
+    end
+  end
+
+  it 'jumps from a call site through (import-macros) to the macro definition file' do
+    text_a = "(macro swap! [a b] `(let [tmp# ,a] (set ,a ,b) (set ,b tmp#)))\n"
+    text_b = "(import-macros {: swap!} :a)\n(var x 1)\n(var y 2)\n(swap! x y)\n"
+    with_workspace('a.kap' => text_a, 'b.kap' => text_b) do |root_uri, uri|
+      responses = run(
+        frame_initialize([root_uri]),
+        frame_did_open(uri['b.kap'], text_b),
+        frame_definition(uri: uri['b.kap'], line: 3, character: 1)
+      )
+      result = result_for(responses)['result']
+
+      expect(result['uri']).to eq(uri['a.kap'])
+      expect(result['range']['start']).to eq('line' => 0, 'character' => 7)
+    end
+  end
+
+  it 'returns null definition when the symbol has no known binding' do
+    text = "(foo)\n"
+    responses = run(
+      frame_initialize,
+      frame_did_open('file:///x.kap', text),
+      frame_definition(uri: 'file:///x.kap', **cursor_at(text, 'foo'))
+    )
+
+    expect(result_for(responses)['result']).to be_nil
+  end
+
+  it 'renames a macro definition and its call sites within a file' do
+    text = "(macro swap! [a b]\n  `(let [tmp# ,a]\n     (set ,a ,b)\n     (set ,b tmp#)))\n(swap! x y)\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, 'swap!'), new_name: 'flip!')
+      )
+      changes = result_for(responses)['result']['documentChanges']
+
+      expect(changes.length).to eq(1)
+      edits = changes.first['edits']
+      expect(edits.map { |e| e['newText'] }).to eq(%w[flip! flip!])
+    end
+  end
+
+  it 'renames a macro across files when imported via shorthand destructure' do
+    text_a = "(macro swap! [a b]\n  `(let [tmp# ,a] (set ,a ,b) (set ,b tmp#)))\n"
+    text_b = "(import-macros {: swap!} :a)\n(var x 1)\n(var y 2)\n(swap! x y)\n"
+    with_workspace('a.kap' => text_a, 'b.kap' => text_b) do |root_uri, uri|
+      responses = run(
+        frame_initialize([root_uri]),
+        frame_did_open(uri['a.kap'], text_a),
+        frame_rename(uri: uri['a.kap'], **cursor_at(text_a, 'swap!'), new_name: 'flip!')
+      )
+      changes = result_for(responses)['result']['documentChanges']
+
+      uris = changes.map { |c| c['textDocument']['uri'] }
+      expect(uris).to include(uri['a.kap'], uri['b.kap'])
+
+      b_edits = changes.find { |c| c['textDocument']['uri'] == uri['b.kap'] }['edits']
+      expect(b_edits.map { |e| e['newText'] }).to all(eq('flip!'))
+      expect(b_edits.length).to eq(2)
+    end
+  end
+
+  it 'renames a macro across files when starting from an imported call site' do
+    text_a = "(macro swap! [a b]\n  `(let [tmp# ,a] (set ,a ,b) (set ,b tmp#)))\n"
+    text_b = "(import-macros {: swap!} :a)\n(var x 1)\n(var y 2)\n(swap! x y)\n"
+    with_workspace('a.kap' => text_a, 'b.kap' => text_b) do |root_uri, uri|
+      responses = run(
+        frame_initialize([root_uri]),
+        frame_did_open(uri['b.kap'], text_b),
+        frame_rename(uri: uri['b.kap'],
+                     line: 3, character: cursor_at(text_b.lines[3], 'swap!')[:character],
+                     new_name: 'flip!')
+      )
+      changes = result_for(responses)['result']['documentChanges']
+
+      uris = changes.map { |c| c['textDocument']['uri'] }
+      expect(uris).to include(uri['a.kap'], uri['b.kap'])
+    end
+  end
+
+  it 'renames a user macro that shadows a core special form name' do
+    text = "(macro unless [c & body] `(if (not ,c) (do ,(unpack body))))\n" \
+           "(unless false (print \"x\"))\n(unless true (print \"y\"))\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, 'unless'), new_name: 'except')
+      )
+      edits = result_for(responses)['result']['documentChanges'].first['edits']
+
+      expect(edits.map { |e| e['newText'] }).to eq(%w[except except except])
+    end
+  end
+
+  it 'offers prepareRename on a macro call site shadowing a special form' do
+    text = "(macro unless [c & body] `(if (not ,c) (do ,(unpack body))))\n(unless false 1)\n"
+    with_workspace('a.kap' => text) do |root_uri, uri|
+      responses = run(
+        frame_initialize([root_uri]),
+        frame_did_open(uri['a.kap'], text),
+        frame_prepare_rename(uri: uri['a.kap'], line: 1, character: 1)
+      )
+      result = result_for(responses)['result']
+
+      expect(result).to include('range', 'placeholder')
+      expect(result['placeholder']).to eq('unless')
+      expect(result['range']['start']).to eq('line' => 1, 'character' => 1)
+      expect(result['range']['end']).to eq('line' => 1, 'character' => 7)
+    end
+  end
+
+  it 'returns null prepareRename for an unshadowed special form call' do
+    text = "(unless false 1)\n"
+    responses = run(
+      frame_initialize,
+      frame_did_open('file:///x.kap', text),
+      frame_prepare_rename(uri: 'file:///x.kap', line: 0, character: 1)
+    )
+
+    expect(result_for(responses)['result']).to be_nil
+  end
+
+  it 'renames only the targeted import when multiple macros are destructured together' do
+    text_a = "(macro foo [x] `,x)\n(macro bar [x] `,x)\n"
+    text_b = "(import-macros {: foo : bar} :a)\n(foo 1)\n(bar 2)\n"
+    with_workspace('a.kap' => text_a, 'b.kap' => text_b) do |root_uri, uri|
+      responses = run(
+        frame_initialize([root_uri]),
+        frame_did_open(uri['a.kap'], text_a),
+        frame_rename(uri: uri['a.kap'], **cursor_at(text_a, 'foo'), new_name: 'qux')
+      )
+      changes = result_for(responses)['result']['documentChanges']
+      b_edits = changes.find { |c| c['textDocument']['uri'] == uri['b.kap'] }['edits']
+
+      expect(b_edits.map { |e| e['newText'] }).to all(eq('qux'))
+      expect(b_edits.length).to eq(2)
+      expect(b_edits.flat_map { |e| [e['range']['start']['line'], e['range']['end']['line']] })
+        .to all(satisfy { |n| [0, 1].include?(n) })
+    end
+  end
+
+  it 'propagates a macro rename to multiple importing files' do
+    text_a = "(macro tap [x] `(do (print ,x) ,x))\n"
+    text_b = "(import-macros {: tap} :a)\n(tap 1)\n"
+    text_c = "(import-macros {: tap} :a)\n(tap 2)\n(tap 3)\n"
+    with_workspace('a.kap' => text_a, 'b.kap' => text_b, 'c.kap' => text_c) do |root_uri, uri|
+      responses = run(
+        frame_initialize([root_uri]),
+        frame_did_open(uri['a.kap'], text_a),
+        frame_rename(uri: uri['a.kap'], **cursor_at(text_a, 'tap'), new_name: 'spy')
+      )
+      changes = result_for(responses)['result']['documentChanges']
+
+      expect(changes.map { |c| c['textDocument']['uri'] })
+        .to contain_exactly(uri['a.kap'], uri['b.kap'], uri['c.kap'])
+
+      changes.each do |c|
+        expect(c['edits'].map { |e| e['newText'] }).to all(eq('spy'))
+      end
+
+      c_edits = changes.find { |c| c['textDocument']['uri'] == uri['c.kap'] }['edits']
+      expect(c_edits.length).to eq(3)
+    end
+  end
+
+  it 'jumps to itself when invoked on a macro definition name' do
+    text = "(macro tap [x] `(do (print ,x) ,x))\n"
+    with_workspace('a.kap' => text) do |root_uri, uri|
+      responses = run(
+        frame_initialize([root_uri]),
+        frame_did_open(uri['a.kap'], text),
+        frame_definition(uri: uri['a.kap'], **cursor_at(text, 'tap'))
+      )
+      result = result_for(responses)['result']
+
+      expect(result).to eq(
+        'uri' => uri['a.kap'],
+        'range' => {
+          'start' => { 'line' => 0, 'character' => 7 },
+          'end' => { 'line' => 0, 'character' => 10 }
+        }
+      )
+    end
+  end
+
+  it 'jumps through (import-macros) to a fn-defined macro template in a .kapm module' do
+    text_helper = "(fn scaled [x] `(* ,x 10))\n{: scaled}\n"
+    text_user = "(import-macros {: scaled} :import-helpers)\n(print (scaled 3))\n"
+    with_workspace('import-helpers.kapm' => text_helper,
+                   'macros-import-helpers.kap' => text_user) do |root_uri, uri|
+      responses = run(
+        frame_initialize([root_uri]),
+        frame_did_open(uri['macros-import-helpers.kap'], text_user),
+        frame_definition(uri: uri['macros-import-helpers.kap'],
+                         **cursor_at(text_user.lines[1], 'scaled').merge(line: 1))
+      )
+      result = result_for(responses)['result']
+
+      expect(result['uri']).to eq(uri['import-helpers.kapm'])
+      expect(result['range']['start']).to eq('line' => 0, 'character' => 4)
+    end
+  end
+
+  it 'returns null definition for a special-form call with no shadowing macro' do
+    text = "(unless false 1)\n"
+    responses = run(
+      frame_initialize,
+      frame_did_open('file:///x.kap', text),
+      frame_definition(uri: 'file:///x.kap', line: 0, character: 1)
+    )
+
+    expect(result_for(responses)['result']).to be_nil
+  end
+
+  it 'rejects macro rename when the new name conflicts with an existing macro definition' do
+    text_a = "(macro swap! [a b] `(do ,a ,b))\n(macro flip! [a b] `(do ,b ,a))\n"
+    with_workspace('a.kap' => text_a) do |root_uri, uri|
+      responses = run(
+        frame_initialize([root_uri]),
+        frame_did_open(uri['a.kap'], text_a),
+        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')
+    end
+  end
+
+  it 'escapes file URIs built during workspace scans' do
+    Dir.mktmpdir do |dir|
+      nested = File.join(dir, 'space dir')
+      Dir.mkdir(nested)
+      File.write(File.join(nested, 'a b#c.kap'), "(fn greet [] 1)\n")
+
+      index = Kapusta::LSP::WorkspaceIndex.new(roots: [nested]).scan!
+      uri = index.toplevel_fn_occurrences('greet').keys.first
+
+      expect(uri).to include('space%20dir')
+      expect(uri).to include('a%20b%23c.kap')
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kapusta
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Evgenii Morozov
@@ -57,10 +57,14 @@ files:
 - examples/greet.kap
 - examples/happy-number.kap
 - examples/hashfn.kap
+- examples/import-helpers.kapm
 - examples/kwargs.kap
 - examples/leap-year.kap
 - examples/length-of-last-word.kap
 - examples/macros-dbg.kap
+- examples/macros-import-helpers.kap
+- examples/macros-import-whole.kap
+- examples/macros-import.kap
 - examples/macros-multi.kap
 - examples/macros-swap.kap
 - examples/macros-thrice-if.kap
@@ -93,6 +97,7 @@ files:
 - examples/safe-lookup.kap
 - examples/scopes.kap
 - examples/shapes.kap
+- examples/shared-macros.kapm
 - examples/single-number.kap
 - examples/squares.kap
 - examples/stack.kap
@@ -128,12 +133,22 @@ files:
 - lib/kapusta/compiler/emitter/support.rb
 - lib/kapusta/compiler/lua_compat.rb
 - lib/kapusta/compiler/macro_expander.rb
+- lib/kapusta/compiler/macro_gensym.rb
+- lib/kapusta/compiler/macro_importer.rb
+- lib/kapusta/compiler/macro_lowerer.rb
 - lib/kapusta/compiler/normalizer.rb
 - lib/kapusta/env.rb
 - lib/kapusta/error.rb
 - lib/kapusta/errors.rb
 - lib/kapusta/formatter.rb
 - lib/kapusta/lsp.rb
+- lib/kapusta/lsp/definition.rb
+- lib/kapusta/lsp/diagnostics.rb
+- lib/kapusta/lsp/formatting.rb
+- lib/kapusta/lsp/identifier.rb
+- lib/kapusta/lsp/rename.rb
+- lib/kapusta/lsp/scope_walker.rb
+- lib/kapusta/lsp/workspace_index.rb
 - lib/kapusta/reader.rb
 - lib/kapusta/support.rb
 - lib/kapusta/version.rb