From 5d9a239b84448dab824a611b6b7e4a8c7cc4722d Mon Sep 17 00:00:00 2001 From: Robert Holt Date: Fri, 1 Nov 2019 22:20:36 -0700 Subject: [PATCH 1/5] Fix highlighting offset --- .../TextDocument/Handlers/DocumentHighlightHandler.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PowerShellEditorServices/Services/TextDocument/Handlers/DocumentHighlightHandler.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/DocumentHighlightHandler.cs index 2790f8409..102d0ab17 100644 --- a/src/PowerShellEditorServices/Services/TextDocument/Handlers/DocumentHighlightHandler.cs +++ b/src/PowerShellEditorServices/Services/TextDocument/Handlers/DocumentHighlightHandler.cs @@ -60,8 +60,8 @@ public Task Handle( IReadOnlyList symbolOccurrences = _symbolsService.FindOccurrencesInFile( scriptFile, - (int)request.Position.Line, - (int)request.Position.Character); + (int)request.Position.Line + 1, + (int)request.Position.Character + 1); if (symbolOccurrences == null) { From 845c6112283b98cb4b919bbdc85d0661c0edd6f0 Mon Sep 17 00:00:00 2001 From: Robert Holt Date: Fri, 1 Nov 2019 22:59:20 -0700 Subject: [PATCH 2/5] Change test offsets --- .../LanguageServerProtocolMessageTests.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/PowerShellEditorServices.Test.E2E/LanguageServerProtocolMessageTests.cs b/test/PowerShellEditorServices.Test.E2E/LanguageServerProtocolMessageTests.cs index bd43f06c8..9f2d5a333 100644 --- a/test/PowerShellEditorServices.Test.E2E/LanguageServerProtocolMessageTests.cs +++ b/test/PowerShellEditorServices.Test.E2E/LanguageServerProtocolMessageTests.cs @@ -453,18 +453,18 @@ await LanguageClient.SendRequest( documentHighlight1 => { Range range = documentHighlight1.Range; - Assert.Equal(1, range.Start.Line); + Assert.Equal(0, range.Start.Line); Assert.Equal(0, range.Start.Character); - Assert.Equal(1, range.End.Line); + Assert.Equal(0, range.End.Line); Assert.Equal(10, range.End.Character); }, documentHighlight2 => { Range range = documentHighlight2.Range; - Assert.Equal(3, range.Start.Line); + Assert.Equal(2, range.Start.Line); Assert.Equal(0, range.Start.Character); - Assert.Equal(3, range.End.Line); + Assert.Equal(2, range.End.Line); Assert.Equal(10, range.End.Character); }); } From 8539dd7f7436e2281b547da248d4b1f44fefd584 Mon Sep 17 00:00:00 2001 From: Robert Holt Date: Fri, 1 Nov 2019 23:15:11 -0700 Subject: [PATCH 3/5] Fix initial offset --- .../LanguageServerProtocolMessageTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/PowerShellEditorServices.Test.E2E/LanguageServerProtocolMessageTests.cs b/test/PowerShellEditorServices.Test.E2E/LanguageServerProtocolMessageTests.cs index 9f2d5a333..0bac6c1ad 100644 --- a/test/PowerShellEditorServices.Test.E2E/LanguageServerProtocolMessageTests.cs +++ b/test/PowerShellEditorServices.Test.E2E/LanguageServerProtocolMessageTests.cs @@ -444,7 +444,7 @@ await LanguageClient.SendRequest( }, Position = new Position { - Line = 4, + Line = 3, Character = 1 } }); From 42446b94bec4c98c8c73d712b7d890374e7455a1 Mon Sep 17 00:00:00 2001 From: Robert Holt Date: Fri, 1 Nov 2019 23:25:34 -0700 Subject: [PATCH 4/5] Change offsets --- .../LanguageServerProtocolMessageTests.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/PowerShellEditorServices.Test.E2E/LanguageServerProtocolMessageTests.cs b/test/PowerShellEditorServices.Test.E2E/LanguageServerProtocolMessageTests.cs index 0bac6c1ad..e73cd84ef 100644 --- a/test/PowerShellEditorServices.Test.E2E/LanguageServerProtocolMessageTests.cs +++ b/test/PowerShellEditorServices.Test.E2E/LanguageServerProtocolMessageTests.cs @@ -453,19 +453,19 @@ await LanguageClient.SendRequest( documentHighlight1 => { Range range = documentHighlight1.Range; - Assert.Equal(0, range.Start.Line); - Assert.Equal(0, range.Start.Character); - Assert.Equal(0, range.End.Line); - Assert.Equal(10, range.End.Character); + Assert.Equal(1, range.Start.Line); + Assert.Equal(1, range.Start.Character); + Assert.Equal(1, range.End.Line); + Assert.Equal(11, range.End.Character); }, documentHighlight2 => { Range range = documentHighlight2.Range; - Assert.Equal(2, range.Start.Line); - Assert.Equal(0, range.Start.Character); - Assert.Equal(2, range.End.Line); - Assert.Equal(10, range.End.Character); + Assert.Equal(3, range.Start.Line); + Assert.Equal(1, range.Start.Character); + Assert.Equal(3, range.End.Line); + Assert.Equal(11, range.End.Character); }); } From 866c1ed0fed6218753138c7f70a8c55bbc5e173c Mon Sep 17 00:00:00 2001 From: Robert Holt Date: Fri, 1 Nov 2019 23:32:09 -0700 Subject: [PATCH 5/5] Try again --- .../LanguageServerProtocolMessageTests.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/PowerShellEditorServices.Test.E2E/LanguageServerProtocolMessageTests.cs b/test/PowerShellEditorServices.Test.E2E/LanguageServerProtocolMessageTests.cs index e73cd84ef..1ea7a0aea 100644 --- a/test/PowerShellEditorServices.Test.E2E/LanguageServerProtocolMessageTests.cs +++ b/test/PowerShellEditorServices.Test.E2E/LanguageServerProtocolMessageTests.cs @@ -454,18 +454,18 @@ await LanguageClient.SendRequest( { Range range = documentHighlight1.Range; Assert.Equal(1, range.Start.Line); - Assert.Equal(1, range.Start.Character); + Assert.Equal(0, range.Start.Character); Assert.Equal(1, range.End.Line); - Assert.Equal(11, range.End.Character); + Assert.Equal(10, range.End.Character); }, documentHighlight2 => { Range range = documentHighlight2.Range; Assert.Equal(3, range.Start.Line); - Assert.Equal(1, range.Start.Character); + Assert.Equal(0, range.Start.Character); Assert.Equal(3, range.End.Line); - Assert.Equal(11, range.End.Character); + Assert.Equal(10, range.End.Character); }); }