Skip to content

Remove IVTs to legacy language service #7001

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KevinRansom merged 5 commits into from
Jun 19, 2019
Merged

Remove IVTs to legacy language service #7001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
31f0edf
Remove IVTs to legacy language service
cartermp Jun 14, 2019
c19cde7
Merge branch 'master' into no-ivts-legacy-langservice
KevinRansom Jun 15, 2019
cdf7ace
Merge branch 'master' into no-ivts-legacy-langservice
KevinRansom Jun 18, 2019
e821785
Use public API and remove seemingly useless test
cartermp Jun 18, 2019
8f384de
Merge branch 'no-ivts-legacy-langservice' of https://github.com/carte…
cartermp Jun 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@

<ItemGroup>
<InternalsVisibleTo Include="fsc" />
<InternalsVisibleTo Include="FSharp.LanguageService" />
<InternalsVisibleTo Include="FSharp.LanguageService.Base" />
<InternalsVisibleTo Include="FSharp.Compiler.Server.Shared" />
<InternalsVisibleTo Include="VisualFSharp.Salsa" />
<InternalsVisibleTo Include="VisualFSharp.UnitTests" />
Expand Down
13 changes: 6 additions & 7 deletions vsintegration/src/FSharp.LanguageService/GotoDefinition.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,20 @@
namespace Microsoft.VisualStudio.FSharp.LanguageService

open System
open System.IO
open System.Collections.Generic
open System.Diagnostics
open Microsoft.VisualStudio
open Microsoft.VisualStudio.Shell
open Microsoft.VisualStudio.Shell.Interop
open Microsoft.VisualStudio.TextManager.Interop
open FSharp.Compiler
open FSharp.Compiler.Lib
open FSharp.Compiler.SourceCodeServices

module internal OperatorToken =

let asIdentifier_DEPRECATED (token : TokenInfo) =
// Typechecker reports information about all values in the same fashion no matter whether it is named value (let binding) or operator
// here we piggyback on this fact and just pretend that we need data time for identifier
let tagOfIdentToken = FSharp.Compiler.Parser.tagOfToken(FSharp.Compiler.Parser.IDENT "")

let tagOfIdentToken = FSharpTokenTag.IDENT

let endCol = token.EndIndex + 1 // EndIndex from GetTokenInfoAt points to the last operator char, but here it should point to column 'after' the last char
tagOfIdentToken, token.StartIndex, endCol

Expand Down Expand Up @@ -69,7 +66,9 @@ module internal GotoDefinition =
|> GotoDefinitionResult_DEPRECATED.MakeError
| Some(colIdent, tag, qualId) ->
if typedResults.HasFullTypeCheckInfo then
if Parser.tokenTagToTokenId tag <> Parser.TOKEN_IDENT then
// Used to be the Parser's internal definition, now hard-coded to avoid an IVT into the parser itsef.
// Dead code (aside from legacy tests), ignore
if tag <> FSharpTokenTag.IDENT then
Strings.GotoDefinitionFailed_NotIdentifier()
|> GotoDefinitionResult_DEPRECATED.MakeError
else
Expand Down
2 changes: 1 addition & 1 deletion vsintegration/src/FSharp.LanguageService/Intellisense.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ type internal FSharpDeclarations_DEPRECATED(documentationBuilder, declarations:
// We intercept this call only to get the initial extent
// of what was committed to the source buffer.
let result = decl.GetName(filterText, index)
FSharp.Compiler.Lexhelp.Keywords.QuoteIdentifierIfNeeded result
Keywords.QuoteIdentifierIfNeeded result

override decl.IsCommitChar(commitCharacter) =
// Usual language identifier rules...
Expand Down
19 changes: 0 additions & 19 deletions vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.General.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,25 +101,6 @@ type UsingMSBuild() =
n
) 0


[<Test>]
member public this.``PublicSurfaceArea.DotNetReflection``() =
let ps = publicTypesInAsm @"FSharp.ProjectSystem.FSharp.dll"
Assert.AreEqual(1, ps) // BuildPropertyDescriptor
let ls = publicTypesInAsm @"FSharp.LanguageService.dll"
Assert.AreEqual(0, ls)
let compis = publicTypesInAsm @"FSharp.Compiler.Interactive.Settings.dll"
Assert.AreEqual(5, compis)
let compserver = publicTypesInAsm @"FSharp.Compiler.Server.Shared.dll"
Assert.AreEqual(0, compserver)
let lsbase = publicTypesInAsm @"FSharp.LanguageService.Base.dll"
Assert.AreEqual(0, lsbase)
let psbase = publicTypesInAsm @"FSharp.ProjectSystem.Base.dll"
Assert.AreEqual(17, psbase)
let fsi = publicTypesInAsm @"FSharp.VS.FSI.dll"
Assert.AreEqual(1, fsi)


[<Test>]
member public this.``ReconcileErrors.Test1``() =
let (_solution, project, file) = this.CreateSingleFileProject(["erroneous"])
Expand Down