From bff3d2a68d28a78267d3e3d0701eede1a4919aaa Mon Sep 17 00:00:00 2001 From: Andy Waite Date: Wed, 30 Aug 2023 15:34:05 -0400 Subject: [PATCH] wip --- .../test/classes_and_modules_test.rb | 32 +++++++++---------- lib/ruby_indexer/test/constant_test.rb | 22 ++++++------- lib/ruby_lsp/requests/document_symbol.rb | 2 +- .../definition/class_reference.exp.json | 2 +- .../document_symbol/attr_accessor.exp.json | 16 +++++----- .../class_declaration_nested.exp.json | 8 ++--- .../document_symbol/const.exp.json | 16 +++++----- .../expectations/document_symbol/def.exp.json | 4 +-- .../document_symbol/def_endless.exp.json | 4 +-- .../def_with_decorators.exp.json | 12 +++---- .../document_symbol/defs.exp.json | 4 +-- .../document_symbol/ivar.exp.json | 32 +++++++++---------- .../module_declaration.exp.json | 12 +++---- .../document_symbol/one_line_nesting.exp.json | 20 ++++++------ test/expectations/expectations_test_runner.rb | 3 -- .../hover/documented_class.exp.json | 4 +-- .../hover/documented_constant.exp.json | 4 +-- .../hover/documented_module.exp.json | 4 +-- .../documented_namespaced_class.exp.json | 4 +-- .../array_literal_oneline.exp.json | 6 ++-- .../begin_rescue_ensure.exp.json | 8 ++--- .../selection_ranges/case_when.exp.json | 6 ++-- .../class_declaration.exp.json | 6 ++-- .../class_declaration_nested.exp.json | 2 +- .../selection_ranges/def.exp.json | 4 +-- .../selection_ranges/def_endless.exp.json | 2 +- .../def_multiline_params.exp.json | 6 ++-- .../selection_ranges/def_oneline.exp.json | 2 +- .../def_require_name_parameter.exp.json | 2 +- .../selection_ranges/defs.exp.json | 2 +- .../defs_multiline_params.exp.json | 6 ++-- .../selection_ranges/do_blocks.exp.json | 4 +-- .../selection_ranges/ensure.exp.json | 6 ++-- .../selection_ranges/for.exp.json | 4 +-- .../selection_ranges/hash_literal.exp.json | 8 ++--- .../hash_literal_oneline.exp.json | 8 ++--- .../selection_ranges/heredoc.exp.json | 2 +- .../expectations/selection_ranges/if.exp.json | 4 +-- .../selection_ranges/if_elsif_else.exp.json | 8 ++--- .../if_elsif_else_empty.exp.json | 6 ++-- .../selection_ranges/lambdas.exp.json | 6 ++-- .../module_declaration.exp.json | 4 +-- .../multiline_arrays.exp.json | 6 ++-- .../selection_ranges/multiline_block.exp.json | 4 +-- .../multiline_invocation.exp.json | 10 +++--- .../nested_invocation.exp.json | 10 +++--- .../nested_invocation_no_parenthesis.exp.json | 10 +++--- .../pattern_matching.exp.json | 6 ++-- .../selection_ranges/rescue_multiple.exp.json | 6 ++-- .../selection_ranges/sclass.exp.json | 4 +-- .../selection_ranges/string_concat.exp.json | 6 ++-- .../selection_ranges/unless.exp.json | 4 +-- .../selection_ranges/until.exp.json | 4 +-- .../selection_ranges/while.exp.json | 4 +-- 54 files changed, 194 insertions(+), 197 deletions(-) diff --git a/lib/ruby_indexer/test/classes_and_modules_test.rb b/lib/ruby_indexer/test/classes_and_modules_test.rb index 4a6ff4618..52f7fde06 100644 --- a/lib/ruby_indexer/test/classes_and_modules_test.rb +++ b/lib/ruby_indexer/test/classes_and_modules_test.rb @@ -11,7 +11,7 @@ class Foo end RUBY - assert_entry("Foo", Index::Entry::Class, "/fake/path/foo.rb:0-0:1-2") + assert_entry("Foo", Index::Entry::Class, "/fake/path/foo.rb:0-0:1-3") end def test_class_with_statements @@ -21,7 +21,7 @@ def something; end end RUBY - assert_entry("Foo", Index::Entry::Class, "/fake/path/foo.rb:0-0:2-2") + assert_entry("Foo", Index::Entry::Class, "/fake/path/foo.rb:0-0:2-3") end def test_colon_colon_class @@ -30,7 +30,7 @@ class ::Foo end RUBY - assert_entry("Foo", Index::Entry::Class, "/fake/path/foo.rb:0-0:1-2") + assert_entry("Foo", Index::Entry::Class, "/fake/path/foo.rb:0-0:1-3") end def test_colon_colon_class_inside_class @@ -41,8 +41,8 @@ class ::Foo end RUBY - assert_entry("Bar", Index::Entry::Class, "/fake/path/foo.rb:0-0:3-2") - assert_entry("Foo", Index::Entry::Class, "/fake/path/foo.rb:1-2:2-4") + assert_entry("Bar", Index::Entry::Class, "/fake/path/foo.rb:0-0:3-3") + assert_entry("Foo", Index::Entry::Class, "/fake/path/foo.rb:1-2:2-5") end def test_namespaced_class @@ -51,7 +51,7 @@ class Foo::Bar end RUBY - assert_entry("Foo::Bar", Index::Entry::Class, "/fake/path/foo.rb:0-0:1-2") + assert_entry("Foo::Bar", Index::Entry::Class, "/fake/path/foo.rb:0-0:1-3") end def test_dynamically_namespaced_class @@ -69,7 +69,7 @@ module Foo end RUBY - assert_entry("Foo", Index::Entry::Module, "/fake/path/foo.rb:0-0:1-2") + assert_entry("Foo", Index::Entry::Module, "/fake/path/foo.rb:0-0:1-3") end def test_module_with_statements @@ -79,7 +79,7 @@ def something; end end RUBY - assert_entry("Foo", Index::Entry::Module, "/fake/path/foo.rb:0-0:2-2") + assert_entry("Foo", Index::Entry::Module, "/fake/path/foo.rb:0-0:2-3") end def test_colon_colon_module @@ -88,7 +88,7 @@ module ::Foo end RUBY - assert_entry("Foo", Index::Entry::Module, "/fake/path/foo.rb:0-0:1-2") + assert_entry("Foo", Index::Entry::Module, "/fake/path/foo.rb:0-0:1-3") end def test_namespaced_module @@ -97,7 +97,7 @@ module Foo::Bar end RUBY - assert_entry("Foo::Bar", Index::Entry::Module, "/fake/path/foo.rb:0-0:1-2") + assert_entry("Foo::Bar", Index::Entry::Module, "/fake/path/foo.rb:0-0:1-3") end def test_dynamically_namespaced_module @@ -124,11 +124,11 @@ class Something end RUBY - assert_entry("Foo", Index::Entry::Module, "/fake/path/foo.rb:0-0:10-2") - assert_entry("Foo::Bar", Index::Entry::Class, "/fake/path/foo.rb:1-2:2-4") - assert_entry("Foo::Baz", Index::Entry::Module, "/fake/path/foo.rb:4-2:9-4") - assert_entry("Foo::Baz::Qux", Index::Entry::Class, "/fake/path/foo.rb:5-4:8-6") - assert_entry("Foo::Baz::Qux::Something", Index::Entry::Class, "/fake/path/foo.rb:6-6:7-8") + assert_entry("Foo", Index::Entry::Module, "/fake/path/foo.rb:0-0:10-3") + assert_entry("Foo::Bar", Index::Entry::Class, "/fake/path/foo.rb:1-2:2-5") + assert_entry("Foo::Baz", Index::Entry::Module, "/fake/path/foo.rb:4-2:9-5") + assert_entry("Foo::Baz::Qux", Index::Entry::Class, "/fake/path/foo.rb:5-4:8-7") + assert_entry("Foo::Baz::Qux::Something", Index::Entry::Class, "/fake/path/foo.rb:6-6:7-9") end def test_deleting_from_index_based_on_file_path @@ -137,7 +137,7 @@ class Foo end RUBY - assert_entry("Foo", Index::Entry::Class, "/fake/path/foo.rb:0-0:1-2") + assert_entry("Foo", Index::Entry::Class, "/fake/path/foo.rb:0-0:1-3") @index.delete("/fake/path/foo.rb") refute_entry("Foo") diff --git a/lib/ruby_indexer/test/constant_test.rb b/lib/ruby_indexer/test/constant_test.rb index 62632a911..4f40658e9 100644 --- a/lib/ruby_indexer/test/constant_test.rb +++ b/lib/ruby_indexer/test/constant_test.rb @@ -14,8 +14,8 @@ class ::Bar end RUBY - assert_entry("FOO", Index::Entry::Constant, "/fake/path/foo.rb:0-0:0-6") - assert_entry("Bar::FOO", Index::Entry::Constant, "/fake/path/foo.rb:3-2:3-8") + assert_entry("FOO", Index::Entry::Constant, "/fake/path/foo.rb:0-0:0-7") + assert_entry("Bar::FOO", Index::Entry::Constant, "/fake/path/foo.rb:3-2:3-9") end def test_constant_or_writes @@ -27,8 +27,8 @@ class ::Bar end RUBY - assert_entry("FOO", Index::Entry::Constant, "/fake/path/foo.rb:0-0:0-8") - assert_entry("Bar::FOO", Index::Entry::Constant, "/fake/path/foo.rb:3-2:3-10") + assert_entry("FOO", Index::Entry::Constant, "/fake/path/foo.rb:0-0:0-9") + assert_entry("Bar::FOO", Index::Entry::Constant, "/fake/path/foo.rb:3-2:3-11") end def test_constant_path_writes @@ -45,10 +45,10 @@ module B A::BAZ = 1 RUBY - assert_entry("A::FOO", Index::Entry::Constant, "/fake/path/foo.rb:1-2:1-8") - assert_entry("BAR", Index::Entry::Constant, "/fake/path/foo.rb:2-2:2-10") - assert_entry("A::B::FOO", Index::Entry::Constant, "/fake/path/foo.rb:5-4:5-10") - assert_entry("A::BAZ", Index::Entry::Constant, "/fake/path/foo.rb:9-0:9-9") + assert_entry("A::FOO", Index::Entry::Constant, "/fake/path/foo.rb:1-2:1-9") + assert_entry("BAR", Index::Entry::Constant, "/fake/path/foo.rb:2-2:2-11") + assert_entry("A::B::FOO", Index::Entry::Constant, "/fake/path/foo.rb:5-4:5-11") + assert_entry("A::BAZ", Index::Entry::Constant, "/fake/path/foo.rb:9-0:9-10") end def test_constant_path_or_writes @@ -61,9 +61,9 @@ class A A::BAZ ||= 1 RUBY - assert_entry("A::FOO", Index::Entry::Constant, "/fake/path/foo.rb:1-2:1-10") - assert_entry("BAR", Index::Entry::Constant, "/fake/path/foo.rb:2-2:2-12") - assert_entry("A::BAZ", Index::Entry::Constant, "/fake/path/foo.rb:5-0:5-11") + assert_entry("A::FOO", Index::Entry::Constant, "/fake/path/foo.rb:1-2:1-11") + assert_entry("BAR", Index::Entry::Constant, "/fake/path/foo.rb:2-2:2-13") + assert_entry("A::BAZ", Index::Entry::Constant, "/fake/path/foo.rb:5-0:5-12") end def test_comments_for_constants diff --git a/lib/ruby_lsp/requests/document_symbol.rb b/lib/ruby_lsp/requests/document_symbol.rb index 1da3d1efa..55bae4053 100644 --- a/lib/ruby_lsp/requests/document_symbol.rb +++ b/lib/ruby_lsp/requests/document_symbol.rb @@ -207,7 +207,7 @@ def after_module(node) sig { params(node: YARP::InstanceVariableWriteNode).void } def on_instance_variable_write(node) create_document_symbol( - name: node.name, + name: node.name.to_s, # ??? kind: :variable, range_node: node, selection_range_node: node.name_loc, diff --git a/test/expectations/definition/class_reference.exp.json b/test/expectations/definition/class_reference.exp.json index 6bd653fa8..689f8a9fd 100644 --- a/test/expectations/definition/class_reference.exp.json +++ b/test/expectations/definition/class_reference.exp.json @@ -9,7 +9,7 @@ }, "end": { "line": 187, - "character": 4 + "character": 5 } } } diff --git a/test/expectations/document_symbol/attr_accessor.exp.json b/test/expectations/document_symbol/attr_accessor.exp.json index 502692aee..3362a0850 100644 --- a/test/expectations/document_symbol/attr_accessor.exp.json +++ b/test/expectations/document_symbol/attr_accessor.exp.json @@ -10,7 +10,7 @@ }, "end": { "line": 0, - "character": 13 + "character": 14 } }, "selectionRange": { @@ -20,7 +20,7 @@ }, "end": { "line": 0, - "character": 13 + "character": 14 } }, "children": [] @@ -35,7 +35,7 @@ }, "end": { "line": 1, - "character": 13 + "character": 14 } }, "selectionRange": { @@ -45,7 +45,7 @@ }, "end": { "line": 1, - "character": 13 + "character": 14 } }, "children": [] @@ -60,7 +60,7 @@ }, "end": { "line": 1, - "character": 17 + "character": 18 } }, "selectionRange": { @@ -70,7 +70,7 @@ }, "end": { "line": 1, - "character": 17 + "character": 18 } }, "children": [] @@ -85,7 +85,7 @@ }, "end": { "line": 2, - "character": 15 + "character": 16 } }, "selectionRange": { @@ -95,7 +95,7 @@ }, "end": { "line": 2, - "character": 15 + "character": 16 } }, "children": [] diff --git a/test/expectations/document_symbol/class_declaration_nested.exp.json b/test/expectations/document_symbol/class_declaration_nested.exp.json index 04ad0715c..b4bc9a357 100644 --- a/test/expectations/document_symbol/class_declaration_nested.exp.json +++ b/test/expectations/document_symbol/class_declaration_nested.exp.json @@ -10,7 +10,7 @@ }, "end": { "line": 2, - "character": 2 + "character": 3 } }, "selectionRange": { @@ -20,7 +20,7 @@ }, "end": { "line": 0, - "character": 8 + "character": 9 } }, "children": [ @@ -34,7 +34,7 @@ }, "end": { "line": 1, - "character": 15 + "character": 16 } }, "selectionRange": { @@ -44,7 +44,7 @@ }, "end": { "line": 1, - "character": 10 + "character": 11 } }, "children": [] diff --git a/test/expectations/document_symbol/const.exp.json b/test/expectations/document_symbol/const.exp.json index 111d1a891..e8fa48529 100644 --- a/test/expectations/document_symbol/const.exp.json +++ b/test/expectations/document_symbol/const.exp.json @@ -10,7 +10,7 @@ }, "end": { "line": 0, - "character": 6 + "character": 7 } }, "selectionRange": { @@ -20,7 +20,7 @@ }, "end": { "line": 0, - "character": 1 + "character": 2 } }, "children": [] @@ -35,7 +35,7 @@ }, "end": { "line": 1, - "character": 8 + "character": 9 } }, "selectionRange": { @@ -45,7 +45,7 @@ }, "end": { "line": 1, - "character": 3 + "character": 4 } }, "children": [] @@ -60,7 +60,7 @@ }, "end": { "line": 2, - "character": 11 + "character": 12 } }, "selectionRange": { @@ -70,7 +70,7 @@ }, "end": { "line": 2, - "character": 6 + "character": 7 } }, "children": [] @@ -85,7 +85,7 @@ }, "end": { "line": 3, - "character": 13 + "character": 14 } }, "selectionRange": { @@ -95,7 +95,7 @@ }, "end": { "line": 3, - "character": 8 + "character": 9 } }, "children": [] diff --git a/test/expectations/document_symbol/def.exp.json b/test/expectations/document_symbol/def.exp.json index 703581345..348820d84 100644 --- a/test/expectations/document_symbol/def.exp.json +++ b/test/expectations/document_symbol/def.exp.json @@ -10,7 +10,7 @@ }, "end": { "line": 3, - "character": 2 + "character": 3 } }, "selectionRange": { @@ -20,7 +20,7 @@ }, "end": { "line": 0, - "character": 6 + "character": 7 } }, "children": [] diff --git a/test/expectations/document_symbol/def_endless.exp.json b/test/expectations/document_symbol/def_endless.exp.json index 9f2bdf128..4cc3522f2 100644 --- a/test/expectations/document_symbol/def_endless.exp.json +++ b/test/expectations/document_symbol/def_endless.exp.json @@ -10,7 +10,7 @@ }, "end": { "line": 2, - "character": 11 + "character": 12 } }, "selectionRange": { @@ -20,7 +20,7 @@ }, "end": { "line": 2, - "character": 6 + "character": 7 } }, "children": [] diff --git a/test/expectations/document_symbol/def_with_decorators.exp.json b/test/expectations/document_symbol/def_with_decorators.exp.json index 9f5e91329..54640fbe5 100644 --- a/test/expectations/document_symbol/def_with_decorators.exp.json +++ b/test/expectations/document_symbol/def_with_decorators.exp.json @@ -10,7 +10,7 @@ }, "end": { "line": 2, - "character": 2 + "character": 3 } }, "selectionRange": { @@ -20,7 +20,7 @@ }, "end": { "line": 0, - "character": 14 + "character": 15 } }, "children": [] @@ -35,7 +35,7 @@ }, "end": { "line": 6, - "character": 2 + "character": 3 } }, "selectionRange": { @@ -45,7 +45,7 @@ }, "end": { "line": 4, - "character": 17 + "character": 18 } }, "children": [] @@ -60,7 +60,7 @@ }, "end": { "line": 10, - "character": 2 + "character": 3 } }, "selectionRange": { @@ -70,7 +70,7 @@ }, "end": { "line": 8, - "character": 32 + "character": 33 } }, "children": [] diff --git a/test/expectations/document_symbol/defs.exp.json b/test/expectations/document_symbol/defs.exp.json index b3b6be74f..f18b6b521 100644 --- a/test/expectations/document_symbol/defs.exp.json +++ b/test/expectations/document_symbol/defs.exp.json @@ -10,7 +10,7 @@ }, "end": { "line": 3, - "character": 2 + "character": 3 } }, "selectionRange": { @@ -20,7 +20,7 @@ }, "end": { "line": 0, - "character": 11 + "character": 12 } }, "children": [] diff --git a/test/expectations/document_symbol/ivar.exp.json b/test/expectations/document_symbol/ivar.exp.json index 2e8871754..6524bca76 100644 --- a/test/expectations/document_symbol/ivar.exp.json +++ b/test/expectations/document_symbol/ivar.exp.json @@ -10,7 +10,7 @@ }, "end": { "line": 0, - "character": 6 + "character": 7 } }, "selectionRange": { @@ -20,7 +20,7 @@ }, "end": { "line": 0, - "character": 1 + "character": 2 } }, "children": [] @@ -35,7 +35,7 @@ }, "end": { "line": 1, - "character": 7 + "character": 8 } }, "selectionRange": { @@ -45,7 +45,7 @@ }, "end": { "line": 1, - "character": 2 + "character": 3 } }, "children": [] @@ -60,7 +60,7 @@ }, "end": { "line": 11, - "character": 2 + "character": 3 } }, "selectionRange": { @@ -70,7 +70,7 @@ }, "end": { "line": 3, - "character": 8 + "character": 9 } }, "children": [ @@ -84,7 +84,7 @@ }, "end": { "line": 4, - "character": 8 + "character": 9 } }, "selectionRange": { @@ -94,7 +94,7 @@ }, "end": { "line": 4, - "character": 3 + "character": 4 } }, "children": [] @@ -109,7 +109,7 @@ }, "end": { "line": 5, - "character": 9 + "character": 10 } }, "selectionRange": { @@ -119,7 +119,7 @@ }, "end": { "line": 5, - "character": 4 + "character": 5 } }, "children": [] @@ -134,7 +134,7 @@ }, "end": { "line": 10, - "character": 4 + "character": 5 } }, "selectionRange": { @@ -144,7 +144,7 @@ }, "end": { "line": 7, - "character": 15 + "character": 16 } }, "children": [ @@ -158,7 +158,7 @@ }, "end": { "line": 8, - "character": 10 + "character": 11 } }, "selectionRange": { @@ -168,7 +168,7 @@ }, "end": { "line": 8, - "character": 5 + "character": 6 } }, "children": [] @@ -183,7 +183,7 @@ }, "end": { "line": 9, - "character": 11 + "character": 12 } }, "selectionRange": { @@ -193,7 +193,7 @@ }, "end": { "line": 9, - "character": 6 + "character": 7 } }, "children": [] diff --git a/test/expectations/document_symbol/module_declaration.exp.json b/test/expectations/document_symbol/module_declaration.exp.json index 0c635884a..46231663f 100644 --- a/test/expectations/document_symbol/module_declaration.exp.json +++ b/test/expectations/document_symbol/module_declaration.exp.json @@ -10,7 +10,7 @@ }, "end": { "line": 6, - "character": 2 + "character": 3 } }, "selectionRange": { @@ -20,7 +20,7 @@ }, "end": { "line": 0, - "character": 9 + "character": 10 } }, "children": [ @@ -34,7 +34,7 @@ }, "end": { "line": 2, - "character": 4 + "character": 5 } }, "selectionRange": { @@ -44,7 +44,7 @@ }, "end": { "line": 1, - "character": 10 + "character": 11 } }, "children": [] @@ -59,7 +59,7 @@ }, "end": { "line": 5, - "character": 4 + "character": 5 } }, "selectionRange": { @@ -69,7 +69,7 @@ }, "end": { "line": 4, - "character": 11 + "character": 12 } }, "children": [] diff --git a/test/expectations/document_symbol/one_line_nesting.exp.json b/test/expectations/document_symbol/one_line_nesting.exp.json index 1aadddc1a..73cc8f330 100644 --- a/test/expectations/document_symbol/one_line_nesting.exp.json +++ b/test/expectations/document_symbol/one_line_nesting.exp.json @@ -10,7 +10,7 @@ }, "end": { "line": 1, - "character": 2 + "character": 3 } }, "selectionRange": { @@ -20,7 +20,7 @@ }, "end": { "line": 0, - "character": 9 + "character": 10 } }, "children": [] @@ -35,7 +35,7 @@ }, "end": { "line": 4, - "character": 2 + "character": 3 } }, "selectionRange": { @@ -45,7 +45,7 @@ }, "end": { "line": 3, - "character": 14 + "character": 15 } }, "children": [] @@ -60,7 +60,7 @@ }, "end": { "line": 7, - "character": 2 + "character": 3 } }, "selectionRange": { @@ -70,7 +70,7 @@ }, "end": { "line": 6, - "character": 18 + "character": 19 } }, "children": [] @@ -85,7 +85,7 @@ }, "end": { "line": 12, - "character": 2 + "character": 3 } }, "selectionRange": { @@ -95,7 +95,7 @@ }, "end": { "line": 9, - "character": 9 + "character": 10 } }, "children": [ @@ -109,7 +109,7 @@ }, "end": { "line": 11, - "character": 4 + "character": 5 } }, "selectionRange": { @@ -119,7 +119,7 @@ }, "end": { "line": 10, - "character": 16 + "character": 17 } }, "children": [] diff --git a/test/expectations/expectations_test_runner.rb b/test/expectations/expectations_test_runner.rb index 557ff4ce4..277eccd7f 100644 --- a/test/expectations/expectations_test_runner.rb +++ b/test/expectations/expectations_test_runner.rb @@ -50,9 +50,6 @@ def default_args RB Dir.glob(TEST_FIXTURES_GLOB).each do |path| - # temporarily skip until we figure out comment handling - next if handler_class == RubyLsp::Requests::DocumentLink && path == "test/fixtures/source_comment.rb" - test_name = File.basename(path, ".rb") expectations_dir = File.join(TEST_EXP_DIR, expectation_suffix) diff --git a/test/expectations/hover/documented_class.exp.json b/test/expectations/hover/documented_class.exp.json index be39d5e9d..332ec3932 100644 --- a/test/expectations/hover/documented_class.exp.json +++ b/test/expectations/hover/documented_class.exp.json @@ -8,7 +8,7 @@ "result": { "contents": { "kind": "markdown", - "value": "```ruby\nBar\n```\n\n**Definitions**: [fake.rb](file:///fake.rb#L2,1-3,3) | [fake.rb](file:///fake.rb#L6,1-7,3)\n\n\n\nThis is the documentation for Bar\n\nThis is more documentation for Bar" + "value": "```ruby\nBar\n```\n\n**Definitions**: [fake.rb](file:///fake.rb#L2,1-3,4) | [fake.rb](file:///fake.rb#L6,1-7,4)\n\n\n\nThis is the documentation for Bar\n\nThis is more documentation for Bar" }, "range": { "start": { @@ -17,7 +17,7 @@ }, "end": { "line": 1, - "character": 8 + "character": 9 } } } diff --git a/test/expectations/hover/documented_constant.exp.json b/test/expectations/hover/documented_constant.exp.json index f2ecf5edb..07d3fdac9 100644 --- a/test/expectations/hover/documented_constant.exp.json +++ b/test/expectations/hover/documented_constant.exp.json @@ -8,7 +8,7 @@ "result": { "contents": { "kind": "markdown", - "value": "```ruby\nBAZ\n```\n\n**Definitions**: [fake.rb](file:///fake.rb#L2,1-2,9)\n\n\n\nThis is the documentation for Baz" + "value": "```ruby\nBAZ\n```\n\n**Definitions**: [fake.rb](file:///fake.rb#L2,1-2,10)\n\n\n\nThis is the documentation for Baz" }, "range": { "start": { @@ -17,7 +17,7 @@ }, "end": { "line": 1, - "character": 2 + "character": 3 } } } diff --git a/test/expectations/hover/documented_module.exp.json b/test/expectations/hover/documented_module.exp.json index 96a24743b..abc831ec7 100644 --- a/test/expectations/hover/documented_module.exp.json +++ b/test/expectations/hover/documented_module.exp.json @@ -8,7 +8,7 @@ "result": { "contents": { "kind": "markdown", - "value": "```ruby\nFoo\n```\n\n**Definitions**: [fake.rb](file:///fake.rb#L2,1-3,3)\n\n\n\nThis is the documentation for Foo" + "value": "```ruby\nFoo\n```\n\n**Definitions**: [fake.rb](file:///fake.rb#L2,1-3,4)\n\n\n\nThis is the documentation for Foo" }, "range": { "start": { @@ -17,7 +17,7 @@ }, "end": { "line": 1, - "character": 9 + "character": 10 } } } diff --git a/test/expectations/hover/documented_namespaced_class.exp.json b/test/expectations/hover/documented_namespaced_class.exp.json index cf08046fd..3c26cd28f 100644 --- a/test/expectations/hover/documented_namespaced_class.exp.json +++ b/test/expectations/hover/documented_namespaced_class.exp.json @@ -8,7 +8,7 @@ "result": { "contents": { "kind": "markdown", - "value": "```ruby\nFoo::Bar\n```\n\n**Definitions**: [fake.rb](file:///fake.rb#L2,1-3,3) | [fake.rb](file:///fake.rb#L6,1-7,3) | [fake.rb](file:///fake.rb#L11,3-12,5)\n\n\n\nThis is the documentation for Foo::Bar\n\nThis is more documentation for Foo::Bar\n\nThis is even more documentation for Foo::Bar" + "value": "```ruby\nFoo::Bar\n```\n\n**Definitions**: [fake.rb](file:///fake.rb#L2,1-3,4) | [fake.rb](file:///fake.rb#L6,1-7,4) | [fake.rb](file:///fake.rb#L11,3-12,6)\n\n\n\nThis is the documentation for Foo::Bar\n\nThis is more documentation for Foo::Bar\n\nThis is even more documentation for Foo::Bar" }, "range": { "start": { @@ -17,7 +17,7 @@ }, "end": { "line": 1, - "character": 13 + "character": 14 } } } diff --git a/test/expectations/selection_ranges/array_literal_oneline.exp.json b/test/expectations/selection_ranges/array_literal_oneline.exp.json index a166ce482..719c515f0 100644 --- a/test/expectations/selection_ranges/array_literal_oneline.exp.json +++ b/test/expectations/selection_ranges/array_literal_oneline.exp.json @@ -14,7 +14,7 @@ }, "end": { "line": 0, - "character": 5 + "character": 6 } }, "parent": { @@ -25,7 +25,7 @@ }, "end": { "line": 0, - "character": 9 + "character": 10 } }, "parent": { @@ -36,7 +36,7 @@ }, "end": { "line": 0, - "character": 9 + "character": 10 } } } diff --git a/test/expectations/selection_ranges/begin_rescue_ensure.exp.json b/test/expectations/selection_ranges/begin_rescue_ensure.exp.json index 023124658..cc0bf74f7 100644 --- a/test/expectations/selection_ranges/begin_rescue_ensure.exp.json +++ b/test/expectations/selection_ranges/begin_rescue_ensure.exp.json @@ -14,7 +14,7 @@ }, "end": { "line": 5, - "character": 17 + "character": 18 } }, "parent": { @@ -25,7 +25,7 @@ }, "end": { "line": 5, - "character": 17 + "character": 18 } }, "parent": { @@ -36,7 +36,7 @@ }, "end": { "line": 5, - "character": 17 + "character": 18 } }, "parent": { @@ -47,7 +47,7 @@ }, "end": { "line": 8, - "character": 2 + "character": 3 } } } diff --git a/test/expectations/selection_ranges/case_when.exp.json b/test/expectations/selection_ranges/case_when.exp.json index af23a6a0d..2779c0f43 100644 --- a/test/expectations/selection_ranges/case_when.exp.json +++ b/test/expectations/selection_ranges/case_when.exp.json @@ -14,7 +14,7 @@ }, "end": { "line": 2, - "character": 12 + "character": 13 } }, "parent": { @@ -25,7 +25,7 @@ }, "end": { "line": 2, - "character": 12 + "character": 13 } }, "parent": { @@ -36,7 +36,7 @@ }, "end": { "line": 5, - "character": 2 + "character": 3 } } } diff --git a/test/expectations/selection_ranges/class_declaration.exp.json b/test/expectations/selection_ranges/class_declaration.exp.json index 278ff8b84..e3f46d592 100644 --- a/test/expectations/selection_ranges/class_declaration.exp.json +++ b/test/expectations/selection_ranges/class_declaration.exp.json @@ -14,7 +14,7 @@ }, "end": { "line": 2, - "character": 16 + "character": 17 } }, "parent": { @@ -25,7 +25,7 @@ }, "end": { "line": 3, - "character": 4 + "character": 5 } }, "parent": { @@ -36,7 +36,7 @@ }, "end": { "line": 4, - "character": 2 + "character": 3 } } } diff --git a/test/expectations/selection_ranges/class_declaration_nested.exp.json b/test/expectations/selection_ranges/class_declaration_nested.exp.json index dd413b558..19b0926d0 100644 --- a/test/expectations/selection_ranges/class_declaration_nested.exp.json +++ b/test/expectations/selection_ranges/class_declaration_nested.exp.json @@ -14,7 +14,7 @@ }, "end": { "line": 2, - "character": 2 + "character": 3 } } } diff --git a/test/expectations/selection_ranges/def.exp.json b/test/expectations/selection_ranges/def.exp.json index 60db6b682..12b3cf112 100644 --- a/test/expectations/selection_ranges/def.exp.json +++ b/test/expectations/selection_ranges/def.exp.json @@ -14,7 +14,7 @@ }, "end": { "line": 1, - "character": 6 + "character": 7 } }, "parent": { @@ -25,7 +25,7 @@ }, "end": { "line": 3, - "character": 2 + "character": 3 } } } diff --git a/test/expectations/selection_ranges/def_endless.exp.json b/test/expectations/selection_ranges/def_endless.exp.json index de2dfd84e..3137c28b0 100644 --- a/test/expectations/selection_ranges/def_endless.exp.json +++ b/test/expectations/selection_ranges/def_endless.exp.json @@ -14,7 +14,7 @@ }, "end": { "line": 2, - "character": 11 + "character": 12 } } } diff --git a/test/expectations/selection_ranges/def_multiline_params.exp.json b/test/expectations/selection_ranges/def_multiline_params.exp.json index 58f1daa48..6169a5a85 100644 --- a/test/expectations/selection_ranges/def_multiline_params.exp.json +++ b/test/expectations/selection_ranges/def_multiline_params.exp.json @@ -14,7 +14,7 @@ }, "end": { "line": 1, - "character": 2 + "character": 3 } }, "parent": { @@ -25,7 +25,7 @@ }, "end": { "line": 2, - "character": 2 + "character": 3 } }, "parent": { @@ -36,7 +36,7 @@ }, "end": { "line": 6, - "character": 2 + "character": 3 } } } diff --git a/test/expectations/selection_ranges/def_oneline.exp.json b/test/expectations/selection_ranges/def_oneline.exp.json index d279b3d7e..75be59e0f 100644 --- a/test/expectations/selection_ranges/def_oneline.exp.json +++ b/test/expectations/selection_ranges/def_oneline.exp.json @@ -14,7 +14,7 @@ }, "end": { "line": 0, - "character": 11 + "character": 12 } } } diff --git a/test/expectations/selection_ranges/def_require_name_parameter.exp.json b/test/expectations/selection_ranges/def_require_name_parameter.exp.json index d4c78002b..2c6ee3067 100644 --- a/test/expectations/selection_ranges/def_require_name_parameter.exp.json +++ b/test/expectations/selection_ranges/def_require_name_parameter.exp.json @@ -14,7 +14,7 @@ }, "end": { "line": 1, - "character": 2 + "character": 3 } } } diff --git a/test/expectations/selection_ranges/defs.exp.json b/test/expectations/selection_ranges/defs.exp.json index 2e6af85a7..c3c778e23 100644 --- a/test/expectations/selection_ranges/defs.exp.json +++ b/test/expectations/selection_ranges/defs.exp.json @@ -14,7 +14,7 @@ }, "end": { "line": 3, - "character": 2 + "character": 3 } } } diff --git a/test/expectations/selection_ranges/defs_multiline_params.exp.json b/test/expectations/selection_ranges/defs_multiline_params.exp.json index 58f1daa48..6169a5a85 100644 --- a/test/expectations/selection_ranges/defs_multiline_params.exp.json +++ b/test/expectations/selection_ranges/defs_multiline_params.exp.json @@ -14,7 +14,7 @@ }, "end": { "line": 1, - "character": 2 + "character": 3 } }, "parent": { @@ -25,7 +25,7 @@ }, "end": { "line": 2, - "character": 2 + "character": 3 } }, "parent": { @@ -36,7 +36,7 @@ }, "end": { "line": 6, - "character": 2 + "character": 3 } } } diff --git a/test/expectations/selection_ranges/do_blocks.exp.json b/test/expectations/selection_ranges/do_blocks.exp.json index 8a40c840d..f398b5a4d 100644 --- a/test/expectations/selection_ranges/do_blocks.exp.json +++ b/test/expectations/selection_ranges/do_blocks.exp.json @@ -14,7 +14,7 @@ }, "end": { "line": 2, - "character": 2 + "character": 3 } }, "parent": { @@ -25,7 +25,7 @@ }, "end": { "line": 2, - "character": 2 + "character": 3 } } } diff --git a/test/expectations/selection_ranges/ensure.exp.json b/test/expectations/selection_ranges/ensure.exp.json index 53e7e693b..74043124e 100644 --- a/test/expectations/selection_ranges/ensure.exp.json +++ b/test/expectations/selection_ranges/ensure.exp.json @@ -14,7 +14,7 @@ }, "end": { "line": 3, - "character": 14 + "character": 15 } }, "parent": { @@ -25,7 +25,7 @@ }, "end": { "line": 4, - "character": 2 + "character": 3 } }, "parent": { @@ -36,7 +36,7 @@ }, "end": { "line": 4, - "character": 2 + "character": 3 } } } diff --git a/test/expectations/selection_ranges/for.exp.json b/test/expectations/selection_ranges/for.exp.json index 8d81e19c1..230d31b86 100644 --- a/test/expectations/selection_ranges/for.exp.json +++ b/test/expectations/selection_ranges/for.exp.json @@ -14,7 +14,7 @@ }, "end": { "line": 1, - "character": 13 + "character": 14 } }, "parent": { @@ -25,7 +25,7 @@ }, "end": { "line": 2, - "character": 2 + "character": 3 } } } diff --git a/test/expectations/selection_ranges/hash_literal.exp.json b/test/expectations/selection_ranges/hash_literal.exp.json index f5d6678d4..086ace4de 100644 --- a/test/expectations/selection_ranges/hash_literal.exp.json +++ b/test/expectations/selection_ranges/hash_literal.exp.json @@ -14,7 +14,7 @@ }, "end": { "line": 1, - "character": 3 + "character": 4 } }, "parent": { @@ -25,7 +25,7 @@ }, "end": { "line": 1, - "character": 5 + "character": 6 } }, "parent": { @@ -36,7 +36,7 @@ }, "end": { "line": 3, - "character": 0 + "character": 1 } }, "parent": { @@ -47,7 +47,7 @@ }, "end": { "line": 3, - "character": 0 + "character": 1 } } } diff --git a/test/expectations/selection_ranges/hash_literal_oneline.exp.json b/test/expectations/selection_ranges/hash_literal_oneline.exp.json index dc4018f0b..29dd4d676 100644 --- a/test/expectations/selection_ranges/hash_literal_oneline.exp.json +++ b/test/expectations/selection_ranges/hash_literal_oneline.exp.json @@ -14,7 +14,7 @@ }, "end": { "line": 0, - "character": 7 + "character": 8 } }, "parent": { @@ -25,7 +25,7 @@ }, "end": { "line": 0, - "character": 9 + "character": 10 } }, "parent": { @@ -36,7 +36,7 @@ }, "end": { "line": 0, - "character": 17 + "character": 18 } }, "parent": { @@ -47,7 +47,7 @@ }, "end": { "line": 0, - "character": 17 + "character": 18 } } } diff --git a/test/expectations/selection_ranges/heredoc.exp.json b/test/expectations/selection_ranges/heredoc.exp.json index 1a6b1ab99..8624cc35c 100644 --- a/test/expectations/selection_ranges/heredoc.exp.json +++ b/test/expectations/selection_ranges/heredoc.exp.json @@ -14,7 +14,7 @@ }, "end": { "line": 1, - "character": 17 + "character": 18 } }, "parent": { diff --git a/test/expectations/selection_ranges/if.exp.json b/test/expectations/selection_ranges/if.exp.json index eadca142a..55959a702 100644 --- a/test/expectations/selection_ranges/if.exp.json +++ b/test/expectations/selection_ranges/if.exp.json @@ -14,7 +14,7 @@ }, "end": { "line": 1, - "character": 14 + "character": 15 } }, "parent": { @@ -25,7 +25,7 @@ }, "end": { "line": 2, - "character": 2 + "character": 3 } } } diff --git a/test/expectations/selection_ranges/if_elsif_else.exp.json b/test/expectations/selection_ranges/if_elsif_else.exp.json index 42a30c864..9fff145dc 100644 --- a/test/expectations/selection_ranges/if_elsif_else.exp.json +++ b/test/expectations/selection_ranges/if_elsif_else.exp.json @@ -14,7 +14,7 @@ }, "end": { "line": 5, - "character": 10 + "character": 11 } }, "parent": { @@ -25,7 +25,7 @@ }, "end": { "line": 6, - "character": 2 + "character": 3 } }, "parent": { @@ -36,7 +36,7 @@ }, "end": { "line": 6, - "character": 2 + "character": 3 } }, "parent": { @@ -47,7 +47,7 @@ }, "end": { "line": 6, - "character": 2 + "character": 3 } } } diff --git a/test/expectations/selection_ranges/if_elsif_else_empty.exp.json b/test/expectations/selection_ranges/if_elsif_else_empty.exp.json index 26edff6d8..9a8759bc9 100644 --- a/test/expectations/selection_ranges/if_elsif_else_empty.exp.json +++ b/test/expectations/selection_ranges/if_elsif_else_empty.exp.json @@ -14,7 +14,7 @@ }, "end": { "line": 3, - "character": 2 + "character": 3 } }, "parent": { @@ -25,7 +25,7 @@ }, "end": { "line": 3, - "character": 2 + "character": 3 } }, "parent": { @@ -36,7 +36,7 @@ }, "end": { "line": 3, - "character": 2 + "character": 3 } } } diff --git a/test/expectations/selection_ranges/lambdas.exp.json b/test/expectations/selection_ranges/lambdas.exp.json index c73cb5929..9eebe8a5b 100644 --- a/test/expectations/selection_ranges/lambdas.exp.json +++ b/test/expectations/selection_ranges/lambdas.exp.json @@ -14,7 +14,7 @@ }, "end": { "line": 1, - "character": 10 + "character": 11 } }, "parent": { @@ -25,7 +25,7 @@ }, "end": { "line": 2, - "character": 0 + "character": 1 } }, "parent": { @@ -36,7 +36,7 @@ }, "end": { "line": 2, - "character": 0 + "character": 1 } } } diff --git a/test/expectations/selection_ranges/module_declaration.exp.json b/test/expectations/selection_ranges/module_declaration.exp.json index 19cd79bdc..39c5b32b4 100644 --- a/test/expectations/selection_ranges/module_declaration.exp.json +++ b/test/expectations/selection_ranges/module_declaration.exp.json @@ -14,7 +14,7 @@ }, "end": { "line": 2, - "character": 4 + "character": 5 } }, "parent": { @@ -25,7 +25,7 @@ }, "end": { "line": 6, - "character": 2 + "character": 3 } } } diff --git a/test/expectations/selection_ranges/multiline_arrays.exp.json b/test/expectations/selection_ranges/multiline_arrays.exp.json index 545f5b40b..3df1b740c 100644 --- a/test/expectations/selection_ranges/multiline_arrays.exp.json +++ b/test/expectations/selection_ranges/multiline_arrays.exp.json @@ -14,7 +14,7 @@ }, "end": { "line": 1, - "character": 2 + "character": 3 } }, "parent": { @@ -25,7 +25,7 @@ }, "end": { "line": 3, - "character": 0 + "character": 1 } }, "parent": { @@ -36,7 +36,7 @@ }, "end": { "line": 3, - "character": 0 + "character": 1 } } } diff --git a/test/expectations/selection_ranges/multiline_block.exp.json b/test/expectations/selection_ranges/multiline_block.exp.json index 6887fc8f0..679c237e4 100644 --- a/test/expectations/selection_ranges/multiline_block.exp.json +++ b/test/expectations/selection_ranges/multiline_block.exp.json @@ -14,7 +14,7 @@ }, "end": { "line": 2, - "character": 0 + "character": 1 } }, "parent": { @@ -25,7 +25,7 @@ }, "end": { "line": 2, - "character": 0 + "character": 1 } } } diff --git a/test/expectations/selection_ranges/multiline_invocation.exp.json b/test/expectations/selection_ranges/multiline_invocation.exp.json index ad836ad53..ae75d49af 100644 --- a/test/expectations/selection_ranges/multiline_invocation.exp.json +++ b/test/expectations/selection_ranges/multiline_invocation.exp.json @@ -14,7 +14,7 @@ }, "end": { "line": 1, - "character": 3 + "character": 4 } }, "parent": { @@ -25,7 +25,7 @@ }, "end": { "line": 1, - "character": 5 + "character": 6 } }, "parent": { @@ -36,7 +36,7 @@ }, "end": { "line": 2, - "character": 5 + "character": 6 } }, "parent": { @@ -47,7 +47,7 @@ }, "end": { "line": 2, - "character": 5 + "character": 6 } }, "parent": { @@ -58,7 +58,7 @@ }, "end": { "line": 3, - "character": 0 + "character": 1 } } } diff --git a/test/expectations/selection_ranges/nested_invocation.exp.json b/test/expectations/selection_ranges/nested_invocation.exp.json index e77f59815..64770cbf1 100644 --- a/test/expectations/selection_ranges/nested_invocation.exp.json +++ b/test/expectations/selection_ranges/nested_invocation.exp.json @@ -14,7 +14,7 @@ }, "end": { "line": 2, - "character": 4 + "character": 5 } }, "parent": { @@ -25,7 +25,7 @@ }, "end": { "line": 3, - "character": 4 + "character": 5 } }, "parent": { @@ -36,7 +36,7 @@ }, "end": { "line": 4, - "character": 2 + "character": 3 } }, "parent": { @@ -47,7 +47,7 @@ }, "end": { "line": 4, - "character": 2 + "character": 3 } }, "parent": { @@ -58,7 +58,7 @@ }, "end": { "line": 5, - "character": 0 + "character": 1 } } } diff --git a/test/expectations/selection_ranges/nested_invocation_no_parenthesis.exp.json b/test/expectations/selection_ranges/nested_invocation_no_parenthesis.exp.json index 570fd41a3..39443a858 100644 --- a/test/expectations/selection_ranges/nested_invocation_no_parenthesis.exp.json +++ b/test/expectations/selection_ranges/nested_invocation_no_parenthesis.exp.json @@ -14,7 +14,7 @@ }, "end": { "line": 2, - "character": 4 + "character": 5 } }, "parent": { @@ -25,7 +25,7 @@ }, "end": { "line": 2, - "character": 4 + "character": 5 } }, "parent": { @@ -36,7 +36,7 @@ }, "end": { "line": 2, - "character": 4 + "character": 5 } }, "parent": { @@ -47,7 +47,7 @@ }, "end": { "line": 2, - "character": 4 + "character": 5 } }, "parent": { @@ -58,7 +58,7 @@ }, "end": { "line": 3, - "character": 0 + "character": 1 } } } diff --git a/test/expectations/selection_ranges/pattern_matching.exp.json b/test/expectations/selection_ranges/pattern_matching.exp.json index d1e852d83..897b10012 100644 --- a/test/expectations/selection_ranges/pattern_matching.exp.json +++ b/test/expectations/selection_ranges/pattern_matching.exp.json @@ -14,7 +14,7 @@ }, "end": { "line": 2, - "character": 9 + "character": 10 } }, "parent": { @@ -25,7 +25,7 @@ }, "end": { "line": 2, - "character": 9 + "character": 10 } }, "parent": { @@ -36,7 +36,7 @@ }, "end": { "line": 5, - "character": 2 + "character": 3 } } } diff --git a/test/expectations/selection_ranges/rescue_multiple.exp.json b/test/expectations/selection_ranges/rescue_multiple.exp.json index 7e6bc10c7..c8b35faa7 100644 --- a/test/expectations/selection_ranges/rescue_multiple.exp.json +++ b/test/expectations/selection_ranges/rescue_multiple.exp.json @@ -14,7 +14,7 @@ }, "end": { "line": 1, - "character": 15 + "character": 16 } }, "parent": { @@ -25,7 +25,7 @@ }, "end": { "line": 1, - "character": 35 + "character": 36 } }, "parent": { @@ -36,7 +36,7 @@ }, "end": { "line": 2, - "character": 2 + "character": 3 } } } diff --git a/test/expectations/selection_ranges/sclass.exp.json b/test/expectations/selection_ranges/sclass.exp.json index 33587cfda..c93480f6e 100644 --- a/test/expectations/selection_ranges/sclass.exp.json +++ b/test/expectations/selection_ranges/sclass.exp.json @@ -14,7 +14,7 @@ }, "end": { "line": 3, - "character": 4 + "character": 5 } }, "parent": { @@ -25,7 +25,7 @@ }, "end": { "line": 4, - "character": 2 + "character": 3 } } } diff --git a/test/expectations/selection_ranges/string_concat.exp.json b/test/expectations/selection_ranges/string_concat.exp.json index 667d2e79e..5ddb824bf 100644 --- a/test/expectations/selection_ranges/string_concat.exp.json +++ b/test/expectations/selection_ranges/string_concat.exp.json @@ -14,7 +14,7 @@ }, "end": { "line": 1, - "character": 6 + "character": 7 } }, "parent": { @@ -25,7 +25,7 @@ }, "end": { "line": 1, - "character": 6 + "character": 7 } }, "parent": { @@ -36,7 +36,7 @@ }, "end": { "line": 2, - "character": 6 + "character": 7 } } } diff --git a/test/expectations/selection_ranges/unless.exp.json b/test/expectations/selection_ranges/unless.exp.json index 54fd0f7c5..e61319355 100644 --- a/test/expectations/selection_ranges/unless.exp.json +++ b/test/expectations/selection_ranges/unless.exp.json @@ -14,7 +14,7 @@ }, "end": { "line": 1, - "character": 12 + "character": 13 } }, "parent": { @@ -25,7 +25,7 @@ }, "end": { "line": 2, - "character": 2 + "character": 3 } } } diff --git a/test/expectations/selection_ranges/until.exp.json b/test/expectations/selection_ranges/until.exp.json index 8d81e19c1..230d31b86 100644 --- a/test/expectations/selection_ranges/until.exp.json +++ b/test/expectations/selection_ranges/until.exp.json @@ -14,7 +14,7 @@ }, "end": { "line": 1, - "character": 13 + "character": 14 } }, "parent": { @@ -25,7 +25,7 @@ }, "end": { "line": 2, - "character": 2 + "character": 3 } } } diff --git a/test/expectations/selection_ranges/while.exp.json b/test/expectations/selection_ranges/while.exp.json index 8d81e19c1..230d31b86 100644 --- a/test/expectations/selection_ranges/while.exp.json +++ b/test/expectations/selection_ranges/while.exp.json @@ -14,7 +14,7 @@ }, "end": { "line": 1, - "character": 13 + "character": 14 } }, "parent": { @@ -25,7 +25,7 @@ }, "end": { "line": 2, - "character": 2 + "character": 3 } } }