Skip to content

Merge master to release/dev16.2 #6918

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
7 commits merged into from
Jun 2, 2019
Merged

Merge master to release/dev16.2 #6918

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6f66403
Cleanup xml in error message tests (#6902)
KevinRansom May 30, 2019
4a695e7
Removed reference counting from IncrementalBuilder; now relies on GC.…
TIHan May 31, 2019
8e467c1
Remove call to internal API in Simplify Name Analyzer (#6901)
cartermp May 31, 2019
be0a374
add framework for LSP support (#6907)
brettfo May 31, 2019
53f8ea1
Clean projectinfomanager (#6850)
cartermp May 31, 2019
4702abb
remove NuGet dependency from fslex/fsyacc (#6913)
brettfo May 31, 2019
9b1287c
Replace FSComp invocations in VS tooling with an FCS API (#6904)
cartermp Jun 1, 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
Prev Previous commit
Next Next commit
Clean projectinfomanager (#6850) 
* Expose IsScript from CompileOps so IVT is not needed

* Undo rename of internal VersionStamp in PatternMatcher
  • Loading branch information
@cartermp @KevinRansom
cartermp authored and KevinRansom committed May 31, 2019
commit 53f8ea1bc1944351c2596b707bacfaf900953482
2 changes: 2 additions & 0 deletions src/fsharp/service/service.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3325,3 +3325,5 @@ module PrettyNaming =
let QuoteIdentifierIfNeeded id = Lexhelp.Keywords.QuoteIdentifierIfNeeded id
let KeywordNames = Lexhelp.Keywords.keywordNames

module FSharpFileUtilities =
let isScriptFile (fileName: string) = CompileOps.IsScript fileName
3 changes: 3 additions & 0 deletions src/fsharp/service/service.fsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,3 +761,6 @@ module public PrettyNaming =
/// All the keywords in the F# language
val KeywordNames : string list

/// A set of helpers for dealing with F# files.
module FSharpFileUtilities =
val isScriptFile : string -> bool
3 changes: 1 addition & 2 deletions vsintegration/src/FSharp.Editor/LanguageService/FSharpProjectOptionsManager.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ open System.ComponentModel.Composition
open System.IO
open System.Linq
open Microsoft.CodeAnalysis
open FSharp.Compiler.CompileOps
open FSharp.Compiler.SourceCodeServices
open Microsoft.VisualStudio
open Microsoft.VisualStudio.FSharp.Editor
Expand Down Expand Up @@ -359,7 +358,7 @@ type internal FSharpProjectOptionsManager
let parsingOptions =
match reactor.TryGetCachedOptionsByProjectId(document.Project.Id) with
| Some (_, parsingOptions, _) -> parsingOptions
| _ -> { FSharpParsingOptions.Default with IsInteractive = IsScript document.Name }
| _ -> { FSharpParsingOptions.Default with IsInteractive = FSharpFileUtilities.isScriptFile document.Name }
CompilerEnvironment.GetCompilationDefinesForEditing parsingOptions

member this.TryGetOptionsByProject(project) =
Expand Down