Skip to content

Use Roslyn line numbers only in lexer cache - #2090

Merged
KevinRansom merged 5 commits into
dotnet:masterfrom
vasily-kirichenko:fix-2079
Dec 31, 2016
Merged

Use Roslyn line numbers only in lexer cache#2090
KevinRansom merged 5 commits into
dotnet:masterfrom
vasily-kirichenko:fix-2079

Conversation

@vasily-kirichenko

Copy link
Copy Markdown
Contributor

No description provided.

@vasily-kirichenko

Copy link
Copy Markdown
Contributor Author

@dotnet-bot test this please

@KevinRansom

Copy link
Copy Markdown
Contributor

@vasily-kirichenko
to repro

build vs vstest

I think these may be related to the change.

Errors and Failures

1) Failed : Microsoft.VisualStudio.FSharp.Editor.Tests.Roslyn.DocumentHighlightsServiceTests.ShouldHighlightAllQualifiedSymbolReferences
  Expected is <Microsoft.VisualStudio.FSharp.Editor.FSharpHighlightSpan[2]>, actual is <Microsoft.VisualStudio.FSharp.Editor.FSharpHighlightSpan[0]>
  Values differ at index [0]
  Missing:  < <{IsDefinition = false;
 TextSpan = [21..29);}>, <{IsDefinition = false;
 TextSpan = [54..62);}> >
at Microsoft.VisualStudio.FSharp.Editor.Tests.Roslyn.DocumentHighlightsServiceTests.ShouldHighlightAllQualifiedSymbolReferences() in D:\j\workspace\release_ci_pa---3f142ccc\vsintegration\tests\unittests\DocumentHighlightsServiceTests.fs:line 93

2) Failed : Microsoft.VisualStudio.FSharp.Editor.Tests.Roslyn.DocumentHighlightsServiceTests.ShouldHighlightAllSimpleLocalSymbolReferences
  Expected is <Microsoft.VisualStudio.FSharp.Editor.FSharpHighlightSpan[2]>, actual is <Microsoft.VisualStudio.FSharp.Editor.FSharpHighlightSpan[0]>
  Values differ at index [0]
  Missing:  < <{IsDefinition = true;
 TextSpan = [10..13);}>, <{IsDefinition = false;
 TextSpan = [47..50);}> >
at Microsoft.VisualStudio.FSharp.Editor.Tests.Roslyn.DocumentHighlightsServiceTests.ShouldHighlightAllSimpleLocalSymbolReferences() in D:\j\workspace\release_ci_pa---3f142ccc\vsintegration\tests\unittests\DocumentHighlightsServiceTests.fs:line 75

3) Failed : Microsoft.VisualStudio.FSharp.Editor.Tests.Roslyn.GoToDefinitionServiceTests.VerifyDefinition
Incorrect information returned for fileContents=<<<
type TestType() =
    member this.Member1(par1: int) =
        printf "%d" par1
    member this.Member2(par2: string) =
        printf "%s" par2

[<EntryPoint>]
let main argv =
    let obj = TestType()
    obj.Member1(5)
    obj.Member2("test")>>>, caretMarker=<<<printf "%d" par1>>>, expected =<<<Some (3, 3, 24, 28)>>>, actual = <<<<null>>>>
at Microsoft.VisualStudio.FSharp.Editor.Tests.Roslyn.GoToDefinitionServiceTests.VerifyDefinition() in D:\j\workspace\release_ci_pa---3f142ccc\vsintegration\tests\unittests\GoToDefinitionServiceTests.fs:line 107

4) Failed : Microsoft.VisualStudio.FSharp.Editor.Tests.Roslyn.QuickInfoProviderTests.ShouldShowQuickInfoAtCorrectPositions
  Expected: <Some(val x : int
Full name: Test.x)>
  But was:  null
at Microsoft.VisualStudio.FSharp.Editor.Tests.Roslyn.QuickInfoProviderTests.ShouldShowQuickInfoAtCorrectPositions() in D:\j\workspace\release_ci_pa---3f142ccc\vsintegration\tests\unittests\QuickInfoProviderTests.fs:line 104
````
@vasily-kirichenko

Copy link
Copy Markdown
Contributor Author

Fixed.

@forki

forki commented Dec 27, 2016

Copy link
Copy Markdown
Contributor

CI error is unrelated. Please merge asap

@KevinRansom

Copy link
Copy Markdown
Contributor

@vasily-kirichenko, would you resolve the conflicts please.

Kevin

@vasily-kirichenko

Copy link
Copy Markdown
Contributor Author

this code was merged to #2102 and further refactored to Lexer class, so merging this PR would create conflicts and it's needed anymore anyway.

@forki

forki commented Dec 28, 2016 via email

Copy link
Copy Markdown
Contributor
@vasily-kirichenko

Copy link
Copy Markdown
Contributor Author

@forki Yes.

# Conflicts:
#	vsintegration/src/FSharp.Editor/Common/CommonHelpers.fs
@vasily-kirichenko

Copy link
Copy Markdown
Contributor Author

I'm reopening this as I closed #2102, which included "out of range" bug fix merged from this PR.

@KevinRansom
KevinRansom merged commit c7cf40b into dotnet:master Dec 31, 2016
vasily-kirichenko added a commit to vasily-kirichenko/visualfsharp that referenced this pull request Jan 4, 2017
KevinRansom pushed a commit that referenced this pull request Jan 6, 2017
* revert "Use Roslyn line numbers only in lexer cache" #2090

* fix OutOfRangeException in getCachedSourceLineData

* fixed: lexer cache does not work at all

* fix finding start line for relexing in getCachedSourceLineData
nosami pushed a commit to xamarin/visualfsharp that referenced this pull request Jan 26, 2022
* use Roslyn line numbers only in lexer cache

* fix and refactor getSymbolAtPosition

* fix after merge

* fix out of range exn
nosami pushed a commit to xamarin/visualfsharp that referenced this pull request Jan 26, 2022
* revert "Use Roslyn line numbers only in lexer cache" dotnet#2090

* fix OutOfRangeException in getCachedSourceLineData

* fixed: lexer cache does not work at all

* fix finding start line for relexing in getCachedSourceLineData
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

4 participants