From e91f72d52e1150978587a0816b076997867406ee Mon Sep 17 00:00:00 2001 From: Martin521 <29605222+Martin521@users.noreply.github.com> Date: Wed, 11 Sep 2024 13:10:58 +0000 Subject: [PATCH 01/35] temp checkin for testing --- src/Compiler/Checking/CheckDeclarations.fs | 4 +- src/Compiler/CodeGen/IlxGen.fs | 2 +- src/Compiler/Driver/CompilerDiagnostics.fs | 89 +++------ src/Compiler/Driver/CompilerDiagnostics.fsi | 16 +- src/Compiler/Driver/ParseAndCheckInputs.fs | 188 ++++++------------ src/Compiler/Driver/ParseAndCheckInputs.fsi | 3 - src/Compiler/Driver/ScriptClosure.fs | 14 +- src/Compiler/Driver/fsc.fs | 26 +-- src/Compiler/FSComp.txt | 1 + src/Compiler/FSharp.Compiler.Service.fsproj | 2 + src/Compiler/Facilities/DiagnosticOptions.fs | 15 ++ src/Compiler/Facilities/DiagnosticOptions.fsi | 18 +- src/Compiler/Interactive/fsi.fs | 25 +-- .../Optimize/InnerLambdasToTopLevelFuncs.fs | 4 +- src/Compiler/Optimize/Optimizer.fs | 4 +- src/Compiler/Service/FSharpCheckerResults.fs | 4 - src/Compiler/Service/IncrementalBuild.fs | 3 +- src/Compiler/Service/TransparentCompiler.fs | 16 +- src/Compiler/Symbols/Exprs.fs | 2 +- src/Compiler/Symbols/FSharpDiagnostic.fs | 26 +-- src/Compiler/SyntaxTree/ParseHelpers.fs | 5 + src/Compiler/SyntaxTree/SyntaxTree.fs | 14 +- src/Compiler/SyntaxTree/SyntaxTree.fsi | 16 +- src/Compiler/SyntaxTree/WarnScopes.fs | 139 +++++++++++++ src/Compiler/SyntaxTree/WarnScopes.fsi | 23 +++ src/Compiler/TypedTree/TypedTree.fs | 4 +- src/Compiler/TypedTree/TypedTree.fsi | 4 +- src/Compiler/TypedTree/TypedTreeOps.fs | 8 +- src/Compiler/lex.fsl | 14 +- src/Compiler/pars.fsy | 2 +- .../CompilerDirectives/NonStringArgs.fs | 129 +----------- .../CompilerDirectives/Nowarn.fs | 176 +++++++++++++++- .../SyntaxTreeTests.fs | 5 +- 33 files changed, 522 insertions(+), 479 deletions(-) create mode 100644 src/Compiler/SyntaxTree/WarnScopes.fs create mode 100644 src/Compiler/SyntaxTree/WarnScopes.fsi diff --git a/src/Compiler/Checking/CheckDeclarations.fs b/src/Compiler/Checking/CheckDeclarations.fs index 96d3bb2b28d..6bb55b2ac85 100644 --- a/src/Compiler/Checking/CheckDeclarations.fs +++ b/src/Compiler/Checking/CheckDeclarations.fs @@ -5722,7 +5722,7 @@ let CheckOneImplFile synImplFile, diagnosticOptions) = - let (ParsedImplFileInput (fileName, isScript, qualNameOfFile, scopedPragmas, _, implFileFrags, isLastCompiland, _, _)) = synImplFile + let (ParsedImplFileInput (fileName, isScript, qualNameOfFile, _, implFileFrags, isLastCompiland, _, _)) = synImplFile let infoReader = InfoReader(g, amap) cancellable { @@ -5861,7 +5861,7 @@ let CheckOneImplFile |> Array.map (fun (KeyValue(k,v)) -> (k,v)) |> Map - let implFile = CheckedImplFile (qualNameOfFile, scopedPragmas, implFileTy, implFileContents, hasExplicitEntryPoint, isScript, anonRecdTypes, namedDebugPointsForInlinedCode) + let implFile = CheckedImplFile (qualNameOfFile, implFileTy, implFileContents, hasExplicitEntryPoint, isScript, anonRecdTypes, namedDebugPointsForInlinedCode) return (topAttrs, implFile, envAtEnd, cenv.createsGeneratedProvidedTypes) } diff --git a/src/Compiler/CodeGen/IlxGen.fs b/src/Compiler/CodeGen/IlxGen.fs index 6758b6dcd94..1173f5e1329 100644 --- a/src/Compiler/CodeGen/IlxGen.fs +++ b/src/Compiler/CodeGen/IlxGen.fs @@ -10313,7 +10313,7 @@ and GenModuleBinding cenv (cgbuf: CodeGenBuffer) (qname: QualifiedNameOfFile) la /// Generate the namespace fragments in a single file and GenImplFile cenv (mgbuf: AssemblyBuilder) mainInfoOpt eenv (implFile: CheckedImplFileAfterOptimization) = - let (CheckedImplFile(qname, _, signature, contents, hasExplicitEntryPoint, isScript, anonRecdTypes, _)) = + let (CheckedImplFile(qname, signature, contents, hasExplicitEntryPoint, isScript, anonRecdTypes, _)) = implFile.ImplFile let optimizeDuringCodeGen = implFile.OptimizeDuringCodeGen diff --git a/src/Compiler/Driver/CompilerDiagnostics.fs b/src/Compiler/Driver/CompilerDiagnostics.fs index c73b8e5d197..f9f7008b017 100644 --- a/src/Compiler/Driver/CompilerDiagnostics.fs +++ b/src/Compiler/Driver/CompilerDiagnostics.fs @@ -380,7 +380,7 @@ type PhasedDiagnostic with // Level 2 | _ -> 2 - member x.IsEnabled(severity, options) = + member private x.IsEnabled(severity, options) = let level = options.WarnLevel let specificWarnOn = options.WarnOn let n = x.Number @@ -410,47 +410,34 @@ type PhasedDiagnostic with (severity = FSharpDiagnosticSeverity.Info && level > 0) || (severity = FSharpDiagnosticSeverity.Warning && level >= x.WarningLevel) - /// Indicates if a diagnostic should be reported as an informational - member x.ReportAsInfo(options, severity) = - match severity with - | FSharpDiagnosticSeverity.Error -> false - | FSharpDiagnosticSeverity.Warning -> false - | FSharpDiagnosticSeverity.Info -> x.IsEnabled(severity, options) && not (List.contains x.Number options.WarnOff) - | FSharpDiagnosticSeverity.Hidden -> false - - /// Indicates if a diagnostic should be reported as a warning - member x.ReportAsWarning(options, severity) = - match severity with - | FSharpDiagnosticSeverity.Error -> false - - | FSharpDiagnosticSeverity.Warning -> x.IsEnabled(severity, options) && not (List.contains x.Number options.WarnOff) + member x.AdaptedSeverity(options, severity) = + let n = x.Number - // Informational become warning if explicitly on and not explicitly off - | FSharpDiagnosticSeverity.Info -> - let n = x.Number - List.contains n options.WarnOn && not (List.contains n options.WarnOff) + let localWarnon () = WarnScopes.IsWarnon options.WarnScopes n x.Range - | FSharpDiagnosticSeverity.Hidden -> false + let localNowarn () = + WarnScopes.IsNowarn options.WarnScopes n x.Range options.Fsharp8CompatibleNowarn - /// Indicates if a diagnostic should be reported as an error - member x.ReportAsError(options, severity) = + let warnOff () = + List.contains n options.WarnOff && not (localWarnon ()) || localNowarn () match severity with - | FSharpDiagnosticSeverity.Error -> true - - // Warnings become errors in some situations - | FSharpDiagnosticSeverity.Warning -> - let n = x.Number - + | FSharpDiagnosticSeverity.Error -> FSharpDiagnosticSeverity.Error + | FSharpDiagnosticSeverity.Warning when x.IsEnabled(severity, options) && not (List.contains n options.WarnAsWarn) - && ((options.GlobalWarnAsError && not (List.contains n options.WarnOff)) - || List.contains n options.WarnAsError) + && ((options.GlobalWarnAsError && not (warnOff ())) + || List.contains n options.WarnAsError && not (localNowarn ())) + -> + FSharpDiagnosticSeverity.Error + | FSharpDiagnosticSeverity.Info when List.contains n options.WarnAsError && not (localNowarn ()) -> FSharpDiagnosticSeverity.Error + + | FSharpDiagnosticSeverity.Warning when x.IsEnabled(severity, options) && not (warnOff ()) -> FSharpDiagnosticSeverity.Warning + | FSharpDiagnosticSeverity.Info when List.contains n options.WarnOn && not (warnOff ()) -> FSharpDiagnosticSeverity.Warning - // Informational become errors if explicitly WarnAsError - | FSharpDiagnosticSeverity.Info -> List.contains x.Number options.WarnAsError + | FSharpDiagnosticSeverity.Info when x.IsEnabled(severity, options) && not (warnOff ()) -> FSharpDiagnosticSeverity.Info - | FSharpDiagnosticSeverity.Hidden -> false + | _ -> FSharpDiagnosticSeverity.Hidden [] module OldStyleMessages = @@ -2299,45 +2286,25 @@ type PhasedDiagnostic with //---------------------------------------------------------------------------- // Scoped #nowarn pragmas -/// Build an DiagnosticsLogger that delegates to another DiagnosticsLogger but filters warnings turned off by the given pragma declarations -type DiagnosticsLoggerFilteringByScopedPragmas - (langVersion: LanguageVersion, scopedPragmas, diagnosticOptions: FSharpDiagnosticOptions, diagnosticsLogger: DiagnosticsLogger) = +/// Build an DiagnosticsLogger that delegates to another DiagnosticsLogger but filters warnings (still needed??) +type DiagnosticsLoggerFilteringByScopedPragmas(diagnosticOptions: FSharpDiagnosticOptions, diagnosticsLogger: DiagnosticsLogger) = inherit DiagnosticsLogger("DiagnosticsLoggerFilteringByScopedPragmas") - let needCompatibilityWithEarlierInconsistentInteraction = - not (langVersion.SupportsFeature LanguageFeature.ConsistentNowarnLineDirectiveInteraction) - let mutable realErrorPresent = false override _.DiagnosticSink(diagnostic: PhasedDiagnostic, severity) = + if severity = FSharpDiagnosticSeverity.Error then realErrorPresent <- true diagnosticsLogger.DiagnosticSink(diagnostic, severity) else - let report = - let warningNum = diagnostic.Number - - match diagnostic.Range with - | Some m -> - scopedPragmas - |> List.exists (fun (ScopedPragma.WarningOff(pragmaRange, warningNumFromPragma)) -> - warningNum = warningNumFromPragma - && (needCompatibilityWithEarlierInconsistentInteraction - || m.FileIndex = pragmaRange.FileIndex && posGeq m.Start pragmaRange.Start)) - |> not - | None -> true - - if report then - if diagnostic.ReportAsError(diagnosticOptions, severity) then - diagnosticsLogger.DiagnosticSink(diagnostic, FSharpDiagnosticSeverity.Error) - elif diagnostic.ReportAsWarning(diagnosticOptions, severity) then - diagnosticsLogger.DiagnosticSink(diagnostic, FSharpDiagnosticSeverity.Warning) - elif diagnostic.ReportAsInfo(diagnosticOptions, severity) then - diagnosticsLogger.DiagnosticSink(diagnostic, severity) + match diagnostic.AdaptedSeverity(diagnosticOptions, severity) with + | FSharpDiagnosticSeverity.Hidden -> () + | s -> diagnosticsLogger.DiagnosticSink(diagnostic, s) override _.ErrorCount = diagnosticsLogger.ErrorCount override _.CheckForRealErrorsIgnoringWarnings = realErrorPresent -let GetDiagnosticsLoggerFilteringByScopedPragmas (langVersion, scopedPragmas, diagnosticOptions, diagnosticsLogger) = - DiagnosticsLoggerFilteringByScopedPragmas(langVersion, scopedPragmas, diagnosticOptions, diagnosticsLogger) :> DiagnosticsLogger +let GetDiagnosticsLoggerFilteringByScopedPragmas (diagnosticOptions, diagnosticsLogger) = + DiagnosticsLoggerFilteringByScopedPragmas(diagnosticOptions, diagnosticsLogger) :> DiagnosticsLogger diff --git a/src/Compiler/Driver/CompilerDiagnostics.fsi b/src/Compiler/Driver/CompilerDiagnostics.fsi index 7c5acef17d4..a6fd5132e20 100644 --- a/src/Compiler/Driver/CompilerDiagnostics.fsi +++ b/src/Compiler/Driver/CompilerDiagnostics.fsi @@ -62,14 +62,8 @@ type PhasedDiagnostic with /// Format the core of the diagnostic as a string. Doesn't include the range information. member FormatCore: flattenErrors: bool * suggestNames: bool -> string - /// Indicates if a diagnostic should be reported as an informational - member ReportAsInfo: FSharpDiagnosticOptions * FSharpDiagnosticSeverity -> bool - - /// Indicates if a diagnostic should be reported as a warning - member ReportAsWarning: FSharpDiagnosticOptions * FSharpDiagnosticSeverity -> bool - - /// Indicates if a diagnostic should be reported as an error - member ReportAsError: FSharpDiagnosticOptions * FSharpDiagnosticSeverity -> bool + /// Compute new severity according to the various diagnostics options + member AdaptedSeverity: FSharpDiagnosticOptions * FSharpDiagnosticSeverity -> FSharpDiagnosticSeverity /// Output all of a diagnostic to a buffer, including range member Output: buf: StringBuilder * tcConfig: TcConfig * severity: FSharpDiagnosticSeverity -> unit @@ -85,11 +79,7 @@ type PhasedDiagnostic with /// Get a diagnostics logger that filters the reporting of warnings based on scoped pragma information val GetDiagnosticsLoggerFilteringByScopedPragmas: - langVersion: LanguageVersion * - scopedPragmas: ScopedPragma list * - diagnosticOptions: FSharpDiagnosticOptions * - diagnosticsLogger: DiagnosticsLogger -> - DiagnosticsLogger + diagnosticOptions: FSharpDiagnosticOptions * diagnosticsLogger: DiagnosticsLogger -> DiagnosticsLogger /// Remove 'implicitIncludeDir' from a file name before output val SanitizeFileName: fileName: string -> implicitIncludeDir: string -> string diff --git a/src/Compiler/Driver/ParseAndCheckInputs.fs b/src/Compiler/Driver/ParseAndCheckInputs.fs index d5d18d79651..5f3e862ef58 100644 --- a/src/Compiler/Driver/ParseAndCheckInputs.fs +++ b/src/Compiler/Driver/ParseAndCheckInputs.fs @@ -95,13 +95,13 @@ let PrependPathToSpec x (SynModuleOrNamespaceSig(longId, isRecursive, kind, decl let PrependPathToInput x inp = match inp with - | ParsedInput.ImplFile(ParsedImplFileInput(b, c, q, d, hd, impls, e, trivia, i)) -> + | ParsedInput.ImplFile(ParsedImplFileInput(b, c, q, hd, impls, e, trivia, i)) -> ParsedInput.ImplFile( - ParsedImplFileInput(b, c, PrependPathToQualFileName x q, d, hd, List.map (PrependPathToImpl x) impls, e, trivia, i) + ParsedImplFileInput(b, c, PrependPathToQualFileName x q, hd, List.map (PrependPathToImpl x) impls, e, trivia, i) ) - | ParsedInput.SigFile(ParsedSigFileInput(b, q, d, hd, specs, trivia, i)) -> - ParsedInput.SigFile(ParsedSigFileInput(b, PrependPathToQualFileName x q, d, hd, List.map (PrependPathToSpec x) specs, trivia, i)) + | ParsedInput.SigFile(ParsedSigFileInput(b, q, hd, specs, trivia, i)) -> + ParsedInput.SigFile(ParsedSigFileInput(b, PrependPathToQualFileName x q, hd, List.map (PrependPathToSpec x) specs, trivia, i)) let IsValidAnonModuleName (modname: string) = modname |> String.forall (fun c -> Char.IsLetterOrDigit c || c = '_') @@ -216,29 +216,6 @@ let PostParseModuleSpec (_i, defaultNamespace, isLastCompiland, fileName, intf) SynModuleOrNamespaceSig(lid, isRecursive, kind, decls, xmlDoc, attributes, None, range, trivia) -let GetScopedPragmasForHashDirective hd (langVersion: LanguageVersion) = - let supportsNonStringArguments = - langVersion.SupportsFeature(LanguageFeature.ParsedHashDirectiveArgumentNonQuotes) - - [ - match hd with - | ParsedHashDirective("nowarn", numbers, m) -> - for s in numbers do - let warningNumber = - match supportsNonStringArguments, s with - | _, ParsedHashDirectiveArgument.SourceIdentifier _ -> None - | true, ParsedHashDirectiveArgument.LongIdent _ -> None - | true, ParsedHashDirectiveArgument.Int32(n, _) -> GetWarningNumber(m, string n, true) - | true, ParsedHashDirectiveArgument.Ident(s, _) -> GetWarningNumber(m, s.idText, true) - | _, ParsedHashDirectiveArgument.String(s, _, _) -> GetWarningNumber(m, s, true) - | _ -> None - - match warningNumber with - | None -> () - | Some n -> ScopedPragma.WarningOff(m, n) - | _ -> () - ] - let private collectCodeComments (lexbuf: UnicodeLexing.Lexbuf) (tripleSlashComments: range list) = [ yield! LexbufCommentStore.GetComments(lexbuf) @@ -276,17 +253,6 @@ let PostParseModuleImpls let qualName = QualFileNameOfImpls fileName impls let isScript = IsScript fileName - let scopedPragmas = - [ - for SynModuleOrNamespace(decls = decls) in impls do - for d in decls do - match d with - | SynModuleDecl.HashDirective(hd, _) -> yield! GetScopedPragmasForHashDirective hd lexbuf.LanguageVersion - | _ -> () - for hd in hashDirectives do - yield! GetScopedPragmasForHashDirective hd lexbuf.LanguageVersion - ] - let conditionalDirectives = LexbufIfdefStore.GetTrivia(lexbuf) let codeComments = collectCodeComments lexbuf tripleSlashComments @@ -296,9 +262,7 @@ let PostParseModuleImpls CodeComments = codeComments } - ParsedInput.ImplFile( - ParsedImplFileInput(fileName, isScript, qualName, scopedPragmas, hashDirectives, impls, isLastCompiland, trivia, identifiers) - ) + ParsedInput.ImplFile(ParsedImplFileInput(fileName, isScript, qualName, hashDirectives, impls, isLastCompiland, trivia, identifiers)) let PostParseModuleSpecs ( @@ -327,17 +291,6 @@ let PostParseModuleSpecs let qualName = QualFileNameOfSpecs fileName specs - let scopedPragmas = - [ - for SynModuleOrNamespaceSig(decls = decls) in specs do - for d in decls do - match d with - | SynModuleSigDecl.HashDirective(hd, _) -> yield! GetScopedPragmasForHashDirective hd lexbuf.LanguageVersion - | _ -> () - for hd in hashDirectives do - yield! GetScopedPragmasForHashDirective hd lexbuf.LanguageVersion - ] - let conditionalDirectives = LexbufIfdefStore.GetTrivia(lexbuf) let codeComments = collectCodeComments lexbuf tripleSlashComments @@ -347,7 +300,7 @@ let PostParseModuleSpecs CodeComments = codeComments } - ParsedInput.SigFile(ParsedSigFileInput(fileName, qualName, scopedPragmas, hashDirectives, specs, trivia, identifiers)) + ParsedInput.SigFile(ParsedSigFileInput(fileName, qualName, hashDirectives, specs, trivia, identifiers)) type ModuleNamesDict = Map> @@ -392,26 +345,26 @@ let DeduplicateModuleName (moduleNamesDict: ModuleNamesDict) (fileName: string) let DeduplicateParsedInputModuleName (moduleNamesDict: ModuleNamesDict) input = match input with | ParsedInput.ImplFile implFile -> - let (ParsedImplFileInput(fileName, isScript, qualNameOfFile, scopedPragmas, hashDirectives, modules, flags, trivia, identifiers)) = + let (ParsedImplFileInput(fileName, isScript, qualNameOfFile, hashDirectives, modules, flags, trivia, identifiers)) = implFile let qualNameOfFileR, moduleNamesDictR = DeduplicateModuleName moduleNamesDict fileName qualNameOfFile let implFileR = - ParsedImplFileInput(fileName, isScript, qualNameOfFileR, scopedPragmas, hashDirectives, modules, flags, trivia, identifiers) + ParsedImplFileInput(fileName, isScript, qualNameOfFileR, hashDirectives, modules, flags, trivia, identifiers) let inputR = ParsedInput.ImplFile implFileR inputR, moduleNamesDictR | ParsedInput.SigFile sigFile -> - let (ParsedSigFileInput(fileName, qualNameOfFile, scopedPragmas, hashDirectives, modules, trivia, identifiers)) = + let (ParsedSigFileInput(fileName, qualNameOfFile, hashDirectives, modules, trivia, identifiers)) = sigFile let qualNameOfFileR, moduleNamesDictR = DeduplicateModuleName moduleNamesDict fileName qualNameOfFile let sigFileR = - ParsedSigFileInput(fileName, qualNameOfFileR, scopedPragmas, hashDirectives, modules, trivia, identifiers) + ParsedSigFileInput(fileName, qualNameOfFileR, hashDirectives, modules, trivia, identifiers) let inputT = ParsedInput.SigFile sigFileR inputT, moduleNamesDictR @@ -450,68 +403,66 @@ let ParseInput use _ = UseDiagnosticsLogger delayLogger use _ = UseBuildPhase BuildPhase.Parse - let mutable scopedPragmas = [] - try - let input = - let identStore = HashSet() - - let lexer = - if identCapture then - (fun x -> - let token = lexer x - - match token with - | Parser.token.PERCENT_OP ident - | Parser.token.FUNKY_OPERATOR_NAME ident - | Parser.token.ADJACENT_PREFIX_OP ident - | Parser.token.PLUS_MINUS_OP ident - | Parser.token.INFIX_AMP_OP ident - | Parser.token.INFIX_STAR_DIV_MOD_OP ident - | Parser.token.PREFIX_OP ident - | Parser.token.INFIX_BAR_OP ident - | Parser.token.INFIX_AT_HAT_OP ident - | Parser.token.INFIX_COMPARE_OP ident - | Parser.token.INFIX_STAR_STAR_OP ident - | Parser.token.IDENT ident -> identStore.Add ident |> ignore - | _ -> () - - token) - else - lexer + let identStore = HashSet() + + let lexer = + if identCapture then + (fun x -> + let token = lexer x + + match token with + | Parser.token.PERCENT_OP ident + | Parser.token.FUNKY_OPERATOR_NAME ident + | Parser.token.ADJACENT_PREFIX_OP ident + | Parser.token.PLUS_MINUS_OP ident + | Parser.token.INFIX_AMP_OP ident + | Parser.token.INFIX_STAR_DIV_MOD_OP ident + | Parser.token.PREFIX_OP ident + | Parser.token.INFIX_BAR_OP ident + | Parser.token.INFIX_AT_HAT_OP ident + | Parser.token.INFIX_COMPARE_OP ident + | Parser.token.INFIX_STAR_STAR_OP ident + | Parser.token.IDENT ident -> identStore.Add ident |> ignore + | _ -> () - if FSharpMLCompatFileSuffixes |> List.exists (FileSystemUtils.checkSuffix fileName) then - if lexbuf.SupportsFeature LanguageFeature.MLCompatRevisions then - errorR (Error(FSComp.SR.buildInvalidSourceFileExtensionML fileName, rangeStartup)) - else - mlCompatWarning (FSComp.SR.buildCompilingExtensionIsForML ()) rangeStartup + token) + else + lexer - // Call the appropriate parser - for signature files or implementation files - if FSharpImplFileSuffixes |> List.exists (FileSystemUtils.checkSuffix fileName) then - let impl = Parser.implementationFile lexer lexbuf + if FSharpMLCompatFileSuffixes |> List.exists (FileSystemUtils.checkSuffix fileName) then + if lexbuf.SupportsFeature LanguageFeature.MLCompatRevisions then + errorR (Error(FSComp.SR.buildInvalidSourceFileExtensionML fileName, rangeStartup)) + else + mlCompatWarning (FSComp.SR.buildCompilingExtensionIsForML ()) rangeStartup - let tripleSlashComments = - LexbufLocalXmlDocStore.ReportInvalidXmlDocPositions(lexbuf) + // Call the appropriate parser - for signature files or implementation files + if FSharpImplFileSuffixes |> List.exists (FileSystemUtils.checkSuffix fileName) then + let impl = Parser.implementationFile lexer lexbuf - PostParseModuleImpls(defaultNamespace, fileName, isLastCompiland, impl, lexbuf, tripleSlashComments, Set identStore) - elif FSharpSigFileSuffixes |> List.exists (FileSystemUtils.checkSuffix fileName) then - let intfs = Parser.signatureFile lexer lexbuf + lexbuf |> WarnScopes.FromLexbuf |> WarnScopes.MergeInto diagnosticOptions - let tripleSlashComments = - LexbufLocalXmlDocStore.ReportInvalidXmlDocPositions(lexbuf) + let tripleSlashComments = + LexbufLocalXmlDocStore.ReportInvalidXmlDocPositions(lexbuf) - PostParseModuleSpecs(defaultNamespace, fileName, isLastCompiland, intfs, lexbuf, tripleSlashComments, Set identStore) - else if lexbuf.SupportsFeature LanguageFeature.MLCompatRevisions then - error (Error(FSComp.SR.buildInvalidSourceFileExtensionUpdated fileName, rangeStartup)) - else - error (Error(FSComp.SR.buildInvalidSourceFileExtension fileName, rangeStartup)) + PostParseModuleImpls(defaultNamespace, fileName, isLastCompiland, impl, lexbuf, tripleSlashComments, Set identStore) + elif FSharpSigFileSuffixes |> List.exists (FileSystemUtils.checkSuffix fileName) then + let intfs = Parser.signatureFile lexer lexbuf - scopedPragmas <- input.ScopedPragmas - input + lexbuf |> WarnScopes.FromLexbuf |> WarnScopes.MergeInto diagnosticOptions + + let tripleSlashComments = + LexbufLocalXmlDocStore.ReportInvalidXmlDocPositions(lexbuf) + + PostParseModuleSpecs(defaultNamespace, fileName, isLastCompiland, intfs, lexbuf, tripleSlashComments, Set identStore) + else if lexbuf.SupportsFeature LanguageFeature.MLCompatRevisions then + error (Error(FSComp.SR.buildInvalidSourceFileExtensionUpdated fileName, rangeStartup)) + else + error (Error(FSComp.SR.buildInvalidSourceFileExtension fileName, rangeStartup)) finally // OK, now commit the errors, since the ScopedPragmas will (hopefully) have been scraped let filteringDiagnosticsLogger = - GetDiagnosticsLoggerFilteringByScopedPragmas(lexbuf.LanguageVersion, scopedPragmas, diagnosticOptions, diagnosticsLogger) + GetDiagnosticsLoggerFilteringByScopedPragmas(diagnosticOptions, diagnosticsLogger) delayLogger.CommitDelayedDiagnostics filteringDiagnosticsLogger @@ -581,7 +532,6 @@ let EmptyParsedInput (fileName, isLastCompiland) = QualFileNameOfImpls fileName [], [], [], - [], { ConditionalDirectives = [] CodeComments = [] @@ -597,7 +547,6 @@ let EmptyParsedInput (fileName, isLastCompiland) = QualFileNameOfImpls fileName [], [], [], - [], isLastCompiland, { ConditionalDirectives = [] @@ -1035,15 +984,6 @@ let ProcessMetaCommandsFromInput let state = List.fold ProcessMetaCommandsFromModuleImpl state implFile.Contents state -let ApplyNoWarnsToTcConfig (tcConfig: TcConfig, inp: ParsedInput, pathOfMetaCommandSource) = - // Clone - let tcConfigB = tcConfig.CloneToBuilder() - let addNoWarn = fun () (m, s) -> tcConfigB.TurnWarningOff(m, s) - let addReference = fun () (_m, _s, _) -> () - let addLoadedSource = fun () (_m, _s) -> () - ProcessMetaCommandsFromInput (addNoWarn, addReference, addLoadedSource) (tcConfigB, inp, pathOfMetaCommandSource, ()) - TcConfig.Create(tcConfigB, validate = false) - let ApplyMetaCommandsFromInputToTcConfig (tcConfig: TcConfig, inp: ParsedInput, pathOfMetaCommandSource, dependencyProvider) = // Clone let tcConfigB = tcConfig.CloneToBuilder() @@ -1295,7 +1235,7 @@ let SkippedImplFilePlaceholder (tcConfig: TcConfig, tcImports: TcImports, tcGlob tcState let emptyImplFile = - CheckedImplFile(qualNameOfFile, [], rootSigTy, ModuleOrNamespaceContents.TMDefs [], false, false, StampMap [], Map.empty) + CheckedImplFile(qualNameOfFile, rootSigTy, ModuleOrNamespaceContents.TMDefs [], false, false, StampMap [], Map.empty) let tcEnvAtEnd = tcStateForImplFile.TcEnvFromImpls Some((tcEnvAtEnd, EmptyTopAttrs, Some emptyImplFile, ccuSigForFile), tcState) @@ -1428,15 +1368,15 @@ let CheckOneInput } // Within a file, equip loggers to locally filter w.r.t. scope pragmas in each input -let DiagnosticsLoggerForInput (tcConfig: TcConfig, input: ParsedInput, oldLogger) = - GetDiagnosticsLoggerFilteringByScopedPragmas(tcConfig.langVersion, input.ScopedPragmas, tcConfig.diagnosticsOptions, oldLogger) +let DiagnosticsLoggerForInput (tcConfig: TcConfig, oldLogger) = + GetDiagnosticsLoggerFilteringByScopedPragmas(tcConfig.diagnosticsOptions, oldLogger) /// Typecheck a single file (or interactive entry into F# Interactive) let CheckOneInputEntry (ctok, checkForErrors, tcConfig: TcConfig, tcImports, tcGlobals, prefixPathOpt) tcState input = cancellable { // Equip loggers to locally filter w.r.t. scope pragmas in each input use _ = - UseTransformedDiagnosticsLogger(fun oldLogger -> DiagnosticsLoggerForInput(tcConfig, input, oldLogger)) + UseTransformedDiagnosticsLogger(fun oldLogger -> DiagnosticsLoggerForInput(tcConfig, oldLogger)) use _ = UseBuildPhase BuildPhase.TypeCheck @@ -1936,7 +1876,7 @@ let CheckMultipleInputsUsingGraphMode inputsWithLoggers |> List.toArray |> Array.map (fun (input, oldLogger) -> - let logger = DiagnosticsLoggerForInput(tcConfig, input, oldLogger) + let logger = DiagnosticsLoggerForInput(tcConfig, oldLogger) input, logger) let processFile (node: NodeToTypeCheck) (state: State) : Finisher = diff --git a/src/Compiler/Driver/ParseAndCheckInputs.fsi b/src/Compiler/Driver/ParseAndCheckInputs.fsi index fb32a4557cd..1972c81c328 100644 --- a/src/Compiler/Driver/ParseAndCheckInputs.fsi +++ b/src/Compiler/Driver/ParseAndCheckInputs.fsi @@ -85,9 +85,6 @@ val ProcessMetaCommandsFromInput: /// Process all the #r, #I etc. in an input. For non-scripts report warnings about ignored directives. val ApplyMetaCommandsFromInputToTcConfig: TcConfig * ParsedInput * string * DependencyProvider -> TcConfig -/// Process the #nowarn in an input and integrate them into the TcConfig -val ApplyNoWarnsToTcConfig: TcConfig * ParsedInput * string -> TcConfig - /// Parse one input stream val ParseOneInputStream: tcConfig: TcConfig * diff --git a/src/Compiler/Driver/ScriptClosure.fs b/src/Compiler/Driver/ScriptClosure.fs index 0e22231abb8..a8d37c01b61 100644 --- a/src/Compiler/Driver/ScriptClosure.fs +++ b/src/Compiler/Driver/ScriptClosure.fs @@ -515,23 +515,13 @@ module ScriptPreprocessClosure = match lastParsedInput with | Some(ParsedInput.ImplFile lastParsedImplFile) -> - let (ParsedImplFileInput(name, isScript, qualNameOfFile, scopedPragmas, hashDirectives, implFileFlags, _, trivia, identifiers)) = + let (ParsedImplFileInput(name, isScript, qualNameOfFile, hashDirectives, implFileFlags, _, trivia, identifiers)) = lastParsedImplFile let isLastCompiland = (true, tcConfig.target.IsExe) let lastParsedImplFileR = - ParsedImplFileInput( - name, - isScript, - qualNameOfFile, - scopedPragmas, - hashDirectives, - implFileFlags, - isLastCompiland, - trivia, - identifiers - ) + ParsedImplFileInput(name, isScript, qualNameOfFile, hashDirectives, implFileFlags, isLastCompiland, trivia, identifiers) let lastClosureFileR = ClosureFile(fileName, m, Some(ParsedInput.ImplFile lastParsedImplFileR), parseDiagnostics, metaDiagnostics, nowarns) diff --git a/src/Compiler/Driver/fsc.fs b/src/Compiler/Driver/fsc.fs index 9dccdec826d..7e07183845c 100644 --- a/src/Compiler/Driver/fsc.fs +++ b/src/Compiler/Driver/fsc.fs @@ -76,7 +76,8 @@ type DiagnosticsLoggerUpToMaxErrors(tcConfigB: TcConfigBuilder, exiter: Exiter, override x.DiagnosticSink(diagnostic, severity) = let tcConfig = TcConfig.Create(tcConfigB, validate = false) - if diagnostic.ReportAsError(tcConfig.diagnosticsOptions, severity) then + match diagnostic.AdaptedSeverity(tcConfigB.diagnosticsOptions, severity) with + | FSharpDiagnosticSeverity.Error -> if errors >= tcConfig.maxErrors then x.HandleTooManyErrors(FSComp.SR.fscTooManyErrors ()) exiter.Exit 1 @@ -92,11 +93,8 @@ type DiagnosticsLoggerUpToMaxErrors(tcConfigB: TcConfigBuilder, exiter: Exiter, Debug.Assert(false, sprintf "Lookup exception in compiler: %s" (diagnostic.Exception.ToString())) | _ -> () - elif diagnostic.ReportAsWarning(tcConfig.diagnosticsOptions, severity) then - x.HandleIssue(tcConfig, diagnostic, FSharpDiagnosticSeverity.Warning) - - elif diagnostic.ReportAsInfo(tcConfig.diagnosticsOptions, severity) then - x.HandleIssue(tcConfig, diagnostic, severity) + | FSharpDiagnosticSeverity.Hidden -> () + | s -> x.HandleIssue(tcConfig, diagnostic, s) /// Create an error logger that counts and prints errors let ConsoleDiagnosticsLogger (tcConfigB: TcConfigBuilder, exiter: Exiter) = @@ -236,11 +234,6 @@ let AdjustForScriptCompile (tcConfigB: TcConfigBuilder, commandLineSourceFiles, references |> List.iter (fun r -> tcConfigB.AddReferencedAssemblyByPath(r.originalReference.Range, r.resolvedPath)) - // Also record the other declarations from the script. - closure.NoWarns - |> List.collect (fun (n, ms) -> ms |> List.map (fun m -> m, n)) - |> List.iter (fun (x, m) -> tcConfigB.TurnWarningOff(x, m)) - closure.SourceFiles |> List.map fst |> List.iter AddIfNotPresent closure.AllRootFileDiagnostics |> List.iter diagnosticSink @@ -290,6 +283,9 @@ let ProcessCommandLineFlags (tcConfigB: TcConfigBuilder, lcidFromCodePage, argv) // This is where flags are interpreted by the command line fsc.exe. ParseCompilerOptions(collect, GetCoreFscCompilerOptions tcConfigB, List.tail (PostProcessCompilerArgs abbrevArgs argv)) + tcConfigB.diagnosticsOptions.Fsharp8CompatibleNowarn <- + not <| tcConfigB.langVersion.SupportsFeature LanguageFeature.ConsistentNowarnLineDirectiveInteraction + let inputFiles = List.rev inputFilesRef // Check if we have a codepage from the console @@ -739,13 +735,7 @@ let main2 let oldLogger = diagnosticsLogger let diagnosticsLogger = - let scopedPragmas = - [ - for CheckedImplFile(pragmas = pragmas) in typedImplFiles do - yield! pragmas - ] - - GetDiagnosticsLoggerFilteringByScopedPragmas(tcConfig.langVersion, scopedPragmas, tcConfig.diagnosticsOptions, oldLogger) + GetDiagnosticsLoggerFilteringByScopedPragmas(tcConfig.diagnosticsOptions, oldLogger) SetThreadDiagnosticsLoggerNoUnwind diagnosticsLogger diff --git a/src/Compiler/FSComp.txt b/src/Compiler/FSComp.txt index 2e391fa5515..3382b118f53 100644 --- a/src/Compiler/FSComp.txt +++ b/src/Compiler/FSComp.txt @@ -1785,3 +1785,4 @@ featureAllowAccessModifiersToAutoPropertiesGettersAndSetters,"Allow access modif featureAllowObjectExpressionWithoutOverrides,"Allow object expressions without overrides" 3872,tcPartialActivePattern,"Multi-case partial active patterns are not supported. Consider using a single-case partial active pattern or a full active pattern." featureConsistentNowarnLineDirectiveInteraction,"The interaction between #nowarn and #line is now consistent." +3873,lexWarnDirectiveMustBeFirst,"#nowarn / #warnon directives must appear as the first non-whitespace character on a line" diff --git a/src/Compiler/FSharp.Compiler.Service.fsproj b/src/Compiler/FSharp.Compiler.Service.fsproj index 45b5bda0d10..6a3b3921d65 100644 --- a/src/Compiler/FSharp.Compiler.Service.fsproj +++ b/src/Compiler/FSharp.Compiler.Service.fsproj @@ -269,6 +269,8 @@ + + diff --git a/src/Compiler/Facilities/DiagnosticOptions.fs b/src/Compiler/Facilities/DiagnosticOptions.fs index 2a3a6ffe742..d3e366d5876 100644 --- a/src/Compiler/Facilities/DiagnosticOptions.fs +++ b/src/Compiler/Facilities/DiagnosticOptions.fs @@ -5,6 +5,17 @@ // F# compiler. namespace FSharp.Compiler.Diagnostics +open FSharp.Compiler.Text + +[] +type WarnScope = + | Off of range + | On of range + | OpenOff of range + | OpenOn of range + +type WarnScopeMap = WarnScopeMap of Map + [] type FSharpDiagnosticSeverity = | Hidden @@ -20,6 +31,8 @@ type FSharpDiagnosticOptions = WarnOn: int list WarnAsError: int list WarnAsWarn: int list + mutable Fsharp8CompatibleNowarn: bool // set after setting compiler options + mutable WarnScopes: WarnScopeMap // set after lexing } static member Default = @@ -30,6 +43,8 @@ type FSharpDiagnosticOptions = WarnOn = [] WarnAsError = [] WarnAsWarn = [] + Fsharp8CompatibleNowarn = false + WarnScopes = WarnScopeMap Map.empty } member x.CheckXmlDocs = diff --git a/src/Compiler/Facilities/DiagnosticOptions.fsi b/src/Compiler/Facilities/DiagnosticOptions.fsi index 8ff6b3d2f88..036cfba810f 100644 --- a/src/Compiler/Facilities/DiagnosticOptions.fsi +++ b/src/Compiler/Facilities/DiagnosticOptions.fsi @@ -6,6 +6,20 @@ namespace FSharp.Compiler.Diagnostics +open FSharp.Compiler.Text + +/// The range between #nowarn and #warnon, or #warnon and #nowarn, for a warning number. +/// Or between the directive and eof, for the "Open" cases. +[] +type WarnScope = + | Off of range + | On of range + | OpenOff of range + | OpenOn of range + +/// The collected WarnScope objects (collected during lexing) +type WarnScopeMap = WarnScopeMap of Map + [] type FSharpDiagnosticSeverity = | Hidden @@ -19,7 +33,9 @@ type FSharpDiagnosticOptions = WarnOff: int list WarnOn: int list WarnAsError: int list - WarnAsWarn: int list } + WarnAsWarn: int list + mutable Fsharp8CompatibleNowarn: bool + mutable WarnScopes: WarnScopeMap } static member Default: FSharpDiagnosticOptions diff --git a/src/Compiler/Interactive/fsi.fs b/src/Compiler/Interactive/fsi.fs index 832327656d9..4a412c337c5 100644 --- a/src/Compiler/Interactive/fsi.fs +++ b/src/Compiler/Interactive/fsi.fs @@ -898,7 +898,8 @@ type internal DiagnosticsLoggerThatStopsOnFirstError override _.DiagnosticSink(diagnostic, severity) = let tcConfig = TcConfig.Create(tcConfigB, validate = false) - if diagnostic.ReportAsError(tcConfig.diagnosticsOptions, severity) then + match diagnostic.AdaptedSeverity(tcConfig.diagnosticsOptions, severity) with + | FSharpDiagnosticSeverity.Error -> fsiStdinSyphon.PrintDiagnostic(tcConfig, diagnostic) errorCount <- errorCount + 1 @@ -906,20 +907,21 @@ type internal DiagnosticsLoggerThatStopsOnFirstError exit 1 (* non-zero exit code *) // STOP ON FIRST ERROR (AVOIDS PARSER ERROR RECOVERY) raise StopProcessing - elif diagnostic.ReportAsWarning(tcConfig.diagnosticsOptions, severity) then + | FSharpDiagnosticSeverity.Warning -> DoWithDiagnosticColor FSharpDiagnosticSeverity.Warning (fun () -> fsiConsoleOutput.Error.WriteLine() diagnostic.WriteWithContext(fsiConsoleOutput.Error, " ", fsiStdinSyphon.GetLine, tcConfig, severity) fsiConsoleOutput.Error.WriteLine() fsiConsoleOutput.Error.WriteLine() fsiConsoleOutput.Error.Flush()) - elif diagnostic.ReportAsInfo(tcConfig.diagnosticsOptions, severity) then + | FSharpDiagnosticSeverity.Info -> DoWithDiagnosticColor FSharpDiagnosticSeverity.Info (fun () -> fsiConsoleOutput.Error.WriteLine() diagnostic.WriteWithContext(fsiConsoleOutput.Error, " ", fsiStdinSyphon.GetLine, tcConfig, severity) fsiConsoleOutput.Error.WriteLine() fsiConsoleOutput.Error.WriteLine() fsiConsoleOutput.Error.Flush()) + | FSharpDiagnosticSeverity.Hidden -> () override _.ErrorCount = errorCount @@ -1673,7 +1675,7 @@ let internal mkBoundValueTypedImpl tcGlobals m moduleName name ty = let contents = TMDefs([ TMDefs[TMDefRec(false, [], [], [ mbinding ], m)] ]) let qname = QualifiedNameOfFile.QualifiedNameOfFile(Ident(moduleName, m)) - entity, v, CheckedImplFile.CheckedImplFile(qname, [], mty, contents, false, false, StampMap.Empty, Map.empty) + entity, v, CheckedImplFile.CheckedImplFile(qname, mty, contents, false, false, StampMap.Empty, Map.empty) let scriptingSymbolsPath = let createDirectory (path: string) = @@ -2484,7 +2486,6 @@ type internal FsiDynamicCompiler true, ComputeQualifiedNameOfFileFromUniquePath(m, prefixPath), [], - [], [ impl ], (isLastCompiland, isExe), { @@ -2839,9 +2840,7 @@ type internal FsiDynamicCompiler ) = WithImplicitHome (tcConfigB, directoryName sourceFile) (fun () -> ProcessMetaCommandsFromInput - ((fun st (m, nm) -> - tcConfigB.TurnWarningOff(m, nm) - st), + ((fun st _ -> st), (fun st (m, path, directive) -> let st, _ = fsiDynamicCompiler.PartiallyProcessReferenceOrPackageIncludePathDirective(ctok, st, directive, path, false, m) @@ -2885,10 +2884,6 @@ type internal FsiDynamicCompiler fsiConsoleOutput.uprintfn "]" - for (warnNum, ranges) in closure.NoWarns do - for m in ranges do - tcConfigB.TurnWarningOff(m, warnNum) - // Play errors and warnings from resolution closure.ResolutionDiagnostics |> List.iter diagnosticSink @@ -3849,9 +3844,9 @@ type FsiInteractionProcessor istate, Completed None - | ParsedHashDirective("nowarn", nowarnArguments, m) -> - let numbers = (parsedHashDirectiveArguments nowarnArguments tcConfigB.langVersion) - List.iter (fun (d: string) -> tcConfigB.TurnWarningOff(m, d)) numbers + | ParsedHashDirective("nowarn", _, _) -> + // let numbers = (parsedHashDirectiveArguments nowarnArguments tcConfigB.langVersion) + // List.iter (fun (d: string) -> tcConfigB.TurnWarningOff(m, d)) numbers istate, Completed None | ParsedHashDirective("terms", [], _) -> diff --git a/src/Compiler/Optimize/InnerLambdasToTopLevelFuncs.fs b/src/Compiler/Optimize/InnerLambdasToTopLevelFuncs.fs index f03db8f5e6f..0e2ced16da4 100644 --- a/src/Compiler/Optimize/InnerLambdasToTopLevelFuncs.fs +++ b/src/Compiler/Optimize/InnerLambdasToTopLevelFuncs.fs @@ -1332,9 +1332,9 @@ module Pass4_RewriteAssembly = let rhs, z = TransModuleContents penv z rhs ModuleOrNamespaceBinding.Module(nm, rhs), z - let TransImplFile penv z (CheckedImplFile (fragName, pragmas, signature, contents, hasExplicitEntryPoint, isScript, anonRecdTypes, namedDebugPointsForInlinedCode)) = + let TransImplFile penv z (CheckedImplFile (fragName, signature, contents, hasExplicitEntryPoint, isScript, anonRecdTypes, namedDebugPointsForInlinedCode)) = let contentsR, z = TransModuleContents penv z contents - (CheckedImplFile (fragName, pragmas, signature, contentsR, hasExplicitEntryPoint, isScript, anonRecdTypes, namedDebugPointsForInlinedCode)), z + (CheckedImplFile (fragName, signature, contentsR, hasExplicitEntryPoint, isScript, anonRecdTypes, namedDebugPointsForInlinedCode)), z //------------------------------------------------------------------------- // pass5: copyExpr diff --git a/src/Compiler/Optimize/Optimizer.fs b/src/Compiler/Optimize/Optimizer.fs index 51d889f5691..9a613dd1123 100644 --- a/src/Compiler/Optimize/Optimizer.fs +++ b/src/Compiler/Optimize/Optimizer.fs @@ -4349,7 +4349,7 @@ and OptimizeModuleDefs cenv (env, bindInfosColl) defs = (defs, UnionOptimizationInfos minfos), (env, bindInfosColl) and OptimizeImplFileInternal cenv env isIncrementalFragment hidden implFile = - let (CheckedImplFile (qname, pragmas, signature, contents, hasExplicitEntryPoint, isScript, anonRecdTypes, namedDebugPointsForInlinedCode)) = implFile + let (CheckedImplFile (qname, signature, contents, hasExplicitEntryPoint, isScript, anonRecdTypes, namedDebugPointsForInlinedCode)) = implFile let env, contentsR, minfo, hidden = // FSI compiles interactive fragments as if you're typing incrementally into one module. // @@ -4371,7 +4371,7 @@ and OptimizeImplFileInternal cenv env isIncrementalFragment hidden implFile = let env = BindValsInModuleOrNamespace cenv minfo env env, mexprR, minfoExternal, hidden - let implFileR = CheckedImplFile (qname, pragmas, signature, contentsR, hasExplicitEntryPoint, isScript, anonRecdTypes, namedDebugPointsForInlinedCode) + let implFileR = CheckedImplFile (qname, signature, contentsR, hasExplicitEntryPoint, isScript, anonRecdTypes, namedDebugPointsForInlinedCode) env, implFileR, minfo, hidden diff --git a/src/Compiler/Service/FSharpCheckerResults.fs b/src/Compiler/Service/FSharpCheckerResults.fs index 6af2b440cc0..268affd673a 100644 --- a/src/Compiler/Service/FSharpCheckerResults.fs +++ b/src/Compiler/Service/FSharpCheckerResults.fs @@ -3218,10 +3218,6 @@ module internal ParseAndCheckFile = use _unwindBP = UseBuildPhase BuildPhase.TypeCheck - // Apply nowarns to tcConfig (may generate errors, so ensure diagnosticsLogger is installed) - let tcConfig = - ApplyNoWarnsToTcConfig(tcConfig, parsedMainInput, !! Path.GetDirectoryName(mainInputFileName)) - // update the error handler with the modified tcConfig errHandler.DiagnosticOptions <- tcConfig.diagnosticsOptions diff --git a/src/Compiler/Service/IncrementalBuild.fs b/src/Compiler/Service/IncrementalBuild.fs index 7951f3c9328..44fb113f255 100644 --- a/src/Compiler/Service/IncrementalBuild.fs +++ b/src/Compiler/Service/IncrementalBuild.fs @@ -128,7 +128,6 @@ module IncrementalBuildSyntaxTree = sigName, [], [], - [], isLastCompiland, { ConditionalDirectives = []; CodeComments = [] }, Set.empty @@ -259,7 +258,7 @@ type BoundModel private ( IncrementalBuilderEventTesting.MRU.Add(IncrementalBuilderEventTesting.IBETypechecked fileName) let capturingDiagnosticsLogger = CapturingDiagnosticsLogger("TypeCheck") - let diagnosticsLogger = GetDiagnosticsLoggerFilteringByScopedPragmas(tcConfig.langVersion, input.ScopedPragmas, tcConfig.diagnosticsOptions, capturingDiagnosticsLogger) + let diagnosticsLogger = GetDiagnosticsLoggerFilteringByScopedPragmas(tcConfig.diagnosticsOptions, capturingDiagnosticsLogger) use _ = new CompilationGlobalsScope(diagnosticsLogger, BuildPhase.TypeCheck) beforeFileChecked.Trigger fileName diff --git a/src/Compiler/Service/TransparentCompiler.fs b/src/Compiler/Service/TransparentCompiler.fs index 735a6b241f1..460ef1995d8 100644 --- a/src/Compiler/Service/TransparentCompiler.fs +++ b/src/Compiler/Service/TransparentCompiler.fs @@ -1283,7 +1283,6 @@ type internal TransparentCompiler let mainInputFileName = file.FileName let sourceText = file.SourceText - let parsedMainInput = file.ParsedInput // Initialize the error handler let errHandler = @@ -1296,19 +1295,10 @@ type internal TransparentCompiler tcConfig.flatErrors ) - // Apply nowarns to tcConfig (may generate errors, so ensure diagnosticsLogger is installed) - let tcConfig = - ApplyNoWarnsToTcConfig(tcConfig, parsedMainInput, !! Path.GetDirectoryName(mainInputFileName)) - let diagnosticsLogger = errHandler.DiagnosticsLogger let diagnosticsLogger = - GetDiagnosticsLoggerFilteringByScopedPragmas( - tcConfig.langVersion, - input.ScopedPragmas, - tcConfig.diagnosticsOptions, - diagnosticsLogger - ) + GetDiagnosticsLoggerFilteringByScopedPragmas(tcConfig.diagnosticsOptions, diagnosticsLogger) use _ = new CompilationGlobalsScope(diagnosticsLogger, BuildPhase.TypeCheck) @@ -1571,9 +1561,7 @@ type internal TransparentCompiler let extraLogger = CapturingDiagnosticsLogger("DiagnosticsWhileCreatingDiagnostics") use _ = new CompilationGlobalsScope(extraLogger, BuildPhase.TypeCheck) - // Apply nowarns to tcConfig (may generate errors, so ensure diagnosticsLogger is installed) - let tcConfig = - ApplyNoWarnsToTcConfig(bootstrapInfo.TcConfig, parseResults.ParseTree, Path.GetDirectoryName fileName |> (!!)) + let tcConfig = bootstrapInfo.TcConfig let diagnosticsOptions = tcConfig.diagnosticsOptions diff --git a/src/Compiler/Symbols/Exprs.fs b/src/Compiler/Symbols/Exprs.fs index 15b1bb2a3f6..1bc566453d8 100644 --- a/src/Compiler/Symbols/Exprs.fs +++ b/src/Compiler/Symbols/Exprs.fs @@ -1352,7 +1352,7 @@ and FSharpImplementationFileDeclaration = and FSharpImplementationFileContents(cenv, mimpl) = let g = cenv.g - let (CheckedImplFile (qname, _pragmas, _, contents, hasExplicitEntryPoint, isScript, _anonRecdTypes, _)) = mimpl + let (CheckedImplFile (qname, _, contents, hasExplicitEntryPoint, isScript, _anonRecdTypes, _)) = mimpl let rec getBind (bind: Binding) = let v = bind.Var assert v.IsCompiledAsTopLevel diff --git a/src/Compiler/Symbols/FSharpDiagnostic.fs b/src/Compiler/Symbols/FSharpDiagnostic.fs index 46566d61bbf..5f0f3c3ab06 100644 --- a/src/Compiler/Symbols/FSharpDiagnostic.fs +++ b/src/Compiler/Symbols/FSharpDiagnostic.fs @@ -304,13 +304,12 @@ type internal CompilationDiagnosticLogger (debugName: string, options: FSharpDia | Some f -> f diagnostic | None -> diagnostic - if diagnostic.ReportAsError (options, severity) then + match diagnostic.AdaptedSeverity(options, severity) with + | FSharpDiagnosticSeverity.Error -> diagnostics.Add(diagnostic, FSharpDiagnosticSeverity.Error) errorCount <- errorCount + 1 - elif diagnostic.ReportAsWarning (options, severity) then - diagnostics.Add(diagnostic, FSharpDiagnosticSeverity.Warning) - elif diagnostic.ReportAsInfo (options, severity) then - diagnostics.Add(diagnostic, severity) + | FSharpDiagnosticSeverity.Hidden -> () + | s -> diagnostics.Add(diagnostic, s) override _.ErrorCount = errorCount @@ -319,23 +318,18 @@ type internal CompilationDiagnosticLogger (debugName: string, options: FSharpDia module DiagnosticHelpers = let ReportDiagnostic (options: FSharpDiagnosticOptions, allErrors, mainInputFileName, fileInfo, diagnostic: PhasedDiagnostic, severity, suggestNames, flatErrors, symbolEnv) = - [ let severity = - if diagnostic.ReportAsError (options, severity) then - FSharpDiagnosticSeverity.Error - else - severity - - if severity = FSharpDiagnosticSeverity.Error || - diagnostic.ReportAsWarning (options, severity) || - diagnostic.ReportAsInfo (options, severity) then + match diagnostic.AdaptedSeverity(options, severity) with + | FSharpDiagnosticSeverity.Hidden -> [] + | sev -> // We use the first line of the file as a fallbackRange for reporting unexpected errors. // Not ideal, but it's hard to see what else to do. let fallbackRange = rangeN mainInputFileName 1 - let diagnostic = FSharpDiagnostic.CreateFromExceptionAndAdjustEof (diagnostic, severity, fallbackRange, fileInfo, suggestNames, flatErrors, symbolEnv) + let diagnostic = FSharpDiagnostic.CreateFromExceptionAndAdjustEof (diagnostic, sev, fallbackRange, fileInfo, suggestNames, flatErrors, symbolEnv) let fileName = diagnostic.Range.FileName if allErrors || fileName = mainInputFileName || fileName = TcGlobals.DummyFileNameForRangesWithoutASpecificLocation then - yield diagnostic ] + [diagnostic] + else [] let CreateDiagnostics (options, allErrors, mainInputFileName, diagnostics, suggestNames, flatErrors, symbolEnv) = let fileInfo = (Int32.MaxValue, Int32.MaxValue) diff --git a/src/Compiler/SyntaxTree/ParseHelpers.fs b/src/Compiler/SyntaxTree/ParseHelpers.fs index 22c27eeb9b0..5f6dba51502 100644 --- a/src/Compiler/SyntaxTree/ParseHelpers.fs +++ b/src/Compiler/SyntaxTree/ParseHelpers.fs @@ -16,6 +16,7 @@ open FSharp.Compiler.Xml open Internal.Utilities.Library open Internal.Utilities.Text.Lexing open Internal.Utilities.Text.Parsing +open System.Text.RegularExpressions //------------------------------------------------------------------------ // Parsing: Error recovery exception for fsyacc @@ -232,6 +233,10 @@ module LexbufIfdefStore = let store = getStore lexbuf Seq.toList store +//------------------------------------------------------------------------ +// Parsing/lexing: capture the ranges of code comments as syntax trivia +//------------------------------------------------------------------------ + /// Used to capture the ranges of code comments as syntax trivia module LexbufCommentStore = // The key into the BufferLocalStore used to hold the compiler directives diff --git a/src/Compiler/SyntaxTree/SyntaxTree.fs b/src/Compiler/SyntaxTree/SyntaxTree.fs index 50c81fdcc58..f5a89330fb7 100644 --- a/src/Compiler/SyntaxTree/SyntaxTree.fs +++ b/src/Compiler/SyntaxTree/SyntaxTree.fs @@ -9,6 +9,7 @@ open FSharp.Compiler.Text open FSharp.Compiler.Text.Range open FSharp.Compiler.Xml open FSharp.Compiler.SyntaxTrivia +open FSharp.Compiler.Diagnostics [] type Ident(text: string, range: range) = @@ -1757,7 +1758,6 @@ type ParsedImplFileInput = fileName: string * isScript: bool * qualifiedNameOfFile: QualifiedNameOfFile * - scopedPragmas: ScopedPragma list * hashDirectives: ParsedHashDirective list * contents: SynModuleOrNamespace list * flags: (bool * bool) * @@ -1767,9 +1767,6 @@ type ParsedImplFileInput = member x.QualifiedName = (let (ParsedImplFileInput(qualifiedNameOfFile = qualNameOfFile)) = x in qualNameOfFile) - member x.ScopedPragmas = - (let (ParsedImplFileInput(scopedPragmas = scopedPragmas)) = x in scopedPragmas) - member x.HashDirectives = (let (ParsedImplFileInput(hashDirectives = hashDirectives)) = x in hashDirectives) @@ -1791,7 +1788,6 @@ type ParsedSigFileInput = | ParsedSigFileInput of fileName: string * qualifiedNameOfFile: QualifiedNameOfFile * - scopedPragmas: ScopedPragma list * hashDirectives: ParsedHashDirective list * contents: SynModuleOrNamespaceSig list * trivia: ParsedSigFileInputTrivia * @@ -1800,9 +1796,6 @@ type ParsedSigFileInput = member x.QualifiedName = (let (ParsedSigFileInput(qualifiedNameOfFile = qualNameOfFile)) = x in qualNameOfFile) - member x.ScopedPragmas = - (let (ParsedSigFileInput(scopedPragmas = scopedPragmas)) = x in scopedPragmas) - member x.HashDirectives = (let (ParsedSigFileInput(hashDirectives = hashDirectives)) = x in hashDirectives) @@ -1823,11 +1816,6 @@ type ParsedInput = | ParsedInput.ImplFile file -> file.FileName | ParsedInput.SigFile file -> file.FileName - member inp.ScopedPragmas = - match inp with - | ParsedInput.ImplFile file -> file.ScopedPragmas - | ParsedInput.SigFile file -> file.ScopedPragmas - member inp.QualifiedName = match inp with | ParsedInput.ImplFile file -> file.QualifiedName diff --git a/src/Compiler/SyntaxTree/SyntaxTree.fsi b/src/Compiler/SyntaxTree/SyntaxTree.fsi index 2cc6b14947a..910f904687c 100644 --- a/src/Compiler/SyntaxTree/SyntaxTree.fsi +++ b/src/Compiler/SyntaxTree/SyntaxTree.fsi @@ -7,6 +7,7 @@ open FSharp.Compiler.Syntax open FSharp.Compiler.Text open FSharp.Compiler.Xml open FSharp.Compiler.SyntaxTrivia +open FSharp.Compiler.Diagnostics /// Represents an identifier in F# code [] @@ -1920,12 +1921,6 @@ type ParsedImplFile = [] type ParsedSigFile = ParsedSigFile of hashDirectives: ParsedHashDirective list * fragments: ParsedSigFileFragment list -/// Represents a scoped pragma -[] -type ScopedPragma = - /// A pragma to turn a warning off - | WarningOff of range: range * warningNumber: int - /// Represents a qualifying name for anonymous module specifications and implementations, [] type QualifiedNameOfFile = @@ -1947,7 +1942,6 @@ type ParsedImplFileInput = fileName: string * isScript: bool * qualifiedNameOfFile: QualifiedNameOfFile * - scopedPragmas: ScopedPragma list * hashDirectives: ParsedHashDirective list * contents: SynModuleOrNamespace list * flags: (bool * bool) * @@ -1960,8 +1954,6 @@ type ParsedImplFileInput = member QualifiedName: QualifiedNameOfFile - member ScopedPragmas: ScopedPragma list - member HashDirectives: ParsedHashDirective list member Contents: SynModuleOrNamespace list @@ -1978,7 +1970,6 @@ type ParsedSigFileInput = | ParsedSigFileInput of fileName: string * qualifiedNameOfFile: QualifiedNameOfFile * - scopedPragmas: ScopedPragma list * hashDirectives: ParsedHashDirective list * contents: SynModuleOrNamespaceSig list * trivia: ParsedSigFileInputTrivia * @@ -1988,8 +1979,6 @@ type ParsedSigFileInput = member QualifiedName: QualifiedNameOfFile - member ScopedPragmas: ScopedPragma list - member HashDirectives: ParsedHashDirective list member Contents: SynModuleOrNamespaceSig list @@ -2014,8 +2003,5 @@ type ParsedInput = /// Gets the qualified name used to help match signature and implementation files member QualifiedName: QualifiedNameOfFile - /// Gets the #nowarn and other scoped pragmas - member ScopedPragmas: ScopedPragma list - /// Gets a set of all identifiers used in this parsed input. Only populated if captureIdentifiersWhenParsing option was used. member Identifiers: Set diff --git a/src/Compiler/SyntaxTree/WarnScopes.fs b/src/Compiler/SyntaxTree/WarnScopes.fs new file mode 100644 index 00000000000..0fdb82415c2 --- /dev/null +++ b/src/Compiler/SyntaxTree/WarnScopes.fs @@ -0,0 +1,139 @@ +// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. + +namespace FSharp.Compiler + +open FSharp.Compiler.UnicodeLexing +open FSharp.Compiler.Text +open FSharp.Compiler.Text.Position +open FSharp.Compiler.Text.Range +open FSharp.Compiler.Diagnostics +open System.Text.RegularExpressions + +[] +module internal WarnScopes = + + // ************************************* + // Collect the warn scopes during lexing + // ************************************* + + // The key into the BufferLocalStore used to hold the warn scopes + let private warnScopeKey = "WarnScopes" + + let FromLexbuf (lexbuf: Lexbuf) : WarnScopeMap = + if not <| lexbuf.BufferLocalStore.ContainsKey warnScopeKey then + lexbuf.BufferLocalStore.Add(warnScopeKey, WarnScopeMap Map.empty) + + lexbuf.BufferLocalStore[warnScopeKey] :?> WarnScopeMap + + [] + type private WarnDirective = + | Nowarn of int * range + | Warnon of int * range + + let private getWarningNumber (s: string) = + let s = + if s.StartsWith "\"" && s.EndsWith "\"" then + s.Substring(1, s.Length - 2) + else + s + + let s = if s.StartsWith "FS" then s[2..] else s + + match System.Int32.TryParse s with + | true, i -> Some i + | false, _ -> None + + let private regex = + Regex(" *#(nowarn|warnon)(?: +([^ ]+))*(?:\n|\r\n)", RegexOptions.Compiled ||| RegexOptions.CultureInvariant) + + let private getDirectives text m = + let mkDirective (directiveId: string) (m: range) (c: Capture) = + let argRange () = + Range.withEnd (mkPos m.StartLine (c.Index + c.Length - 1)) (Range.shiftStart 0 c.Index m) + + match directiveId, getWarningNumber c.Value with + | "nowarn", Some n -> Some(WarnDirective.Nowarn(n, argRange ())) + | "warnon", Some n -> Some(WarnDirective.Warnon(n, argRange ())) + | _ -> None + + let mGroups = (regex.Match text).Groups + let dIdent = mGroups[1].Value + [ for c in mGroups[2].Captures -> c ] |> List.choose (mkDirective dIdent m) + + let private index (fileIndex, warningNumber) = + (int64 fileIndex <<< 32) + int64 warningNumber + + let private getScopes idx warnScopes = + Map.tryFind idx warnScopes |> Option.defaultValue [] + + let private mkScope (m1: range) (m2: range) = + mkFileIndexRange m1.FileIndex m1.Start m2.End + + let private processWarnDirective (WarnScopeMap warnScopes) (wd: WarnDirective) = + match wd with + | WarnDirective.Nowarn(n, m) -> + let idx = index (m.FileIndex, n) + + match getScopes idx warnScopes with + | WarnScope.OpenOn m' :: t -> warnScopes.Add(idx, WarnScope.On(mkScope m' m) :: t) + | WarnScope.OpenOff _ :: _ -> warnScopes + | scopes -> warnScopes.Add(idx, WarnScope.OpenOff(mkScope m m) :: scopes) + | WarnDirective.Warnon(n, m) -> + let idx = index (m.FileIndex, n) + + match getScopes idx warnScopes with + | WarnScope.OpenOff m' :: t -> warnScopes.Add(idx, WarnScope.Off(mkScope m' m) :: t) + | WarnScope.OpenOn _ :: _ -> warnScopes + | scopes -> warnScopes.Add(idx, WarnScope.OpenOn(mkScope m m) :: scopes) + |> WarnScopeMap + + let ParseAndSaveWarnDirectiveLine (lexbuf: Lexbuf) = + let convert (p: Internal.Utilities.Text.Lexing.Position) = mkPos p.Line p.Column + + let m = + mkFileIndexRange lexbuf.StartPos.FileIndex (convert lexbuf.StartPos) (convert lexbuf.EndPos) + + let text = Lexbuf.LexemeString lexbuf + let directives = getDirectives text m + let warnScopes = (FromLexbuf lexbuf, directives) ||> List.fold processWarnDirective + lexbuf.BufferLocalStore[warnScopeKey] <- warnScopes + + let MergeInto (diagnosticOptions: FSharpDiagnosticOptions) (WarnScopeMap warnScopes) = + lock diagnosticOptions (fun () -> + let (WarnScopeMap current) = diagnosticOptions.WarnScopes + let warnScopes' = Map.fold (fun wss idx ws -> Map.add idx ws wss) current warnScopes + diagnosticOptions.WarnScopes <- WarnScopeMap warnScopes' + ) + + /// true if m1 contains m2 + let private contains (m2: range) (m1: range) = + m2.StartLine > m1.StartLine && m2.EndLine < m1.EndLine + + let IsWarnon (WarnScopeMap warnScopes) warningNumber (mo: range option) = + match mo with + | None -> false + | Some m -> + let scopes = getScopes (index (m.FileIndex, warningNumber)) warnScopes + + let isEnclosingWarnonScope scope = + match scope with + | WarnScope.On wm when contains m wm -> true + | WarnScope.OpenOn wm when m.StartLine > wm.StartLine -> true + | _ -> false + + List.exists isEnclosingWarnonScope scopes + + /// compatible = compatible with earlier (< F#9.0) inconsistent interaction between #line and #nowarn + let IsNowarn (WarnScopeMap warnScopes) warningNumber (mo: range option) compatible = + match mo with + | None -> compatible + | Some m -> + let scopes = getScopes (index (m.FileIndex, warningNumber)) warnScopes + + let isEnclosingNowarnScope scope = + match scope with + | WarnScope.Off wm when contains m wm -> true + | WarnScope.OpenOff wm when compatible || m.StartLine > wm.StartLine -> true + | _ -> false + + List.exists isEnclosingNowarnScope scopes diff --git a/src/Compiler/SyntaxTree/WarnScopes.fsi b/src/Compiler/SyntaxTree/WarnScopes.fsi new file mode 100644 index 00000000000..e1025d25558 --- /dev/null +++ b/src/Compiler/SyntaxTree/WarnScopes.fsi @@ -0,0 +1,23 @@ +// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. + +namespace FSharp.Compiler + +open FSharp.Compiler.Diagnostics +open FSharp.Compiler.Text + +module internal WarnScopes = + + /// For use in lex.fsl: #nowarn / #warnon directives are turned into warn scopes and saved in lexbuf.BufferLocalStore + val ParseAndSaveWarnDirectiveLine: lexbuf: UnicodeLexing.Lexbuf -> unit + + /// Get the collected warn scopes out of the lexbuf.BufferLocalStore + val FromLexbuf: lexbuf: UnicodeLexing.Lexbuf -> WarnScopeMap + + /// Add the warn scopes of a lexed file into the diagnostics options + val MergeInto: FSharpDiagnosticOptions -> WarnScopeMap -> unit + + /// Check if the range is inside a WarnScope.On scope + val IsWarnon: WarnScopeMap -> warningNumber: int -> mo: range option -> bool + + /// Check if the range is inside a WarnScope.Off scope + val IsNowarn: WarnScopeMap -> warningNumber: int -> mo: range option -> bool -> bool diff --git a/src/Compiler/TypedTree/TypedTree.fs b/src/Compiler/TypedTree/TypedTree.fs index daf31357df3..eb787507ab5 100644 --- a/src/Compiler/TypedTree/TypedTree.fs +++ b/src/Compiler/TypedTree/TypedTree.fs @@ -18,6 +18,7 @@ open FSharp.Compiler open FSharp.Compiler.AbstractIL.IL open FSharp.Compiler.AbstractIL.ILX.Types open FSharp.Compiler.CompilerGlobalState +open FSharp.Compiler.Diagnostics open FSharp.Compiler.DiagnosticsLogger open FSharp.Compiler.Syntax open FSharp.Compiler.Syntax.PrettyNaming @@ -5576,7 +5577,6 @@ type NamedDebugPointKey = type CheckedImplFile = | CheckedImplFile of qualifiedNameOfFile: QualifiedNameOfFile * - pragmas: ScopedPragma list * signature: ModuleOrNamespaceType * contents: ModuleOrNamespaceContents * hasExplicitEntryPoint: bool * @@ -5590,8 +5590,6 @@ type CheckedImplFile = member x.QualifiedNameOfFile = let (CheckedImplFile (qualifiedNameOfFile=res)) = x in res - member x.Pragmas = let (CheckedImplFile (pragmas=res)) = x in res - member x.HasExplicitEntryPoint = let (CheckedImplFile (hasExplicitEntryPoint=res)) = x in res member x.IsScript = let (CheckedImplFile (isScript=res)) = x in res diff --git a/src/Compiler/TypedTree/TypedTree.fsi b/src/Compiler/TypedTree/TypedTree.fsi index 3ba4f5c12ba..3b981ef819b 100644 --- a/src/Compiler/TypedTree/TypedTree.fsi +++ b/src/Compiler/TypedTree/TypedTree.fsi @@ -10,6 +10,7 @@ open Internal.Utilities.Library open Internal.Utilities.Library.Extras open Internal.Utilities.Rational open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.Diagnostics open FSharp.Compiler.DiagnosticsLogger open FSharp.Compiler.Syntax open FSharp.Compiler.Text @@ -4049,7 +4050,6 @@ type NamedDebugPointKey = type CheckedImplFile = | CheckedImplFile of qualifiedNameOfFile: Syntax.QualifiedNameOfFile * - pragmas: Syntax.ScopedPragma list * signature: ModuleOrNamespaceType * contents: ModuleOrNamespaceContents * hasExplicitEntryPoint: bool * @@ -4068,8 +4068,6 @@ type CheckedImplFile = member IsScript: bool - member Pragmas: Syntax.ScopedPragma list - member QualifiedNameOfFile: Syntax.QualifiedNameOfFile member Signature: ModuleOrNamespaceType diff --git a/src/Compiler/TypedTree/TypedTreeOps.fs b/src/Compiler/TypedTree/TypedTreeOps.fs index 60ab98e8c5f..180a9f2576d 100644 --- a/src/Compiler/TypedTree/TypedTreeOps.fs +++ b/src/Compiler/TypedTree/TypedTreeOps.fs @@ -6454,10 +6454,10 @@ and remapAndRenameModBind ctxt compgen tmenv x = ModuleOrNamespaceBinding.Module(mspec, def) and remapImplFile ctxt compgen tmenv implFile = - let (CheckedImplFile (fragName, pragmas, signature, contents, hasExplicitEntryPoint, isScript, anonRecdTypes, namedDebugPointsForInlinedCode)) = implFile + let (CheckedImplFile (fragName, signature, contents, hasExplicitEntryPoint, isScript, anonRecdTypes, namedDebugPointsForInlinedCode)) = implFile let contentsR = copyAndRemapModDef ctxt compgen tmenv contents let signatureR, tmenv = copyAndRemapAndBindModTy ctxt compgen tmenv signature - let implFileR = CheckedImplFile (fragName, pragmas, signatureR, contentsR, hasExplicitEntryPoint, isScript, anonRecdTypes, namedDebugPointsForInlinedCode) + let implFileR = CheckedImplFile (fragName, signatureR, contentsR, hasExplicitEntryPoint, isScript, anonRecdTypes, namedDebugPointsForInlinedCode) implFileR, tmenv // Entry points @@ -9762,9 +9762,9 @@ and rewriteModuleOrNamespaceBindings env mbinds = List.map (rewriteModuleOrNamespaceBinding env) mbinds and RewriteImplFile env implFile = - let (CheckedImplFile (fragName, pragmas, signature, contents, hasExplicitEntryPoint, isScript, anonRecdTypes, namedDebugPointsForInlinedCode)) = implFile + let (CheckedImplFile (fragName, signature, contents, hasExplicitEntryPoint, isScript, anonRecdTypes, namedDebugPointsForInlinedCode)) = implFile let contentsR = rewriteModuleOrNamespaceContents env contents - let implFileR = CheckedImplFile (fragName, pragmas, signature, contentsR, hasExplicitEntryPoint, isScript, anonRecdTypes, namedDebugPointsForInlinedCode) + let implFileR = CheckedImplFile (fragName, signature, contentsR, hasExplicitEntryPoint, isScript, anonRecdTypes, namedDebugPointsForInlinedCode) implFileR //-------------------------------------------------------------------------- diff --git a/src/Compiler/lex.fsl b/src/Compiler/lex.fsl index fd95cd3ebce..18a441d0245 100644 --- a/src/Compiler/lex.fsl +++ b/src/Compiler/lex.fsl @@ -1080,13 +1080,13 @@ rule token (args: LexArgs) (skip: bool) = parse let tok = fail args lexbuf (FSComp.SR.lexHashIfMustHaveIdent()) tok if not skip then tok else token args skip lexbuf } - | anywhite* "#if" ident_char+ - | anywhite* "#else" ident_char+ - | anywhite* "#endif" ident_char+ - | anywhite* "#light" ident_char+ - { let n = (lexeme lexbuf).IndexOf('#') - lexbuf.StartPos <- lexbuf.StartPos.ShiftColumnBy(n) - HASH_IDENT(lexemeTrimLeft lexbuf (n+1)) } + | anywhite* ("#nowarn" | "#warnon") anystring newline + { + WarnScopes.ParseAndSaveWarnDirectiveLine lexbuf + newline lexbuf + let tok = WHITESPACE (LexCont.Token (args.ifdefStack, args.stringNest)) + if not skip then tok else token args skip lexbuf + } | surrogateChar surrogateChar diff --git a/src/Compiler/pars.fsy b/src/Compiler/pars.fsy index 2588f9d128b..57d18b33e46 100644 --- a/src/Compiler/pars.fsy +++ b/src/Compiler/pars.fsy @@ -474,7 +474,7 @@ interactiveSeparator: | OBLOCKSEP { } /*--------------------------------------------------------------------------*/ -/* #directives - used by both F# Interactive directives and #nowarn etc. */ +/* #directives - used by F# Interactive directives */ /* A #directive in a module, namespace or an interaction */ diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/NonStringArgs.fs b/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/NonStringArgs.fs index 080811bd7c2..f6412f22ef6 100644 --- a/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/NonStringArgs.fs +++ b/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/NonStringArgs.fs @@ -6,133 +6,6 @@ open FSharp.Test.Compiler module NonStringArgs = - [] - [] - [] - let ``#nowarn - errors`` (languageVersion) = - - FSharp """ -#nowarn "988" -#nowarn FS -#nowarn FSBLAH -#nowarn ACME -#nowarn "FS" -#nowarn "FSBLAH" -#nowarn "ACME" - """ - |> withLangVersion languageVersion - |> asExe - |> compile - |> shouldFail - |> withDiagnostics[ - if languageVersion = "8.0" then - (Warning 203, Line 6, Col 1, Line 6, Col 13, "Invalid warning number 'FS'") - (Error 3350, Line 3, Col 9, Line 3, Col 11, "Feature '# directives with non-quoted string arguments' is not available in F# 8.0. Please use language version 9.0 or greater.") - (Error 3350, Line 4, Col 9, Line 4, Col 15, "Feature '# directives with non-quoted string arguments' is not available in F# 8.0. Please use language version 9.0 or greater.") - (Error 3350, Line 5, Col 9, Line 5, Col 13, "Feature '# directives with non-quoted string arguments' is not available in F# 8.0. Please use language version 9.0 or greater.") - else - (Warning 203, Line 3, Col 1, Line 3, Col 11, "Invalid warning number 'FS'") - (Warning 203, Line 6, Col 1, Line 6, Col 13, "Invalid warning number 'FS'") - ] - - - [] - [] - [] - let ``#nowarn - errors - collected`` (languageVersion) = - - FSharp """ -#nowarn - "988" - FS - FSBLAH - ACME - "FS" - "FSBLAH" - "ACME" - """ - |> withLangVersion languageVersion - |> asExe - |> compile - |> shouldFail - |> withDiagnostics[ - if languageVersion = "8.0" then - (Warning 203, Line 2, Col 1, Line 9, Col 11, "Invalid warning number 'FS'") - (Error 3350, Line 4, Col 5, Line 4, Col 7, "Feature '# directives with non-quoted string arguments' is not available in F# 8.0. Please use language version 9.0 or greater.") - (Error 3350, Line 5, Col 5, Line 5, Col 11, "Feature '# directives with non-quoted string arguments' is not available in F# 8.0. Please use language version 9.0 or greater.") - (Error 3350, Line 6, Col 5, Line 6, Col 9, "Feature '# directives with non-quoted string arguments' is not available in F# 8.0. Please use language version 9.0 or greater.") - else - (Warning 203, Line 2, Col 1, Line 9, Col 11, "Invalid warning number 'FS'") - ] - - - [] - [] - [] - let ``#nowarn - errors - inline`` (languageVersion) = - - FSharp """ -#nowarn "988" -#nowarn FS FSBLAH ACME "FS" "FSBLAH" "ACME" - """ - |> withLangVersion languageVersion - |> asExe - |> compile - |> shouldFail - |> withDiagnostics [ - if languageVersion = "8.0" then - (Warning 203, Line 3, Col 1, Line 3, Col 44, "Invalid warning number 'FS'") - (Error 3350, Line 3, Col 9, Line 3, Col 11, "Feature '# directives with non-quoted string arguments' is not available in F# 8.0. Please use language version 9.0 or greater.") - (Error 3350, Line 3, Col 12, Line 3, Col 18, "Feature '# directives with non-quoted string arguments' is not available in F# 8.0. Please use language version 9.0 or greater.") - (Error 3350, Line 3, Col 19, Line 3, Col 23, "Feature '# directives with non-quoted string arguments' is not available in F# 8.0. Please use language version 9.0 or greater.") - else - (Warning 203, Line 3, Col 1, Line 3, Col 44, "Invalid warning number 'FS'") - ] - - - [] - [] - [] - let ``#nowarn - realcode`` (langVersion) = - - let compileResult = - FSharp """ -#nowarn 20 FS1104 "3391" "FS3221" - -module Exception = - exception ``Crazy@name.p`` of string - -module Decimal = - type T1 = { a : decimal } - module M0 = - type T1 = { a : int;} - let x = { a = 10 } // error - 'expecting decimal' (which means we are not seeing M0.T1) - -module MismatchedYields = - let collection () = [ - yield "Hello" - "And this" - ] -module DoBinding = - let square x = x * x - square 32 - """ - |> withLangVersion langVersion - |> asExe - |> compile - - if langVersion = "8.0" then - compileResult - |> shouldFail - |> withDiagnostics [ - (Warning 1104, Line 5, Col 15, Line 5, Col 31, "Identifiers containing '@' are reserved for use in F# code generation") - (Error 3350, Line 2, Col 9, Line 2, Col 11, "Feature '# directives with non-quoted string arguments' is not available in F# 8.0. Please use language version 9.0 or greater.") - (Error 3350, Line 2, Col 12, Line 2, Col 18, "Feature '# directives with non-quoted string arguments' is not available in F# 8.0. Please use language version 9.0 or greater.") - ] - else - compileResult - |> shouldSucceed - [] [] @@ -248,7 +121,7 @@ printfn "Hello, World" |> asExe |> compile |> shouldFail - |> withDiagnostics[ + |> withDiagnostics [ (Error 76, Line 2, Col 9, Line 2, Col 11, "This directive may only be used in F# script files (extensions .fsx or .fsscript). Either remove the directive, move this code to a script file or delimit the directive with '#if INTERACTIVE'/'#endif'.") (Error 76, Line 3, Col 9, Line 3, Col 14, "This directive may only be used in F# script files (extensions .fsx or .fsscript). Either remove the directive, move this code to a script file or delimit the directive with '#if INTERACTIVE'/'#endif'.") (Error 76, Line 4, Col 9, Line 4, Col 17, "This directive may only be used in F# script files (extensions .fsx or .fsscript). Either remove the directive, move this code to a script file or delimit the directive with '#if INTERACTIVE'/'#endif'.") diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Nowarn.fs b/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Nowarn.fs index 78067aa8c32..e8c6de2192e 100644 --- a/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Nowarn.fs +++ b/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Nowarn.fs @@ -6,16 +6,19 @@ open FSharp.Test.Compiler module Nowarn = - let warn20Text = "The result of this expression has type 'string' and is implicitly ignored. Consider using 'ignore' to discard this value explicitly, e.g. 'expr |> ignore', or 'let' to bind the result to a name, e.g. 'let result = expr'." + let warning20Text = "The result of this expression has type 'string' and is implicitly ignored. Consider using 'ignore' to discard this value explicitly, e.g. 'expr |> ignore', or 'let' to bind the result to a name, e.g. 'let result = expr'." + let private warning25Text = "Incomplete pattern matches on this expression. For example, the value 'Some (_)' may indicate a case not covered by the pattern(s)." + let private warning44Text = "This construct is deprecated" + - let checkFileBugSource = """ + let consistencySource1 = """ module A #nowarn "20" #line 1 "xyz.fs" "" """ - let checkFileBugSource2 = """ + let consistencySource2 = """ module A #line 1 "xyz.fs" #nowarn "20" @@ -24,28 +27,181 @@ module A [] - let ``checkFile bug simulation for compatibility`` () = + let consistentInteractionBetweenLineAndNowarnCompatibility () = - FSharp checkFileBugSource + FSharp consistencySource1 |> withLangVersion80 |> compile |> shouldSucceed [] - let ``checkFile bug fixed leads to new warning`` () = + let consistentInteractionBetweenLineAndNowarnFail () = - FSharp checkFileBugSource + FSharp consistencySource1 |> withLangVersion90 |> compile |> shouldFail |> withDiagnostics [ - (Warning 20, Line 1, Col 1, Line 1, Col 3, warn20Text) + (Warning 20, Line 1, Col 1, Line 1, Col 3, warning20Text) ] [] - let ``checkFile bug fixed, no warning if nowarn is correctly used`` () = + let consistentInteractionBetweenLineAndNowarnSucceed () = - FSharp checkFileBugSource2 + FSharp consistencySource2 |> withLangVersion90 |> compile |> shouldSucceed + + + let private sourceForWarningIsSuppressed = """ +module A +match None with None -> () +#nowarn "25" +match None with None -> () +#warnon "25" +match None with None -> () +#nowarn "25" +match None with None -> () + """ + + [] + let warningIsSuppressedBetweenNowarnAndWarnonDirectives () = + FSharp sourceForWarningIsSuppressed + |> withLangVersionPreview + |> compile + |> withDiagnostics [ + Warning 25, Line 3, Col 7, Line 3, Col 11, warning25Text + Warning 25, Line 7, Col 7, Line 7, Col 11, warning25Text + ] + + let private sigSourceForWarningIsSuppressedInSigFile = """ +module A +open System +[] +type T = class end +type T2 = T +#nowarn "44" +type T3 = T +#warnon "44" +type T4 = T +#nowarn "44" +type T5 = T + """ + + let private sourceForWarningIsSuppressedInSigFile = """ +module A +#nowarn "44" +open System +[] +type T = class end +type T2 = T +type T3 = T +type T4 = T +type T5 = T + """ + + [] + let warningIsSuppressedBetweenNowarnAndWarnonDirectivesInASignatureFile () = + Fsi sigSourceForWarningIsSuppressedInSigFile + |> withAdditionalSourceFile (FsSource sourceForWarningIsSuppressedInSigFile) + |> withLangVersionPreview + |> compile + |> withDiagnostics [ + Warning 44, Line 6, Col 11, Line 6, Col 12, warning44Text + Warning 44, Line 10, Col 11, Line 10, Col 12, warning44Text + ] + + let private scriptForWarningIsSuppressed = """ + +match None with None -> () +#nowarn "25" +match None with None -> () +#warnon "25" +match None with None -> () +#nowarn "25" +match None with None -> () + """ + + [] + let warningIsSuppressedBetweenNowarnAndWarnonInScript () = + Fsx scriptForWarningIsSuppressed + |> withLangVersionPreview + |> compile + |> withDiagnostics [ + Warning 25, Line 3, Col 7, Line 3, Col 11, warning25Text + Warning 25, Line 7, Col 7, Line 7, Col 11, warning25Text + ] + + [] + [] + [] + let ``#nowarn - errors`` (languageVersion) = + + FSharp """ +#nowarn "988" +#nowarn FS +#nowarn FSBLAH +#nowarn ACME +#nowarn "FS" +#nowarn "FSBLAH" +#nowarn "ACME" + """ + |> withLangVersion languageVersion + |> asExe + |> compile + |> shouldSucceed + + [] + [] + [] + let ``#nowarn - errors - inline`` (languageVersion) = + + FSharp """ +#nowarn "988" +#nowarn FS FSBLAH ACME "FS" "FSBLAH" "ACME" + """ + |> withLangVersion languageVersion + |> asExe + |> compile + |> shouldSucceed + + + [] + [] + [] + let ``#nowarn - realcode`` (langVersion) = + + let compileResult = + FSharp """ +#nowarn 20 FS1104 "3391" "FS3221" + +module Exception = + exception ``Crazy@name.p`` of string + +module Decimal = + type T1 = { a : decimal } + module M0 = + type T1 = { a : int;} + let x = { a = 10 } // error - 'expecting decimal' (which means we are not seeing M0.T1) + +module MismatchedYields = + let collection () = [ + yield "Hello" + "And this" + ] +module DoBinding = + let square x = x * x + square 32 + """ + |> withLangVersion langVersion + |> asExe + |> compile + + if langVersion = "8.0" then + compileResult + |> shouldSucceed + else + compileResult + |> shouldSucceed + diff --git a/tests/FSharp.Compiler.Service.Tests/SyntaxTreeTests.fs b/tests/FSharp.Compiler.Service.Tests/SyntaxTreeTests.fs index 654c01d6cc0..42bf0cf0eb0 100644 --- a/tests/FSharp.Compiler.Service.Tests/SyntaxTreeTests.fs +++ b/tests/FSharp.Compiler.Service.Tests/SyntaxTreeTests.fs @@ -95,7 +95,6 @@ let private sanitizeAST (sourceDirectoryValue: string) (ast: ParsedInput) : Pars | ParsedInput.ImplFile(ParsedImplFileInput(fileName, isScript, qualifiedNameOfFile, - scopedPragmas, hashDirectives, contents, flags, @@ -105,7 +104,6 @@ let private sanitizeAST (sourceDirectoryValue: string) (ast: ParsedInput) : Pars fileName, isScript, qualifiedNameOfFile, - scopedPragmas, List.map mapParsedHashDirective hashDirectives, List.map mapSynModuleOrNamespace contents, flags, @@ -113,11 +111,10 @@ let private sanitizeAST (sourceDirectoryValue: string) (ast: ParsedInput) : Pars identifiers ) |> ParsedInput.ImplFile - | ParsedInput.SigFile(ParsedSigFileInput(fileName, qualifiedNameOfFile, scopedPragmas, hashDirectives, contents, trivia, identifiers)) -> + | ParsedInput.SigFile(ParsedSigFileInput(fileName, qualifiedNameOfFile, hashDirectives, contents, trivia, identifiers)) -> ParsedSigFileInput( fileName, qualifiedNameOfFile, - scopedPragmas, List.map mapParsedHashDirective hashDirectives, List.map mapSynModuleOrNamespaceSig contents, trivia, From bd562229cee7da5bb96dfad94f23b69ea20c1018 Mon Sep 17 00:00:00 2001 From: Martin521 <29605222+Martin521@users.noreply.github.com> Date: Wed, 11 Sep 2024 13:40:29 +0000 Subject: [PATCH 02/35] add xlf files --- src/Compiler/xlf/FSComp.txt.cs.xlf | 5 +++++ src/Compiler/xlf/FSComp.txt.de.xlf | 5 +++++ src/Compiler/xlf/FSComp.txt.es.xlf | 5 +++++ src/Compiler/xlf/FSComp.txt.fr.xlf | 5 +++++ src/Compiler/xlf/FSComp.txt.it.xlf | 5 +++++ src/Compiler/xlf/FSComp.txt.ja.xlf | 5 +++++ src/Compiler/xlf/FSComp.txt.ko.xlf | 5 +++++ src/Compiler/xlf/FSComp.txt.pl.xlf | 5 +++++ src/Compiler/xlf/FSComp.txt.pt-BR.xlf | 5 +++++ src/Compiler/xlf/FSComp.txt.ru.xlf | 5 +++++ src/Compiler/xlf/FSComp.txt.tr.xlf | 5 +++++ src/Compiler/xlf/FSComp.txt.zh-Hans.xlf | 5 +++++ src/Compiler/xlf/FSComp.txt.zh-Hant.xlf | 5 +++++ 13 files changed, 65 insertions(+) diff --git a/src/Compiler/xlf/FSComp.txt.cs.xlf b/src/Compiler/xlf/FSComp.txt.cs.xlf index 39b41f3b382..ee636590e79 100644 --- a/src/Compiler/xlf/FSComp.txt.cs.xlf +++ b/src/Compiler/xlf/FSComp.txt.cs.xlf @@ -817,6 +817,11 @@ Interpolovaný řetězec obsahuje nespárované složené závorky. + + #nowarn / #warnon directives must appear as the first non-whitespace character on a line + #nowarn / #warnon directives must appear as the first non-whitespace character on a line + + All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n Všechny prvky seznamu musí být implicitně převoditelné na typ prvního prvku, což je řazená kolekce členů o délce {0} typu\n {1} \nTento element je řazená kolekce členů o délce {2} typu\n {3} \n diff --git a/src/Compiler/xlf/FSComp.txt.de.xlf b/src/Compiler/xlf/FSComp.txt.de.xlf index 402571c8a5a..bd45105f55c 100644 --- a/src/Compiler/xlf/FSComp.txt.de.xlf +++ b/src/Compiler/xlf/FSComp.txt.de.xlf @@ -817,6 +817,11 @@ Die interpolierte Zeichenfolge enthält schließende geschweifte Klammern ohne Entsprechung. + + #nowarn / #warnon directives must appear as the first non-whitespace character on a line + #nowarn / #warnon directives must appear as the first non-whitespace character on a line + + All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n Alle Elemente einer Liste müssen implizit in den Typ des ersten Elements konvertiert werden. Hierbei handelt es sich um ein Tupel der Länge {0} vom Typ\n {1} \nDieses Element ist ein Tupel der Länge {2} vom Typ\n {3}. \n diff --git a/src/Compiler/xlf/FSComp.txt.es.xlf b/src/Compiler/xlf/FSComp.txt.es.xlf index d3267a7425c..1c0d40dcc17 100644 --- a/src/Compiler/xlf/FSComp.txt.es.xlf +++ b/src/Compiler/xlf/FSComp.txt.es.xlf @@ -817,6 +817,11 @@ La cadena interpolada contiene llaves de cierre no coincidentes. + + #nowarn / #warnon directives must appear as the first non-whitespace character on a line + #nowarn / #warnon directives must appear as the first non-whitespace character on a line + + All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n Todos los elementos de una lista deben convertirse implícitamente en el tipo del primer elemento, que aquí es una tupla de longitud {0} de tipo\n {1} \nEste elemento es una tupla de longitud {2} de tipo\n {3} \n diff --git a/src/Compiler/xlf/FSComp.txt.fr.xlf b/src/Compiler/xlf/FSComp.txt.fr.xlf index f74bc4e3196..a9b66b91305 100644 --- a/src/Compiler/xlf/FSComp.txt.fr.xlf +++ b/src/Compiler/xlf/FSComp.txt.fr.xlf @@ -817,6 +817,11 @@ La chaîne interpolée contient des accolades fermantes sans correspondance. + + #nowarn / #warnon directives must appear as the first non-whitespace character on a line + #nowarn / #warnon directives must appear as the first non-whitespace character on a line + + All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n Tous les éléments d’une liste doivent être implicitement convertibles en type du premier élément, qui est ici un tuple de longueur {0} de type\n {1} \nCet élément est un tuple de longueur {2} de type\n {3} \n diff --git a/src/Compiler/xlf/FSComp.txt.it.xlf b/src/Compiler/xlf/FSComp.txt.it.xlf index 3495d0c1659..3c5e4fc5cb2 100644 --- a/src/Compiler/xlf/FSComp.txt.it.xlf +++ b/src/Compiler/xlf/FSComp.txt.it.xlf @@ -817,6 +817,11 @@ La stringa interpolata contiene parentesi graffe di chiusura non corrispondenti. + + #nowarn / #warnon directives must appear as the first non-whitespace character on a line + #nowarn / #warnon directives must appear as the first non-whitespace character on a line + + All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n Tutti gli elementi di un elenco devono essere convertibili in modo implicito nel tipo del primo elemento, che qui è una tupla di lunghezza {0} di tipo\n {1} \nQuesto elemento è una tupla di lunghezza {2} di tipo\n {3} \n diff --git a/src/Compiler/xlf/FSComp.txt.ja.xlf b/src/Compiler/xlf/FSComp.txt.ja.xlf index a87915633be..a3566e53cca 100644 --- a/src/Compiler/xlf/FSComp.txt.ja.xlf +++ b/src/Compiler/xlf/FSComp.txt.ja.xlf @@ -817,6 +817,11 @@ 補間された文字列には、一致しない閉じかっこが含まれています。 + + #nowarn / #warnon directives must appear as the first non-whitespace character on a line + #nowarn / #warnon directives must appear as the first non-whitespace character on a line + + All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n リストのすべての要素は、最初の要素の型に暗黙的に変換できる必要があります。これは、型の長さ {0} のタプルです\n {1} \nこの要素は、型の長さ {2} のタプルです\n {3} \n diff --git a/src/Compiler/xlf/FSComp.txt.ko.xlf b/src/Compiler/xlf/FSComp.txt.ko.xlf index 70a64e75a53..a4d22e6a424 100644 --- a/src/Compiler/xlf/FSComp.txt.ko.xlf +++ b/src/Compiler/xlf/FSComp.txt.ko.xlf @@ -817,6 +817,11 @@ 보간된 문자열에 일치하지 않는 닫는 중괄호가 포함되어 있습니다. + + #nowarn / #warnon directives must appear as the first non-whitespace character on a line + #nowarn / #warnon directives must appear as the first non-whitespace character on a line + + All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n 목록의 모든 요소는 첫 번째 요소의 형식으로 암시적으로 변환할 수 있어야 합니다. 여기서는 형식이 \n {1}이고 길이가 {0}인 튜플입니다. \n이 요소는 형식이 \n {3}이고 길이가 {2}인 튜플입니다. \n diff --git a/src/Compiler/xlf/FSComp.txt.pl.xlf b/src/Compiler/xlf/FSComp.txt.pl.xlf index 31b8d2a6215..79f9b1600a9 100644 --- a/src/Compiler/xlf/FSComp.txt.pl.xlf +++ b/src/Compiler/xlf/FSComp.txt.pl.xlf @@ -817,6 +817,11 @@ Ciąg interpolowany zawiera niedopasowane zamykające nawiasy klamrowe. + + #nowarn / #warnon directives must appear as the first non-whitespace character on a line + #nowarn / #warnon directives must appear as the first non-whitespace character on a line + + All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n Wszystkie elementy tablicy muszą być niejawnie konwertowalne na typ pierwszego elementu, który w tym miejscu jest krotką o długości {0} typu\n {1} \nTen element jest krotką o długości {2} typu\n {3} \n diff --git a/src/Compiler/xlf/FSComp.txt.pt-BR.xlf b/src/Compiler/xlf/FSComp.txt.pt-BR.xlf index c49d815ca06..ac8616a415b 100644 --- a/src/Compiler/xlf/FSComp.txt.pt-BR.xlf +++ b/src/Compiler/xlf/FSComp.txt.pt-BR.xlf @@ -817,6 +817,11 @@ A cadeia de caracteres interpolada contém chaves de fechamento sem correspondência. + + #nowarn / #warnon directives must appear as the first non-whitespace character on a line + #nowarn / #warnon directives must appear as the first non-whitespace character on a line + + All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n Todos os elementos de uma lista devem ser implicitamente conversíveis ao tipo do primeiro elemento, que aqui é uma tupla de comprimento {0} do tipo\n {1} \nEste elemento é uma tupla de comprimento {2} do tipo\n {3} \n diff --git a/src/Compiler/xlf/FSComp.txt.ru.xlf b/src/Compiler/xlf/FSComp.txt.ru.xlf index 495089d8c53..bfa26863544 100644 --- a/src/Compiler/xlf/FSComp.txt.ru.xlf +++ b/src/Compiler/xlf/FSComp.txt.ru.xlf @@ -817,6 +817,11 @@ Интерполированная строка содержит непарные закрывающие фигурные скобки. + + #nowarn / #warnon directives must appear as the first non-whitespace character on a line + #nowarn / #warnon directives must appear as the first non-whitespace character on a line + + All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n Все элементы списка должны поддерживать неявное преобразование в тип первого элемента, который здесь является кортежем длиной {0} типа\n {1} \nЭтот элемент является кортежем длиной {2} типа\n {3} \n diff --git a/src/Compiler/xlf/FSComp.txt.tr.xlf b/src/Compiler/xlf/FSComp.txt.tr.xlf index 93dfdedb2bd..acfd439f39b 100644 --- a/src/Compiler/xlf/FSComp.txt.tr.xlf +++ b/src/Compiler/xlf/FSComp.txt.tr.xlf @@ -817,6 +817,11 @@ İlişkilendirilmiş dize, eşleşmeyen kapatma küme ayraçları içeriyor. + + #nowarn / #warnon directives must appear as the first non-whitespace character on a line + #nowarn / #warnon directives must appear as the first non-whitespace character on a line + + All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n Bir listenin tüm öğeleri örtük olarak ilk öğenin türüne dönüştürülebilir olmalıdır. Burada ilk öğe {0} uzunluğunda türü\n {1} \nolan bir demet. Bu öğe ise {2} uzunluğunda türü\n {3} \nolan bir demet. diff --git a/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf b/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf index 54f6b088094..8292e5160fd 100644 --- a/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf +++ b/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf @@ -817,6 +817,11 @@ 内插字符串包含不匹配的右大括号。 + + #nowarn / #warnon directives must appear as the first non-whitespace character on a line + #nowarn / #warnon directives must appear as the first non-whitespace character on a line + + All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n 列表的所有元素必须可隐式转换为第一个元素的类型，这是一个长度为 {0} 的类型的元组\n {1} \n此元素是长度为 {2} 类型的元组\n {3} \n diff --git a/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf b/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf index df3a706ae28..66b9fcf9759 100644 --- a/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf +++ b/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf @@ -817,6 +817,11 @@ 差補字串包含不成對的右大括弧。 + + #nowarn / #warnon directives must appear as the first non-whitespace character on a line + #nowarn / #warnon directives must appear as the first non-whitespace character on a line + + All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n 清單的所有元素必須以隱含方式轉換成第一個元素的類型，這是類型為\n {1} \n的元組長度 {0}此元素是類型為\n {3} \n的元組長度 {2} From bab4a17746573eb5a434702c5c47708eb4e2aa5e Mon Sep 17 00:00:00 2001 From: Martin521 <29605222+Martin521@users.noreply.github.com> Date: Thu, 12 Sep 2024 05:45:02 +0000 Subject: [PATCH 03/35] fix for Windows and fix for compatibilty mode --- src/Compiler/SyntaxTree/WarnScopes.fs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/Compiler/SyntaxTree/WarnScopes.fs b/src/Compiler/SyntaxTree/WarnScopes.fs index 0fdb82415c2..7a7d9646893 100644 --- a/src/Compiler/SyntaxTree/WarnScopes.fs +++ b/src/Compiler/SyntaxTree/WarnScopes.fs @@ -44,7 +44,7 @@ module internal WarnScopes = | false, _ -> None let private regex = - Regex(" *#(nowarn|warnon)(?: +([^ ]+))*(?:\n|\r\n)", RegexOptions.Compiled ||| RegexOptions.CultureInvariant) + Regex(" *#(nowarn|warnon)(?: +([^ \r\n]+))*\r?\n", RegexOptions.Compiled ||| RegexOptions.CultureInvariant) let private getDirectives text m = let mkDirective (directiveId: string) (m: range) (c: Capture) = @@ -62,6 +62,8 @@ module internal WarnScopes = let private index (fileIndex, warningNumber) = (int64 fileIndex <<< 32) + int64 warningNumber + + let private warnNumFromIndex (idx: int64) = idx &&& 0xFFFFFFFFL let private getScopes idx warnScopes = Map.tryFind idx warnScopes |> Option.defaultValue [] @@ -125,15 +127,16 @@ module internal WarnScopes = /// compatible = compatible with earlier (< F#9.0) inconsistent interaction between #line and #nowarn let IsNowarn (WarnScopeMap warnScopes) warningNumber (mo: range option) compatible = - match mo with - | None -> compatible - | Some m -> + match mo, compatible with + | Some m, false -> let scopes = getScopes (index (m.FileIndex, warningNumber)) warnScopes let isEnclosingNowarnScope scope = match scope with | WarnScope.Off wm when contains m wm -> true - | WarnScope.OpenOff wm when compatible || m.StartLine > wm.StartLine -> true + | WarnScope.OpenOff wm when m.StartLine > wm.StartLine -> true | _ -> false List.exists isEnclosingNowarnScope scopes + | _ -> + warnScopes |> Map.exists (fun idx _ -> warnNumFromIndex idx = warningNumber) From bdb8a3b4a0346817a25f0810eaf1509b722681cc Mon Sep 17 00:00:00 2001 From: Martin521 <29605222+Martin521@users.noreply.github.com> Date: Wed, 18 Sep 2024 11:33:25 +0000 Subject: [PATCH 04/35] corrected scope logic; added ClearLexbufStore --- src/Compiler/SyntaxTree/LexHelpers.fs | 1 + src/Compiler/SyntaxTree/WarnScopes.fs | 9 ++++++--- src/Compiler/SyntaxTree/WarnScopes.fsi | 3 +++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/Compiler/SyntaxTree/LexHelpers.fs b/src/Compiler/SyntaxTree/LexHelpers.fs index 736e4be04f5..fb4719397ea 100644 --- a/src/Compiler/SyntaxTree/LexHelpers.fs +++ b/src/Compiler/SyntaxTree/LexHelpers.fs @@ -102,6 +102,7 @@ let reusingLexbufForParsing lexbuf f = use _ = UseBuildPhase BuildPhase.Parse LexbufLocalXmlDocStore.ClearXmlDoc lexbuf LexbufCommentStore.ClearComments lexbuf + WarnScopes.ClearLexbufStore lexbuf try f () diff --git a/src/Compiler/SyntaxTree/WarnScopes.fs b/src/Compiler/SyntaxTree/WarnScopes.fs index 7a7d9646893..d82526c7ade 100644 --- a/src/Compiler/SyntaxTree/WarnScopes.fs +++ b/src/Compiler/SyntaxTree/WarnScopes.fs @@ -99,7 +99,10 @@ module internal WarnScopes = let directives = getDirectives text m let warnScopes = (FromLexbuf lexbuf, directives) ||> List.fold processWarnDirective lexbuf.BufferLocalStore[warnScopeKey] <- warnScopes - + + let ClearLexbufStore (lexbuf: Lexbuf) = + lexbuf.BufferLocalStore.Remove warnScopeKey |> ignore + let MergeInto (diagnosticOptions: FSharpDiagnosticOptions) (WarnScopeMap warnScopes) = lock diagnosticOptions (fun () -> let (WarnScopeMap current) = diagnosticOptions.WarnScopes @@ -107,9 +110,9 @@ module internal WarnScopes = diagnosticOptions.WarnScopes <- WarnScopeMap warnScopes' ) - /// true if m1 contains m2 + /// true if m1 contains the start of m2 (#line directives can appear in the middle of an error range) let private contains (m2: range) (m1: range) = - m2.StartLine > m1.StartLine && m2.EndLine < m1.EndLine + m2.StartLine > m1.StartLine && m2.StartLine < m1.EndLine let IsWarnon (WarnScopeMap warnScopes) warningNumber (mo: range option) = match mo with diff --git a/src/Compiler/SyntaxTree/WarnScopes.fsi b/src/Compiler/SyntaxTree/WarnScopes.fsi index e1025d25558..349ca6282e2 100644 --- a/src/Compiler/SyntaxTree/WarnScopes.fsi +++ b/src/Compiler/SyntaxTree/WarnScopes.fsi @@ -12,6 +12,9 @@ module internal WarnScopes = /// Get the collected warn scopes out of the lexbuf.BufferLocalStore val FromLexbuf: lexbuf: UnicodeLexing.Lexbuf -> WarnScopeMap + + /// Clear the warn scopes in lexbuf.BufferLocalStore for reuse of the lexbuf + val ClearLexbufStore: UnicodeLexing.Lexbuf -> unit /// Add the warn scopes of a lexed file into the diagnostics options val MergeInto: FSharpDiagnosticOptions -> WarnScopeMap -> unit From 062ee2ef57b124f9a17eaba90fb6c100a88cbbb6 Mon Sep 17 00:00:00 2001 From: Martin521 <29605222+Martin521@users.noreply.github.com> Date: Thu, 19 Sep 2024 07:17:10 +0000 Subject: [PATCH 05/35] fixed issues from merge --- src/Compiler/Driver/fsc.fs | 2 +- src/Compiler/FSComp.txt | 3 ++- src/Compiler/Facilities/LanguageFeatures.fs | 2 ++ src/Compiler/Facilities/LanguageFeatures.fsi | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Compiler/Driver/fsc.fs b/src/Compiler/Driver/fsc.fs index 7e07183845c..32a44a796d8 100644 --- a/src/Compiler/Driver/fsc.fs +++ b/src/Compiler/Driver/fsc.fs @@ -284,7 +284,7 @@ let ProcessCommandLineFlags (tcConfigB: TcConfigBuilder, lcidFromCodePage, argv) ParseCompilerOptions(collect, GetCoreFscCompilerOptions tcConfigB, List.tail (PostProcessCompilerArgs abbrevArgs argv)) tcConfigB.diagnosticsOptions.Fsharp8CompatibleNowarn <- - not <| tcConfigB.langVersion.SupportsFeature LanguageFeature.ConsistentNowarnLineDirectiveInteraction + not <| tcConfigB.langVersion.SupportsFeature LanguageFeature.ScopedNowarn let inputFiles = List.rev inputFilesRef diff --git a/src/Compiler/FSComp.txt b/src/Compiler/FSComp.txt index b5a50afc7c0..ef28779d001 100644 --- a/src/Compiler/FSComp.txt +++ b/src/Compiler/FSComp.txt @@ -1783,4 +1783,5 @@ featureEmptyBodiedComputationExpressions,"Support for computation expressions wi featureAllowAccessModifiersToAutoPropertiesGettersAndSetters,"Allow access modifiers to auto properties getters and setters" 3871,tcAccessModifiersNotAllowedInSRTPConstraint,"Access modifiers cannot be applied to an SRTP constraint." featureAllowObjectExpressionWithoutOverrides,"Allow object expressions without overrides" -3872,tcPartialActivePattern,"Multi-case partial active patterns are not supported. Consider using a single-case partial active pattern or a full active pattern." \ No newline at end of file +3872,tcPartialActivePattern,"Multi-case partial active patterns are not supported. Consider using a single-case partial active pattern or a full active pattern." +featureScopedNowarn,"Support for scoped enabling / disabling of warnings by #warn and #nowarn directives" \ No newline at end of file diff --git a/src/Compiler/Facilities/LanguageFeatures.fs b/src/Compiler/Facilities/LanguageFeatures.fs index 5c311237594..a5338d61c80 100644 --- a/src/Compiler/Facilities/LanguageFeatures.fs +++ b/src/Compiler/Facilities/LanguageFeatures.fs @@ -94,6 +94,7 @@ type LanguageFeature = | ParsedHashDirectiveArgumentNonQuotes | EmptyBodiedComputationExpressions | AllowObjectExpressionWithoutOverrides + | ScopedNowarn /// LanguageVersion management type LanguageVersion(versionText) = @@ -375,6 +376,7 @@ type LanguageVersion(versionText) = | LanguageFeature.ParsedHashDirectiveArgumentNonQuotes -> FSComp.SR.featureParsedHashDirectiveArgumentNonString () | LanguageFeature.EmptyBodiedComputationExpressions -> FSComp.SR.featureEmptyBodiedComputationExpressions () | LanguageFeature.AllowObjectExpressionWithoutOverrides -> FSComp.SR.featureAllowObjectExpressionWithoutOverrides () + | LanguageFeature.ScopedNowarn -> FSComp.SR.featureScopedNowarn () /// Get a version string associated with the given feature. static member GetFeatureVersionString feature = diff --git a/src/Compiler/Facilities/LanguageFeatures.fsi b/src/Compiler/Facilities/LanguageFeatures.fsi index 7408300b943..03fb649b6e3 100644 --- a/src/Compiler/Facilities/LanguageFeatures.fsi +++ b/src/Compiler/Facilities/LanguageFeatures.fsi @@ -85,6 +85,7 @@ type LanguageFeature = | ParsedHashDirectiveArgumentNonQuotes | EmptyBodiedComputationExpressions | AllowObjectExpressionWithoutOverrides + | ScopedNowarn /// LanguageVersion management type LanguageVersion = From 45105fd1bc66c1101af67c26cbdc61993cca17b6 Mon Sep 17 00:00:00 2001 From: Martin521 <29605222+Martin521@users.noreply.github.com> Date: Thu, 19 Sep 2024 13:25:31 +0200 Subject: [PATCH 06/35] added ScopedNowarn language feature --- src/Compiler/Facilities/LanguageFeatures.fs | 1 + src/Compiler/SyntaxTree/WarnScopes.fs | 2 +- .../FSharp.Compiler.ComponentTests/CompilerDirectives/Nowarn.fs | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Compiler/Facilities/LanguageFeatures.fs b/src/Compiler/Facilities/LanguageFeatures.fs index a5338d61c80..25632458d08 100644 --- a/src/Compiler/Facilities/LanguageFeatures.fs +++ b/src/Compiler/Facilities/LanguageFeatures.fs @@ -220,6 +220,7 @@ type LanguageVersion(versionText) = LanguageFeature.FromEndSlicing, previewVersion // Unfinished features --- needs work LanguageFeature.AllowAccessModifiersToAutoPropertiesGettersAndSetters, previewVersion LanguageFeature.AllowObjectExpressionWithoutOverrides, previewVersion + LanguageFeature.ScopedNowarn, previewVersion ] static let defaultLanguageVersion = LanguageVersion("default") diff --git a/src/Compiler/SyntaxTree/WarnScopes.fs b/src/Compiler/SyntaxTree/WarnScopes.fs index d82526c7ade..ec57d222617 100644 --- a/src/Compiler/SyntaxTree/WarnScopes.fs +++ b/src/Compiler/SyntaxTree/WarnScopes.fs @@ -128,7 +128,7 @@ module internal WarnScopes = List.exists isEnclosingWarnonScope scopes - /// compatible = compatible with earlier (< F#9.0) inconsistent interaction between #line and #nowarn + /// compatible = compatible with earlier (< F# 10.0) inconsistent interaction between #line and #nowarn let IsNowarn (WarnScopeMap warnScopes) warningNumber (mo: range option) compatible = match mo, compatible with | Some m, false -> diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Nowarn.fs b/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Nowarn.fs index e8c6de2192e..c7a65780052 100644 --- a/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Nowarn.fs +++ b/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Nowarn.fs @@ -38,7 +38,7 @@ module A let consistentInteractionBetweenLineAndNowarnFail () = FSharp consistencySource1 - |> withLangVersion90 + |> withLangVersionPreview |> compile |> shouldFail |> withDiagnostics [ From f5525f3df16c71641da50a56319c16d7fffa66e7 Mon Sep 17 00:00:00 2001 From: Martin521 <29605222+Martin521@users.noreply.github.com> Date: Thu, 19 Sep 2024 12:51:00 +0000 Subject: [PATCH 07/35] xlf files --- src/Compiler/xlf/FSComp.txt.cs.xlf | 10 +++++----- src/Compiler/xlf/FSComp.txt.de.xlf | 10 +++++----- src/Compiler/xlf/FSComp.txt.es.xlf | 10 +++++----- src/Compiler/xlf/FSComp.txt.fr.xlf | 10 +++++----- src/Compiler/xlf/FSComp.txt.it.xlf | 10 +++++----- src/Compiler/xlf/FSComp.txt.ja.xlf | 10 +++++----- src/Compiler/xlf/FSComp.txt.ko.xlf | 10 +++++----- src/Compiler/xlf/FSComp.txt.pl.xlf | 10 +++++----- src/Compiler/xlf/FSComp.txt.pt-BR.xlf | 10 +++++----- src/Compiler/xlf/FSComp.txt.ru.xlf | 10 +++++----- src/Compiler/xlf/FSComp.txt.tr.xlf | 10 +++++----- src/Compiler/xlf/FSComp.txt.zh-Hans.xlf | 10 +++++----- src/Compiler/xlf/FSComp.txt.zh-Hant.xlf | 10 +++++----- 13 files changed, 65 insertions(+), 65 deletions(-) diff --git a/src/Compiler/xlf/FSComp.txt.cs.xlf b/src/Compiler/xlf/FSComp.txt.cs.xlf index 041f56869fe..5c2970ae495 100644 --- a/src/Compiler/xlf/FSComp.txt.cs.xlf +++ b/src/Compiler/xlf/FSComp.txt.cs.xlf @@ -562,6 +562,11 @@ Sdílení podkladových polí v rozlišeném sjednocení [<Struct>] za předpokladu, že mají stejný název a typ + + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + + self type constraints omezení vlastního typu @@ -812,11 +817,6 @@ Interpolovaný řetězec obsahuje nespárované složené závorky. - - #nowarn / #warnon directives must appear as the first non-whitespace character on a line - #nowarn / #warnon directives must appear as the first non-whitespace character on a line - - All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n Všechny prvky seznamu musí být implicitně převoditelné na typ prvního prvku, což je řazená kolekce členů o délce {0} typu\n {1} \nTento element je řazená kolekce členů o délce {2} typu\n {3} \n diff --git a/src/Compiler/xlf/FSComp.txt.de.xlf b/src/Compiler/xlf/FSComp.txt.de.xlf index c3245dd76f9..31b00beddeb 100644 --- a/src/Compiler/xlf/FSComp.txt.de.xlf +++ b/src/Compiler/xlf/FSComp.txt.de.xlf @@ -562,6 +562,11 @@ Teilen sie zugrunde liegende Felder in einen [<Struct>]-diskriminierten Union, solange sie denselben Namen und Typ aufweisen. + + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + + self type constraints Selbsttypeinschränkungen @@ -812,11 +817,6 @@ Die interpolierte Zeichenfolge enthält schließende geschweifte Klammern ohne Entsprechung. - - #nowarn / #warnon directives must appear as the first non-whitespace character on a line - #nowarn / #warnon directives must appear as the first non-whitespace character on a line - - All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n Alle Elemente einer Liste müssen implizit in den Typ des ersten Elements konvertiert werden. Hierbei handelt es sich um ein Tupel der Länge {0} vom Typ\n {1} \nDieses Element ist ein Tupel der Länge {2} vom Typ\n {3}. \n diff --git a/src/Compiler/xlf/FSComp.txt.es.xlf b/src/Compiler/xlf/FSComp.txt.es.xlf index 86300e5bcea..c865feea458 100644 --- a/src/Compiler/xlf/FSComp.txt.es.xlf +++ b/src/Compiler/xlf/FSComp.txt.es.xlf @@ -562,6 +562,11 @@ Compartir campos subyacentes en una unión discriminada [<Struct>] siempre y cuando tengan el mismo nombre y tipo + + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + + self type constraints restricciones de tipo propio @@ -812,11 +817,6 @@ La cadena interpolada contiene llaves de cierre no coincidentes. - - #nowarn / #warnon directives must appear as the first non-whitespace character on a line - #nowarn / #warnon directives must appear as the first non-whitespace character on a line - - All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n Todos los elementos de una lista deben convertirse implícitamente en el tipo del primer elemento, que aquí es una tupla de longitud {0} de tipo\n {1} \nEste elemento es una tupla de longitud {2} de tipo\n {3} \n diff --git a/src/Compiler/xlf/FSComp.txt.fr.xlf b/src/Compiler/xlf/FSComp.txt.fr.xlf index ca8c1bffe71..5f340d9250b 100644 --- a/src/Compiler/xlf/FSComp.txt.fr.xlf +++ b/src/Compiler/xlf/FSComp.txt.fr.xlf @@ -562,6 +562,11 @@ Partager les champs sous-jacents dans une union discriminée [<Struct>] tant qu’ils ont le même nom et le même type + + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + + self type constraints contraintes d’auto-type @@ -812,11 +817,6 @@ La chaîne interpolée contient des accolades fermantes sans correspondance. - - #nowarn / #warnon directives must appear as the first non-whitespace character on a line - #nowarn / #warnon directives must appear as the first non-whitespace character on a line - - All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n Tous les éléments d’une liste doivent être implicitement convertibles en type du premier élément, qui est ici un tuple de longueur {0} de type\n {1} \nCet élément est un tuple de longueur {2} de type\n {3} \n diff --git a/src/Compiler/xlf/FSComp.txt.it.xlf b/src/Compiler/xlf/FSComp.txt.it.xlf index 5f1fd6b7607..cac0a9240f3 100644 --- a/src/Compiler/xlf/FSComp.txt.it.xlf +++ b/src/Compiler/xlf/FSComp.txt.it.xlf @@ -562,6 +562,11 @@ Condividi i campi sottostanti in un'unione discriminata di [<Struct>] purché abbiano lo stesso nome e tipo + + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + + self type constraints vincoli di tipo automatico @@ -812,11 +817,6 @@ La stringa interpolata contiene parentesi graffe di chiusura non corrispondenti. - - #nowarn / #warnon directives must appear as the first non-whitespace character on a line - #nowarn / #warnon directives must appear as the first non-whitespace character on a line - - All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n Tutti gli elementi di un elenco devono essere convertibili in modo implicito nel tipo del primo elemento, che qui è una tupla di lunghezza {0} di tipo\n {1} \nQuesto elemento è una tupla di lunghezza {2} di tipo\n {3} \n diff --git a/src/Compiler/xlf/FSComp.txt.ja.xlf b/src/Compiler/xlf/FSComp.txt.ja.xlf index 35a6f80dee2..aa0037b18c3 100644 --- a/src/Compiler/xlf/FSComp.txt.ja.xlf +++ b/src/Compiler/xlf/FSComp.txt.ja.xlf @@ -562,6 +562,11 @@ 名前と型が同じである限り、[<Struct>] 判別可能な共用体で基になるフィールドを共有する + + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + + self type constraints 自己型制約 @@ -812,11 +817,6 @@ 補間された文字列には、一致しない閉じかっこが含まれています。 - - #nowarn / #warnon directives must appear as the first non-whitespace character on a line - #nowarn / #warnon directives must appear as the first non-whitespace character on a line - - All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n リストのすべての要素は、最初の要素の型に暗黙的に変換できる必要があります。これは、型の長さ {0} のタプルです\n {1} \nこの要素は、型の長さ {2} のタプルです\n {3} \n diff --git a/src/Compiler/xlf/FSComp.txt.ko.xlf b/src/Compiler/xlf/FSComp.txt.ko.xlf index f76fbea2502..1b43d0f2463 100644 --- a/src/Compiler/xlf/FSComp.txt.ko.xlf +++ b/src/Compiler/xlf/FSComp.txt.ko.xlf @@ -562,6 +562,11 @@ 이름과 형식이 같으면 [<Struct>] 구분된 공용 구조체에서 기본 필드 공유 + + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + + self type constraints 자체 형식 제약 조건 @@ -812,11 +817,6 @@ 보간된 문자열에 일치하지 않는 닫는 중괄호가 포함되어 있습니다. - - #nowarn / #warnon directives must appear as the first non-whitespace character on a line - #nowarn / #warnon directives must appear as the first non-whitespace character on a line - - All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n 목록의 모든 요소는 첫 번째 요소의 형식으로 암시적으로 변환할 수 있어야 합니다. 여기서는 형식이 \n {1}이고 길이가 {0}인 튜플입니다. \n이 요소는 형식이 \n {3}이고 길이가 {2}인 튜플입니다. \n diff --git a/src/Compiler/xlf/FSComp.txt.pl.xlf b/src/Compiler/xlf/FSComp.txt.pl.xlf index 4a1282c265d..97fa85a2b46 100644 --- a/src/Compiler/xlf/FSComp.txt.pl.xlf +++ b/src/Compiler/xlf/FSComp.txt.pl.xlf @@ -562,6 +562,11 @@ Udostępnij pola źródłowe w unii rozłącznej [<Struct>], o ile mają taką samą nazwę i ten sam typ + + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + + self type constraints ograniczenia typu własnego @@ -812,11 +817,6 @@ Ciąg interpolowany zawiera niedopasowane zamykające nawiasy klamrowe. - - #nowarn / #warnon directives must appear as the first non-whitespace character on a line - #nowarn / #warnon directives must appear as the first non-whitespace character on a line - - All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n Wszystkie elementy tablicy muszą być niejawnie konwertowalne na typ pierwszego elementu, który w tym miejscu jest krotką o długości {0} typu\n {1} \nTen element jest krotką o długości {2} typu\n {3} \n diff --git a/src/Compiler/xlf/FSComp.txt.pt-BR.xlf b/src/Compiler/xlf/FSComp.txt.pt-BR.xlf index 4af3165bc7e..4f6cc8b5697 100644 --- a/src/Compiler/xlf/FSComp.txt.pt-BR.xlf +++ b/src/Compiler/xlf/FSComp.txt.pt-BR.xlf @@ -562,6 +562,11 @@ Compartilhar campos subjacentes em uma união discriminada [<Struct>], desde que tenham o mesmo nome e tipo + + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + + self type constraints restrições de auto-tipo @@ -812,11 +817,6 @@ A cadeia de caracteres interpolada contém chaves de fechamento sem correspondência. - - #nowarn / #warnon directives must appear as the first non-whitespace character on a line - #nowarn / #warnon directives must appear as the first non-whitespace character on a line - - All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n Todos os elementos de uma lista devem ser implicitamente conversíveis ao tipo do primeiro elemento, que aqui é uma tupla de comprimento {0} do tipo\n {1} \nEste elemento é uma tupla de comprimento {2} do tipo\n {3} \n diff --git a/src/Compiler/xlf/FSComp.txt.ru.xlf b/src/Compiler/xlf/FSComp.txt.ru.xlf index 4e4ebe0ec2d..04ca13357e9 100644 --- a/src/Compiler/xlf/FSComp.txt.ru.xlf +++ b/src/Compiler/xlf/FSComp.txt.ru.xlf @@ -562,6 +562,11 @@ Совместное использование базовых полей в дискриминируемом объединении [<Struct>], если они имеют одинаковое имя и тип. + + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + + self type constraints ограничения самостоятельного типа @@ -812,11 +817,6 @@ Интерполированная строка содержит непарные закрывающие фигурные скобки. - - #nowarn / #warnon directives must appear as the first non-whitespace character on a line - #nowarn / #warnon directives must appear as the first non-whitespace character on a line - - All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n Все элементы списка должны поддерживать неявное преобразование в тип первого элемента, который здесь является кортежем длиной {0} типа\n {1} \nЭтот элемент является кортежем длиной {2} типа\n {3} \n diff --git a/src/Compiler/xlf/FSComp.txt.tr.xlf b/src/Compiler/xlf/FSComp.txt.tr.xlf index eac24a53062..0dd0aa4f911 100644 --- a/src/Compiler/xlf/FSComp.txt.tr.xlf +++ b/src/Compiler/xlf/FSComp.txt.tr.xlf @@ -562,6 +562,11 @@ Aynı ada ve türe sahip oldukları sürece temel alınan alanları [<Struct>] ayırt edici birleşim biçiminde paylaşın + + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + + self type constraints kendi kendine tür kısıtlamaları @@ -812,11 +817,6 @@ İlişkilendirilmiş dize, eşleşmeyen kapatma küme ayraçları içeriyor. - - #nowarn / #warnon directives must appear as the first non-whitespace character on a line - #nowarn / #warnon directives must appear as the first non-whitespace character on a line - - All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n Bir listenin tüm öğeleri örtük olarak ilk öğenin türüne dönüştürülebilir olmalıdır. Burada ilk öğe {0} uzunluğunda türü\n {1} \nolan bir demet. Bu öğe ise {2} uzunluğunda türü\n {3} \nolan bir demet. diff --git a/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf b/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf index 745f93b825f..54b8059f400 100644 --- a/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf +++ b/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf @@ -562,6 +562,11 @@ 只要它们具有相同的名称和类型，即可在 [<Struct>] 中共享基础字段 + + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + + self type constraints 自类型约束 @@ -812,11 +817,6 @@ 内插字符串包含不匹配的右大括号。 - - #nowarn / #warnon directives must appear as the first non-whitespace character on a line - #nowarn / #warnon directives must appear as the first non-whitespace character on a line - - All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n 列表的所有元素必须可隐式转换为第一个元素的类型，这是一个长度为 {0} 的类型的元组\n {1} \n此元素是长度为 {2} 类型的元组\n {3} \n diff --git a/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf b/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf index db47787843f..9dcebdcf97f 100644 --- a/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf +++ b/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf @@ -562,6 +562,11 @@ 只要 [<Struct>] 具有相同名稱和類型，就以強制聯集共用基礎欄位 + + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + + self type constraints 自我類型限制式 @@ -812,11 +817,6 @@ 差補字串包含不成對的右大括弧。 - - #nowarn / #warnon directives must appear as the first non-whitespace character on a line - #nowarn / #warnon directives must appear as the first non-whitespace character on a line - - All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n 清單的所有元素必須以隱含方式轉換成第一個元素的類型，這是類型為\n {1} \n的元組長度 {0}此元素是類型為\n {3} \n的元組長度 {2} From 56413614a0b3edb4bca49b6155ce304c4e0c77ea Mon Sep 17 00:00:00 2001 From: Martin521 <29605222+Martin521@users.noreply.github.com> Date: Thu, 19 Sep 2024 16:14:58 +0000 Subject: [PATCH 08/35] MergeInto from lexbuf rather than warnScopes --- src/Compiler/Driver/ParseAndCheckInputs.fs | 4 +-- src/Compiler/SyntaxTree/WarnScopes.fs | 14 ++++++++--- src/Compiler/SyntaxTree/WarnScopes.fsi | 10 +++----- .../CompilerDirectives/Nowarn.fs | 25 +++++++++++-------- 4 files changed, 31 insertions(+), 22 deletions(-) diff --git a/src/Compiler/Driver/ParseAndCheckInputs.fs b/src/Compiler/Driver/ParseAndCheckInputs.fs index 5f3e862ef58..b4e1012efed 100644 --- a/src/Compiler/Driver/ParseAndCheckInputs.fs +++ b/src/Compiler/Driver/ParseAndCheckInputs.fs @@ -440,7 +440,7 @@ let ParseInput if FSharpImplFileSuffixes |> List.exists (FileSystemUtils.checkSuffix fileName) then let impl = Parser.implementationFile lexer lexbuf - lexbuf |> WarnScopes.FromLexbuf |> WarnScopes.MergeInto diagnosticOptions + lexbuf |> WarnScopes.MergeInto diagnosticOptions let tripleSlashComments = LexbufLocalXmlDocStore.ReportInvalidXmlDocPositions(lexbuf) @@ -449,7 +449,7 @@ let ParseInput elif FSharpSigFileSuffixes |> List.exists (FileSystemUtils.checkSuffix fileName) then let intfs = Parser.signatureFile lexer lexbuf - lexbuf |> WarnScopes.FromLexbuf |> WarnScopes.MergeInto diagnosticOptions + lexbuf |> WarnScopes.MergeInto diagnosticOptions let tripleSlashComments = LexbufLocalXmlDocStore.ReportInvalidXmlDocPositions(lexbuf) diff --git a/src/Compiler/SyntaxTree/WarnScopes.fs b/src/Compiler/SyntaxTree/WarnScopes.fs index ec57d222617..829b2fa5b80 100644 --- a/src/Compiler/SyntaxTree/WarnScopes.fs +++ b/src/Compiler/SyntaxTree/WarnScopes.fs @@ -19,7 +19,7 @@ module internal WarnScopes = // The key into the BufferLocalStore used to hold the warn scopes let private warnScopeKey = "WarnScopes" - let FromLexbuf (lexbuf: Lexbuf) : WarnScopeMap = + let private fromLexbuf (lexbuf: Lexbuf) : WarnScopeMap = if not <| lexbuf.BufferLocalStore.ContainsKey warnScopeKey then lexbuf.BufferLocalStore.Add(warnScopeKey, WarnScopeMap Map.empty) @@ -97,13 +97,14 @@ module internal WarnScopes = let text = Lexbuf.LexemeString lexbuf let directives = getDirectives text m - let warnScopes = (FromLexbuf lexbuf, directives) ||> List.fold processWarnDirective + let warnScopes = (fromLexbuf lexbuf, directives) ||> List.fold processWarnDirective lexbuf.BufferLocalStore[warnScopeKey] <- warnScopes - + let ClearLexbufStore (lexbuf: Lexbuf) = lexbuf.BufferLocalStore.Remove warnScopeKey |> ignore - let MergeInto (diagnosticOptions: FSharpDiagnosticOptions) (WarnScopeMap warnScopes) = + let MergeInto (diagnosticOptions: FSharpDiagnosticOptions) (lexbuf: Lexbuf) = + let (WarnScopeMap warnScopes) = fromLexbuf lexbuf lock diagnosticOptions (fun () -> let (WarnScopeMap current) = diagnosticOptions.WarnScopes let warnScopes' = Map.fold (fun wss idx ws -> Map.add idx ws wss) current warnScopes @@ -114,6 +115,11 @@ module internal WarnScopes = let private contains (m2: range) (m1: range) = m2.StartLine > m1.StartLine && m2.StartLine < m1.EndLine + + // ************************************* + // Use the warn scopes after lexing + // ************************************* + let IsWarnon (WarnScopeMap warnScopes) warningNumber (mo: range option) = match mo with | None -> false diff --git a/src/Compiler/SyntaxTree/WarnScopes.fsi b/src/Compiler/SyntaxTree/WarnScopes.fsi index 349ca6282e2..57e369cd75d 100644 --- a/src/Compiler/SyntaxTree/WarnScopes.fsi +++ b/src/Compiler/SyntaxTree/WarnScopes.fsi @@ -4,20 +4,18 @@ namespace FSharp.Compiler open FSharp.Compiler.Diagnostics open FSharp.Compiler.Text +open FSharp.Compiler.UnicodeLexing module internal WarnScopes = /// For use in lex.fsl: #nowarn / #warnon directives are turned into warn scopes and saved in lexbuf.BufferLocalStore - val ParseAndSaveWarnDirectiveLine: lexbuf: UnicodeLexing.Lexbuf -> unit - - /// Get the collected warn scopes out of the lexbuf.BufferLocalStore - val FromLexbuf: lexbuf: UnicodeLexing.Lexbuf -> WarnScopeMap + val ParseAndSaveWarnDirectiveLine: lexbuf: Lexbuf -> unit /// Clear the warn scopes in lexbuf.BufferLocalStore for reuse of the lexbuf - val ClearLexbufStore: UnicodeLexing.Lexbuf -> unit + val ClearLexbufStore: Lexbuf -> unit /// Add the warn scopes of a lexed file into the diagnostics options - val MergeInto: FSharpDiagnosticOptions -> WarnScopeMap -> unit + val MergeInto: FSharpDiagnosticOptions -> Lexbuf -> unit /// Check if the range is inside a WarnScope.On scope val IsWarnon: WarnScopeMap -> warningNumber: int -> mo: range option -> bool diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Nowarn.fs b/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Nowarn.fs index c7a65780052..c2ab1b598da 100644 --- a/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Nowarn.fs +++ b/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Nowarn.fs @@ -14,20 +14,20 @@ module Nowarn = let consistencySource1 = """ module A #nowarn "20" -#line 1 "xyz.fs" +#line 5 "xyz.fs" "" """ let consistencySource2 = """ module A -#line 1 "xyz.fs" #nowarn "20" +#line 1 "xyz.fs" "" """ [] - let consistentInteractionBetweenLineAndNowarnCompatibility () = + let inconsistentInteractionBetweenLineAndNowarn1 () = FSharp consistencySource1 |> withLangVersion80 @@ -35,21 +35,26 @@ module A |> shouldSucceed [] - let consistentInteractionBetweenLineAndNowarnFail () = + let inconsistentInteractionBetweenLineAndNowarn2 () = + + FSharp consistencySource2 + |> withLangVersion80 + |> compile + |> shouldSucceed + + [] + let consistentInteractionBetweenLineAndNowarn1 () = FSharp consistencySource1 |> withLangVersionPreview |> compile - |> shouldFail - |> withDiagnostics [ - (Warning 20, Line 1, Col 1, Line 1, Col 3, warning20Text) - ] + |> shouldSucceed [] - let consistentInteractionBetweenLineAndNowarnSucceed () = + let consistentInteractionBetweenLineAndNowarn2 () = FSharp consistencySource2 - |> withLangVersion90 + |> withLangVersionPreview |> compile |> shouldSucceed From be99297119b0656fa731299e2903ce823ce8d920 Mon Sep 17 00:00:00 2001 From: Martin521 <29605222+Martin521@users.noreply.github.com> Date: Thu, 19 Sep 2024 16:18:09 +0000 Subject: [PATCH 09/35] just updated comments --- src/Compiler/SyntaxTree/WarnScopes.fs | 3 +-- src/Compiler/SyntaxTree/WarnScopes.fsi | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Compiler/SyntaxTree/WarnScopes.fs b/src/Compiler/SyntaxTree/WarnScopes.fs index 829b2fa5b80..5fe89bff7ee 100644 --- a/src/Compiler/SyntaxTree/WarnScopes.fs +++ b/src/Compiler/SyntaxTree/WarnScopes.fs @@ -117,7 +117,7 @@ module internal WarnScopes = // ************************************* - // Use the warn scopes after lexing + // Apply the warn scopes after lexing // ************************************* let IsWarnon (WarnScopeMap warnScopes) warningNumber (mo: range option) = @@ -134,7 +134,6 @@ module internal WarnScopes = List.exists isEnclosingWarnonScope scopes - /// compatible = compatible with earlier (< F# 10.0) inconsistent interaction between #line and #nowarn let IsNowarn (WarnScopeMap warnScopes) warningNumber (mo: range option) compatible = match mo, compatible with | Some m, false -> diff --git a/src/Compiler/SyntaxTree/WarnScopes.fsi b/src/Compiler/SyntaxTree/WarnScopes.fsi index 57e369cd75d..c031e470365 100644 --- a/src/Compiler/SyntaxTree/WarnScopes.fsi +++ b/src/Compiler/SyntaxTree/WarnScopes.fsi @@ -21,4 +21,5 @@ module internal WarnScopes = val IsWarnon: WarnScopeMap -> warningNumber: int -> mo: range option -> bool /// Check if the range is inside a WarnScope.Off scope - val IsNowarn: WarnScopeMap -> warningNumber: int -> mo: range option -> bool -> bool + /// compatible = compatible with earlier (< F# 10.0) inconsistent interaction between #line and #nowarn + val IsNowarn: WarnScopeMap -> warningNumber: int -> mo: range option -> compatible: bool -> bool From 74481a36b6e856589f28204f36ee9adc748bbd0f Mon Sep 17 00:00:00 2001 From: Martin521 <29605222+Martin521@users.noreply.github.com> Date: Fri, 20 Sep 2024 07:43:27 +0000 Subject: [PATCH 10/35] new handling of #line (lineMappingOrigin in FileIndex) --- src/Compiler/Facilities/prim-lexing.fs | 5 +- src/Compiler/Facilities/prim-lexing.fsi | 2 +- src/Compiler/SyntaxTree/WarnScopes.fs | 69 ++++++++++++++----------- src/Compiler/Utilities/range.fs | 14 +++++ src/Compiler/Utilities/range.fsi | 4 ++ src/Compiler/lex.fsl | 2 +- 6 files changed, 64 insertions(+), 32 deletions(-) diff --git a/src/Compiler/Facilities/prim-lexing.fs b/src/Compiler/Facilities/prim-lexing.fs index d1b965f100f..0267b4aee93 100644 --- a/src/Compiler/Facilities/prim-lexing.fs +++ b/src/Compiler/Facilities/prim-lexing.fs @@ -237,7 +237,10 @@ type internal Position = member x.ColumnMinusOne = Position(x.FileIndex, x.Line, x.OriginalLine, x.StartOfLineAbsoluteOffset, x.StartOfLineAbsoluteOffset - 1) - member x.ApplyLineDirective(fileIdx, line) = + member x.ApplyLineDirective(fileIdx, originalIdx, line) = + if fileIdx <> originalIdx then + FileIndex.setLineMappingOrigin fileIdx originalIdx + FileIndex.setLineMappingOrigin originalIdx originalIdx Position(fileIdx, line, x.OriginalLine, x.AbsoluteOffset, x.AbsoluteOffset) override p.ToString() = $"({p.Line},{p.Column})" diff --git a/src/Compiler/Facilities/prim-lexing.fsi b/src/Compiler/Facilities/prim-lexing.fsi index ff13f96c9e1..7a8adc6a1b0 100644 --- a/src/Compiler/Facilities/prim-lexing.fsi +++ b/src/Compiler/Facilities/prim-lexing.fsi @@ -103,7 +103,7 @@ type internal Position = member ColumnMinusOne: Position /// Apply a #line directive. - member ApplyLineDirective: fileIdx: int * line: int -> Position + member ApplyLineDirective: fileIdx: int * originalIdx: int * line: int -> Position /// Get an arbitrary position, with the empty string as file name. static member Empty: Position diff --git a/src/Compiler/SyntaxTree/WarnScopes.fs b/src/Compiler/SyntaxTree/WarnScopes.fs index 5fe89bff7ee..ccf5d8a1b1d 100644 --- a/src/Compiler/SyntaxTree/WarnScopes.fs +++ b/src/Compiler/SyntaxTree/WarnScopes.fs @@ -62,7 +62,7 @@ module internal WarnScopes = let private index (fileIndex, warningNumber) = (int64 fileIndex <<< 32) + int64 warningNumber - + let private warnNumFromIndex (idx: int64) = idx &&& 0xFFFFFFFFL let private getScopes idx warnScopes = @@ -91,9 +91,10 @@ module internal WarnScopes = let ParseAndSaveWarnDirectiveLine (lexbuf: Lexbuf) = let convert (p: Internal.Utilities.Text.Lexing.Position) = mkPos p.Line p.Column + let idx = lexbuf.StartPos.FileIndex + let idx = FileIndex.tryGetLineMappingOrigin idx |> Option.defaultValue idx - let m = - mkFileIndexRange lexbuf.StartPos.FileIndex (convert lexbuf.StartPos) (convert lexbuf.EndPos) + let m = mkFileIndexRange idx (convert lexbuf.StartPos) (convert lexbuf.EndPos) let text = Lexbuf.LexemeString lexbuf let directives = getDirectives text m @@ -102,49 +103,59 @@ module internal WarnScopes = let ClearLexbufStore (lexbuf: Lexbuf) = lexbuf.BufferLocalStore.Remove warnScopeKey |> ignore - + let MergeInto (diagnosticOptions: FSharpDiagnosticOptions) (lexbuf: Lexbuf) = let (WarnScopeMap warnScopes) = fromLexbuf lexbuf + lock diagnosticOptions (fun () -> let (WarnScopeMap current) = diagnosticOptions.WarnScopes let warnScopes' = Map.fold (fun wss idx ws -> Map.add idx ws wss) current warnScopes - diagnosticOptions.WarnScopes <- WarnScopeMap warnScopes' - ) + diagnosticOptions.WarnScopes <- WarnScopeMap warnScopes') + + // ************************************* + // Apply the warn scopes after lexing + // ************************************* /// true if m1 contains the start of m2 (#line directives can appear in the middle of an error range) let private contains (m2: range) (m1: range) = m2.StartLine > m1.StartLine && m2.StartLine < m1.EndLine + let private isEnclosingWarnonScope m scope = + match scope with + | WarnScope.On wm when contains m wm -> true + | WarnScope.OpenOn wm when m.StartLine > wm.StartLine -> true + | _ -> false - // ************************************* - // Apply the warn scopes after lexing - // ************************************* + let private isEnclosingNowarnScope m scope = + match scope with + | WarnScope.Off wm when contains m wm -> true + | WarnScope.OpenOff wm when m.StartLine > wm.StartLine -> true + | _ -> false + + let private isOffScope scope = + match scope with + | WarnScope.Off _ + | WarnScope.OpenOff _ -> true + | _ -> false let IsWarnon (WarnScopeMap warnScopes) warningNumber (mo: range option) = match mo with | None -> false | Some m -> - let scopes = getScopes (index (m.FileIndex, warningNumber)) warnScopes - - let isEnclosingWarnonScope scope = - match scope with - | WarnScope.On wm when contains m wm -> true - | WarnScope.OpenOn wm when m.StartLine > wm.StartLine -> true - | _ -> false - - List.exists isEnclosingWarnonScope scopes + if FileIndex.hasLineMapping m.FileIndex then + false + else + let scopes = getScopes (index (m.FileIndex, warningNumber)) warnScopes + List.exists (isEnclosingWarnonScope m) scopes let IsNowarn (WarnScopeMap warnScopes) warningNumber (mo: range option) compatible = match mo, compatible with | Some m, false -> - let scopes = getScopes (index (m.FileIndex, warningNumber)) warnScopes - - let isEnclosingNowarnScope scope = - match scope with - | WarnScope.Off wm when contains m wm -> true - | WarnScope.OpenOff wm when m.StartLine > wm.StartLine -> true - | _ -> false - - List.exists isEnclosingNowarnScope scopes - | _ -> - warnScopes |> Map.exists (fun idx _ -> warnNumFromIndex idx = warningNumber) + match FileIndex.tryGetLineMappingOrigin m.FileIndex with + | None -> + let scopes = getScopes (index (m.FileIndex, warningNumber)) warnScopes + List.exists (isEnclosingNowarnScope m) scopes + | Some fileIndex -> // file has #line directives + let scopes = getScopes (index (fileIndex, warningNumber)) warnScopes + List.exists isOffScope scopes + | _ -> warnScopes |> Map.exists (fun idx _ -> warnNumFromIndex idx = warningNumber) diff --git a/src/Compiler/Utilities/range.fs b/src/Compiler/Utilities/range.fs index 6d0002a97ba..974059c2dd3 100755 --- a/src/Compiler/Utilities/range.fs +++ b/src/Compiler/Utilities/range.fs @@ -185,6 +185,7 @@ module RangeImpl = type FileIndexTable() = let indexToFileTable = ResizeArray<_>(11) let fileToIndexTable = ConcurrentDictionary() + let lineMappingOrigin = ConcurrentDictionary() // Note: we should likely adjust this code to always normalize. However some testing (and possibly some // product behaviour) appears to be sensitive to error messages reporting un-normalized file names. @@ -237,6 +238,15 @@ type FileIndexTable() = failwithf "fileOfFileIndex: invalid argument: n = %d\n" n indexToFileTable[n] + + member t.SetLineMappingOrigin n m = lineMappingOrigin[n] <- m + + member t.TryGetLineMappingOrigin n = + match lineMappingOrigin.TryGetValue n with + | true, idx -> Some idx + | _ -> None + + member t.HasLineMapping n = lineMappingOrigin.ContainsKey n [] module FileIndex = @@ -257,6 +267,10 @@ module FileIndex = let unknownFileName = "unknown" let startupFileName = "startup" let commandLineArgsFileName = "commandLineArgs" + + let setLineMappingOrigin n m = fileIndexTable.SetLineMappingOrigin n m + let tryGetLineMappingOrigin n = fileIndexTable.TryGetLineMappingOrigin n + let hasLineMapping n = fileIndexTable.HasLineMapping n [] [ {DebugCode}")>] diff --git a/src/Compiler/Utilities/range.fsi b/src/Compiler/Utilities/range.fsi index 40a52efa879..db6e850c929 100755 --- a/src/Compiler/Utilities/range.fsi +++ b/src/Compiler/Utilities/range.fsi @@ -182,6 +182,10 @@ module internal FileIndex = val fileOfFileIndex: FileIndex -> string val startupFileName: string + + val setLineMappingOrigin: int -> int -> unit + val tryGetLineMappingOrigin: int -> int option + val hasLineMapping: int -> bool module Range = diff --git a/src/Compiler/lex.fsl b/src/Compiler/lex.fsl index 18a441d0245..74048a7de70 100644 --- a/src/Compiler/lex.fsl +++ b/src/Compiler/lex.fsl @@ -816,7 +816,7 @@ rule token (args: LexArgs) (skip: bool) = parse // Construct the new position if args.applyLineDirectives then - lexbuf.EndPos <- pos.ApplyLineDirective((match file with Some f -> FileIndex.fileIndexOfFile f | None -> pos.FileIndex), line) + lexbuf.EndPos <- pos.ApplyLineDirective((match file with Some f -> FileIndex.fileIndexOfFile f | None -> pos.FileIndex), pos.FileIndex, line) else // add a newline when we don't apply a directive since we consumed a newline getting here newline lexbuf From 82f48f23d29ed10b6cb4db6dc501ed18b90ff559 Mon Sep 17 00:00:00 2001 From: Martin521 <29605222+Martin521@users.noreply.github.com> Date: Fri, 20 Sep 2024 17:13:11 +0200 Subject: [PATCH 11/35] corrected ApplyLineDirective, corrected tests, added tests --- src/Compiler/Facilities/prim-lexing.fs | 4 +- .../CompilerDirectives/Nowarn.fs | 70 +++++++++++++++---- 2 files changed, 60 insertions(+), 14 deletions(-) diff --git a/src/Compiler/Facilities/prim-lexing.fs b/src/Compiler/Facilities/prim-lexing.fs index 0267b4aee93..74cdc60c101 100644 --- a/src/Compiler/Facilities/prim-lexing.fs +++ b/src/Compiler/Facilities/prim-lexing.fs @@ -238,9 +238,9 @@ type internal Position = Position(x.FileIndex, x.Line, x.OriginalLine, x.StartOfLineAbsoluteOffset, x.StartOfLineAbsoluteOffset - 1) member x.ApplyLineDirective(fileIdx, originalIdx, line) = - if fileIdx <> originalIdx then + if not <| FileIndex.hasLineMapping fileIdx then FileIndex.setLineMappingOrigin fileIdx originalIdx - FileIndex.setLineMappingOrigin originalIdx originalIdx + FileIndex.setLineMappingOrigin originalIdx originalIdx // to flag that it contains a #line directive Position(fileIdx, line, x.OriginalLine, x.AbsoluteOffset, x.AbsoluteOffset) override p.ToString() = $"({p.Line},{p.Column})" diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Nowarn.fs b/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Nowarn.fs index c2ab1b598da..8ecd8ed8c92 100644 --- a/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Nowarn.fs +++ b/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Nowarn.fs @@ -11,17 +11,39 @@ module Nowarn = let private warning44Text = "This construct is deprecated" - let consistencySource1 = """ + let consistencySource1a = """ module A #nowarn "20" -#line 5 "xyz.fs" +#line 5 "xyz1a.fs" "" """ - let consistencySource2 = """ + // need different file names here because of global table + let consistencySource1b = """ module A #nowarn "20" -#line 1 "xyz.fs" +#line 5 "xyz1b.fs" +"" + """ + + let consistencySource2a = """ +module A +#nowarn "20" +#line 1 "xyz2a.fs" +"" + """ + + let consistencySource2b = """ +module A +#nowarn "20" +#line 1 "xyz2b.fs" +"" + """ + + let consistencySource2c = """ +module A +#nowarn "20" +#line 1 "xyz2c.fs" "" """ @@ -29,35 +51,59 @@ module A [] let inconsistentInteractionBetweenLineAndNowarn1 () = - FSharp consistencySource1 - |> withLangVersion80 + FSharp consistencySource1a + |> withLangVersion90 |> compile |> shouldSucceed [] let inconsistentInteractionBetweenLineAndNowarn2 () = - FSharp consistencySource2 - |> withLangVersion80 + FSharp consistencySource2a + |> withLangVersion90 |> compile |> shouldSucceed [] - let consistentInteractionBetweenLineAndNowarn1 () = + let consistentInteractionBetweenLineAndNowarn1 () = - FSharp consistencySource1 + FSharp consistencySource1b |> withLangVersionPreview |> compile |> shouldSucceed [] - let consistentInteractionBetweenLineAndNowarn2 () = + let consistentInteractionBetweenLineAndNowarn2 () = - FSharp consistencySource2 + FSharp consistencySource2b |> withLangVersionPreview |> compile |> shouldSucceed + [] + let consistentInteractionBetweenLineAndNowarn2AsError () = + + FSharp consistencySource2c + |> withLangVersionPreview + |> withOptions ["--warnaserror+"] + |> compile + |> shouldSucceed + + + let doubleSemiSource = """ +module A +#nowarn "20";; +"" + """ + + [] + let acceptDoubleSemicolonAfterDirective () = + + FSharp doubleSemiSource + |> withLangVersion90 + |> compile + |> shouldSucceed + let private sourceForWarningIsSuppressed = """ module A From 369c3c8949ddeeca75bb1216b3abaeb8c478e780 Mon Sep 17 00:00:00 2001 From: Martin521 <29605222+Martin521@users.noreply.github.com> Date: Fri, 20 Sep 2024 16:22:55 +0000 Subject: [PATCH 12/35] extended regex to allow comments after directive --- src/Compiler/SyntaxTree/WarnScopes.fs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Compiler/SyntaxTree/WarnScopes.fs b/src/Compiler/SyntaxTree/WarnScopes.fs index ccf5d8a1b1d..a4ffb99d8f1 100644 --- a/src/Compiler/SyntaxTree/WarnScopes.fs +++ b/src/Compiler/SyntaxTree/WarnScopes.fs @@ -44,7 +44,8 @@ module internal WarnScopes = | false, _ -> None let private regex = - Regex(" *#(nowarn|warnon)(?: +([^ \r\n]+))*\r?\n", RegexOptions.Compiled ||| RegexOptions.CultureInvariant) + Regex(" *#(nowarn|warnon)(?: +([^ \r\n/;]+))*(?: *(?:;;|\\/\\/).*)?\r?\n", + RegexOptions.Compiled ||| RegexOptions.CultureInvariant) let private getDirectives text m = let mkDirective (directiveId: string) (m: range) (c: Capture) = From 164d7cf4bd75d2ed6707971df4a6f7df1195a107 Mon Sep 17 00:00:00 2001 From: Martin521 <29605222+Martin521@users.noreply.github.com> Date: Sat, 21 Sep 2024 11:40:07 +0000 Subject: [PATCH 13/35] moved LineMap to FSharpDiagnosticOptions --- src/Compiler/Driver/CompilerDiagnostics.fs | 5 +- src/Compiler/Driver/fsc.fs | 2 +- src/Compiler/Facilities/DiagnosticOptions.fs | 9 ++- src/Compiler/Facilities/DiagnosticOptions.fsi | 7 +- src/Compiler/Facilities/prim-lexing.fs | 5 +- src/Compiler/Facilities/prim-lexing.fsi | 2 +- src/Compiler/SyntaxTree/WarnScopes.fs | 73 ++++++++++++++----- src/Compiler/SyntaxTree/WarnScopes.fsi | 16 ++-- src/Compiler/Utilities/range.fs | 14 ---- src/Compiler/Utilities/range.fsi | 4 - src/Compiler/lex.fsl | 6 +- 11 files changed, 85 insertions(+), 58 deletions(-) diff --git a/src/Compiler/Driver/CompilerDiagnostics.fs b/src/Compiler/Driver/CompilerDiagnostics.fs index f9f7008b017..811125e4455 100644 --- a/src/Compiler/Driver/CompilerDiagnostics.fs +++ b/src/Compiler/Driver/CompilerDiagnostics.fs @@ -413,10 +413,9 @@ type PhasedDiagnostic with member x.AdaptedSeverity(options, severity) = let n = x.Number - let localWarnon () = WarnScopes.IsWarnon options.WarnScopes n x.Range + let localWarnon () = WarnScopes.IsWarnon options n x.Range - let localNowarn () = - WarnScopes.IsNowarn options.WarnScopes n x.Range options.Fsharp8CompatibleNowarn + let localNowarn () = WarnScopes.IsNowarn options n x.Range let warnOff () = List.contains n options.WarnOff && not (localWarnon ()) || localNowarn () diff --git a/src/Compiler/Driver/fsc.fs b/src/Compiler/Driver/fsc.fs index 32a44a796d8..e611dd8e5cc 100644 --- a/src/Compiler/Driver/fsc.fs +++ b/src/Compiler/Driver/fsc.fs @@ -283,7 +283,7 @@ let ProcessCommandLineFlags (tcConfigB: TcConfigBuilder, lcidFromCodePage, argv) // This is where flags are interpreted by the command line fsc.exe. ParseCompilerOptions(collect, GetCoreFscCompilerOptions tcConfigB, List.tail (PostProcessCompilerArgs abbrevArgs argv)) - tcConfigB.diagnosticsOptions.Fsharp8CompatibleNowarn <- + tcConfigB.diagnosticsOptions.Fsharp9CompatibleNowarn <- not <| tcConfigB.langVersion.SupportsFeature LanguageFeature.ScopedNowarn let inputFiles = List.rev inputFilesRef diff --git a/src/Compiler/Facilities/DiagnosticOptions.fs b/src/Compiler/Facilities/DiagnosticOptions.fs index d3e366d5876..6782d518e66 100644 --- a/src/Compiler/Facilities/DiagnosticOptions.fs +++ b/src/Compiler/Facilities/DiagnosticOptions.fs @@ -16,6 +16,9 @@ type WarnScope = type WarnScopeMap = WarnScopeMap of Map +type LineMap = LineMap of Map + with static member Empty = LineMap Map.empty + [] type FSharpDiagnosticSeverity = | Hidden @@ -31,7 +34,8 @@ type FSharpDiagnosticOptions = WarnOn: int list WarnAsError: int list WarnAsWarn: int list - mutable Fsharp8CompatibleNowarn: bool // set after setting compiler options + mutable Fsharp9CompatibleNowarn: bool // set after setting compiler options + mutable LineMap: LineMap // set after lexing mutable WarnScopes: WarnScopeMap // set after lexing } @@ -43,7 +47,8 @@ type FSharpDiagnosticOptions = WarnOn = [] WarnAsError = [] WarnAsWarn = [] - Fsharp8CompatibleNowarn = false + Fsharp9CompatibleNowarn = false + LineMap = LineMap.Empty WarnScopes = WarnScopeMap Map.empty } diff --git a/src/Compiler/Facilities/DiagnosticOptions.fsi b/src/Compiler/Facilities/DiagnosticOptions.fsi index 036cfba810f..1b798371a64 100644 --- a/src/Compiler/Facilities/DiagnosticOptions.fsi +++ b/src/Compiler/Facilities/DiagnosticOptions.fsi @@ -20,6 +20,10 @@ type WarnScope = /// The collected WarnScope objects (collected during lexing) type WarnScopeMap = WarnScopeMap of Map +/// Information about the mapping implied by the #line directives +type LineMap = LineMap of Map + with static member Empty : LineMap + [] type FSharpDiagnosticSeverity = | Hidden @@ -34,7 +38,8 @@ type FSharpDiagnosticOptions = WarnOn: int list WarnAsError: int list WarnAsWarn: int list - mutable Fsharp8CompatibleNowarn: bool + mutable Fsharp9CompatibleNowarn: bool + mutable LineMap: LineMap mutable WarnScopes: WarnScopeMap } static member Default: FSharpDiagnosticOptions diff --git a/src/Compiler/Facilities/prim-lexing.fs b/src/Compiler/Facilities/prim-lexing.fs index 74cdc60c101..d1b965f100f 100644 --- a/src/Compiler/Facilities/prim-lexing.fs +++ b/src/Compiler/Facilities/prim-lexing.fs @@ -237,10 +237,7 @@ type internal Position = member x.ColumnMinusOne = Position(x.FileIndex, x.Line, x.OriginalLine, x.StartOfLineAbsoluteOffset, x.StartOfLineAbsoluteOffset - 1) - member x.ApplyLineDirective(fileIdx, originalIdx, line) = - if not <| FileIndex.hasLineMapping fileIdx then - FileIndex.setLineMappingOrigin fileIdx originalIdx - FileIndex.setLineMappingOrigin originalIdx originalIdx // to flag that it contains a #line directive + member x.ApplyLineDirective(fileIdx, line) = Position(fileIdx, line, x.OriginalLine, x.AbsoluteOffset, x.AbsoluteOffset) override p.ToString() = $"({p.Line},{p.Column})" diff --git a/src/Compiler/Facilities/prim-lexing.fsi b/src/Compiler/Facilities/prim-lexing.fsi index 7a8adc6a1b0..ff13f96c9e1 100644 --- a/src/Compiler/Facilities/prim-lexing.fsi +++ b/src/Compiler/Facilities/prim-lexing.fsi @@ -103,7 +103,7 @@ type internal Position = member ColumnMinusOne: Position /// Apply a #line directive. - member ApplyLineDirective: fileIdx: int * originalIdx: int * line: int -> Position + member ApplyLineDirective: fileIdx: int * line: int -> Position /// Get an arbitrary position, with the empty string as file name. static member Empty: Position diff --git a/src/Compiler/SyntaxTree/WarnScopes.fs b/src/Compiler/SyntaxTree/WarnScopes.fs index a4ffb99d8f1..180a715f868 100644 --- a/src/Compiler/SyntaxTree/WarnScopes.fs +++ b/src/Compiler/SyntaxTree/WarnScopes.fs @@ -12,17 +12,40 @@ open System.Text.RegularExpressions [] module internal WarnScopes = + // The keys into the BufferLocalStore used to hold the warn scopes and related data + let private warnScopeKey = "WarnScopes" + let private lineMapKey = "WarnScopes.LineMaps" + + // ************************************* - // Collect the warn scopes during lexing + // Collect the line directives to correctly interact with them // ************************************* - // The key into the BufferLocalStore used to hold the warn scopes - let private warnScopeKey = "WarnScopes" + let private getLineMap (lexbuf: Lexbuf) = + if not <| lexbuf.BufferLocalStore.ContainsKey lineMapKey then + lexbuf.BufferLocalStore.Add(lineMapKey, LineMap.Empty) + lexbuf.BufferLocalStore[lineMapKey] :?> LineMap + + let private setLineMap (lexbuf: Lexbuf) lineMap = + lexbuf.BufferLocalStore[lineMapKey] <- LineMap lineMap + + let RegisterLineDirective(lexbuf, previousFileIndex, fileIndex, line: int) = + let (LineMap lineMap) = getLineMap lexbuf + if not <| lineMap.ContainsKey fileIndex then + lineMap + |> Map.add fileIndex previousFileIndex + |> Map.add previousFileIndex previousFileIndex // to flag that it contains a line directive + |> setLineMap lexbuf + ignore line // for now + + + // ************************************* + // Collect the warn scopes during lexing + // ************************************* - let private fromLexbuf (lexbuf: Lexbuf) : WarnScopeMap = + let private getWarnScopes (lexbuf: Lexbuf) = if not <| lexbuf.BufferLocalStore.ContainsKey warnScopeKey then lexbuf.BufferLocalStore.Add(warnScopeKey, WarnScopeMap Map.empty) - lexbuf.BufferLocalStore[warnScopeKey] :?> WarnScopeMap [] @@ -90,28 +113,36 @@ module internal WarnScopes = | scopes -> warnScopes.Add(idx, WarnScope.OpenOn(mkScope m m) :: scopes) |> WarnScopeMap - let ParseAndSaveWarnDirectiveLine (lexbuf: Lexbuf) = + let ParseAndRegisterWarnDirective (lexbuf: Lexbuf) = + let (LineMap lineMap) = getLineMap lexbuf let convert (p: Internal.Utilities.Text.Lexing.Position) = mkPos p.Line p.Column let idx = lexbuf.StartPos.FileIndex - let idx = FileIndex.tryGetLineMappingOrigin idx |> Option.defaultValue idx - + let idx = lineMap.TryFind idx |> Option.defaultValue idx let m = mkFileIndexRange idx (convert lexbuf.StartPos) (convert lexbuf.EndPos) - let text = Lexbuf.LexemeString lexbuf let directives = getDirectives text m - let warnScopes = (fromLexbuf lexbuf, directives) ||> List.fold processWarnDirective + let warnScopes = (getWarnScopes lexbuf, directives) ||> List.fold processWarnDirective lexbuf.BufferLocalStore[warnScopeKey] <- warnScopes - let ClearLexbufStore (lexbuf: Lexbuf) = - lexbuf.BufferLocalStore.Remove warnScopeKey |> ignore + // ************************************* + // Move the warnscope data to diagnosticOptions + // ************************************* let MergeInto (diagnosticOptions: FSharpDiagnosticOptions) (lexbuf: Lexbuf) = - let (WarnScopeMap warnScopes) = fromLexbuf lexbuf + let (WarnScopeMap warnScopes) = getWarnScopes lexbuf + let (LineMap lineMap) = getLineMap lexbuf lock diagnosticOptions (fun () -> let (WarnScopeMap current) = diagnosticOptions.WarnScopes let warnScopes' = Map.fold (fun wss idx ws -> Map.add idx ws wss) current warnScopes - diagnosticOptions.WarnScopes <- WarnScopeMap warnScopes') + diagnosticOptions.WarnScopes <- WarnScopeMap warnScopes' + let (LineMap clm) = diagnosticOptions.LineMap + let lineMap' = Map.fold (fun lms idx oidx -> Map.add idx oidx lms) clm lineMap + diagnosticOptions.LineMap <- LineMap lineMap' + ) + + let ClearLexbufStore (lexbuf: Lexbuf) = + lexbuf.BufferLocalStore.Remove warnScopeKey |> ignore // ************************************* // Apply the warn scopes after lexing @@ -139,20 +170,24 @@ module internal WarnScopes = | WarnScope.OpenOff _ -> true | _ -> false - let IsWarnon (WarnScopeMap warnScopes) warningNumber (mo: range option) = + let IsWarnon (diagnosticOptions: FSharpDiagnosticOptions) warningNumber (mo: range option) = + let (WarnScopeMap warnScopes) = diagnosticOptions.WarnScopes + let (LineMap lineMap) = diagnosticOptions.LineMap match mo with | None -> false | Some m -> - if FileIndex.hasLineMapping m.FileIndex then + if lineMap.ContainsKey m.FileIndex then false else let scopes = getScopes (index (m.FileIndex, warningNumber)) warnScopes List.exists (isEnclosingWarnonScope m) scopes - let IsNowarn (WarnScopeMap warnScopes) warningNumber (mo: range option) compatible = - match mo, compatible with + let IsNowarn (diagnosticOptions: FSharpDiagnosticOptions) warningNumber (mo: range option) = + let (WarnScopeMap warnScopes) = diagnosticOptions.WarnScopes + let (LineMap lineMap) = diagnosticOptions.LineMap + match mo, diagnosticOptions.Fsharp9CompatibleNowarn with | Some m, false -> - match FileIndex.tryGetLineMappingOrigin m.FileIndex with + match lineMap.TryFind m.FileIndex with | None -> let scopes = getScopes (index (m.FileIndex, warningNumber)) warnScopes List.exists (isEnclosingNowarnScope m) scopes diff --git a/src/Compiler/SyntaxTree/WarnScopes.fsi b/src/Compiler/SyntaxTree/WarnScopes.fsi index c031e470365..4497b3385e0 100644 --- a/src/Compiler/SyntaxTree/WarnScopes.fsi +++ b/src/Compiler/SyntaxTree/WarnScopes.fsi @@ -8,18 +8,20 @@ open FSharp.Compiler.UnicodeLexing module internal WarnScopes = - /// For use in lex.fsl: #nowarn / #warnon directives are turned into warn scopes and saved in lexbuf.BufferLocalStore - val ParseAndSaveWarnDirectiveLine: lexbuf: Lexbuf -> unit + /// To be called from lex.fsl to register the line directives for warn scope processing + val RegisterLineDirective: lexbuf: Lexbuf * previousFileIndex: int * fileIndex: int * line: int -> unit - /// Clear the warn scopes in lexbuf.BufferLocalStore for reuse of the lexbuf + /// To be called from lex.fsl: #nowarn / #warnon directives are turned into warn scopes and saved + val ParseAndRegisterWarnDirective: lexbuf: Lexbuf -> unit + + /// Clear the WarnScopes data in lexbuf.BufferLocalStore for reuse of the lexbuf val ClearLexbufStore: Lexbuf -> unit - /// Add the warn scopes of a lexed file into the diagnostics options + /// Add the WarnScopes data of a lexed file into the diagnostics options val MergeInto: FSharpDiagnosticOptions -> Lexbuf -> unit /// Check if the range is inside a WarnScope.On scope - val IsWarnon: WarnScopeMap -> warningNumber: int -> mo: range option -> bool + val IsWarnon: FSharpDiagnosticOptions -> warningNumber: int -> mo: range option -> bool /// Check if the range is inside a WarnScope.Off scope - /// compatible = compatible with earlier (< F# 10.0) inconsistent interaction between #line and #nowarn - val IsNowarn: WarnScopeMap -> warningNumber: int -> mo: range option -> compatible: bool -> bool + val IsNowarn: FSharpDiagnosticOptions -> warningNumber: int -> mo: range option -> bool diff --git a/src/Compiler/Utilities/range.fs b/src/Compiler/Utilities/range.fs index 974059c2dd3..6d0002a97ba 100755 --- a/src/Compiler/Utilities/range.fs +++ b/src/Compiler/Utilities/range.fs @@ -185,7 +185,6 @@ module RangeImpl = type FileIndexTable() = let indexToFileTable = ResizeArray<_>(11) let fileToIndexTable = ConcurrentDictionary() - let lineMappingOrigin = ConcurrentDictionary() // Note: we should likely adjust this code to always normalize. However some testing (and possibly some // product behaviour) appears to be sensitive to error messages reporting un-normalized file names. @@ -238,15 +237,6 @@ type FileIndexTable() = failwithf "fileOfFileIndex: invalid argument: n = %d\n" n indexToFileTable[n] - - member t.SetLineMappingOrigin n m = lineMappingOrigin[n] <- m - - member t.TryGetLineMappingOrigin n = - match lineMappingOrigin.TryGetValue n with - | true, idx -> Some idx - | _ -> None - - member t.HasLineMapping n = lineMappingOrigin.ContainsKey n [] module FileIndex = @@ -267,10 +257,6 @@ module FileIndex = let unknownFileName = "unknown" let startupFileName = "startup" let commandLineArgsFileName = "commandLineArgs" - - let setLineMappingOrigin n m = fileIndexTable.SetLineMappingOrigin n m - let tryGetLineMappingOrigin n = fileIndexTable.TryGetLineMappingOrigin n - let hasLineMapping n = fileIndexTable.HasLineMapping n [] [ {DebugCode}")>] diff --git a/src/Compiler/Utilities/range.fsi b/src/Compiler/Utilities/range.fsi index db6e850c929..40a52efa879 100755 --- a/src/Compiler/Utilities/range.fsi +++ b/src/Compiler/Utilities/range.fsi @@ -182,10 +182,6 @@ module internal FileIndex = val fileOfFileIndex: FileIndex -> string val startupFileName: string - - val setLineMappingOrigin: int -> int -> unit - val tryGetLineMappingOrigin: int -> int option - val hasLineMapping: int -> bool module Range = diff --git a/src/Compiler/lex.fsl b/src/Compiler/lex.fsl index 74048a7de70..8b095bb23a1 100644 --- a/src/Compiler/lex.fsl +++ b/src/Compiler/lex.fsl @@ -816,7 +816,9 @@ rule token (args: LexArgs) (skip: bool) = parse // Construct the new position if args.applyLineDirectives then - lexbuf.EndPos <- pos.ApplyLineDirective((match file with Some f -> FileIndex.fileIndexOfFile f | None -> pos.FileIndex), pos.FileIndex, line) + let fileIndex = match file with Some f -> FileIndex.fileIndexOfFile f | None -> pos.FileIndex + lexbuf.EndPos <- pos.ApplyLineDirective(fileIndex, line) + WarnScopes.RegisterLineDirective(lexbuf, pos.FileIndex, fileIndex, line) else // add a newline when we don't apply a directive since we consumed a newline getting here newline lexbuf @@ -1082,7 +1084,7 @@ rule token (args: LexArgs) (skip: bool) = parse | anywhite* ("#nowarn" | "#warnon") anystring newline { - WarnScopes.ParseAndSaveWarnDirectiveLine lexbuf + WarnScopes.ParseAndRegisterWarnDirective lexbuf newline lexbuf let tok = WHITESPACE (LexCont.Token (args.ifdefStack, args.stringNest)) if not skip then tok else token args skip lexbuf From 267c8dfbb77688ac913c51af55470fc1bb1e47fc Mon Sep 17 00:00:00 2001 From: Martin521 <29605222+Martin521@users.noreply.github.com> Date: Sat, 21 Sep 2024 19:26:28 +0000 Subject: [PATCH 14/35] typo correction --- src/Compiler/Driver/fsc.fs | 2 +- src/Compiler/Facilities/DiagnosticOptions.fs | 4 ++-- src/Compiler/Facilities/DiagnosticOptions.fsi | 2 +- src/Compiler/SyntaxTree/WarnScopes.fs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Compiler/Driver/fsc.fs b/src/Compiler/Driver/fsc.fs index e611dd8e5cc..24a6c0fad1b 100644 --- a/src/Compiler/Driver/fsc.fs +++ b/src/Compiler/Driver/fsc.fs @@ -283,7 +283,7 @@ let ProcessCommandLineFlags (tcConfigB: TcConfigBuilder, lcidFromCodePage, argv) // This is where flags are interpreted by the command line fsc.exe. ParseCompilerOptions(collect, GetCoreFscCompilerOptions tcConfigB, List.tail (PostProcessCompilerArgs abbrevArgs argv)) - tcConfigB.diagnosticsOptions.Fsharp9CompatibleNowarn <- + tcConfigB.diagnosticsOptions.FSharp9CompatibleNowarn <- not <| tcConfigB.langVersion.SupportsFeature LanguageFeature.ScopedNowarn let inputFiles = List.rev inputFilesRef diff --git a/src/Compiler/Facilities/DiagnosticOptions.fs b/src/Compiler/Facilities/DiagnosticOptions.fs index 6782d518e66..e619cfd5985 100644 --- a/src/Compiler/Facilities/DiagnosticOptions.fs +++ b/src/Compiler/Facilities/DiagnosticOptions.fs @@ -34,7 +34,7 @@ type FSharpDiagnosticOptions = WarnOn: int list WarnAsError: int list WarnAsWarn: int list - mutable Fsharp9CompatibleNowarn: bool // set after setting compiler options + mutable FSharp9CompatibleNowarn: bool // set after setting compiler options mutable LineMap: LineMap // set after lexing mutable WarnScopes: WarnScopeMap // set after lexing } @@ -47,7 +47,7 @@ type FSharpDiagnosticOptions = WarnOn = [] WarnAsError = [] WarnAsWarn = [] - Fsharp9CompatibleNowarn = false + FSharp9CompatibleNowarn = false LineMap = LineMap.Empty WarnScopes = WarnScopeMap Map.empty } diff --git a/src/Compiler/Facilities/DiagnosticOptions.fsi b/src/Compiler/Facilities/DiagnosticOptions.fsi index 1b798371a64..663e6ba06d3 100644 --- a/src/Compiler/Facilities/DiagnosticOptions.fsi +++ b/src/Compiler/Facilities/DiagnosticOptions.fsi @@ -38,7 +38,7 @@ type FSharpDiagnosticOptions = WarnOn: int list WarnAsError: int list WarnAsWarn: int list - mutable Fsharp9CompatibleNowarn: bool + mutable FSharp9CompatibleNowarn: bool mutable LineMap: LineMap mutable WarnScopes: WarnScopeMap } diff --git a/src/Compiler/SyntaxTree/WarnScopes.fs b/src/Compiler/SyntaxTree/WarnScopes.fs index 180a715f868..ea272d697ca 100644 --- a/src/Compiler/SyntaxTree/WarnScopes.fs +++ b/src/Compiler/SyntaxTree/WarnScopes.fs @@ -185,7 +185,7 @@ module internal WarnScopes = let IsNowarn (diagnosticOptions: FSharpDiagnosticOptions) warningNumber (mo: range option) = let (WarnScopeMap warnScopes) = diagnosticOptions.WarnScopes let (LineMap lineMap) = diagnosticOptions.LineMap - match mo, diagnosticOptions.Fsharp9CompatibleNowarn with + match mo, diagnosticOptions.FSharp9CompatibleNowarn with | Some m, false -> match lineMap.TryFind m.FileIndex with | None -> From 4bef77db31e30981c3c004e1eda24be9b8a07649 Mon Sep 17 00:00:00 2001 From: Martin521 <29605222+Martin521@users.noreply.github.com> Date: Sat, 21 Sep 2024 19:26:53 +0000 Subject: [PATCH 15/35] surface area baseline update --- ...vice.SurfaceArea.netstandard20.release.bsl | 115 +++++++++++++----- 1 file changed, 82 insertions(+), 33 deletions(-) diff --git a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.release.bsl b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.release.bsl index 543c92ef5cc..abcdac5d891 100644 --- a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.release.bsl +++ b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.release.bsl @@ -2236,9 +2236,6 @@ FSharp.Compiler.CodeAnalysis.FSharpParsingOptions: FSharp.Compiler.CodeAnalysis. FSharp.Compiler.CodeAnalysis.FSharpParsingOptions: FSharp.Compiler.CodeAnalysis.FSharpParsingOptions get_Default() FSharp.Compiler.CodeAnalysis.FSharpParsingOptions: FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions DiagnosticOptions FSharp.Compiler.CodeAnalysis.FSharpParsingOptions: FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions get_DiagnosticOptions() -FSharp.Compiler.CodeAnalysis.FSharpParsingOptions: Int32 CompareTo(FSharp.Compiler.CodeAnalysis.FSharpParsingOptions) -FSharp.Compiler.CodeAnalysis.FSharpParsingOptions: Int32 CompareTo(System.Object) -FSharp.Compiler.CodeAnalysis.FSharpParsingOptions: Int32 CompareTo(System.Object, System.Collections.IComparer) FSharp.Compiler.CodeAnalysis.FSharpParsingOptions: Int32 GetHashCode() FSharp.Compiler.CodeAnalysis.FSharpParsingOptions: Int32 GetHashCode(System.Collections.IEqualityComparer) FSharp.Compiler.CodeAnalysis.FSharpParsingOptions: Microsoft.FSharp.Collections.FSharpList`1[System.String] ConditionalDefines @@ -2802,14 +2799,20 @@ FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean Equals(FSharp.Compi FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean Equals(FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions, System.Collections.IEqualityComparer) FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean Equals(System.Object) FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean Equals(System.Object, System.Collections.IEqualityComparer) +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean FSharp9CompatibleNowarn +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean FSharp9CompatibleNowarn@ FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean GlobalWarnAsError FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean get_CheckXmlDocs() +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean get_FSharp9CompatibleNowarn() FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean get_GlobalWarnAsError() FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions Default FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions get_Default() -FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Int32 CompareTo(FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions) -FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Int32 CompareTo(System.Object) -FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Int32 CompareTo(System.Object, System.Collections.IComparer) +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: FSharp.Compiler.Diagnostics.LineMap LineMap +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: FSharp.Compiler.Diagnostics.LineMap LineMap@ +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: FSharp.Compiler.Diagnostics.LineMap get_LineMap() +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: FSharp.Compiler.Diagnostics.WarnScopeMap WarnScopes +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: FSharp.Compiler.Diagnostics.WarnScopeMap WarnScopes@ +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: FSharp.Compiler.Diagnostics.WarnScopeMap get_WarnScopes() FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Int32 GetHashCode() FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Int32 GetHashCode(System.Collections.IEqualityComparer) FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Int32 WarnLevel @@ -2823,7 +2826,10 @@ FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Microsoft.FSharp.Collection FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Microsoft.FSharp.Collections.FSharpList`1[System.Int32] get_WarnOff() FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Microsoft.FSharp.Collections.FSharpList`1[System.Int32] get_WarnOn() FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: System.String ToString() -FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Void .ctor(Int32, Boolean, Microsoft.FSharp.Collections.FSharpList`1[System.Int32], Microsoft.FSharp.Collections.FSharpList`1[System.Int32], Microsoft.FSharp.Collections.FSharpList`1[System.Int32], Microsoft.FSharp.Collections.FSharpList`1[System.Int32]) +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Void .ctor(Int32, Boolean, Microsoft.FSharp.Collections.FSharpList`1[System.Int32], Microsoft.FSharp.Collections.FSharpList`1[System.Int32], Microsoft.FSharp.Collections.FSharpList`1[System.Int32], Microsoft.FSharp.Collections.FSharpList`1[System.Int32], Boolean, FSharp.Compiler.Diagnostics.LineMap, FSharp.Compiler.Diagnostics.WarnScopeMap) +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Void set_FSharp9CompatibleNowarn(Boolean) +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Void set_LineMap(FSharp.Compiler.Diagnostics.LineMap) +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Void set_WarnScopes(FSharp.Compiler.Diagnostics.WarnScopeMap) FSharp.Compiler.Diagnostics.FSharpDiagnosticSeverity+Tags: Int32 Error FSharp.Compiler.Diagnostics.FSharpDiagnosticSeverity+Tags: Int32 Hidden FSharp.Compiler.Diagnostics.FSharpDiagnosticSeverity+Tags: Int32 Info @@ -2857,6 +2863,73 @@ FSharp.Compiler.Diagnostics.FSharpDiagnosticSeverity: Int32 GetHashCode(System.C FSharp.Compiler.Diagnostics.FSharpDiagnosticSeverity: Int32 Tag FSharp.Compiler.Diagnostics.FSharpDiagnosticSeverity: Int32 get_Tag() FSharp.Compiler.Diagnostics.FSharpDiagnosticSeverity: System.String ToString() +FSharp.Compiler.Diagnostics.LineMap: Boolean Equals(FSharp.Compiler.Diagnostics.LineMap) +FSharp.Compiler.Diagnostics.LineMap: Boolean Equals(FSharp.Compiler.Diagnostics.LineMap, System.Collections.IEqualityComparer) +FSharp.Compiler.Diagnostics.LineMap: Boolean Equals(System.Object) +FSharp.Compiler.Diagnostics.LineMap: Boolean Equals(System.Object, System.Collections.IEqualityComparer) +FSharp.Compiler.Diagnostics.LineMap: FSharp.Compiler.Diagnostics.LineMap Empty +FSharp.Compiler.Diagnostics.LineMap: FSharp.Compiler.Diagnostics.LineMap NewLineMap(Microsoft.FSharp.Collections.FSharpMap`2[System.Int32,System.Int32]) +FSharp.Compiler.Diagnostics.LineMap: FSharp.Compiler.Diagnostics.LineMap get_Empty() +FSharp.Compiler.Diagnostics.LineMap: Int32 CompareTo(FSharp.Compiler.Diagnostics.LineMap) +FSharp.Compiler.Diagnostics.LineMap: Int32 CompareTo(System.Object) +FSharp.Compiler.Diagnostics.LineMap: Int32 CompareTo(System.Object, System.Collections.IComparer) +FSharp.Compiler.Diagnostics.LineMap: Int32 GetHashCode() +FSharp.Compiler.Diagnostics.LineMap: Int32 GetHashCode(System.Collections.IEqualityComparer) +FSharp.Compiler.Diagnostics.LineMap: Int32 Tag +FSharp.Compiler.Diagnostics.LineMap: Int32 get_Tag() +FSharp.Compiler.Diagnostics.LineMap: Microsoft.FSharp.Collections.FSharpMap`2[System.Int32,System.Int32] Item +FSharp.Compiler.Diagnostics.LineMap: Microsoft.FSharp.Collections.FSharpMap`2[System.Int32,System.Int32] get_Item() +FSharp.Compiler.Diagnostics.LineMap: System.String ToString() +FSharp.Compiler.Diagnostics.WarnScope+Off: FSharp.Compiler.Text.Range Item +FSharp.Compiler.Diagnostics.WarnScope+Off: FSharp.Compiler.Text.Range get_Item() +FSharp.Compiler.Diagnostics.WarnScope+On: FSharp.Compiler.Text.Range Item +FSharp.Compiler.Diagnostics.WarnScope+On: FSharp.Compiler.Text.Range get_Item() +FSharp.Compiler.Diagnostics.WarnScope+OpenOff: FSharp.Compiler.Text.Range Item +FSharp.Compiler.Diagnostics.WarnScope+OpenOff: FSharp.Compiler.Text.Range get_Item() +FSharp.Compiler.Diagnostics.WarnScope+OpenOn: FSharp.Compiler.Text.Range Item +FSharp.Compiler.Diagnostics.WarnScope+OpenOn: FSharp.Compiler.Text.Range get_Item() +FSharp.Compiler.Diagnostics.WarnScope+Tags: Int32 Off +FSharp.Compiler.Diagnostics.WarnScope+Tags: Int32 On +FSharp.Compiler.Diagnostics.WarnScope+Tags: Int32 OpenOff +FSharp.Compiler.Diagnostics.WarnScope+Tags: Int32 OpenOn +FSharp.Compiler.Diagnostics.WarnScope: Boolean Equals(FSharp.Compiler.Diagnostics.WarnScope) +FSharp.Compiler.Diagnostics.WarnScope: Boolean Equals(FSharp.Compiler.Diagnostics.WarnScope, System.Collections.IEqualityComparer) +FSharp.Compiler.Diagnostics.WarnScope: Boolean Equals(System.Object) +FSharp.Compiler.Diagnostics.WarnScope: Boolean Equals(System.Object, System.Collections.IEqualityComparer) +FSharp.Compiler.Diagnostics.WarnScope: Boolean IsOff +FSharp.Compiler.Diagnostics.WarnScope: Boolean IsOn +FSharp.Compiler.Diagnostics.WarnScope: Boolean IsOpenOff +FSharp.Compiler.Diagnostics.WarnScope: Boolean IsOpenOn +FSharp.Compiler.Diagnostics.WarnScope: Boolean get_IsOff() +FSharp.Compiler.Diagnostics.WarnScope: Boolean get_IsOn() +FSharp.Compiler.Diagnostics.WarnScope: Boolean get_IsOpenOff() +FSharp.Compiler.Diagnostics.WarnScope: Boolean get_IsOpenOn() +FSharp.Compiler.Diagnostics.WarnScope: FSharp.Compiler.Diagnostics.WarnScope NewOff(FSharp.Compiler.Text.Range) +FSharp.Compiler.Diagnostics.WarnScope: FSharp.Compiler.Diagnostics.WarnScope NewOn(FSharp.Compiler.Text.Range) +FSharp.Compiler.Diagnostics.WarnScope: FSharp.Compiler.Diagnostics.WarnScope NewOpenOff(FSharp.Compiler.Text.Range) +FSharp.Compiler.Diagnostics.WarnScope: FSharp.Compiler.Diagnostics.WarnScope NewOpenOn(FSharp.Compiler.Text.Range) +FSharp.Compiler.Diagnostics.WarnScope: FSharp.Compiler.Diagnostics.WarnScope+Off +FSharp.Compiler.Diagnostics.WarnScope: FSharp.Compiler.Diagnostics.WarnScope+On +FSharp.Compiler.Diagnostics.WarnScope: FSharp.Compiler.Diagnostics.WarnScope+OpenOff +FSharp.Compiler.Diagnostics.WarnScope: FSharp.Compiler.Diagnostics.WarnScope+OpenOn +FSharp.Compiler.Diagnostics.WarnScope: FSharp.Compiler.Diagnostics.WarnScope+Tags +FSharp.Compiler.Diagnostics.WarnScope: Int32 GetHashCode() +FSharp.Compiler.Diagnostics.WarnScope: Int32 GetHashCode(System.Collections.IEqualityComparer) +FSharp.Compiler.Diagnostics.WarnScope: Int32 Tag +FSharp.Compiler.Diagnostics.WarnScope: Int32 get_Tag() +FSharp.Compiler.Diagnostics.WarnScope: System.String ToString() +FSharp.Compiler.Diagnostics.WarnScopeMap: Boolean Equals(FSharp.Compiler.Diagnostics.WarnScopeMap) +FSharp.Compiler.Diagnostics.WarnScopeMap: Boolean Equals(FSharp.Compiler.Diagnostics.WarnScopeMap, System.Collections.IEqualityComparer) +FSharp.Compiler.Diagnostics.WarnScopeMap: Boolean Equals(System.Object) +FSharp.Compiler.Diagnostics.WarnScopeMap: Boolean Equals(System.Object, System.Collections.IEqualityComparer) +FSharp.Compiler.Diagnostics.WarnScopeMap: FSharp.Compiler.Diagnostics.WarnScopeMap NewWarnScopeMap(Microsoft.FSharp.Collections.FSharpMap`2[System.Int64,Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Diagnostics.WarnScope]]) +FSharp.Compiler.Diagnostics.WarnScopeMap: Int32 GetHashCode() +FSharp.Compiler.Diagnostics.WarnScopeMap: Int32 GetHashCode(System.Collections.IEqualityComparer) +FSharp.Compiler.Diagnostics.WarnScopeMap: Int32 Tag +FSharp.Compiler.Diagnostics.WarnScopeMap: Int32 get_Tag() +FSharp.Compiler.Diagnostics.WarnScopeMap: Microsoft.FSharp.Collections.FSharpMap`2[System.Int64,Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Diagnostics.WarnScope]] Item +FSharp.Compiler.Diagnostics.WarnScopeMap: Microsoft.FSharp.Collections.FSharpMap`2[System.Int64,Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Diagnostics.WarnScope]] get_Item() +FSharp.Compiler.Diagnostics.WarnScopeMap: System.String ToString() FSharp.Compiler.EditorServices.AssemblyContent: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.EditorServices.AssemblySymbol] GetAssemblyContent(Microsoft.FSharp.Core.FSharpFunc`2[Microsoft.FSharp.Core.FSharpFunc`2[FSharp.Compiler.EditorServices.IAssemblyContentCache,Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.EditorServices.AssemblySymbol]],Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.EditorServices.AssemblySymbol]], FSharp.Compiler.EditorServices.AssemblyContentType, Microsoft.FSharp.Core.FSharpOption`1[System.String], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Symbols.FSharpAssembly]) FSharp.Compiler.EditorServices.AssemblyContent: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.EditorServices.AssemblySymbol] GetAssemblySignatureContent(FSharp.Compiler.EditorServices.AssemblyContentType, FSharp.Compiler.Symbols.FSharpAssemblySignature) FSharp.Compiler.EditorServices.AssemblyContentType+Tags: Int32 Full @@ -6133,7 +6206,7 @@ FSharp.Compiler.Syntax.ParsedImplFileInput: Boolean get_IsLastCompiland() FSharp.Compiler.Syntax.ParsedImplFileInput: Boolean get_IsScript() FSharp.Compiler.Syntax.ParsedImplFileInput: Boolean get_isScript() FSharp.Compiler.Syntax.ParsedImplFileInput: Boolean isScript -FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.Syntax.ParsedImplFileInput NewParsedImplFileInput(System.String, Boolean, FSharp.Compiler.Syntax.QualifiedNameOfFile, Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ScopedPragma], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynModuleOrNamespace], System.Tuple`2[System.Boolean,System.Boolean], FSharp.Compiler.SyntaxTrivia.ParsedImplFileInputTrivia, Microsoft.FSharp.Collections.FSharpSet`1[System.String]) +FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.Syntax.ParsedImplFileInput NewParsedImplFileInput(System.String, Boolean, FSharp.Compiler.Syntax.QualifiedNameOfFile, Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynModuleOrNamespace], System.Tuple`2[System.Boolean,System.Boolean], FSharp.Compiler.SyntaxTrivia.ParsedImplFileInputTrivia, Microsoft.FSharp.Collections.FSharpSet`1[System.String]) FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.Syntax.QualifiedNameOfFile QualifiedName FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.Syntax.QualifiedNameOfFile get_QualifiedName() FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.Syntax.QualifiedNameOfFile get_qualifiedNameOfFile() @@ -6148,10 +6221,6 @@ FSharp.Compiler.Syntax.ParsedImplFileInput: Microsoft.FSharp.Collections.FSharpL FSharp.Compiler.Syntax.ParsedImplFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective] get_HashDirectives() FSharp.Compiler.Syntax.ParsedImplFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective] get_hashDirectives() FSharp.Compiler.Syntax.ParsedImplFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective] hashDirectives -FSharp.Compiler.Syntax.ParsedImplFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ScopedPragma] ScopedPragmas -FSharp.Compiler.Syntax.ParsedImplFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ScopedPragma] get_ScopedPragmas() -FSharp.Compiler.Syntax.ParsedImplFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ScopedPragma] get_scopedPragmas() -FSharp.Compiler.Syntax.ParsedImplFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ScopedPragma] scopedPragmas FSharp.Compiler.Syntax.ParsedImplFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynModuleOrNamespace] Contents FSharp.Compiler.Syntax.ParsedImplFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynModuleOrNamespace] contents FSharp.Compiler.Syntax.ParsedImplFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynModuleOrNamespace] get_Contents() @@ -6186,8 +6255,6 @@ FSharp.Compiler.Syntax.ParsedInput: FSharp.Compiler.Text.Range Range FSharp.Compiler.Syntax.ParsedInput: FSharp.Compiler.Text.Range get_Range() FSharp.Compiler.Syntax.ParsedInput: Int32 Tag FSharp.Compiler.Syntax.ParsedInput: Int32 get_Tag() -FSharp.Compiler.Syntax.ParsedInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ScopedPragma] ScopedPragmas -FSharp.Compiler.Syntax.ParsedInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ScopedPragma] get_ScopedPragmas() FSharp.Compiler.Syntax.ParsedInput: Microsoft.FSharp.Collections.FSharpSet`1[System.String] Identifiers FSharp.Compiler.Syntax.ParsedInput: Microsoft.FSharp.Collections.FSharpSet`1[System.String] get_Identifiers() FSharp.Compiler.Syntax.ParsedInput: System.String FileName @@ -6256,7 +6323,7 @@ FSharp.Compiler.Syntax.ParsedSigFileFragment: FSharp.Compiler.Syntax.ParsedSigFi FSharp.Compiler.Syntax.ParsedSigFileFragment: Int32 Tag FSharp.Compiler.Syntax.ParsedSigFileFragment: Int32 get_Tag() FSharp.Compiler.Syntax.ParsedSigFileFragment: System.String ToString() -FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.Syntax.ParsedSigFileInput NewParsedSigFileInput(System.String, FSharp.Compiler.Syntax.QualifiedNameOfFile, Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ScopedPragma], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynModuleOrNamespaceSig], FSharp.Compiler.SyntaxTrivia.ParsedSigFileInputTrivia, Microsoft.FSharp.Collections.FSharpSet`1[System.String]) +FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.Syntax.ParsedSigFileInput NewParsedSigFileInput(System.String, FSharp.Compiler.Syntax.QualifiedNameOfFile, Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynModuleOrNamespaceSig], FSharp.Compiler.SyntaxTrivia.ParsedSigFileInputTrivia, Microsoft.FSharp.Collections.FSharpSet`1[System.String]) FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.Syntax.QualifiedNameOfFile QualifiedName FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.Syntax.QualifiedNameOfFile get_QualifiedName() FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.Syntax.QualifiedNameOfFile get_qualifiedNameOfFile() @@ -6271,10 +6338,6 @@ FSharp.Compiler.Syntax.ParsedSigFileInput: Microsoft.FSharp.Collections.FSharpLi FSharp.Compiler.Syntax.ParsedSigFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective] get_HashDirectives() FSharp.Compiler.Syntax.ParsedSigFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective] get_hashDirectives() FSharp.Compiler.Syntax.ParsedSigFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective] hashDirectives -FSharp.Compiler.Syntax.ParsedSigFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ScopedPragma] ScopedPragmas -FSharp.Compiler.Syntax.ParsedSigFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ScopedPragma] get_ScopedPragmas() -FSharp.Compiler.Syntax.ParsedSigFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ScopedPragma] get_scopedPragmas() -FSharp.Compiler.Syntax.ParsedSigFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ScopedPragma] scopedPragmas FSharp.Compiler.Syntax.ParsedSigFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynModuleOrNamespaceSig] Contents FSharp.Compiler.Syntax.ParsedSigFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynModuleOrNamespaceSig] contents FSharp.Compiler.Syntax.ParsedSigFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynModuleOrNamespaceSig] get_Contents() @@ -6342,20 +6405,6 @@ FSharp.Compiler.Syntax.QualifiedNameOfFile: Int32 get_Tag() FSharp.Compiler.Syntax.QualifiedNameOfFile: System.String Text FSharp.Compiler.Syntax.QualifiedNameOfFile: System.String ToString() FSharp.Compiler.Syntax.QualifiedNameOfFile: System.String get_Text() -FSharp.Compiler.Syntax.ScopedPragma: Boolean Equals(FSharp.Compiler.Syntax.ScopedPragma) -FSharp.Compiler.Syntax.ScopedPragma: Boolean Equals(FSharp.Compiler.Syntax.ScopedPragma, System.Collections.IEqualityComparer) -FSharp.Compiler.Syntax.ScopedPragma: Boolean Equals(System.Object) -FSharp.Compiler.Syntax.ScopedPragma: Boolean Equals(System.Object, System.Collections.IEqualityComparer) -FSharp.Compiler.Syntax.ScopedPragma: FSharp.Compiler.Syntax.ScopedPragma NewWarningOff(FSharp.Compiler.Text.Range, Int32) -FSharp.Compiler.Syntax.ScopedPragma: FSharp.Compiler.Text.Range get_range() -FSharp.Compiler.Syntax.ScopedPragma: FSharp.Compiler.Text.Range range -FSharp.Compiler.Syntax.ScopedPragma: Int32 GetHashCode() -FSharp.Compiler.Syntax.ScopedPragma: Int32 GetHashCode(System.Collections.IEqualityComparer) -FSharp.Compiler.Syntax.ScopedPragma: Int32 Tag -FSharp.Compiler.Syntax.ScopedPragma: Int32 get_Tag() -FSharp.Compiler.Syntax.ScopedPragma: Int32 get_warningNumber() -FSharp.Compiler.Syntax.ScopedPragma: Int32 warningNumber -FSharp.Compiler.Syntax.ScopedPragma: System.String ToString() FSharp.Compiler.Syntax.SeqExprOnly: Boolean Equals(FSharp.Compiler.Syntax.SeqExprOnly) FSharp.Compiler.Syntax.SeqExprOnly: Boolean Equals(FSharp.Compiler.Syntax.SeqExprOnly, System.Collections.IEqualityComparer) FSharp.Compiler.Syntax.SeqExprOnly: Boolean Equals(System.Object) From f44248a1c7793c0b4addc38a8c5d0cbbde029961 Mon Sep 17 00:00:00 2001 From: Martin521 <29605222+Martin521@users.noreply.github.com> Date: Sat, 21 Sep 2024 19:28:54 +0000 Subject: [PATCH 16/35] Remove ", []" in 900 baselines (because of removed scopedPragmas parameter in ParsedImplFileInput) --- .../SyntaxTree/Attribute/RangeOfAttribute.fs.bsl | 2 +- .../Attribute/RangeOfAttributeWithPath.fs.bsl | 2 +- .../Attribute/RangeOfAttributeWithTarget.fs.bsl | 2 +- .../ColonBeforeReturnTypeIsPartOfTrivia.fs.bsl | 2 +- ...BeforeReturnTypeIsPartOfTriviaInProperties.fs.bsl | 1 - .../ConditionalDirectiveAroundInlineKeyword.fs.bsl | 2 +- .../SyntaxTree/Binding/InlineKeywordInBinding.fs.bsl | 2 +- ...dPatternShouldBeIncludedInSynModuleDeclLet.fs.bsl | 2 +- ...eShouldBeIncludedInBindingOfSynExprObjExpr.fs.bsl | 2 +- ...BeIncludedInConstructorSynMemberDefnMember.fs.bsl | 2 +- ...dInConstructorSynMemberDefnMemberOptAsSpec.fs.bsl | 2 +- ...eIncludedInFullSynMemberDefnMemberProperty.fs.bsl | 1 - ...buteShouldBeIncludedInSecondaryConstructor.fs.bsl | 2 +- ...ShouldBeIncludedInSynMemberDefnLetBindings.fs.bsl | 2 +- ...ibuteShouldBeIncludedInSynMemberDefnMember.fs.bsl | 2 +- ...ttributeShouldBeIncludedInSynModuleDeclLet.fs.bsl | 1 - ...udedInWriteOnlySynMemberDefnMemberProperty.fs.bsl | 2 +- ...fEqualSignShouldBePresentInLocalLetBinding.fs.bsl | 1 - ...lSignShouldBePresentInLocalLetBindingTyped.fs.bsl | 2 +- ...eOfEqualSignShouldBePresentInMemberBinding.fs.bsl | 2 +- ...ouldBePresentInMemberBindingWithParameters.fs.bsl | 2 +- ...ouldBePresentInMemberBindingWithReturnType.fs.bsl | 2 +- .../RangeOfEqualSignShouldBePresentInProperty.fs.bsl | 2 +- ...gnShouldBePresentInSynModuleDeclLetBinding.fs.bsl | 2 +- ...uldBePresentInSynModuleDeclLetBindingTyped.fs.bsl | 2 +- ...ordShouldBePresentInSynExprLetOrUseBinding.fs.bsl | 2 +- ...rdShouldBePresentInSynModuleDeclLetBinding.fs.bsl | 2 +- ...entInSynModuleDeclLetBindingWithAttributes.fs.bsl | 2 +- ...TupleReturnTypeOfBindingShouldContainStars.fs.bsl | 2 +- .../CodeComment/BlockCommentInSourceCode.fs.bsl | 2 +- .../BlockCommentInSourceCodeSignatureFile.fsi.bsl | 2 +- .../CodeComment/CommentAfterSourceCode.fs.bsl | 2 +- .../CommentAfterSourceCodeSignatureFile.fsi.bsl | 2 +- .../SyntaxTree/CodeComment/CommentAtEndOfFile.fs.bsl | 2 +- .../CodeComment/CommentOnSingleLine.fs.bsl | 2 +- .../CommentOnSingleLineSignatureFile.fsi.bsl | 2 +- ...tShouldBeCapturedIfUsedInAnInvalidLocation.fs.bsl | 2 +- .../TripleSlashCommentShouldNotBeCaptured.fs.bsl | 2 +- ...RangeThatStartsAtAndAndEndsAfterExpression.fs.bsl | 1 - ...BangRangeStartsAtAndAndEndsAfterExpression.fs.bsl | 2 +- ...esInMultilineCommentAreNotReportedAsTrivia.fs.bsl | 1 - ...ommentAreNotReportedAsTriviaSignatureFile.fsi.bsl | 2 +- ...vesInMultilineStringAreNotReportedAsTrivia.fs.bsl | 1 - ...StringAreNotReportedAsTriviaSignatureFile.fsi.bsl | 2 +- .../ConditionalDirective/NestedIfElseEndif.fs.bsl | 2 +- .../NestedIfElseEndifSignatureFile.fsi.bsl | 2 +- .../NestedIfEndifWithComplexExpressions.fs.bsl | 2 +- ...fEndifWithComplexExpressionsSignatureFile.fsi.bsl | 1 - .../ConditionalDirective/SingleIfElseEndif.fs.bsl | 2 +- .../SingleIfElseEndifSignatureFile.fsi.bsl | 2 +- .../ConditionalDirective/SingleIfEndif.fs.bsl | 2 +- .../SingleIfEndifSignatureFile.fsi.bsl | 2 +- .../EnumCase/MultipleSynEnumCasesHaveBarRange.fs.bsl | 2 +- .../EnumCase/SingleSynEnumCaseHasBarRange.fs.bsl | 2 +- .../EnumCase/SingleSynEnumCaseWithoutBar.fs.bsl | 2 +- .../data/SyntaxTree/Exception/Missing name 01.fs.bsl | 2 +- .../data/SyntaxTree/Exception/Missing name 02.fs.bsl | 2 +- .../data/SyntaxTree/Exception/Missing name 03.fs.bsl | 2 +- .../Exception/Recover Function Type 01.fs.bsl | 2 +- ...DefnShouldContainsTheRangeOfTheWithKeyword.fs.bsl | 2 +- .../SyntaxTree/Expression/AnonymousRecords-01.fs.bsl | 2 +- .../SyntaxTree/Expression/AnonymousRecords-02.fs.bsl | 2 +- .../SyntaxTree/Expression/AnonymousRecords-03.fs.bsl | 2 +- .../SyntaxTree/Expression/AnonymousRecords-04.fs.bsl | 2 +- .../SyntaxTree/Expression/AnonymousRecords-05.fs.bsl | 2 +- .../SyntaxTree/Expression/AnonymousRecords-06.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Binary - Eq 01.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Binary - Eq 02.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Binary - Eq 03.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Binary - Eq 04.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Binary - Eq 05.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Binary - Eq 06.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Binary - Eq 07.fs.bsl | 2 +- .../SyntaxTree/Expression/Binary - Plus 01.fs.bsl | 2 +- .../SyntaxTree/Expression/Binary - Plus 02.fs.bsl | 2 +- .../SyntaxTree/Expression/Binary - Plus 03.fs.bsl | 2 +- .../SyntaxTree/Expression/Binary - Plus 04.fs.bsl | 2 +- .../SyntaxTree/Expression/Binary - Plus 05.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Binary 01.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Binary 02.fs.bsl | 2 +- ...heRangeOfTheEqualsSignInSynExprRecordField.fs.bsl | 1 - .../service/data/SyntaxTree/Expression/Do 01.fs.bsl | 2 +- .../service/data/SyntaxTree/Expression/Do 02.fs.bsl | 2 +- .../service/data/SyntaxTree/Expression/Do 03.fs.bsl | 2 +- .../service/data/SyntaxTree/Expression/Do 04.fs.bsl | 2 +- .../service/data/SyntaxTree/Expression/Do 05.fs.bsl | 2 +- .../DotLambda - _ Recovery - Casts.fsx.bsl | 2 +- .../Expression/DotLambda - _ Recovery - Eof.fsx.bsl | 2 +- .../Expression/DotLambda - _ Recovery.fsx.bsl | 2 +- .../Expression/DotLambda - _. Recovery - Eof.fsx.bsl | 2 +- .../Expression/DotLambda - _. Recovery.fsx.bsl | 2 +- ...bda_ArgumentExpressionInInnerAppExpression.fs.bsl | 1 - .../DotLambda_FunctionWithUnderscoreDotLambda.fs.bsl | 2 +- .../DotLambda_NestedPropertiesAfterUnderscore.fs.bsl | 2 +- ...Lambda_NotAllowedFunctionExpressionWithArg.fs.bsl | 2 +- .../Expression/DotLambda_TopLevelLet.fs.bsl | 2 +- .../DotLambda_TopLevelStandaloneDotLambda.fs.bsl | 2 +- ...eToFunctionCallWithSpaceAndUnitApplication.fs.bsl | 2 +- .../Expression/DotLambda_UnderscoreToString.fs.bsl | 2 +- .../DotLambda_WithNonTupledFunctionCall.fs.bsl | 2 +- .../Expression/DotLambda_WithoutDot.fs.bsl | 2 +- .../Expression/DotLambda_WithoutUnderscore.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Downcast 01.fs.bsl | 1 - .../data/SyntaxTree/Expression/Downcast 02.fs.bsl | 1 - .../data/SyntaxTree/Expression/Downcast 03.fs.bsl | 1 - .../service/data/SyntaxTree/Expression/For 01.fs.bsl | 2 +- .../service/data/SyntaxTree/Expression/For 02.fs.bsl | 2 +- .../service/data/SyntaxTree/Expression/For 03.fs.bsl | 2 +- .../service/data/SyntaxTree/Expression/For 04.fs.bsl | 2 +- .../service/data/SyntaxTree/Expression/For 05.fs.bsl | 2 +- .../Expression/GlobalKeywordAsSynExpr.fs.bsl | 2 +- .../service/data/SyntaxTree/Expression/Id 01.fs.bsl | 2 +- .../service/data/SyntaxTree/Expression/Id 02.fs.bsl | 2 +- .../service/data/SyntaxTree/Expression/Id 03.fs.bsl | 2 +- .../service/data/SyntaxTree/Expression/Id 04.fs.bsl | 2 +- .../service/data/SyntaxTree/Expression/Id 05.fs.bsl | 2 +- .../service/data/SyntaxTree/Expression/Id 06.fs.bsl | 2 +- .../service/data/SyntaxTree/Expression/Id 07.fs.bsl | 2 +- .../service/data/SyntaxTree/Expression/If 01.fs.bsl | 2 +- .../service/data/SyntaxTree/Expression/If 02.fs.bsl | 2 +- .../service/data/SyntaxTree/Expression/If 03.fs.bsl | 2 +- .../service/data/SyntaxTree/Expression/If 04.fs.bsl | 2 +- .../service/data/SyntaxTree/Expression/If 05.fs.bsl | 2 +- .../service/data/SyntaxTree/Expression/If 06.fs.bsl | 2 +- .../service/data/SyntaxTree/Expression/If 07.fs.bsl | 2 +- .../service/data/SyntaxTree/Expression/If 08.fs.bsl | 2 +- .../service/data/SyntaxTree/Expression/If 09.fs.bsl | 2 +- .../service/data/SyntaxTree/Expression/If 10.fs.bsl | 2 +- ...heRangeOfTheEqualsSignInSynExprRecordField.fs.bsl | 2 +- .../Expression/Lambda - Missing expr 01.fs.bsl | 2 +- .../Expression/Lambda - Missing expr 02.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Lambda 01.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Lambda 02.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Lazy 01.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Lazy 02.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Lazy 03.fs.bsl | 2 +- .../service/data/SyntaxTree/Expression/Let 01.fs.bsl | 2 +- .../service/data/SyntaxTree/Expression/Let 02.fs.bsl | 2 +- .../Expression/List - Comprehension 01.fs.bsl | 2 +- .../Expression/List - Comprehension 02.fs.bsl | 2 +- ...SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl | 1 - .../SyntaxTree/Expression/Object - Class 01.fs.bsl | 2 +- .../SyntaxTree/Expression/Object - Class 02.fs.bsl | 2 +- .../SyntaxTree/Expression/Object - Class 03.fs.bsl | 2 +- .../SyntaxTree/Expression/Object - Class 04.fs.bsl | 2 +- .../SyntaxTree/Expression/Object - Class 05.fs.bsl | 2 +- .../SyntaxTree/Expression/Object - Class 06.fs.bsl | 2 +- .../SyntaxTree/Expression/Object - Class 07.fs.bsl | 2 +- .../SyntaxTree/Expression/Object - Class 08.fs.bsl | 2 +- .../SyntaxTree/Expression/Object - Class 09.fs.bsl | 2 +- .../SyntaxTree/Expression/Object - Class 10.fs.bsl | 2 +- .../SyntaxTree/Expression/Object - Class 11.fs.bsl | 2 +- .../SyntaxTree/Expression/Object - Class 12.fs.bsl | 2 +- .../SyntaxTree/Expression/Object - Class 13.fs.bsl | 2 +- .../SyntaxTree/Expression/Object - Class 14.fs.bsl | 2 +- .../SyntaxTree/Expression/Object - Class 15.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Rarrow 01.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Rarrow 02.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Rarrow 03.fs.bsl | 2 +- .../SyntaxTree/Expression/Record - Anon 01.fs.bsl | 2 +- .../SyntaxTree/Expression/Record - Anon 02.fs.bsl | 2 +- .../SyntaxTree/Expression/Record - Anon 03.fs.bsl | 2 +- .../SyntaxTree/Expression/Record - Anon 04.fs.bsl | 2 +- .../SyntaxTree/Expression/Record - Anon 05.fs.bsl | 2 +- .../SyntaxTree/Expression/Record - Anon 06.fs.bsl | 2 +- .../SyntaxTree/Expression/Record - Anon 07.fs.bsl | 2 +- .../SyntaxTree/Expression/Record - Anon 08.fs.bsl | 2 +- .../SyntaxTree/Expression/Record - Anon 09.fs.bsl | 2 +- .../SyntaxTree/Expression/Record - Anon 10.fs.bsl | 2 +- .../SyntaxTree/Expression/Record - Anon 11.fs.bsl | 2 +- .../SyntaxTree/Expression/Record - Anon 12.fs.bsl | 2 +- .../SyntaxTree/Expression/Record - Field 01.fs.bsl | 2 +- .../SyntaxTree/Expression/Record - Field 02.fs.bsl | 2 +- .../SyntaxTree/Expression/Record - Field 03.fs.bsl | 2 +- .../SyntaxTree/Expression/Record - Field 04.fs.bsl | 2 +- .../SyntaxTree/Expression/Record - Field 05.fs.bsl | 2 +- .../SyntaxTree/Expression/Record - Field 06.fs.bsl | 2 +- .../SyntaxTree/Expression/Record - Field 07.fs.bsl | 2 +- .../SyntaxTree/Expression/Record - Field 08.fs.bsl | 2 +- .../SyntaxTree/Expression/Record - Field 09.fs.bsl | 2 +- .../SyntaxTree/Expression/Record - Field 10.fs.bsl | 2 +- .../SyntaxTree/Expression/Record - Field 11.fs.bsl | 2 +- .../SyntaxTree/Expression/Record - Field 12.fs.bsl | 2 +- .../SyntaxTree/Expression/Record - Field 13.fs.bsl | 2 +- .../SyntaxTree/Expression/Record - Field 14.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Sequential 01.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Sequential 02.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Sequential 03.fs.bsl | 2 +- .../service/data/SyntaxTree/Expression/Set 01.fs.bsl | 2 +- .../service/data/SyntaxTree/Expression/Set 02.fs.bsl | 2 +- .../service/data/SyntaxTree/Expression/Set 03.fs.bsl | 2 +- .../service/data/SyntaxTree/Expression/Set 04.fs.bsl | 2 +- .../SynExprAnonRecdWithStructKeyword.fs.bsl | 2 +- ...ContainsTheRangeOfTheEqualsSignInTheFields.fs.bsl | 2 +- .../SynExprDoContainsTheRangeOfTheDoKeyword.fs.bsl | 2 +- .../Expression/SynExprDynamicDoesContainIdent.fs.bsl | 2 +- .../SynExprDynamicDoesContainParentheses.fs.bsl | 2 +- .../SynExprForContainsTheRangeOfTheEqualsSign.fs.bsl | 2 +- ...etOrUseBangContainsTheRangeOfTheEqualsSign.fs.bsl | 1 - ...SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl | 2 +- ...rLetOrUseDoesNotContainTheRangeOfInKeyword.fs.bsl | 1 - ...haractersDoesNotContainTheRangeOfInKeyword.fs.bsl | 2 +- ...ecursiveBindingContainsTheRangeOfInKeyword.fs.bsl | 2 +- ...ngContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl | 2 +- ...chContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl | 2 +- ...ynExprObjExprContainsTheRangeOfWithKeyword.fs.bsl | 2 +- .../Expression/SynExprObjWithSetter.fs.bsl | 2 +- ...heRangeOfTheEqualsSignInSynExprRecordField.fs.bsl | 2 +- ...prRecordFieldsContainCorrectAmountOfTrivia.fs.bsl | 2 +- .../Expression/SynExprSetWithSynExprDynamic.fs.bsl | 2 +- ...allyContainsTheRangeOfTheTryAndWithKeyword.fs.bsl | 2 +- ...WithContainsTheRangeOfTheTryAndWithKeyword.fs.bsl | 2 +- .../SyntaxTree/Expression/Try - Finally 01.fs.bsl | 2 +- .../SyntaxTree/Expression/Try - Finally 02.fs.bsl | 2 +- .../SyntaxTree/Expression/Try - Finally 03.fs.bsl | 2 +- .../SyntaxTree/Expression/Try - Finally 04.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Try - With 01.fs.bsl | 1 - .../data/SyntaxTree/Expression/Try - With 02.fs.bsl | 1 - .../data/SyntaxTree/Expression/Try - With 03.fs.bsl | 1 - .../data/SyntaxTree/Expression/Try - With 04.fs.bsl | 1 - .../data/SyntaxTree/Expression/Try - With 05.fs.bsl | 1 - .../data/SyntaxTree/Expression/Try - With 06.fs.bsl | 1 - .../data/SyntaxTree/Expression/Try - With 07.fs.bsl | 1 - .../data/SyntaxTree/Expression/Try - With 08.fs.bsl | 1 - .../data/SyntaxTree/Expression/Try - With 09.fs.bsl | 1 - .../service/data/SyntaxTree/Expression/Try 01.fs.bsl | 2 +- .../service/data/SyntaxTree/Expression/Try 02.fs.bsl | 2 +- .../Expression/Try with - Missing expr 01.fs.bsl | 2 +- .../Expression/Try with - Missing expr 02.fs.bsl | 2 +- .../Expression/Try with - Missing expr 03.fs.bsl | 2 +- .../Expression/Try with - Missing expr 04.fs.bsl | 2 +- .../Expression/Try with - Missing expr 05.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Try with 01.fs.bsl | 1 - .../Expression/Tuple - Missing item 01.fs.bsl | 2 +- .../Expression/Tuple - Missing item 02.fs.bsl | 2 +- .../Expression/Tuple - Missing item 03.fs.bsl | 2 +- .../Expression/Tuple - Missing item 04.fs.bsl | 2 +- .../Expression/Tuple - Missing item 05.fs.bsl | 2 +- .../Expression/Tuple - Missing item 06.fs.bsl | 2 +- .../Expression/Tuple - Missing item 07.fs.bsl | 2 +- .../Expression/Tuple - Missing item 08.fs.bsl | 2 +- .../Expression/Tuple - Missing item 09.fs.bsl | 2 +- .../Expression/Tuple - Missing item 10.fs.bsl | 2 +- .../Expression/Tuple - Missing item 11.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Tuple 01.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Tuple 02.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Type test 01.fs.bsl | 1 - .../data/SyntaxTree/Expression/Type test 02.fs.bsl | 1 - .../data/SyntaxTree/Expression/Type test 03.fs.bsl | 1 - .../data/SyntaxTree/Expression/Type test 04.fs.bsl | 1 - .../data/SyntaxTree/Expression/Typed 01.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Typed 02.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Typed 03.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Typed 04.fs.bsl | 2 +- .../SyntaxTree/Expression/Unary - Reserved 01.fs.bsl | 2 +- .../SyntaxTree/Expression/Unary - Reserved 02.fs.bsl | 2 +- .../Expression/Unfinished escaped ident 01.fs.bsl | 2 +- .../Expression/Unfinished escaped ident 02.fs.bsl | 2 +- .../Expression/Unfinished escaped ident 03.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Upcast 01.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Upcast 02.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Upcast 03.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Upcast 04.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Upcast 05.fs.bsl | 2 +- .../data/SyntaxTree/Expression/While 01.fs.bsl | 2 +- .../data/SyntaxTree/Expression/While 02.fs.bsl | 2 +- .../data/SyntaxTree/Expression/While 03.fs.bsl | 2 +- .../data/SyntaxTree/Expression/While 04.fs.bsl | 2 +- .../data/SyntaxTree/Expression/While 05.fs.bsl | 2 +- .../data/SyntaxTree/Expression/While 06.fs.bsl | 2 +- .../data/SyntaxTree/Expression/WhileBang 01.fs.bsl | 1 - .../data/SyntaxTree/Expression/WhileBang 02.fs.bsl | 1 - .../data/SyntaxTree/Expression/WhileBang 03.fs.bsl | 1 - .../data/SyntaxTree/Expression/WhileBang 04.fs.bsl | 1 - .../data/SyntaxTree/Expression/WhileBang 05.fs.bsl | 1 - .../data/SyntaxTree/Expression/WhileBang 06.fs.bsl | 1 - .../service/data/SyntaxTree/Extern/Extern 01.fs.bsl | 2 +- .../Extern/ExternKeywordIsPresentInTrivia.fs.bsl | 2 +- .../IfThenElse/Comment after else 01.fs.bsl | 2 +- .../IfThenElse/Comment after else 02.fs.bsl | 2 +- .../IfThenElse/DeeplyNestedIfThenElse.fs.bsl | 2 +- .../IfThenElse/ElseKeywordInSimpleIfThenElse.fs.bsl | 2 +- .../IfThenElse/IfKeywordInIfThenElse.fs.bsl | 2 +- .../IfThenAndElseKeywordOnSeparateLines.fs.bsl | 2 +- .../IfThenElse/NestedElifInIfThenElse.fs.bsl | 2 +- .../IfThenElse/NestedElseIfInIfThenElse.fs.bsl | 2 +- .../NestedElseIfOnTheSameLineInIfThenElse.fs.bsl | 2 +- .../ComplexArgumentsLambdaHasArrowRange.fs.bsl | 2 +- .../Lambda/DestructedLambdaHasArrowRange.fs.bsl | 2 +- ...TupleParameterWithWildCardGivesCorrectBody.fs.bsl | 2 +- .../LambdaWithTwoParametersGivesCorrectBody.fs.bsl | 2 +- ...ambdaWithWildCardParameterGivesCorrectBody.fs.bsl | 2 +- ...WildCardThatReturnsALambdaGivesCorrectBody.fs.bsl | 2 +- .../Lambda/MultilineLambdaHasArrowRange.fs.bsl | 2 +- .../SyntaxTree/Lambda/Param - Missing type 01.fs.bsl | 2 +- .../SyntaxTree/Lambda/Param - Missing type 02.fs.bsl | 2 +- .../SyntaxTree/Lambda/Param - Missing type 03.fs.bsl | 2 +- .../SyntaxTree/Lambda/Param - Missing type 04.fs.bsl | 2 +- .../Lambda/SimpleLambdaHasArrowRange.fs.bsl | 2 +- .../Lambda/TupleInLambdaHasArrowRange.fs.bsl | 2 +- .../SyntaxTree/LeadingKeyword/AbstractKeyword.fs.bsl | 2 +- .../LeadingKeyword/AbstractMemberKeyword.fs.bsl | 2 +- .../data/SyntaxTree/LeadingKeyword/AndKeyword.fs.bsl | 2 +- .../SyntaxTree/LeadingKeyword/DefaultKeyword.fsi.bsl | 2 +- .../LeadingKeyword/DefaultValKeyword.fs.bsl | 2 +- .../data/SyntaxTree/LeadingKeyword/DoKeyword.fs.bsl | 2 +- .../SyntaxTree/LeadingKeyword/DoStaticKeyword.fs.bsl | 2 +- .../SyntaxTree/LeadingKeyword/ExternKeyword.fs.bsl | 2 +- .../data/SyntaxTree/LeadingKeyword/LetKeyword.fs.bsl | 2 +- .../SyntaxTree/LeadingKeyword/LetRecKeyword.fs.bsl | 2 +- .../SyntaxTree/LeadingKeyword/MemberKeyword.fs.bsl | 2 +- .../LeadingKeyword/MemberValKeyword.fs.bsl | 2 +- .../data/SyntaxTree/LeadingKeyword/NewKeyword.fs.bsl | 2 +- .../SyntaxTree/LeadingKeyword/OverrideKeyword.fs.bsl | 2 +- .../LeadingKeyword/OverrideValKeyword.fs.bsl | 2 +- .../LeadingKeyword/StaticAbstractKeyword.fs.bsl | 2 +- .../StaticAbstractMemberKeyword.fs.bsl | 2 +- .../LeadingKeyword/StaticLetKeyword.fs.bsl | 2 +- .../LeadingKeyword/StaticLetRecKeyword.fs.bsl | 2 +- .../LeadingKeyword/StaticMemberKeyword.fs.bsl | 2 +- .../LeadingKeyword/StaticMemberValKeyword.fs.bsl | 2 +- .../LeadingKeyword/StaticValKeyword.fsi.bsl | 2 +- .../LeadingKeyword/SyntheticKeyword.fs.bsl | 2 +- .../data/SyntaxTree/LeadingKeyword/UseKeyword.fs.bsl | 2 +- .../SyntaxTree/LeadingKeyword/UseRecKeyword.fs.bsl | 2 +- .../SyntaxTree/LeadingKeyword/ValKeyword.fsi.bsl | 1 - .../SyntaxTree/MatchClause/Missing expr 01.fs.bsl | 2 +- .../SyntaxTree/MatchClause/Missing expr 02.fs.bsl | 2 +- .../SyntaxTree/MatchClause/Missing expr 03.fs.bsl | 2 +- .../SyntaxTree/MatchClause/Missing expr 04.fs.bsl | 2 +- .../SyntaxTree/MatchClause/Missing expr 05.fs.bsl | 2 +- .../SyntaxTree/MatchClause/Missing pat 01.fs.bsl | 2 +- .../SyntaxTree/MatchClause/Missing pat 02.fs.bsl | 2 +- .../SyntaxTree/MatchClause/Missing pat 03.fs.bsl | 2 +- .../SyntaxTree/MatchClause/Missing pat 04.fs.bsl | 2 +- .../SyntaxTree/MatchClause/Missing pat 05.fs.bsl | 2 +- ...BarInASingleSynMatchClauseInSynExprTryWith.fs.bsl | 2 +- .../MatchClause/RangeOfArrowInSynMatchClause.fs.bsl | 2 +- ...RangeOfArrowInSynMatchClauseWithWhenClause.fs.bsl | 2 +- ...InAMultipleSynMatchClausesInSynExprTryWith.fs.bsl | 2 +- ...OfBarInASingleSynMatchClauseInSynExprMatch.fs.bsl | 2 +- ...BarInASingleSynMatchClauseInSynExprTryWith.fs.bsl | 1 - ...BarInMultipleSynMatchClausesInSynExprMatch.fs.bsl | 1 - .../MatchClause/RangeOfMultipleSynMatchClause.fs.bsl | 2 +- .../MatchClause/RangeOfSingleSynMatchClause.fs.bsl | 2 +- .../RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl | 2 +- .../data/SyntaxTree/Measure/Constant - 01.fs.bsl | 2 +- .../data/SyntaxTree/Measure/Constant - 02.fs.bsl | 2 +- .../data/SyntaxTree/Measure/Constant - 03.fs.bsl | 2 +- .../data/SyntaxTree/Measure/Constant - 04.fs.bsl | 2 +- .../data/SyntaxTree/Measure/Constant - 05.fs.bsl | 2 +- .../data/SyntaxTree/Measure/Constant - 06.fs.bsl | 2 +- .../data/SyntaxTree/Measure/Constant - 07.fs.bsl | 2 +- .../data/SyntaxTree/Measure/Constant - 08.fs.bsl | 2 +- .../data/SyntaxTree/Measure/Constant - 09.fs.bsl | 2 +- .../data/SyntaxTree/Measure/Constant - 10.fs.bsl | 2 +- .../MeasureContainsTheRangeOfTheConstant.fs.bsl | 2 +- .../Measure/SynMeasureParenHasCorrectRange.fs.bsl | 2 +- .../SynTypeTupleInMeasureTypeWithLeadingSlash.fs.bsl | 2 +- .../SynTypeTupleInMeasureTypeWithNoSlashes.fs.bsl | 2 +- ...SynTypeTupleInMeasureTypeWithStartAndSlash.fs.bsl | 2 +- .../SyntaxTree/Member/Abstract - Property 01.fs.bsl | 2 +- .../SyntaxTree/Member/Abstract - Property 02.fs.bsl | 2 +- .../SyntaxTree/Member/Abstract - Property 03.fs.bsl | 2 +- .../SyntaxTree/Member/Abstract - Property 04.fs.bsl | 2 +- .../SyntaxTree/Member/Abstract - Property 05.fs.bsl | 2 +- .../data/SyntaxTree/Member/Auto property 01.fs.bsl | 1 - .../data/SyntaxTree/Member/Auto property 02.fs.bsl | 1 - .../data/SyntaxTree/Member/Auto property 03.fs.bsl | 1 - .../data/SyntaxTree/Member/Auto property 04.fs.bsl | 1 - .../data/SyntaxTree/Member/Auto property 05.fs.bsl | 1 - .../data/SyntaxTree/Member/Auto property 06.fs.bsl | 1 - .../data/SyntaxTree/Member/Auto property 07.fs.bsl | 2 +- .../data/SyntaxTree/Member/Auto property 08.fs.bsl | 1 - .../data/SyntaxTree/Member/Auto property 09.fs.bsl | 1 - .../data/SyntaxTree/Member/Auto property 10.fs.bsl | 1 - .../data/SyntaxTree/Member/Auto property 11.fs.bsl | 1 - .../data/SyntaxTree/Member/Auto property 12.fs.bsl | 1 - .../data/SyntaxTree/Member/Auto property 13.fs.bsl | 1 - .../data/SyntaxTree/Member/Auto property 14.fs.bsl | 2 +- .../data/SyntaxTree/Member/Auto property 15.fs.bsl | 2 +- tests/service/data/SyntaxTree/Member/Do 01.fs.bsl | 2 +- tests/service/data/SyntaxTree/Member/Do 02.fs.bsl | 2 +- tests/service/data/SyntaxTree/Member/Do 03.fs.bsl | 2 +- tests/service/data/SyntaxTree/Member/Do 04.fs.bsl | 2 +- tests/service/data/SyntaxTree/Member/Field 01.fs.bsl | 2 +- tests/service/data/SyntaxTree/Member/Field 02.fs.bsl | 2 +- tests/service/data/SyntaxTree/Member/Field 03.fs.bsl | 2 +- tests/service/data/SyntaxTree/Member/Field 04.fs.bsl | 2 +- tests/service/data/SyntaxTree/Member/Field 05.fs.bsl | 2 +- tests/service/data/SyntaxTree/Member/Field 06.fs.bsl | 2 +- tests/service/data/SyntaxTree/Member/Field 07.fs.bsl | 2 +- tests/service/data/SyntaxTree/Member/Field 08.fs.bsl | 2 +- tests/service/data/SyntaxTree/Member/Field 09.fs.bsl | 2 +- tests/service/data/SyntaxTree/Member/Field 10.fs.bsl | 2 +- tests/service/data/SyntaxTree/Member/Field 11.fs.bsl | 2 +- tests/service/data/SyntaxTree/Member/Field 12.fs.bsl | 2 +- tests/service/data/SyntaxTree/Member/Field 13.fs.bsl | 2 +- tests/service/data/SyntaxTree/Member/Field 14.fs.bsl | 2 +- tests/service/data/SyntaxTree/Member/Field 15.fs.bsl | 2 +- .../data/SyntaxTree/Member/GetSetMember 01.fs.bsl | 2 +- .../Member/GetSetMemberWithInlineKeyword.fs.bsl | 2 +- .../Member/Implicit ctor - Missing type 01.fs.bsl | 2 +- .../Member/Implicit ctor - Missing type 02.fs.bsl | 2 +- .../Member/Implicit ctor - Pat - Tuple 01.fs.bsl | 2 +- .../Member/Implicit ctor - Pat - Tuple 02.fs.bsl | 2 +- .../Member/Implicit ctor - Type - Fun 01.fs.bsl | 2 +- .../Member/Implicit ctor - Type - Fun 02.fs.bsl | 2 +- .../Member/Implicit ctor - Type - Fun 03.fs.bsl | 2 +- .../Member/Implicit ctor - Type - Fun 04.fs.bsl | 2 +- .../Member/Implicit ctor - Type - Fun 05.fs.bsl | 2 +- .../Member/Implicit ctor - Type - Fun 06.fs.bsl | 2 +- .../Member/Implicit ctor - Type - Tuple 01.fs.bsl | 2 +- .../Member/Implicit ctor - Type - Tuple 02.fs.bsl | 2 +- .../Member/Implicit ctor - Type - Tuple 03.fs.bsl | 2 +- .../Member/Implicit ctor - Type - Tuple 04.fs.bsl | 2 +- .../Member/Implicit ctor - Type - Tuple 05.fs.bsl | 2 +- .../Member/ImplicitCtorWithAsKeyword.fs.bsl | 2 +- .../service/data/SyntaxTree/Member/Inherit 01.fs.bsl | 2 +- .../service/data/SyntaxTree/Member/Inherit 02.fs.bsl | 2 +- .../service/data/SyntaxTree/Member/Inherit 03.fs.bsl | 2 +- .../service/data/SyntaxTree/Member/Inherit 04.fs.bsl | 2 +- .../service/data/SyntaxTree/Member/Inherit 05.fs.bsl | 2 +- .../data/SyntaxTree/Member/Inherit 06.fsi.bsl | 2 +- .../data/SyntaxTree/Member/Inherit 07.fsi.bsl | 2 +- .../service/data/SyntaxTree/Member/Inherit 08.fs.bsl | 2 +- .../data/SyntaxTree/Member/Interface 01.fs.bsl | 2 +- .../data/SyntaxTree/Member/Interface 02.fs.bsl | 2 +- .../data/SyntaxTree/Member/Interface 03.fs.bsl | 2 +- .../data/SyntaxTree/Member/Interface 04.fs.bsl | 2 +- .../data/SyntaxTree/Member/Interface 05.fs.bsl | 2 +- .../data/SyntaxTree/Member/Interface 06.fs.bsl | 2 +- .../data/SyntaxTree/Member/Interface 07.fs.bsl | 2 +- .../data/SyntaxTree/Member/Interface 08.fs.bsl | 2 +- .../data/SyntaxTree/Member/Interface 09.fs.bsl | 2 +- .../data/SyntaxTree/Member/Interface 10.fs.bsl | 2 +- tests/service/data/SyntaxTree/Member/Let 01.fs.bsl | 2 +- tests/service/data/SyntaxTree/Member/Let 02.fs.bsl | 2 +- tests/service/data/SyntaxTree/Member/Let 03.fs.bsl | 2 +- tests/service/data/SyntaxTree/Member/Let 04.fs.bsl | 2 +- .../SyntaxTree/Member/Member - Attributes 01.fs.bsl | 2 +- .../Member/Member - Param - Missing type 01.fs.bsl | 2 +- .../service/data/SyntaxTree/Member/Member 01.fs.bsl | 2 +- .../service/data/SyntaxTree/Member/Member 02.fs.bsl | 2 +- .../service/data/SyntaxTree/Member/Member 03.fs.bsl | 2 +- .../service/data/SyntaxTree/Member/Member 04.fs.bsl | 2 +- .../service/data/SyntaxTree/Member/Member 05.fs.bsl | 2 +- .../service/data/SyntaxTree/Member/Member 06.fs.bsl | 2 +- .../service/data/SyntaxTree/Member/Member 07.fs.bsl | 2 +- .../service/data/SyntaxTree/Member/Member 08.fs.bsl | 2 +- .../service/data/SyntaxTree/Member/Member 09.fs.bsl | 2 +- .../service/data/SyntaxTree/Member/Member 10.fs.bsl | 2 +- .../service/data/SyntaxTree/Member/Member 11.fs.bsl | 2 +- .../service/data/SyntaxTree/Member/Member 12.fs.bsl | 2 +- .../service/data/SyntaxTree/Member/Member 13.fs.bsl | 2 +- .../SyntaxTree/Member/MemberMispelledToMeme.fs.bsl | 2 +- .../SyntaxTree/Member/MemberWithInlineKeyword.fs.bsl | 2 +- ...DefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl | 2 +- ...DefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl | 2 +- .../SyntaxTree/Member/SignatureMemberWithGet.fsi.bsl | 2 +- .../SyntaxTree/Member/SignatureMemberWithSet.fsi.bsl | 2 +- .../Member/SignatureMemberWithSetget.fsi.bsl | 1 - .../service/data/SyntaxTree/Member/Static 01.fs.bsl | 2 +- .../service/data/SyntaxTree/Member/Static 02.fs.bsl | 2 +- .../service/data/SyntaxTree/Member/Static 03.fs.bsl | 2 +- ...stractSlotContainsTheRangeOfTheWithKeyword.fs.bsl | 2 +- ...utoPropertyContainsTheRangeOfTheEqualsSign.fs.bsl | 2 +- ...toPropertyContainsTheRangeOfTheWithKeyword.fs.bsl | 2 +- .../SynTypeDefnWithMemberWithGetHasXmlComment.fs.bsl | 2 +- .../Member/SynTypeDefnWithMemberWithSetget.fs.bsl | 2 +- .../SynTypeDefnWithStaticMemberWithGetset.fs.bsl | 2 +- ...DefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl | 2 +- .../SynExprObjMembersHaveCorrectKeywords.fs.bsl | 2 +- ...SynMemberDefnAbstractSlotHasCorrectKeyword.fs.bsl | 2 +- ...SynMemberDefnAutoPropertyHasCorrectKeyword.fs.bsl | 2 +- ...emberDefnMemberSynValDataHasCorrectKeyword.fs.bsl | 2 +- .../SynMemberSigMemberHasCorrectKeywords.fsi.bsl | 2 +- .../data/SyntaxTree/ModuleMember/Do 01.fs.bsl | 2 +- .../data/SyntaxTree/ModuleMember/Do 02.fs.bsl | 2 +- .../data/SyntaxTree/ModuleMember/Let 01.fs.bsl | 2 +- .../data/SyntaxTree/ModuleMember/Let 02.fs.bsl | 2 +- .../data/SyntaxTree/ModuleMember/Let 03.fs.bsl | 2 +- .../data/SyntaxTree/ModuleMember/Let 04.fs.bsl | 2 +- .../data/SyntaxTree/ModuleMember/Let 05.fs.bsl | 2 +- .../data/SyntaxTree/ModuleMember/Open 01.fs.bsl | 2 +- .../data/SyntaxTree/ModuleMember/Open 02.fs.bsl | 2 +- .../data/SyntaxTree/ModuleMember/Open 03.fs.bsl | 2 +- .../data/SyntaxTree/ModuleMember/Open 04.fs.bsl | 2 +- .../data/SyntaxTree/ModuleMember/Open 05.fs.bsl | 2 +- .../data/SyntaxTree/ModuleMember/Open 06.fs.bsl | 2 +- .../data/SyntaxTree/ModuleMember/Open 07.fs.bsl | 2 +- .../data/SyntaxTree/ModuleMember/Open 08.fs.bsl | 2 +- .../data/SyntaxTree/ModuleMember/Val 01.fsi.bsl | 2 +- .../ModuleOrNamespace/Anon module 01.fs.bsl | 2 +- .../ModuleOrNamespace/Anon module 02.fsx.bsl | 2 +- ...amespaceRangeShouldStartAtNamespaceKeyword.fs.bsl | 2 +- .../GlobalInOpenPathShouldContainTrivia.fs.bsl | 2 +- ...obalNamespaceShouldStartAtNamespaceKeyword.fs.bsl | 2 +- .../ModuleOrNamespace/Module - Attribute 01.fs.bsl | 2 +- .../SyntaxTree/ModuleOrNamespace/Module 01.fs.bsl | 2 +- .../SyntaxTree/ModuleOrNamespace/Module 02.fs.bsl | 2 +- .../SyntaxTree/ModuleOrNamespace/Module 03.fs.bsl | 2 +- .../SyntaxTree/ModuleOrNamespace/Module 04.fs.bsl | 2 +- .../SyntaxTree/ModuleOrNamespace/Module 05.fs.bsl | 1 - .../SyntaxTree/ModuleOrNamespace/Module 06.fs.bsl | 1 - .../SyntaxTree/ModuleOrNamespace/Module 07.fs.bsl | 1 - .../ModuleShouldContainModuleKeyword.fs.bsl | 2 +- ...dHaveARangeThatStartsAtTheNamespaceKeyword.fs.bsl | 2 +- .../SyntaxTree/ModuleOrNamespace/Namespace 01.fs.bsl | 2 +- .../SyntaxTree/ModuleOrNamespace/Namespace 02.fs.bsl | 2 +- .../SyntaxTree/ModuleOrNamespace/Namespace 03.fs.bsl | 2 +- .../SyntaxTree/ModuleOrNamespace/Namespace 04.fs.bsl | 2 +- .../SyntaxTree/ModuleOrNamespace/Namespace 05.fs.bsl | 2 +- .../SyntaxTree/ModuleOrNamespace/Namespace 06.fs.bsl | 2 +- .../SyntaxTree/ModuleOrNamespace/Namespace 07.fs.bsl | 2 +- .../SyntaxTree/ModuleOrNamespace/Namespace 08.fs.bsl | 2 +- .../SyntaxTree/ModuleOrNamespace/Namespace 09.fs.bsl | 2 +- .../NamespaceShouldContainNamespaceKeyword.fs.bsl | 2 +- .../ModuleOrNamespace/Nested module 01.fs.bsl | 2 +- .../ModuleOrNamespace/Nested module 02.fs.bsl | 2 +- .../ModuleOrNamespace/Nested module 03.fs.bsl | 2 +- .../ModuleOrNamespace/Nested module 04.fs.bsl | 2 +- .../ModuleOrNamespace/Nested module 05.fs.bsl | 2 +- .../ModuleOrNamespace/Nested module 06.fs.bsl | 2 +- .../ModuleOrNamespace/Nested module 07.fs.bsl | 2 +- .../ModuleOrNamespace/Nested module 08.fs.bsl | 2 +- .../ModuleOrNamespace/Nested module 09.fs.bsl | 2 +- .../ModuleOrNamespace/Nested module 10.fs.bsl | 2 +- .../ModuleOrNamespace/Nested module 11.fs.bsl | 2 +- .../ModuleOrNamespace/Nested module 12.fs.bsl | 2 +- .../ModuleOrNamespace/Nested module 13.fs.bsl | 2 +- .../ModuleOrNamespace/Nested module 14.fs.bsl | 2 +- .../ModuleOrNamespace/Nested module 15.fs.bsl | 2 +- .../ModuleOrNamespace/Nested module 16.fs.bsl | 2 +- .../ModuleOrNamespace/Nested module 17.fs.bsl | 2 +- ...balNamespaceShouldStartAtNamespaceKeyword.fsi.bsl | 2 +- .../ModuleOrNamespaceSig/ModuleAbbreviation.fsi.bsl | 2 +- .../ModuleRangeShouldStartAtFirstAttribute.fsi.bsl | 2 +- .../ModuleShouldContainModuleKeyword.fsi.bsl | 2 +- .../Namespace - Keyword 01.fsi.bsl | 2 +- .../ModuleOrNamespaceSig/Nested module 01.fsi.bsl | 2 +- ...mberReturnsRangeOfSynModuleOrNamespaceSig.fsi.bsl | 1 - .../IncompleteNestedModuleSigShouldBePresent.fsi.bsl | 2 +- .../NestedModuleWithBeginEndAndDecls.fs.bsl | 2 +- .../NestedModuleWithBeginEndAndDecls.fsi.bsl | 2 +- ...houldBeIncludedInSynModuleDeclNestedModule.fs.bsl | 2 +- ...dBeIncludedInSynModuleSigDeclNestedModule.fsi.bsl | 2 +- .../SyntaxTree/NestedModule/RangeOfBeginEnd.fs.bsl | 2 +- .../SyntaxTree/NestedModule/RangeOfBeginEnd.fsi.bsl | 2 +- .../RangeOfEqualSignShouldBePresent.fs.bsl | 2 +- ...geOfEqualSignShouldBePresentSignatureFile.fsi.bsl | 2 +- ...ureFileShouldEndAtTheLastSynModuleSigDecl.fsi.bsl | 1 - .../SyntaxTree/Nullness/AbstractClassProperty.fs.bsl | 2 +- .../SyntaxTree/Nullness/DuCaseStringOrNull.fs.bsl | 2 +- .../SyntaxTree/Nullness/DuCaseTuplePrecedence.fs.bsl | 2 +- .../data/SyntaxTree/Nullness/ExplicitField.fs.bsl | 2 +- .../Nullness/FunctionArgAsPatternWithNullCase.fs.bsl | 2 +- .../GenericFunctionReturnTypeNotStructNull.fs.bsl | 2 +- .../Nullness/GenericFunctionTyparNotNull.fs.bsl | 2 +- .../Nullness/GenericFunctionTyparNull.fs.bsl | 2 +- .../SyntaxTree/Nullness/GenericTypeNotNull.fs.bsl | 2 +- .../GenericTypeNotNullAndOtherConstraint.fs.bsl | 2 +- ...otStructAndOtherConstraint-I_am_Still_Sane.fs.bsl | 2 +- .../data/SyntaxTree/Nullness/GenericTypeNull.fs.bsl | 2 +- .../GenericTypeOtherConstraintAndThenNotNull.fs.bsl | 2 +- .../data/SyntaxTree/Nullness/IntListOrNull.fs.bsl | 2 +- .../Nullness/IntListOrNullOrNullOrNull.fs.bsl | 2 +- .../SyntaxTree/Nullness/MatchWithTypeCast.fs.bsl | 2 +- .../Nullness/MatchWithTypeCastParens.fs.bsl | 2 +- ...MatchWithTypeCastParensAndSeparateNullCase.fs.bsl | 2 +- .../Nullness/NullAnnotatedExpression.fs.bsl | 2 +- .../RegressionAnnotatedInlinePatternMatch.fs.bsl | 2 +- .../SyntaxTree/Nullness/RegressionChoiceType.fs.bsl | 2 +- .../SyntaxTree/Nullness/RegressionListType.fs.bsl | 2 +- .../Nullness/RegressionOneLinerOptionType.fs.bsl | 2 +- .../SyntaxTree/Nullness/RegressionOptionType.fs.bsl | 2 +- .../SyntaxTree/Nullness/RegressionOrPattern.fs.bsl | 2 +- .../SyntaxTree/Nullness/RegressionResultType.fs.bsl | 2 +- .../Nullness/SignatureInAbstractMember.fs.bsl | 2 +- .../data/SyntaxTree/Nullness/StringOrNull.fs.bsl | 2 +- .../Nullness/StringOrNullInFunctionArg.fs.bsl | 2 +- .../Nullness/TypeAbbreviationAddingWithNull.fs.bsl | 2 +- .../OperatorName/ActivePatternAnd 01.fs.bsl | 2 +- .../OperatorName/ActivePatternAnd 02.fs.bsl | 2 +- .../OperatorName/ActivePatternAnd 03.fs.bsl | 2 +- .../OperatorName/ActivePatternAnd 04.fs.bsl | 2 +- .../OperatorName/ActivePatternAnd 05.fs.bsl | 2 +- .../OperatorName/ActivePatternAnd 06.fs.bsl | 2 +- .../OperatorName/ActivePatternAnd 07.fs.bsl | 2 +- .../OperatorName/ActivePatternAnd 08.fs.bsl | 2 +- .../OperatorName/ActivePatternAsFunction.fs.bsl | 2 +- .../OperatorName/ActivePatternDefinition.fs.bsl | 2 +- .../OperatorName/ActivePatternExceptionAnd 01.fs.bsl | 2 +- .../OperatorName/ActivePatternExceptionAnd 02.fs.bsl | 2 +- .../OperatorName/ActivePatternExceptionAnd 03.fs.bsl | 2 +- .../OperatorName/ActivePatternExceptionAnd 04.fs.bsl | 2 +- .../OperatorName/ActivePatternExceptionAnd 05.fs.bsl | 2 +- .../OperatorName/ActivePatternExceptionAnd 06.fs.bsl | 2 +- .../OperatorName/ActivePatternExceptionAnd 07.fs.bsl | 2 +- .../OperatorName/ActivePatternExceptionAnd 08.fs.bsl | 2 +- .../ActivePatternIdentifierInPrivateMember.fs.bsl | 2 +- .../OperatorName/CustomOperatorDefinition.fs.bsl | 2 +- .../DetectDifferenceBetweenCompiledOperators.fs.bsl | 2 +- .../SyntaxTree/OperatorName/InfixOperation.fs.bsl | 2 +- .../SyntaxTree/OperatorName/NamedParameter.fs.bsl | 2 +- .../SyntaxTree/OperatorName/NameofOperator.fs.bsl | 2 +- .../OperatorName/ObjectModelWithTwoMembers.fs.bsl | 2 +- .../OperatorName/OperatorAsFunction.fs.bsl | 2 +- .../OperatorName/OperatorInMemberDefinition.fs.bsl | 2 +- .../OperatorName/OperatorNameInSynValSig.fsi.bsl | 2 +- .../OperatorName/OperatorNameInValConstraint.fsi.bsl | 2 +- .../OperatorName/OptionalExpression.fs.bsl | 2 +- .../PartialActivePatternAsFunction.fs.bsl | 2 +- .../PartialActivePatternDefinition.fs.bsl | 2 +- ...alActivePatternDefinitionWithoutParameters.fs.bsl | 2 +- .../SyntaxTree/OperatorName/PrefixOperation.fs.bsl | 2 +- .../PrefixOperationWithTwoCharacters.fs.bsl | 2 +- .../OperatorName/QualifiedOperatorExpression.fs.bsl | 2 +- ...RegularStringAsParsedHashDirectiveArgument.fs.bsl | 1 - ...rceIdentifierAsParsedHashDirectiveArgument.fs.bsl | 2 +- ...leQuoteStringAsParsedHashDirectiveArgument.fs.bsl | 12 ++++-------- ...erbatimStringAsParsedHashDirectiveArgument.fs.bsl | 1 - tests/service/data/SyntaxTree/Pattern/And 01.fs.bsl | 2 +- tests/service/data/SyntaxTree/Pattern/And 02.fs.bsl | 2 +- tests/service/data/SyntaxTree/Pattern/And 03.fs.bsl | 2 +- tests/service/data/SyntaxTree/Pattern/And 04.fs.bsl | 2 +- tests/service/data/SyntaxTree/Pattern/As 01.fs.bsl | 2 +- tests/service/data/SyntaxTree/Pattern/As 02.fs.bsl | 2 +- tests/service/data/SyntaxTree/Pattern/As 03.fs.bsl | 2 +- tests/service/data/SyntaxTree/Pattern/As 04.fs.bsl | 2 +- tests/service/data/SyntaxTree/Pattern/As 05.fs.bsl | 2 +- tests/service/data/SyntaxTree/Pattern/As 06.fs.bsl | 2 +- tests/service/data/SyntaxTree/Pattern/As 07.fs.bsl | 2 +- tests/service/data/SyntaxTree/Pattern/As 08.fs.bsl | 2 +- tests/service/data/SyntaxTree/Pattern/As 09.fs.bsl | 2 +- tests/service/data/SyntaxTree/Pattern/As 10.fs.bsl | 2 +- tests/service/data/SyntaxTree/Pattern/As 11.fs.bsl | 2 +- tests/service/data/SyntaxTree/Pattern/As 12.fs.bsl | 2 +- tests/service/data/SyntaxTree/Pattern/Cons 01.fs.bsl | 2 +- tests/service/data/SyntaxTree/Pattern/Cons 02.fs.bsl | 2 +- tests/service/data/SyntaxTree/Pattern/Cons 03.fs.bsl | 2 +- tests/service/data/SyntaxTree/Pattern/Cons 04.fs.bsl | 2 +- .../data/SyntaxTree/Pattern/InHeadPattern.fs.bsl | 2 +- .../service/data/SyntaxTree/Pattern/IsInst 01.fs.bsl | 2 +- .../service/data/SyntaxTree/Pattern/IsInst 02.fs.bsl | 2 +- .../service/data/SyntaxTree/Pattern/IsInst 03.fs.bsl | 2 +- .../service/data/SyntaxTree/Pattern/IsInst 04.fs.bsl | 2 +- .../service/data/SyntaxTree/Pattern/IsInst 05.fs.bsl | 2 +- .../data/SyntaxTree/Pattern/Named field 01.fs.bsl | 1 - .../data/SyntaxTree/Pattern/Named field 02.fs.bsl | 1 - .../data/SyntaxTree/Pattern/Named field 03.fs.bsl | 1 - .../data/SyntaxTree/Pattern/Named field 04.fs.bsl | 1 - .../data/SyntaxTree/Pattern/Named field 05.fs.bsl | 1 - .../SyntaxTree/Pattern/OperatorInMatchPattern.fs.bsl | 2 +- .../Pattern/OperatorInSynPatLongIdent.fs.bsl | 2 +- .../ParenthesesOfSynArgPatsNamePatPairs.fs.bsl | 2 +- .../service/data/SyntaxTree/Pattern/Record 01.fs.bsl | 2 +- .../service/data/SyntaxTree/Pattern/Record 02.fs.bsl | 2 +- .../service/data/SyntaxTree/Pattern/Record 03.fs.bsl | 2 +- .../service/data/SyntaxTree/Pattern/Record 04.fs.bsl | 2 +- .../service/data/SyntaxTree/Pattern/Record 05.fs.bsl | 2 +- .../service/data/SyntaxTree/Pattern/Record 06.fs.bsl | 2 +- ...amePatPairsContainsTheRangeOfTheEqualsSign.fs.bsl | 2 +- .../Pattern/SynPatOrContainsTheRangeOfTheBar.fs.bsl | 2 +- .../SyntaxTree/Pattern/Tuple - HeadPat 01.fs.bsl | 2 +- .../SyntaxTree/Pattern/Tuple - HeadPat 02.fs.bsl | 2 +- .../SyntaxTree/Pattern/Tuple - Recover 01.fs.bsl | 2 +- .../SyntaxTree/Pattern/Tuple - Recover 02.fs.bsl | 2 +- .../SyntaxTree/Pattern/Tuple - Recover 03.fs.bsl | 2 +- .../SyntaxTree/Pattern/Tuple - Recover 04.fs.bsl | 2 +- .../data/SyntaxTree/Pattern/Tuple - Struct 01.fs.bsl | 1 - .../Pattern/Typed - Missing type 01.fs.bsl | 2 +- .../Pattern/Typed - Missing type 02.fs.bsl | 2 +- .../Pattern/Typed - Missing type 03.fs.bsl | 2 +- .../Pattern/Typed - Missing type 04.fs.bsl | 2 +- .../Pattern/Typed - Missing type 05.fs.bsl | 2 +- .../Pattern/Typed - Missing type 06.fs.bsl | 2 +- .../Pattern/Typed - Missing type 07.fs.bsl | 2 +- .../Pattern/Typed - Missing type 08.fs.bsl | 2 +- .../Pattern/Typed - Missing type 09.fs.bsl | 2 +- .../Pattern/Typed - Missing type 10.fs.bsl | 2 +- .../Pattern/Typed - Missing type 11.fs.bsl | 2 +- .../Pattern/Typed - Missing type 12.fs.bsl | 2 +- .../EqualsTokenIsPresentInSynValSigMember.fsi.bsl | 2 +- .../EqualsTokenIsPresentInSynValSigValue.fsi.bsl | 2 +- .../LeadingKeywordInRecursiveTypes.fsi.bsl | 2 +- ...berShouldContainsTheRangeOfTheWithKeyword.fsi.bsl | 1 - .../NestedTypeHasStaticTypeAsLeadingKeyword.fsi.bsl | 2 +- ...dInSynExceptionDefnReprAndSynExceptionSig.fsi.bsl | 2 +- ...AttributeShouldBeIncludedInSynTypeDefnSig.fsi.bsl | 1 - ...buteShouldBeIncludedInSynValSpfnAndMember.fsi.bsl | 2 +- ...ttributesShouldBeIncludedInRecursiveTypes.fsi.bsl | 1 - ...nExceptionSigAndSynModuleSigDeclException.fsi.bsl | 2 +- ...nTypeDefnSigDelegateOfShouldStartFromName.fsi.bsl | 1 - ...peDefnSigObjectModelShouldEndAtLastMember.fsi.bsl | 2 +- ...SynTypeDefnSigRecordShouldEndAtLastMember.fsi.bsl | 1 - ...eOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi.bsl | 2 +- .../RangeOfTypeShouldEndAtEndKeyword.fsi.bsl | 2 +- ...SigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl | 2 +- ...igWithEnumContainsTheRangeOfTheEqualsSign.fsi.bsl | 2 +- ...ModelClassContainsTheRangeOfTheEqualsSign.fsi.bsl | 1 - ...elDelegateContainsTheRangeOfTheEqualsSign.fsi.bsl | 1 - ...gWithUnionContainsTheRangeOfTheEqualsSign.fsi.bsl | 2 +- .../SynValSigContainsParameterNames.fsi.bsl | 2 +- .../TriviaIsPresentInSynTypeDefnSig.fsi.bsl | 2 +- .../ValKeywordIsPresentInSynValSig.fsi.bsl | 2 +- .../data/SyntaxTree/SignatureType/With 01.fsi.bsl | 2 +- .../SimplePats/SimplePats - Recover 01.fs.bsl | 2 +- .../data/SyntaxTree/SimplePats/SimplePats 01.fs.bsl | 2 +- .../data/SyntaxTree/SimplePats/SimplePats 02.fs.bsl | 2 +- .../data/SyntaxTree/SourceIdentifier/_LINE_.fs.bsl | 1 - .../SourceIdentifier/_SOURCEDIRECTORY_.fs.bsl | 2 +- .../SyntaxTree/SourceIdentifier/_SOURCEFILE_.fs.bsl | 2 +- .../String/InterpolatedStringOffsideInModule.fs.bsl | 2 +- .../InterpolatedStringOffsideInNestedLet.fs.bsl | 2 +- .../SynConstBytesWithSynByteStringKindRegular.fs.bsl | 2 +- ...SynConstBytesWithSynByteStringKindVerbatim.fs.bsl | 2 +- .../SynConstStringWithSynStringKindRegular.fs.bsl | 2 +- ...SynConstStringWithSynStringKindTripleQuote.fs.bsl | 2 +- .../SynConstStringWithSynStringKindVerbatim.fs.bsl | 2 +- ...InterpolatedStringWithSynStringKindRegular.fs.bsl | 1 - ...rpolatedStringWithSynStringKindTripleQuote.fs.bsl | 2 +- ...nterpolatedStringWithSynStringKindVerbatim.fs.bsl | 1 - ...olatedStringWithTripleQuoteMultipleDollars.fs.bsl | 2 +- ...latedStringWithTripleQuoteMultipleDollars2.fs.bsl | 2 +- .../SynIdent/IncompleteLongIdent 01.fs.bsl | 2 +- .../SynIdent/IncompleteLongIdent 02.fs.bsl | 2 +- .../SynTyparDecl/Constraint intersection 01.fs.bsl | 2 +- .../SynType/Constraint intersection 01.fs.bsl | 2 +- .../SynType/Constraint intersection 02.fs.bsl | 2 +- .../SynType/Constraint intersection 03.fs.bsl | 2 +- tests/service/data/SyntaxTree/SynType/Div 01.fs.bsl | 2 +- tests/service/data/SyntaxTree/SynType/Div 02.fs.bsl | 2 +- tests/service/data/SyntaxTree/SynType/Div 03.fs.bsl | 2 +- tests/service/data/SyntaxTree/SynType/Div 04.fs.bsl | 2 +- tests/service/data/SyntaxTree/SynType/Div 05.fs.bsl | 2 +- tests/service/data/SyntaxTree/SynType/Div 06.fs.bsl | 2 +- tests/service/data/SyntaxTree/SynType/Fun 01.fs.bsl | 2 +- tests/service/data/SyntaxTree/SynType/Fun 02.fs.bsl | 2 +- tests/service/data/SyntaxTree/SynType/Fun 03.fs.bsl | 2 +- tests/service/data/SyntaxTree/SynType/Fun 04.fs.bsl | 2 +- tests/service/data/SyntaxTree/SynType/Fun 05.fs.bsl | 2 +- tests/service/data/SyntaxTree/SynType/Fun 06.fs.bsl | 2 +- tests/service/data/SyntaxTree/SynType/Fun 07.fs.bsl | 2 +- tests/service/data/SyntaxTree/SynType/Fun 08.fs.bsl | 2 +- tests/service/data/SyntaxTree/SynType/Fun 09.fs.bsl | 2 +- tests/service/data/SyntaxTree/SynType/Fun 10.fs.bsl | 2 +- .../NestedSynTypeOrInsideSynExprTraitCall.fs.bsl | 2 +- .../SingleSynTypeInsideSynExprTraitCall.fs.bsl | 2 +- .../SynType/SynTypeOrInsideSynExprTraitCall.fs.bsl | 2 +- ...eSynTypeConstraintWhereTyparSupportsMember.fs.bsl | 2 +- .../SynTypeOrWithAppTypeOnTheRightHandSide.fs.bsl | 2 +- ...upleDoesIncludeLeadingParameterAttributes.fsi.bsl | 1 - ...nTypeTupleDoesIncludeLeadingParameterName.fsi.bsl | 2 +- .../data/SyntaxTree/SynType/Tuple - Nested 01.fs.bsl | 2 +- .../data/SyntaxTree/SynType/Tuple - Nested 02.fs.bsl | 2 +- .../data/SyntaxTree/SynType/Tuple - Nested 03.fs.bsl | 2 +- .../data/SyntaxTree/SynType/Tuple - Nested 04.fs.bsl | 2 +- .../data/SyntaxTree/SynType/Tuple - Nested 05.fs.bsl | 2 +- .../data/SyntaxTree/SynType/Tuple - Nested 06.fs.bsl | 2 +- .../service/data/SyntaxTree/SynType/Tuple 01.fs.bsl | 2 +- .../service/data/SyntaxTree/SynType/Tuple 02.fs.bsl | 2 +- .../service/data/SyntaxTree/SynType/Tuple 03.fs.bsl | 2 +- .../service/data/SyntaxTree/SynType/Tuple 04.fs.bsl | 2 +- .../service/data/SyntaxTree/SynType/Tuple 05.fs.bsl | 2 +- .../service/data/SyntaxTree/SynType/Tuple 06.fs.bsl | 2 +- .../service/data/SyntaxTree/SynType/Tuple 07.fs.bsl | 2 +- .../service/data/SyntaxTree/SynType/Tuple 08.fs.bsl | 2 +- .../service/data/SyntaxTree/SynType/Tuple 09.fs.bsl | 2 +- .../service/data/SyntaxTree/SynType/Tuple 10.fs.bsl | 2 +- .../service/data/SyntaxTree/SynType/Tuple 11.fs.bsl | 2 +- .../service/data/SyntaxTree/SynType/Tuple 12.fs.bsl | 2 +- .../service/data/SyntaxTree/SynType/Tuple 13.fs.bsl | 2 +- .../service/data/SyntaxTree/SynType/Tuple 14.fs.bsl | 2 +- .../data/SyntaxTree/Type/Abbreviation 01.fs.bsl | 2 +- .../data/SyntaxTree/Type/Abbreviation 02.fs.bsl | 2 +- .../data/SyntaxTree/Type/Abbreviation 03.fs.bsl | 2 +- .../data/SyntaxTree/Type/Abbreviation 04.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/And 01.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/And 02.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/And 03.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/And 04.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/And 05.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/And 06.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/As 01.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/As 02.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/As 03.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/As 04.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/As 05.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/As 06.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/As 07.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/As 08.fs.bsl | 2 +- .../AttributesInOptionalNamedMemberParameter.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/Class 01.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/Class 02.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/Class 03.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/Class 04.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/Class 05.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/Enum 01.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/Enum 02.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/Enum 03.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/Enum 04.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/Enum 05.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/Enum 06.fs.bsl | 2 +- .../data/SyntaxTree/Type/Enum 07 - Eof.fs.bsl | 2 +- .../data/SyntaxTree/Type/Enum 08 - Eof.fs.bsl | 2 +- .../data/SyntaxTree/Type/Enum 09 - Eof.fs.bsl | 2 +- .../data/SyntaxTree/Type/Enum 10 - Eof.fs.bsl | 2 +- .../service/data/SyntaxTree/Type/Interface 01.fs.bsl | 2 +- .../service/data/SyntaxTree/Type/Interface 02.fs.bsl | 2 +- .../service/data/SyntaxTree/Type/Interface 03.fs.bsl | 2 +- .../service/data/SyntaxTree/Type/Interface 04.fs.bsl | 2 +- .../service/data/SyntaxTree/Type/Interface 05.fs.bsl | 1 - .../service/data/SyntaxTree/Type/Interface 06.fs.bsl | 1 - .../service/data/SyntaxTree/Type/Interface 07.fs.bsl | 2 +- ...MultipleSynEnumCaseContainsRangeOfConstant.fs.bsl | 2 +- .../Type/NamedParametersInDelegateType.fs.bsl | 2 +- .../NestedTypeHasStaticTypeAsLeadingKeyword.fs.bsl | 2 +- .../data/SyntaxTree/Type/Primary ctor 01.fs.bsl | 2 +- .../data/SyntaxTree/Type/Primary ctor 02.fs.bsl | 2 +- .../data/SyntaxTree/Type/Primary ctor 03.fs.bsl | 2 +- .../data/SyntaxTree/Type/Primary ctor 04.fs.bsl | 2 +- .../data/SyntaxTree/Type/Primary ctor 05.fs.bsl | 2 +- ...geOfAttributeShouldBeIncludedInSynTypeDefn.fs.bsl | 2 +- ...AttributesShouldBeIncludedInRecursiveTypes.fs.bsl | 1 - .../data/SyntaxTree/Type/Record - Access 01.fs.bsl | 1 - .../data/SyntaxTree/Type/Record - Access 02.fs.bsl | 1 - .../data/SyntaxTree/Type/Record - Access 03.fs.bsl | 1 - .../data/SyntaxTree/Type/Record - Access 04.fs.bsl | 1 - .../data/SyntaxTree/Type/Record - Mutable 01.fs.bsl | 1 - .../data/SyntaxTree/Type/Record - Mutable 02.fs.bsl | 1 - .../data/SyntaxTree/Type/Record - Mutable 03.fs.bsl | 1 - .../data/SyntaxTree/Type/Record - Mutable 04.fs.bsl | 1 - .../data/SyntaxTree/Type/Record - Mutable 05.fs.bsl | 1 - tests/service/data/SyntaxTree/Type/Record 01.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/Record 02.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/Record 03.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/Record 04.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/Record 05.fs.bsl | 2 +- .../SingleSynEnumCaseContainsRangeOfConstant.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/Struct 01.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/Struct 02.fs.bsl | 2 +- ...nInterfaceContainsTheRangeOfTheWithKeyword.fs.bsl | 2 +- ...hAttributeContainsTheRangeOfTheTypeKeyword.fs.bsl | 2 +- ...gmentationContainsTheRangeOfTheWithKeyword.fs.bsl | 2 +- ...efnWithEnumContainsTheRangeOfTheEqualsSign.fs.bsl | 1 - ...delDelegateContainsTheRangeOfTheEqualsSign.fs.bsl | 1 - ...WithRecordContainsTheRangeOfTheWithKeyword.fs.bsl | 2 +- ...fnWithUnionContainsTheRangeOfTheEqualsSign.fs.bsl | 2 +- ...WithXmlDocContainsTheRangeOfTheTypeKeyword.fs.bsl | 2 +- .../SyntaxTree/Type/SynTypeFunHasRangeOfArrow.fs.bsl | 2 +- .../SyntaxTree/Type/SynTypeTupleWithStruct.fs.bsl | 2 +- .../Type/SynTypeTupleWithStructRecovery.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/Type 01.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/Type 02.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/Type 03.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/Type 04.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/Type 05.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/Type 06.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/Type 07.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/Type 08.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/Type 09.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/Type 10.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/Type 11.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/Type 12.fs.bsl | 2 +- .../data/SyntaxTree/Type/Union - Field 01.fs.bsl | 1 - .../data/SyntaxTree/Type/Union - Field 02.fs.bsl | 1 - .../data/SyntaxTree/Type/Union - Field 03.fs.bsl | 1 - tests/service/data/SyntaxTree/Type/Union 01.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/Union 02.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/Union 03.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/Union 04.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/Union 05.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/Union 06.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/Union 07.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/With 01.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/With 02.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/With 03.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/With 04.fs.bsl | 2 +- tests/service/data/SyntaxTree/Type/With 05.fs.bsl | 2 +- .../SyntaxTree/UnionCase/Missing keyword of.fs.bsl | 2 +- .../data/SyntaxTree/UnionCase/Missing name 01.fs.bsl | 2 +- .../data/SyntaxTree/UnionCase/Missing name 02.fs.bsl | 2 +- .../data/SyntaxTree/UnionCase/Missing name 03.fs.bsl | 2 +- .../data/SyntaxTree/UnionCase/Missing name 04.fs.bsl | 2 +- .../data/SyntaxTree/UnionCase/Missing name 05.fs.bsl | 2 +- .../data/SyntaxTree/UnionCase/Missing name 06.fs.bsl | 2 +- .../data/SyntaxTree/UnionCase/Missing name 07.fs.bsl | 2 +- .../data/SyntaxTree/UnionCase/Missing name 08.fs.bsl | 2 +- .../data/SyntaxTree/UnionCase/Missing name 09.fs.bsl | 2 +- .../MultipleSynUnionCasesHaveBarRange.fs.bsl | 2 +- .../UnionCase/PrivateKeywordHasRange.fs.bsl | 2 +- .../UnionCase/Recover Function Type 01.fs.bsl | 2 +- .../UnionCase/Recover Function Type 02.fs.bsl | 2 +- .../UnionCase/Recover Function Type 03.fs.bsl | 2 +- .../UnionCase/SingleSynUnionCaseHasBarRange.fs.bsl | 2 +- .../UnionCase/SingleSynUnionCaseWithoutBar.fs.bsl | 2 +- .../UnionCase/SynUnionCaseKindFullType.fs.bsl | 2 +- .../UnionCase/UnionCaseFieldsCanHaveComments.fs.bsl | 2 +- .../data/SyntaxTree/Val/InlineKeyword.fsi.bsl | 2 +- 900 files changed, 810 insertions(+), 907 deletions(-) diff --git a/tests/service/data/SyntaxTree/Attribute/RangeOfAttribute.fs.bsl b/tests/service/data/SyntaxTree/Attribute/RangeOfAttribute.fs.bsl index bde23ff1693..a5b0857974d 100644 --- a/tests/service/data/SyntaxTree/Attribute/RangeOfAttribute.fs.bsl +++ b/tests/service/data/SyntaxTree/Attribute/RangeOfAttribute.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Attribute/RangeOfAttribute.fs", false, - QualifiedNameOfFile RangeOfAttribute, [], [], + QualifiedNameOfFile RangeOfAttribute, [], [SynModuleOrNamespace ([RangeOfAttribute], false, AnonModule, [Attributes diff --git a/tests/service/data/SyntaxTree/Attribute/RangeOfAttributeWithPath.fs.bsl b/tests/service/data/SyntaxTree/Attribute/RangeOfAttributeWithPath.fs.bsl index b8c9c031836..4164c660782 100644 --- a/tests/service/data/SyntaxTree/Attribute/RangeOfAttributeWithPath.fs.bsl +++ b/tests/service/data/SyntaxTree/Attribute/RangeOfAttributeWithPath.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Attribute/RangeOfAttributeWithPath.fs", false, - QualifiedNameOfFile RangeOfAttributeWithPath, [], [], + QualifiedNameOfFile RangeOfAttributeWithPath, [], [SynModuleOrNamespace ([RangeOfAttributeWithPath], false, AnonModule, [Attributes diff --git a/tests/service/data/SyntaxTree/Attribute/RangeOfAttributeWithTarget.fs.bsl b/tests/service/data/SyntaxTree/Attribute/RangeOfAttributeWithTarget.fs.bsl index cdb1fdd30fe..e9d4ec73788 100644 --- a/tests/service/data/SyntaxTree/Attribute/RangeOfAttributeWithTarget.fs.bsl +++ b/tests/service/data/SyntaxTree/Attribute/RangeOfAttributeWithTarget.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Attribute/RangeOfAttributeWithTarget.fs", false, - QualifiedNameOfFile RangeOfAttributeWithTarget, [], [], + QualifiedNameOfFile RangeOfAttributeWithTarget, [], [SynModuleOrNamespace ([RangeOfAttributeWithTarget], false, AnonModule, [Attributes diff --git a/tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTrivia.fs.bsl b/tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTrivia.fs.bsl index 17fea8f0a33..e3997215d38 100644 --- a/tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTrivia.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTrivia.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Binding/ColonBeforeReturnTypeIsPartOfTrivia.fs", false, - QualifiedNameOfFile ColonBeforeReturnTypeIsPartOfTrivia, [], [], + QualifiedNameOfFile ColonBeforeReturnTypeIsPartOfTrivia, [], [SynModuleOrNamespace ([ColonBeforeReturnTypeIsPartOfTrivia], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs.bsl b/tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs.bsl index dd5022f2bc2..22d7d1bcba7 100644 --- a/tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs.bsl @@ -2,7 +2,6 @@ ImplFile (ParsedImplFileInput ("/root/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs", false, QualifiedNameOfFile ColonBeforeReturnTypeIsPartOfTriviaInProperties, [], - [], [SynModuleOrNamespace ([ColonBeforeReturnTypeIsPartOfTriviaInProperties], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Binding/ConditionalDirectiveAroundInlineKeyword.fs.bsl b/tests/service/data/SyntaxTree/Binding/ConditionalDirectiveAroundInlineKeyword.fs.bsl index 115b95c51eb..2e54d3392e1 100644 --- a/tests/service/data/SyntaxTree/Binding/ConditionalDirectiveAroundInlineKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/ConditionalDirectiveAroundInlineKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Binding/ConditionalDirectiveAroundInlineKeyword.fs", false, - QualifiedNameOfFile ConditionalDirectiveAroundInlineKeyword, [], [], + QualifiedNameOfFile ConditionalDirectiveAroundInlineKeyword, [], [SynModuleOrNamespace ([ConditionalDirectiveAroundInlineKeyword], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Binding/InlineKeywordInBinding.fs.bsl b/tests/service/data/SyntaxTree/Binding/InlineKeywordInBinding.fs.bsl index 5a7bf976186..cc2a547ae79 100644 --- a/tests/service/data/SyntaxTree/Binding/InlineKeywordInBinding.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/InlineKeywordInBinding.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Binding/InlineKeywordInBinding.fs", false, - QualifiedNameOfFile InlineKeywordInBinding, [], [], + QualifiedNameOfFile InlineKeywordInBinding, [], [SynModuleOrNamespace ([InlineKeywordInBinding], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs.bsl index 63b8a81ea59..ad64bc458a3 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs.bsl @@ -4,7 +4,7 @@ ImplFile false, QualifiedNameOfFile RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet, - [], [], + [], [SynModuleOrNamespace ([RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs.bsl index db5fe5051fe..1f25d18f4e5 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs", false, QualifiedNameOfFile - RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr, [], [], + RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr, [], [SynModuleOrNamespace ([RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs.bsl index d52e2f085ba..f0a79b00099 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs", false, QualifiedNameOfFile - RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember, [], [], + RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember, [], [SynModuleOrNamespace ([RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs.bsl index 4717531eb39..44f46e6147f 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs.bsl @@ -4,7 +4,7 @@ ImplFile false, QualifiedNameOfFile RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec, - [], [], + [], [SynModuleOrNamespace ([RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs.bsl index fe111972f91..2db2e305465 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs.bsl @@ -4,7 +4,6 @@ ImplFile false, QualifiedNameOfFile RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty, [], - [], [SynModuleOrNamespace ([RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs.bsl index ceff4f8e244..e09ffde7504 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs", false, QualifiedNameOfFile RangeOfAttributeShouldBeIncludedInSecondaryConstructor, - [], [], + [], [SynModuleOrNamespace ([RangeOfAttributeShouldBeIncludedInSecondaryConstructor], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs.bsl index a8e5110eeb4..b94919944c1 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs", false, QualifiedNameOfFile - RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings, [], [], + RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings, [], [SynModuleOrNamespace ([RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs.bsl index 83139fe83ee..2f4cc9ab1ed 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs", false, QualifiedNameOfFile RangeOfAttributeShouldBeIncludedInSynMemberDefnMember, - [], [], + [], [SynModuleOrNamespace ([RangeOfAttributeShouldBeIncludedInSynMemberDefnMember], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs.bsl index 08edc3d2631..b1f8155475b 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs.bsl @@ -3,7 +3,6 @@ ImplFile ("/root/Binding/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs", false, QualifiedNameOfFile RangeOfAttributeShouldBeIncludedInSynModuleDeclLet, [], - [], [SynModuleOrNamespace ([RangeOfAttributeShouldBeIncludedInSynModuleDeclLet], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs.bsl index bf0e8802e32..07444f56d48 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs.bsl @@ -4,7 +4,7 @@ ImplFile false, QualifiedNameOfFile RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty, - [], [], + [], [SynModuleOrNamespace ([RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs.bsl index 844946e66c3..9302de5258a 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs.bsl @@ -2,7 +2,6 @@ ImplFile (ParsedImplFileInput ("/root/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs", false, QualifiedNameOfFile RangeOfEqualSignShouldBePresentInLocalLetBinding, [], - [], [SynModuleOrNamespace ([RangeOfEqualSignShouldBePresentInLocalLetBinding], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs.bsl index b0e567ed3bd..d86d4475a48 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs", false, QualifiedNameOfFile RangeOfEqualSignShouldBePresentInLocalLetBindingTyped, - [], [], + [], [SynModuleOrNamespace ([RangeOfEqualSignShouldBePresentInLocalLetBindingTyped], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs.bsl index 9e0bd27f359..5cbf90929d3 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs", false, - QualifiedNameOfFile RangeOfEqualSignShouldBePresentInMemberBinding, [], [], + QualifiedNameOfFile RangeOfEqualSignShouldBePresentInMemberBinding, [], [SynModuleOrNamespace ([RangeOfEqualSignShouldBePresentInMemberBinding], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs.bsl index 463fcef24ba..dcba7a74c90 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs", false, QualifiedNameOfFile - RangeOfEqualSignShouldBePresentInMemberBindingWithParameters, [], [], + RangeOfEqualSignShouldBePresentInMemberBindingWithParameters, [], [SynModuleOrNamespace ([RangeOfEqualSignShouldBePresentInMemberBindingWithParameters], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs.bsl index 49eeec4d346..3cbc0f8e240 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs", false, QualifiedNameOfFile - RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType, [], [], + RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType, [], [SynModuleOrNamespace ([RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInProperty.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInProperty.fs.bsl index 32f9f50c83a..b37d8459c49 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInProperty.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInProperty.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Binding/RangeOfEqualSignShouldBePresentInProperty.fs", false, - QualifiedNameOfFile RangeOfEqualSignShouldBePresentInProperty, [], [], + QualifiedNameOfFile RangeOfEqualSignShouldBePresentInProperty, [], [SynModuleOrNamespace ([RangeOfEqualSignShouldBePresentInProperty], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs.bsl index eca7f36b6dd..873c7cbe531 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs", false, QualifiedNameOfFile - RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding, [], [], + RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding, [], [SynModuleOrNamespace ([RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped.fs.bsl index 651cdb4f8ce..e81beb1206e 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped.fs", false, QualifiedNameOfFile - RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped, [], [], + RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped, [], [SynModuleOrNamespace ([RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs.bsl index 31febede5b6..2d118d1cd46 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs", false, QualifiedNameOfFile - RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding, [], [], + RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding, [], [SynModuleOrNamespace ([RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs.bsl index 0a175553cad..ff787558f5a 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs", false, QualifiedNameOfFile - RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding, [], [], + RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding, [], [SynModuleOrNamespace ([RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs.bsl index 613931862dd..b62efe5550b 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs.bsl @@ -4,7 +4,7 @@ ImplFile false, QualifiedNameOfFile RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes, - [], [], + [], [SynModuleOrNamespace ([RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Binding/TupleReturnTypeOfBindingShouldContainStars.fs.bsl b/tests/service/data/SyntaxTree/Binding/TupleReturnTypeOfBindingShouldContainStars.fs.bsl index a8dae863d64..6e81296f160 100644 --- a/tests/service/data/SyntaxTree/Binding/TupleReturnTypeOfBindingShouldContainStars.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/TupleReturnTypeOfBindingShouldContainStars.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs", false, - QualifiedNameOfFile TupleReturnTypeOfBindingShouldContainStars, [], [], + QualifiedNameOfFile TupleReturnTypeOfBindingShouldContainStars, [], [SynModuleOrNamespace ([TupleReturnTypeOfBindingShouldContainStars], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/CodeComment/BlockCommentInSourceCode.fs.bsl b/tests/service/data/SyntaxTree/CodeComment/BlockCommentInSourceCode.fs.bsl index 91dffc0ee66..764f33921d1 100644 --- a/tests/service/data/SyntaxTree/CodeComment/BlockCommentInSourceCode.fs.bsl +++ b/tests/service/data/SyntaxTree/CodeComment/BlockCommentInSourceCode.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/CodeComment/BlockCommentInSourceCode.fs", false, - QualifiedNameOfFile BlockCommentInSourceCode, [], [], + QualifiedNameOfFile BlockCommentInSourceCode, [], [SynModuleOrNamespace ([BlockCommentInSourceCode], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/CodeComment/BlockCommentInSourceCodeSignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/CodeComment/BlockCommentInSourceCodeSignatureFile.fsi.bsl index 977d7b388de..53f38927cc9 100644 --- a/tests/service/data/SyntaxTree/CodeComment/BlockCommentInSourceCodeSignatureFile.fsi.bsl +++ b/tests/service/data/SyntaxTree/CodeComment/BlockCommentInSourceCodeSignatureFile.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/CodeComment/BlockCommentInSourceCodeSignatureFile.fsi", - QualifiedNameOfFile BlockCommentInSourceCodeSignatureFile, [], [], + QualifiedNameOfFile BlockCommentInSourceCodeSignatureFile, [], [SynModuleOrNamespaceSig ([Meh], false, DeclaredNamespace, [Val diff --git a/tests/service/data/SyntaxTree/CodeComment/CommentAfterSourceCode.fs.bsl b/tests/service/data/SyntaxTree/CodeComment/CommentAfterSourceCode.fs.bsl index a3bb2470842..226cbf63540 100644 --- a/tests/service/data/SyntaxTree/CodeComment/CommentAfterSourceCode.fs.bsl +++ b/tests/service/data/SyntaxTree/CodeComment/CommentAfterSourceCode.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/CodeComment/CommentAfterSourceCode.fs", false, - QualifiedNameOfFile CommentAfterSourceCode, [], [], + QualifiedNameOfFile CommentAfterSourceCode, [], [SynModuleOrNamespace ([CommentAfterSourceCode], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/CodeComment/CommentAfterSourceCodeSignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/CodeComment/CommentAfterSourceCodeSignatureFile.fsi.bsl index 7b8fc685e00..7cc461ec087 100644 --- a/tests/service/data/SyntaxTree/CodeComment/CommentAfterSourceCodeSignatureFile.fsi.bsl +++ b/tests/service/data/SyntaxTree/CodeComment/CommentAfterSourceCodeSignatureFile.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/CodeComment/CommentAfterSourceCodeSignatureFile.fsi", - QualifiedNameOfFile CommentAfterSourceCodeSignatureFile, [], [], + QualifiedNameOfFile CommentAfterSourceCodeSignatureFile, [], [SynModuleOrNamespaceSig ([Meh], false, DeclaredNamespace, [Val diff --git a/tests/service/data/SyntaxTree/CodeComment/CommentAtEndOfFile.fs.bsl b/tests/service/data/SyntaxTree/CodeComment/CommentAtEndOfFile.fs.bsl index 4c1f24b1384..4e4f6c343cf 100644 --- a/tests/service/data/SyntaxTree/CodeComment/CommentAtEndOfFile.fs.bsl +++ b/tests/service/data/SyntaxTree/CodeComment/CommentAtEndOfFile.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/CodeComment/CommentAtEndOfFile.fs", false, - QualifiedNameOfFile CommentAtEndOfFile, [], [], + QualifiedNameOfFile CommentAtEndOfFile, [], [SynModuleOrNamespace ([CommentAtEndOfFile], false, AnonModule, [Expr (Ident x, (2,0--2,1))], PreXmlDocEmpty, [], None, (2,0--2,1), { LeadingKeyword = None })], diff --git a/tests/service/data/SyntaxTree/CodeComment/CommentOnSingleLine.fs.bsl b/tests/service/data/SyntaxTree/CodeComment/CommentOnSingleLine.fs.bsl index ad5aa017eac..c4e03170068 100644 --- a/tests/service/data/SyntaxTree/CodeComment/CommentOnSingleLine.fs.bsl +++ b/tests/service/data/SyntaxTree/CodeComment/CommentOnSingleLine.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/CodeComment/CommentOnSingleLine.fs", false, - QualifiedNameOfFile CommentOnSingleLine, [], [], + QualifiedNameOfFile CommentOnSingleLine, [], [SynModuleOrNamespace ([CommentOnSingleLine], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/CodeComment/CommentOnSingleLineSignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/CodeComment/CommentOnSingleLineSignatureFile.fsi.bsl index 5dd445b4d00..2591b10a9a8 100644 --- a/tests/service/data/SyntaxTree/CodeComment/CommentOnSingleLineSignatureFile.fsi.bsl +++ b/tests/service/data/SyntaxTree/CodeComment/CommentOnSingleLineSignatureFile.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/CodeComment/CommentOnSingleLineSignatureFile.fsi", - QualifiedNameOfFile CommentOnSingleLineSignatureFile, [], [], + QualifiedNameOfFile CommentOnSingleLineSignatureFile, [], [SynModuleOrNamespaceSig ([Meh], false, DeclaredNamespace, [Val diff --git a/tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs.bsl b/tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs.bsl index b57381ca8e6..f2dc787c81e 100644 --- a/tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs.bsl +++ b/tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs", false, QualifiedNameOfFile - TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation, [], [], + TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation, [], [SynModuleOrNamespace ([TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldNotBeCaptured.fs.bsl b/tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldNotBeCaptured.fs.bsl index fafd932e041..734a1c1b83b 100644 --- a/tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldNotBeCaptured.fs.bsl +++ b/tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldNotBeCaptured.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/CodeComment/TripleSlashCommentShouldNotBeCaptured.fs", false, - QualifiedNameOfFile TripleSlashCommentShouldNotBeCaptured, [], [], + QualifiedNameOfFile TripleSlashCommentShouldNotBeCaptured, [], [SynModuleOrNamespace ([TripleSlashCommentShouldNotBeCaptured], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs.bsl b/tests/service/data/SyntaxTree/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs.bsl index 2c7ca108bc8..6e80f566005 100644 --- a/tests/service/data/SyntaxTree/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs.bsl +++ b/tests/service/data/SyntaxTree/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs.bsl @@ -4,7 +4,6 @@ ImplFile false, QualifiedNameOfFile MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression, [], - [], [SynModuleOrNamespace ([MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs.bsl b/tests/service/data/SyntaxTree/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs.bsl index 105a94f5b46..65bdae7d963 100644 --- a/tests/service/data/SyntaxTree/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs.bsl +++ b/tests/service/data/SyntaxTree/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs", false, QualifiedNameOfFile SynExprAndBangRangeStartsAtAndAndEndsAfterExpression, - [], [], + [], [SynModuleOrNamespace ([SynExprAndBangRangeStartsAtAndAndEndsAfterExpression], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs.bsl index 8a7a55c28a1..94af9836414 100644 --- a/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs.bsl +++ b/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs.bsl @@ -3,7 +3,6 @@ ImplFile ("/root/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs", false, QualifiedNameOfFile DirectivesInMultilineCommentAreNotReportedAsTrivia, [], - [], [SynModuleOrNamespace ([DirectivesInMultilineCommentAreNotReportedAsTrivia], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTriviaSignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTriviaSignatureFile.fsi.bsl index bb8a2a87d75..bfd676a8b83 100644 --- a/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTriviaSignatureFile.fsi.bsl +++ b/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTriviaSignatureFile.fsi.bsl @@ -2,7 +2,7 @@ SigFile (ParsedSigFileInput ("/root/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTriviaSignatureFile.fsi", QualifiedNameOfFile - DirectivesInMultilineCommentAreNotReportedAsTriviaSignatureFile, [], [], + DirectivesInMultilineCommentAreNotReportedAsTriviaSignatureFile, [], [SynModuleOrNamespaceSig ([Foobar], false, DeclaredNamespace, [Val diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTrivia.fs.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTrivia.fs.bsl index 231cfd08d6f..3ef223e31aa 100644 --- a/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTrivia.fs.bsl +++ b/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTrivia.fs.bsl @@ -3,7 +3,6 @@ ImplFile ("/root/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTrivia.fs", false, QualifiedNameOfFile DirectivesInMultilineStringAreNotReportedAsTrivia, [], - [], [SynModuleOrNamespace ([DirectivesInMultilineStringAreNotReportedAsTrivia], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTriviaSignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTriviaSignatureFile.fsi.bsl index 3a151928254..8525f4cb417 100644 --- a/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTriviaSignatureFile.fsi.bsl +++ b/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTriviaSignatureFile.fsi.bsl @@ -2,7 +2,7 @@ SigFile (ParsedSigFileInput ("/root/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTriviaSignatureFile.fsi", QualifiedNameOfFile - DirectivesInMultilineStringAreNotReportedAsTriviaSignatureFile, [], [], + DirectivesInMultilineStringAreNotReportedAsTriviaSignatureFile, [], [SynModuleOrNamespaceSig ([Foobar], false, DeclaredNamespace, [Val diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfElseEndif.fs.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfElseEndif.fs.bsl index 9f409f45808..c579043eab6 100644 --- a/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfElseEndif.fs.bsl +++ b/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfElseEndif.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ConditionalDirective/NestedIfElseEndif.fs", false, - QualifiedNameOfFile NestedIfElseEndif, [], [], + QualifiedNameOfFile NestedIfElseEndif, [], [SynModuleOrNamespace ([NestedIfElseEndif], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfElseEndifSignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfElseEndifSignatureFile.fsi.bsl index c1293f6c9c9..b044cfec4cc 100644 --- a/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfElseEndifSignatureFile.fsi.bsl +++ b/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfElseEndifSignatureFile.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/ConditionalDirective/NestedIfElseEndifSignatureFile.fsi", - QualifiedNameOfFile NestedIfElseEndifSignatureFile, [], [], + QualifiedNameOfFile NestedIfElseEndifSignatureFile, [], [SynModuleOrNamespaceSig ([Foobar], false, DeclaredNamespace, [Val diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfEndifWithComplexExpressions.fs.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfEndifWithComplexExpressions.fs.bsl index 25821646aa0..3aba45cae75 100644 --- a/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfEndifWithComplexExpressions.fs.bsl +++ b/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfEndifWithComplexExpressions.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ConditionalDirective/NestedIfEndifWithComplexExpressions.fs", false, - QualifiedNameOfFile NestedIfEndifWithComplexExpressions, [], [], + QualifiedNameOfFile NestedIfEndifWithComplexExpressions, [], [SynModuleOrNamespace ([NestedIfEndifWithComplexExpressions], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfEndifWithComplexExpressionsSignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfEndifWithComplexExpressionsSignatureFile.fsi.bsl index 9f0375afada..39ac359edef 100644 --- a/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfEndifWithComplexExpressionsSignatureFile.fsi.bsl +++ b/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfEndifWithComplexExpressionsSignatureFile.fsi.bsl @@ -2,7 +2,6 @@ SigFile (ParsedSigFileInput ("/root/ConditionalDirective/NestedIfEndifWithComplexExpressionsSignatureFile.fsi", QualifiedNameOfFile NestedIfEndifWithComplexExpressionsSignatureFile, [], - [], [SynModuleOrNamespaceSig ([Foobar], false, DeclaredNamespace, [Val diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfElseEndif.fs.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfElseEndif.fs.bsl index 72ac590cc94..e9ca1db9743 100644 --- a/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfElseEndif.fs.bsl +++ b/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfElseEndif.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ConditionalDirective/SingleIfElseEndif.fs", false, - QualifiedNameOfFile SingleIfElseEndif, [], [], + QualifiedNameOfFile SingleIfElseEndif, [], [SynModuleOrNamespace ([SingleIfElseEndif], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfElseEndifSignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfElseEndifSignatureFile.fsi.bsl index 4164c59cd03..9ac8d98c7b5 100644 --- a/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfElseEndifSignatureFile.fsi.bsl +++ b/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfElseEndifSignatureFile.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/ConditionalDirective/SingleIfElseEndifSignatureFile.fsi", - QualifiedNameOfFile SingleIfElseEndifSignatureFile, [], [], + QualifiedNameOfFile SingleIfElseEndifSignatureFile, [], [SynModuleOrNamespaceSig ([Foobar], false, DeclaredNamespace, [Val diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfEndif.fs.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfEndif.fs.bsl index cd4a4243c4e..e1cd564ab94 100644 --- a/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfEndif.fs.bsl +++ b/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfEndif.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ConditionalDirective/SingleIfEndif.fs", false, - QualifiedNameOfFile SingleIfEndif, [], [], + QualifiedNameOfFile SingleIfEndif, [], [SynModuleOrNamespace ([SingleIfEndif], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfEndifSignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfEndifSignatureFile.fsi.bsl index ea0a6308762..15b9ae12223 100644 --- a/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfEndifSignatureFile.fsi.bsl +++ b/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfEndifSignatureFile.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/ConditionalDirective/SingleIfEndifSignatureFile.fsi", - QualifiedNameOfFile SingleIfEndifSignatureFile, [], [], + QualifiedNameOfFile SingleIfEndifSignatureFile, [], [SynModuleOrNamespaceSig ([Foobar], false, DeclaredNamespace, [Val diff --git a/tests/service/data/SyntaxTree/EnumCase/MultipleSynEnumCasesHaveBarRange.fs.bsl b/tests/service/data/SyntaxTree/EnumCase/MultipleSynEnumCasesHaveBarRange.fs.bsl index 121139817fc..941eeacd441 100644 --- a/tests/service/data/SyntaxTree/EnumCase/MultipleSynEnumCasesHaveBarRange.fs.bsl +++ b/tests/service/data/SyntaxTree/EnumCase/MultipleSynEnumCasesHaveBarRange.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/EnumCase/MultipleSynEnumCasesHaveBarRange.fs", false, - QualifiedNameOfFile MultipleSynEnumCasesHaveBarRange, [], [], + QualifiedNameOfFile MultipleSynEnumCasesHaveBarRange, [], [SynModuleOrNamespace ([MultipleSynEnumCasesHaveBarRange], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/EnumCase/SingleSynEnumCaseHasBarRange.fs.bsl b/tests/service/data/SyntaxTree/EnumCase/SingleSynEnumCaseHasBarRange.fs.bsl index 7f1b4d84526..de48080c664 100644 --- a/tests/service/data/SyntaxTree/EnumCase/SingleSynEnumCaseHasBarRange.fs.bsl +++ b/tests/service/data/SyntaxTree/EnumCase/SingleSynEnumCaseHasBarRange.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/EnumCase/SingleSynEnumCaseHasBarRange.fs", false, - QualifiedNameOfFile SingleSynEnumCaseHasBarRange, [], [], + QualifiedNameOfFile SingleSynEnumCaseHasBarRange, [], [SynModuleOrNamespace ([SingleSynEnumCaseHasBarRange], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/EnumCase/SingleSynEnumCaseWithoutBar.fs.bsl b/tests/service/data/SyntaxTree/EnumCase/SingleSynEnumCaseWithoutBar.fs.bsl index 2b2f3d90daa..a3f2846f4a5 100644 --- a/tests/service/data/SyntaxTree/EnumCase/SingleSynEnumCaseWithoutBar.fs.bsl +++ b/tests/service/data/SyntaxTree/EnumCase/SingleSynEnumCaseWithoutBar.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/EnumCase/SingleSynEnumCaseWithoutBar.fs", false, - QualifiedNameOfFile SingleSynEnumCaseWithoutBar, [], [], + QualifiedNameOfFile SingleSynEnumCaseWithoutBar, [], [SynModuleOrNamespace ([SingleSynEnumCaseWithoutBar], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Exception/Missing name 01.fs.bsl b/tests/service/data/SyntaxTree/Exception/Missing name 01.fs.bsl index 3bf7aea22b1..dc3b24f91f5 100644 --- a/tests/service/data/SyntaxTree/Exception/Missing name 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Exception/Missing name 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Exception/Missing name 01.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Exception diff --git a/tests/service/data/SyntaxTree/Exception/Missing name 02.fs.bsl b/tests/service/data/SyntaxTree/Exception/Missing name 02.fs.bsl index d71336169b3..3ff8296f894 100644 --- a/tests/service/data/SyntaxTree/Exception/Missing name 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Exception/Missing name 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Exception/Missing name 02.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Exception diff --git a/tests/service/data/SyntaxTree/Exception/Missing name 03.fs.bsl b/tests/service/data/SyntaxTree/Exception/Missing name 03.fs.bsl index 2cb9b84bc5b..f12b08046c4 100644 --- a/tests/service/data/SyntaxTree/Exception/Missing name 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Exception/Missing name 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Exception/Missing name 03.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Exception diff --git a/tests/service/data/SyntaxTree/Exception/Recover Function Type 01.fs.bsl b/tests/service/data/SyntaxTree/Exception/Recover Function Type 01.fs.bsl index 690183a18b6..0d9ca8801bf 100644 --- a/tests/service/data/SyntaxTree/Exception/Recover Function Type 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Exception/Recover Function Type 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Exception/Recover Function Type 01.fs", false, - QualifiedNameOfFile Recover Function Type 01, [], [], + QualifiedNameOfFile Recover Function Type 01, [], [SynModuleOrNamespace ([Foo], false, DeclaredNamespace, [Exception diff --git a/tests/service/data/SyntaxTree/Exception/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Exception/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs.bsl index 8326a320162..5832babbec5 100644 --- a/tests/service/data/SyntaxTree/Exception/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Exception/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Exception/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs", false, QualifiedNameOfFile SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword, - [], [], + [], [SynModuleOrNamespace ([X], false, DeclaredNamespace, [Exception diff --git a/tests/service/data/SyntaxTree/Expression/AnonymousRecords-01.fs.bsl b/tests/service/data/SyntaxTree/Expression/AnonymousRecords-01.fs.bsl index f931eda4280..531e0c9fe10 100644 --- a/tests/service/data/SyntaxTree/Expression/AnonymousRecords-01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/AnonymousRecords-01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/AnonymousRecords-01.fs", false, - QualifiedNameOfFile AnonymousRecords-01, [], [], + QualifiedNameOfFile AnonymousRecords-01, [], [SynModuleOrNamespace ([AnonymousRecords-01], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/AnonymousRecords-02.fs.bsl b/tests/service/data/SyntaxTree/Expression/AnonymousRecords-02.fs.bsl index 4701bc305a6..a8c19867200 100644 --- a/tests/service/data/SyntaxTree/Expression/AnonymousRecords-02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/AnonymousRecords-02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/AnonymousRecords-02.fs", false, - QualifiedNameOfFile AnonymousRecords-02, [], [], + QualifiedNameOfFile AnonymousRecords-02, [], [SynModuleOrNamespace ([AnonymousRecords-02], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/AnonymousRecords-03.fs.bsl b/tests/service/data/SyntaxTree/Expression/AnonymousRecords-03.fs.bsl index 074b9f0b601..be0d1b65f4e 100644 --- a/tests/service/data/SyntaxTree/Expression/AnonymousRecords-03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/AnonymousRecords-03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/AnonymousRecords-03.fs", false, - QualifiedNameOfFile AnonymousRecords-03, [], [], + QualifiedNameOfFile AnonymousRecords-03, [], [SynModuleOrNamespace ([AnonymousRecords-03], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/AnonymousRecords-04.fs.bsl b/tests/service/data/SyntaxTree/Expression/AnonymousRecords-04.fs.bsl index 3314197171d..461498a56c5 100644 --- a/tests/service/data/SyntaxTree/Expression/AnonymousRecords-04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/AnonymousRecords-04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/AnonymousRecords-04.fs", false, - QualifiedNameOfFile AnonymousRecords-04, [], [], + QualifiedNameOfFile AnonymousRecords-04, [], [SynModuleOrNamespace ([AnonymousRecords-04], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/AnonymousRecords-05.fs.bsl b/tests/service/data/SyntaxTree/Expression/AnonymousRecords-05.fs.bsl index fde8214fb91..766380f1f78 100644 --- a/tests/service/data/SyntaxTree/Expression/AnonymousRecords-05.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/AnonymousRecords-05.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/AnonymousRecords-05.fs", false, - QualifiedNameOfFile AnonymousRecords-05, [], [], + QualifiedNameOfFile AnonymousRecords-05, [], [SynModuleOrNamespace ([AnonymousRecords-05], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/AnonymousRecords-06.fs.bsl b/tests/service/data/SyntaxTree/Expression/AnonymousRecords-06.fs.bsl index 90e976cc843..cf9d8d54cee 100644 --- a/tests/service/data/SyntaxTree/Expression/AnonymousRecords-06.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/AnonymousRecords-06.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/AnonymousRecords-06.fs", false, - QualifiedNameOfFile AnonymousRecords-06, [], [], + QualifiedNameOfFile AnonymousRecords-06, [], [SynModuleOrNamespace ([AnonymousRecords-06], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Binary - Eq 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Binary - Eq 01.fs.bsl index 4c3ccc484a3..cc73d09ddf6 100644 --- a/tests/service/data/SyntaxTree/Expression/Binary - Eq 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Binary - Eq 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Binary - Eq 01.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Binary - Eq 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Binary - Eq 02.fs.bsl index e6453f7d365..f45a3bd17c8 100644 --- a/tests/service/data/SyntaxTree/Expression/Binary - Eq 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Binary - Eq 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Binary - Eq 02.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Binary - Eq 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Binary - Eq 03.fs.bsl index 5e7b2edfe2e..9c7732d2527 100644 --- a/tests/service/data/SyntaxTree/Expression/Binary - Eq 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Binary - Eq 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Binary - Eq 03.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Binary - Eq 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/Binary - Eq 04.fs.bsl index 9fabf903f5c..c7da9945b05 100644 --- a/tests/service/data/SyntaxTree/Expression/Binary - Eq 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Binary - Eq 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Binary - Eq 04.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Binary - Eq 05.fs.bsl b/tests/service/data/SyntaxTree/Expression/Binary - Eq 05.fs.bsl index 252070781e5..cf828c1302f 100644 --- a/tests/service/data/SyntaxTree/Expression/Binary - Eq 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Binary - Eq 05.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Binary - Eq 05.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Binary - Eq 06.fs.bsl b/tests/service/data/SyntaxTree/Expression/Binary - Eq 06.fs.bsl index f0fd4f42abb..56ae3843ced 100644 --- a/tests/service/data/SyntaxTree/Expression/Binary - Eq 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Binary - Eq 06.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Binary - Eq 06.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Binary - Eq 07.fs.bsl b/tests/service/data/SyntaxTree/Expression/Binary - Eq 07.fs.bsl index 09316e6513d..fb497cad671 100644 --- a/tests/service/data/SyntaxTree/Expression/Binary - Eq 07.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Binary - Eq 07.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Binary - Eq 07.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Binary - Plus 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Binary - Plus 01.fs.bsl index 748e99e38be..9d1d33e469e 100644 --- a/tests/service/data/SyntaxTree/Expression/Binary - Plus 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Binary - Plus 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Binary - Plus 01.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Binary - Plus 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Binary - Plus 02.fs.bsl index 8233f7b8725..e131cec1260 100644 --- a/tests/service/data/SyntaxTree/Expression/Binary - Plus 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Binary - Plus 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Binary - Plus 02.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Binary - Plus 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Binary - Plus 03.fs.bsl index 95babc117f7..8bdbf299590 100644 --- a/tests/service/data/SyntaxTree/Expression/Binary - Plus 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Binary - Plus 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Binary - Plus 03.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Binary - Plus 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/Binary - Plus 04.fs.bsl index 8f5d5280bb7..5dff24cc42f 100644 --- a/tests/service/data/SyntaxTree/Expression/Binary - Plus 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Binary - Plus 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Binary - Plus 04.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Binary - Plus 05.fs.bsl b/tests/service/data/SyntaxTree/Expression/Binary - Plus 05.fs.bsl index 6717b3e3537..5ad65469fd9 100644 --- a/tests/service/data/SyntaxTree/Expression/Binary - Plus 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Binary - Plus 05.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Binary - Plus 05.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Binary 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Binary 01.fs.bsl index d0679ba06df..b1951671b31 100644 --- a/tests/service/data/SyntaxTree/Expression/Binary 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Binary 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Binary 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Binary 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Binary 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Binary 02.fs.bsl index 0b5419a8632..1c91a47b04f 100644 --- a/tests/service/data/SyntaxTree/Expression/Binary 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Binary 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Binary 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Binary 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl b/tests/service/data/SyntaxTree/Expression/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl index fde625dfdba..22138377be4 100644 --- a/tests/service/data/SyntaxTree/Expression/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl @@ -4,7 +4,6 @@ ImplFile false, QualifiedNameOfFile CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField, [], - [], [SynModuleOrNamespace ([CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Expression/Do 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Do 01.fs.bsl index bbac8331c5c..b63ad8484e3 100644 --- a/tests/service/data/SyntaxTree/Expression/Do 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Do 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Do 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Do 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr (Do (Const (Int32 1, (4,4--4,5)), (3,0--4,5)), (3,0--4,5)); diff --git a/tests/service/data/SyntaxTree/Expression/Do 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Do 02.fs.bsl index b3cfba16181..4dda71baa2d 100644 --- a/tests/service/data/SyntaxTree/Expression/Do 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Do 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Do 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Do 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr (Do (Const (Int32 1, (4,4--4,5)), (3,0--4,5)), (3,0--4,5)); diff --git a/tests/service/data/SyntaxTree/Expression/Do 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Do 03.fs.bsl index 2bf1e3df8cb..42d0c78835d 100644 --- a/tests/service/data/SyntaxTree/Expression/Do 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Do 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Do 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Do 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Do 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/Do 04.fs.bsl index 7edad619273..e34ee16528a 100644 --- a/tests/service/data/SyntaxTree/Expression/Do 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Do 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Do 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Do 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Do 05.fs.bsl b/tests/service/data/SyntaxTree/Expression/Do 05.fs.bsl index 8707692afc7..ce047029a64 100644 --- a/tests/service/data/SyntaxTree/Expression/Do 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Do 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Do 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Do 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/DotLambda - _ Recovery - Casts.fsx.bsl b/tests/service/data/SyntaxTree/Expression/DotLambda - _ Recovery - Casts.fsx.bsl index e0923b67823..7efd387e672 100644 --- a/tests/service/data/SyntaxTree/Expression/DotLambda - _ Recovery - Casts.fsx.bsl +++ b/tests/service/data/SyntaxTree/Expression/DotLambda - _ Recovery - Casts.fsx.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/DotLambda - _ Recovery - Casts.fsx", true, - QualifiedNameOfFile DotLambda - _ Recovery - Casts$fsx, [], [], + QualifiedNameOfFile DotLambda - _ Recovery - Casts$fsx, [], [SynModuleOrNamespace ([DotLambda - _ Recovery - Casts], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/DotLambda - _ Recovery - Eof.fsx.bsl b/tests/service/data/SyntaxTree/Expression/DotLambda - _ Recovery - Eof.fsx.bsl index f481a08bdd5..967b24e04b7 100644 --- a/tests/service/data/SyntaxTree/Expression/DotLambda - _ Recovery - Eof.fsx.bsl +++ b/tests/service/data/SyntaxTree/Expression/DotLambda - _ Recovery - Eof.fsx.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/DotLambda - _ Recovery - Eof.fsx", true, - QualifiedNameOfFile DotLambda - _ Recovery - Eof$fsx, [], [], + QualifiedNameOfFile DotLambda - _ Recovery - Eof$fsx, [], [SynModuleOrNamespace ([DotLambda - _ Recovery - Eof], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/DotLambda - _ Recovery.fsx.bsl b/tests/service/data/SyntaxTree/Expression/DotLambda - _ Recovery.fsx.bsl index 1dfda19d13b..6303f207956 100644 --- a/tests/service/data/SyntaxTree/Expression/DotLambda - _ Recovery.fsx.bsl +++ b/tests/service/data/SyntaxTree/Expression/DotLambda - _ Recovery.fsx.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/DotLambda - _ Recovery.fsx", true, - QualifiedNameOfFile DotLambda - _ Recovery$fsx, [], [], + QualifiedNameOfFile DotLambda - _ Recovery$fsx, [], [SynModuleOrNamespace ([DotLambda - _ Recovery], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/DotLambda - _. Recovery - Eof.fsx.bsl b/tests/service/data/SyntaxTree/Expression/DotLambda - _. Recovery - Eof.fsx.bsl index 878b39bfb7a..41c33797f29 100644 --- a/tests/service/data/SyntaxTree/Expression/DotLambda - _. Recovery - Eof.fsx.bsl +++ b/tests/service/data/SyntaxTree/Expression/DotLambda - _. Recovery - Eof.fsx.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/DotLambda - _. Recovery - Eof.fsx", true, - QualifiedNameOfFile DotLambda - _. Recovery - Eof$fsx, [], [], + QualifiedNameOfFile DotLambda - _. Recovery - Eof$fsx, [], [SynModuleOrNamespace ([DotLambda - _; Recovery - Eof], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/DotLambda - _. Recovery.fsx.bsl b/tests/service/data/SyntaxTree/Expression/DotLambda - _. Recovery.fsx.bsl index 0bc367b4df3..0604348d865 100644 --- a/tests/service/data/SyntaxTree/Expression/DotLambda - _. Recovery.fsx.bsl +++ b/tests/service/data/SyntaxTree/Expression/DotLambda - _. Recovery.fsx.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/DotLambda - _. Recovery.fsx", true, - QualifiedNameOfFile DotLambda - _. Recovery$fsx, [], [], + QualifiedNameOfFile DotLambda - _. Recovery$fsx, [], [SynModuleOrNamespace ([DotLambda - _; Recovery], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/DotLambda_ArgumentExpressionInInnerAppExpression.fs.bsl b/tests/service/data/SyntaxTree/Expression/DotLambda_ArgumentExpressionInInnerAppExpression.fs.bsl index cba7a3d17c6..7692643fca3 100644 --- a/tests/service/data/SyntaxTree/Expression/DotLambda_ArgumentExpressionInInnerAppExpression.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/DotLambda_ArgumentExpressionInInnerAppExpression.fs.bsl @@ -3,7 +3,6 @@ ImplFile ("/root/Expression/DotLambda_ArgumentExpressionInInnerAppExpression.fs", false, QualifiedNameOfFile DotLambda_ArgumentExpressionInInnerAppExpression, [], - [], [SynModuleOrNamespace ([DotLambda_ArgumentExpressionInInnerAppExpression], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/DotLambda_FunctionWithUnderscoreDotLambda.fs.bsl b/tests/service/data/SyntaxTree/Expression/DotLambda_FunctionWithUnderscoreDotLambda.fs.bsl index 378bed8cdf2..1eefee02340 100644 --- a/tests/service/data/SyntaxTree/Expression/DotLambda_FunctionWithUnderscoreDotLambda.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/DotLambda_FunctionWithUnderscoreDotLambda.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/DotLambda_FunctionWithUnderscoreDotLambda.fs", false, - QualifiedNameOfFile DotLambda_FunctionWithUnderscoreDotLambda, [], [], + QualifiedNameOfFile DotLambda_FunctionWithUnderscoreDotLambda, [], [SynModuleOrNamespace ([DotLambda_FunctionWithUnderscoreDotLambda], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/DotLambda_NestedPropertiesAfterUnderscore.fs.bsl b/tests/service/data/SyntaxTree/Expression/DotLambda_NestedPropertiesAfterUnderscore.fs.bsl index ad08dcfcd15..e61cdd58b5f 100644 --- a/tests/service/data/SyntaxTree/Expression/DotLambda_NestedPropertiesAfterUnderscore.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/DotLambda_NestedPropertiesAfterUnderscore.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/DotLambda_NestedPropertiesAfterUnderscore.fs", false, - QualifiedNameOfFile DotLambda_NestedPropertiesAfterUnderscore, [], [], + QualifiedNameOfFile DotLambda_NestedPropertiesAfterUnderscore, [], [SynModuleOrNamespace ([DotLambda_NestedPropertiesAfterUnderscore], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/DotLambda_NotAllowedFunctionExpressionWithArg.fs.bsl b/tests/service/data/SyntaxTree/Expression/DotLambda_NotAllowedFunctionExpressionWithArg.fs.bsl index 561a8c4d1ee..1502e694f12 100644 --- a/tests/service/data/SyntaxTree/Expression/DotLambda_NotAllowedFunctionExpressionWithArg.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/DotLambda_NotAllowedFunctionExpressionWithArg.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/DotLambda_NotAllowedFunctionExpressionWithArg.fs", false, - QualifiedNameOfFile DotLambda_NotAllowedFunctionExpressionWithArg, [], [], + QualifiedNameOfFile DotLambda_NotAllowedFunctionExpressionWithArg, [], [SynModuleOrNamespace ([DotLambda_NotAllowedFunctionExpressionWithArg], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/DotLambda_TopLevelLet.fs.bsl b/tests/service/data/SyntaxTree/Expression/DotLambda_TopLevelLet.fs.bsl index 7b8f9aa8c69..49f33b5941d 100644 --- a/tests/service/data/SyntaxTree/Expression/DotLambda_TopLevelLet.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/DotLambda_TopLevelLet.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/DotLambda_TopLevelLet.fs", false, - QualifiedNameOfFile DotLambda_TopLevelLet, [], [], + QualifiedNameOfFile DotLambda_TopLevelLet, [], [SynModuleOrNamespace ([DotLambda_TopLevelLet], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/DotLambda_TopLevelStandaloneDotLambda.fs.bsl b/tests/service/data/SyntaxTree/Expression/DotLambda_TopLevelStandaloneDotLambda.fs.bsl index 2c57852951a..45b7bcca47c 100644 --- a/tests/service/data/SyntaxTree/Expression/DotLambda_TopLevelStandaloneDotLambda.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/DotLambda_TopLevelStandaloneDotLambda.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/DotLambda_TopLevelStandaloneDotLambda.fs", false, - QualifiedNameOfFile DotLambda_TopLevelStandaloneDotLambda, [], [], + QualifiedNameOfFile DotLambda_TopLevelStandaloneDotLambda, [], [SynModuleOrNamespace ([DotLambda_TopLevelStandaloneDotLambda], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/DotLambda_UnderscoreToFunctionCallWithSpaceAndUnitApplication.fs.bsl b/tests/service/data/SyntaxTree/Expression/DotLambda_UnderscoreToFunctionCallWithSpaceAndUnitApplication.fs.bsl index 5d634a011a2..6a5b07e328d 100644 --- a/tests/service/data/SyntaxTree/Expression/DotLambda_UnderscoreToFunctionCallWithSpaceAndUnitApplication.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/DotLambda_UnderscoreToFunctionCallWithSpaceAndUnitApplication.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Expression/DotLambda_UnderscoreToFunctionCallWithSpaceAndUnitApplication.fs", false, QualifiedNameOfFile - DotLambda_UnderscoreToFunctionCallWithSpaceAndUnitApplication, [], [], + DotLambda_UnderscoreToFunctionCallWithSpaceAndUnitApplication, [], [SynModuleOrNamespace ([DotLambda_UnderscoreToFunctionCallWithSpaceAndUnitApplication], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Expression/DotLambda_UnderscoreToString.fs.bsl b/tests/service/data/SyntaxTree/Expression/DotLambda_UnderscoreToString.fs.bsl index 177818e273f..06ed3e8d5c2 100644 --- a/tests/service/data/SyntaxTree/Expression/DotLambda_UnderscoreToString.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/DotLambda_UnderscoreToString.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/DotLambda_UnderscoreToString.fs", false, - QualifiedNameOfFile DotLambda_UnderscoreToString, [], [], + QualifiedNameOfFile DotLambda_UnderscoreToString, [], [SynModuleOrNamespace ([DotLambda_UnderscoreToString], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/DotLambda_WithNonTupledFunctionCall.fs.bsl b/tests/service/data/SyntaxTree/Expression/DotLambda_WithNonTupledFunctionCall.fs.bsl index 2aaeb2c9bff..001a8ea9b4e 100644 --- a/tests/service/data/SyntaxTree/Expression/DotLambda_WithNonTupledFunctionCall.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/DotLambda_WithNonTupledFunctionCall.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/DotLambda_WithNonTupledFunctionCall.fs", false, - QualifiedNameOfFile DotLambda_WithNonTupledFunctionCall, [], [], + QualifiedNameOfFile DotLambda_WithNonTupledFunctionCall, [], [SynModuleOrNamespace ([DotLambda_WithNonTupledFunctionCall], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/DotLambda_WithoutDot.fs.bsl b/tests/service/data/SyntaxTree/Expression/DotLambda_WithoutDot.fs.bsl index c9e140cb3a0..d3e09de5bc5 100644 --- a/tests/service/data/SyntaxTree/Expression/DotLambda_WithoutDot.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/DotLambda_WithoutDot.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/DotLambda_WithoutDot.fs", false, - QualifiedNameOfFile DotLambda_WithoutDot, [], [], + QualifiedNameOfFile DotLambda_WithoutDot, [], [SynModuleOrNamespace ([DotLambda_WithoutDot], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/DotLambda_WithoutUnderscore.fs.bsl b/tests/service/data/SyntaxTree/Expression/DotLambda_WithoutUnderscore.fs.bsl index 624a15c29e4..d387bdb8b78 100644 --- a/tests/service/data/SyntaxTree/Expression/DotLambda_WithoutUnderscore.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/DotLambda_WithoutUnderscore.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/DotLambda_WithoutUnderscore.fs", false, - QualifiedNameOfFile DotLambda_WithoutUnderscore, [], [], + QualifiedNameOfFile DotLambda_WithoutUnderscore, [], [SynModuleOrNamespace ([DotLambda_WithoutUnderscore], false, AnonModule, [], PreXmlDocEmpty, [], None, (1,0--1,1), { LeadingKeyword = None })], (true, true), diff --git a/tests/service/data/SyntaxTree/Expression/Downcast 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Downcast 01.fs.bsl index 8fde0743e4b..0b88548bd44 100644 --- a/tests/service/data/SyntaxTree/Expression/Downcast 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Downcast 01.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Downcast 01.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Downcast 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Downcast 02.fs.bsl index d9a03af749d..0c088e8fd17 100644 --- a/tests/service/data/SyntaxTree/Expression/Downcast 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Downcast 02.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Downcast 02.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr (Downcast (Ident i, Anon (4,0--4,2), (3,0--4,2)), (3,0--4,2))], diff --git a/tests/service/data/SyntaxTree/Expression/Downcast 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Downcast 03.fs.bsl index fab179734b2..6d2e8d4a038 100644 --- a/tests/service/data/SyntaxTree/Expression/Downcast 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Downcast 03.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Downcast 03.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/For 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/For 01.fs.bsl index 97d7c7cb03e..74e1364eaad 100644 --- a/tests/service/data/SyntaxTree/Expression/For 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/For 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/For 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/For 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/For 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/For 02.fs.bsl index aad044dcf30..deb1ef5e477 100644 --- a/tests/service/data/SyntaxTree/Expression/For 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/For 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/For 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/For 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/For 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/For 03.fs.bsl index 023ec9d79e0..9955d95acbe 100644 --- a/tests/service/data/SyntaxTree/Expression/For 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/For 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/For 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/For 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/For 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/For 04.fs.bsl index 41ed392a753..4d5ca721f0d 100644 --- a/tests/service/data/SyntaxTree/Expression/For 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/For 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/For 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/For 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/For 05.fs.bsl b/tests/service/data/SyntaxTree/Expression/For 05.fs.bsl index 9a71d8f9e4c..4a788c6a421 100644 --- a/tests/service/data/SyntaxTree/Expression/For 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/For 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/For 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/For 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/GlobalKeywordAsSynExpr.fs.bsl b/tests/service/data/SyntaxTree/Expression/GlobalKeywordAsSynExpr.fs.bsl index d76e9fe48b4..78a29949d08 100644 --- a/tests/service/data/SyntaxTree/Expression/GlobalKeywordAsSynExpr.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/GlobalKeywordAsSynExpr.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/GlobalKeywordAsSynExpr.fs", false, - QualifiedNameOfFile GlobalKeywordAsSynExpr, [], [], + QualifiedNameOfFile GlobalKeywordAsSynExpr, [], [SynModuleOrNamespace ([GlobalKeywordAsSynExpr], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Id 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Id 01.fs.bsl index e24dcc6b23b..e2853af7874 100644 --- a/tests/service/data/SyntaxTree/Expression/Id 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Id 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Id 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Id 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr (Ident a, (3,0--3,1))], PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None, diff --git a/tests/service/data/SyntaxTree/Expression/Id 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Id 02.fs.bsl index d46a4254b22..3dc42b9e7b6 100644 --- a/tests/service/data/SyntaxTree/Expression/Id 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Id 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Id 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Id 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr (Ident a, (3,0--3,3)); Expr (Ident b, (4,0--4,1))], diff --git a/tests/service/data/SyntaxTree/Expression/Id 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Id 03.fs.bsl index 26ef9dd71d4..982c8e2bde8 100644 --- a/tests/service/data/SyntaxTree/Expression/Id 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Id 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Id 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Id 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr (FromParseError (Ident , (3,0--3,2)), (3,0--3,2)); diff --git a/tests/service/data/SyntaxTree/Expression/Id 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/Id 04.fs.bsl index c76189328b1..a908b643de4 100644 --- a/tests/service/data/SyntaxTree/Expression/Id 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Id 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Id 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Id 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr (FromParseError (Ident , (3,0--3,1)), (3,0--3,1)); diff --git a/tests/service/data/SyntaxTree/Expression/Id 05.fs.bsl b/tests/service/data/SyntaxTree/Expression/Id 05.fs.bsl index 2e3f9d5568d..5156ef62814 100644 --- a/tests/service/data/SyntaxTree/Expression/Id 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Id 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Id 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Id 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Id 06.fs.bsl b/tests/service/data/SyntaxTree/Expression/Id 06.fs.bsl index bade7e896ea..92b191a467a 100644 --- a/tests/service/data/SyntaxTree/Expression/Id 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Id 06.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Id 06.fs", false, QualifiedNameOfFile Id 06, [], [], + ("/root/Expression/Id 06.fs", false, QualifiedNameOfFile Id 06, [], [SynModuleOrNamespace ([Id 06], false, AnonModule, [Expr (FromParseError (Ident , (1,0--1,2)), (1,0--1,2))], diff --git a/tests/service/data/SyntaxTree/Expression/Id 07.fs.bsl b/tests/service/data/SyntaxTree/Expression/Id 07.fs.bsl index 60d8974e781..e05d53011a5 100644 --- a/tests/service/data/SyntaxTree/Expression/Id 07.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Id 07.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Id 07.fs", false, QualifiedNameOfFile Id 07, [], [], + ("/root/Expression/Id 07.fs", false, QualifiedNameOfFile Id 07, [], [SynModuleOrNamespace ([Id 07], false, AnonModule, [Expr (FromParseError (Ident , (1,0--1,1)), (1,0--1,1))], diff --git a/tests/service/data/SyntaxTree/Expression/If 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/If 01.fs.bsl index 775d6d7764d..3c5d6112613 100644 --- a/tests/service/data/SyntaxTree/Expression/If 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/If 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/If 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/If 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/If 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/If 02.fs.bsl index 8f026aa409e..542bd4580dc 100644 --- a/tests/service/data/SyntaxTree/Expression/If 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/If 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/If 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/If 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/If 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/If 03.fs.bsl index c68682f6f59..00f9e86db62 100644 --- a/tests/service/data/SyntaxTree/Expression/If 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/If 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/If 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/If 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/If 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/If 04.fs.bsl index 99ffbe73e73..b53d9856594 100644 --- a/tests/service/data/SyntaxTree/Expression/If 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/If 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/If 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/If 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/If 05.fs.bsl b/tests/service/data/SyntaxTree/Expression/If 05.fs.bsl index 0197cbcd0d2..14c3141b926 100644 --- a/tests/service/data/SyntaxTree/Expression/If 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/If 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/If 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/If 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/If 06.fs.bsl b/tests/service/data/SyntaxTree/Expression/If 06.fs.bsl index 2c0215d0a8f..eb54aff8e05 100644 --- a/tests/service/data/SyntaxTree/Expression/If 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/If 06.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/If 06.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/If 06.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/If 07.fs.bsl b/tests/service/data/SyntaxTree/Expression/If 07.fs.bsl index d4d53023ff8..a775790478a 100644 --- a/tests/service/data/SyntaxTree/Expression/If 07.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/If 07.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/If 07.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/If 07.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/If 08.fs.bsl b/tests/service/data/SyntaxTree/Expression/If 08.fs.bsl index 016bc4dbfe7..936be0da4f1 100644 --- a/tests/service/data/SyntaxTree/Expression/If 08.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/If 08.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/If 08.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/If 08.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/If 09.fs.bsl b/tests/service/data/SyntaxTree/Expression/If 09.fs.bsl index 6541b409bd9..7057cf36e68 100644 --- a/tests/service/data/SyntaxTree/Expression/If 09.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/If 09.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/If 09.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/If 09.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/If 10.fs.bsl b/tests/service/data/SyntaxTree/Expression/If 10.fs.bsl index ef03391599d..170b8ad0a0c 100644 --- a/tests/service/data/SyntaxTree/Expression/If 10.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/If 10.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/If 10.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/If 10.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl b/tests/service/data/SyntaxTree/Expression/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl index 8c19bf183e8..04d12c94d8b 100644 --- a/tests/service/data/SyntaxTree/Expression/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl @@ -4,7 +4,7 @@ ImplFile false, QualifiedNameOfFile InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField, - [], [], + [], [SynModuleOrNamespace ([InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Expression/Lambda - Missing expr 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Lambda - Missing expr 01.fs.bsl index f67f65c9688..1e754640ce9 100644 --- a/tests/service/data/SyntaxTree/Expression/Lambda - Missing expr 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Lambda - Missing expr 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Lambda - Missing expr 01.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Lambda - Missing expr 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Lambda - Missing expr 02.fs.bsl index 42bbbc58539..b53a3b341cf 100644 --- a/tests/service/data/SyntaxTree/Expression/Lambda - Missing expr 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Lambda - Missing expr 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Lambda - Missing expr 02.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Lambda 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Lambda 01.fs.bsl index 095a5f6834a..fbca7518c2a 100644 --- a/tests/service/data/SyntaxTree/Expression/Lambda 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Lambda 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Lambda 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Lambda 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Lambda 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Lambda 02.fs.bsl index 82cf6a37d3a..af47f5c1031 100644 --- a/tests/service/data/SyntaxTree/Expression/Lambda 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Lambda 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Lambda 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Lambda 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Lazy 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Lazy 01.fs.bsl index 9af75da75fe..fdf0eb903a8 100644 --- a/tests/service/data/SyntaxTree/Expression/Lazy 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Lazy 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Lazy 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Lazy 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Lazy 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Lazy 02.fs.bsl index 32e1522a9e5..cda090c76c0 100644 --- a/tests/service/data/SyntaxTree/Expression/Lazy 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Lazy 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Lazy 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Lazy 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Lazy 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Lazy 03.fs.bsl index 17a4c9785fb..138c07fad45 100644 --- a/tests/service/data/SyntaxTree/Expression/Lazy 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Lazy 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Lazy 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Lazy 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Let 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Let 01.fs.bsl index 8eaabfb3d65..ba682cd6020 100644 --- a/tests/service/data/SyntaxTree/Expression/Let 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Let 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Let 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Let 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Let 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Let 02.fs.bsl index bf9b340b539..454d6a9a4fa 100644 --- a/tests/service/data/SyntaxTree/Expression/Let 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Let 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Let 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Let 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/List - Comprehension 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/List - Comprehension 01.fs.bsl index 7cc9b348848..6cfe5fcabbc 100644 --- a/tests/service/data/SyntaxTree/Expression/List - Comprehension 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/List - Comprehension 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/List - Comprehension 01.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/List - Comprehension 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/List - Comprehension 02.fs.bsl index 1a89da1b0fb..2645ff40cab 100644 --- a/tests/service/data/SyntaxTree/Expression/List - Comprehension 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/List - Comprehension 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/List - Comprehension 02.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl index 132e7030303..dbba6b1816e 100644 --- a/tests/service/data/SyntaxTree/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl @@ -3,7 +3,6 @@ ImplFile ("/root/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs", false, QualifiedNameOfFile NestedSynExprLetOrUseContainsTheRangeOfInKeyword, [], - [], [SynModuleOrNamespace ([NestedSynExprLetOrUseContainsTheRangeOfInKeyword], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 01.fs.bsl index cf716944487..fd16ccd744c 100644 --- a/tests/service/data/SyntaxTree/Expression/Object - Class 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Object - Class 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Object - Class 01.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 02.fs.bsl index 9a06f01ae6e..389f44a541a 100644 --- a/tests/service/data/SyntaxTree/Expression/Object - Class 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Object - Class 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Object - Class 02.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 03.fs.bsl index 92401919062..9c75e1441db 100644 --- a/tests/service/data/SyntaxTree/Expression/Object - Class 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Object - Class 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Object - Class 03.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 04.fs.bsl index 5b7efb7cdf9..95379f2d0a5 100644 --- a/tests/service/data/SyntaxTree/Expression/Object - Class 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Object - Class 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Object - Class 04.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 05.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 05.fs.bsl index d4dbc824d6d..44c71c53d1c 100644 --- a/tests/service/data/SyntaxTree/Expression/Object - Class 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Object - Class 05.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Object - Class 05.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 06.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 06.fs.bsl index 1880c3c044f..b23bb6e5f76 100644 --- a/tests/service/data/SyntaxTree/Expression/Object - Class 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Object - Class 06.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Object - Class 06.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 07.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 07.fs.bsl index eeaef3fd16a..c9eabcdd5a6 100644 --- a/tests/service/data/SyntaxTree/Expression/Object - Class 07.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Object - Class 07.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Object - Class 07.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 08.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 08.fs.bsl index f7c76b0b8fb..2176f273e5d 100644 --- a/tests/service/data/SyntaxTree/Expression/Object - Class 08.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Object - Class 08.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Object - Class 08.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 09.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 09.fs.bsl index 831deffbeac..dd3c049e790 100644 --- a/tests/service/data/SyntaxTree/Expression/Object - Class 09.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Object - Class 09.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Object - Class 09.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 10.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 10.fs.bsl index d7670c74151..270b00d7bf5 100644 --- a/tests/service/data/SyntaxTree/Expression/Object - Class 10.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Object - Class 10.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Object - Class 10.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 11.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 11.fs.bsl index ff41ad2a5d8..6ff48652826 100644 --- a/tests/service/data/SyntaxTree/Expression/Object - Class 11.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Object - Class 11.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Object - Class 11.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 12.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 12.fs.bsl index 53d26ec6e93..c3147b138a7 100644 --- a/tests/service/data/SyntaxTree/Expression/Object - Class 12.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Object - Class 12.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Object - Class 12.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 13.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 13.fs.bsl index 6567abe2e7b..ce8375fa6d2 100644 --- a/tests/service/data/SyntaxTree/Expression/Object - Class 13.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Object - Class 13.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Object - Class 13.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 14.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 14.fs.bsl index 64530949bbc..85b1f160c95 100644 --- a/tests/service/data/SyntaxTree/Expression/Object - Class 14.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Object - Class 14.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Object - Class 14.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 15.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 15.fs.bsl index ec08bebfe92..5b20ec7ef7d 100644 --- a/tests/service/data/SyntaxTree/Expression/Object - Class 15.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Object - Class 15.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Object - Class 15.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Rarrow 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Rarrow 01.fs.bsl index 9d7e7af2125..0e9b8672a91 100644 --- a/tests/service/data/SyntaxTree/Expression/Rarrow 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Rarrow 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Rarrow 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Rarrow 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Rarrow 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Rarrow 02.fs.bsl index 54570b38728..dc5826d4efb 100644 --- a/tests/service/data/SyntaxTree/Expression/Rarrow 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Rarrow 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Rarrow 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Rarrow 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Rarrow 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Rarrow 03.fs.bsl index e0d4104ac0a..8f7af982117 100644 --- a/tests/service/data/SyntaxTree/Expression/Rarrow 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Rarrow 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Rarrow 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Rarrow 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Anon 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Anon 01.fs.bsl index 0e74d6eb486..d72cf32a3f1 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Anon 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Anon 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Anon 01.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Anon 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Anon 02.fs.bsl index 52748529a11..88309d54b5a 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Anon 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Anon 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Anon 02.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Anon 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Anon 03.fs.bsl index dbb9b6e063f..4f76f9e4fa8 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Anon 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Anon 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Anon 03.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Anon 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Anon 04.fs.bsl index 07303e1a146..15e39d2acb6 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Anon 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Anon 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Anon 04.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Anon 05.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Anon 05.fs.bsl index 6c2cefee45d..4b8fa60fac5 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Anon 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Anon 05.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Anon 05.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Anon 06.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Anon 06.fs.bsl index edbeaa194e6..b597846c478 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Anon 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Anon 06.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Anon 06.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Anon 07.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Anon 07.fs.bsl index 1bc1a409d91..135e7002a24 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Anon 07.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Anon 07.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Anon 07.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Anon 08.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Anon 08.fs.bsl index 0cd4a997180..e7d89ffedcd 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Anon 08.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Anon 08.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Anon 08.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Anon 09.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Anon 09.fs.bsl index e851232c521..834aed98c3d 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Anon 09.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Anon 09.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Anon 09.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Anon 10.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Anon 10.fs.bsl index 2e01c7ef8c7..174d2094771 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Anon 10.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Anon 10.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Anon 10.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Anon 11.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Anon 11.fs.bsl index 97ffe8e441d..cc377bc241f 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Anon 11.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Anon 11.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Anon 11.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Anon 12.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Anon 12.fs.bsl index 3371e7a75e6..2756e6b0e25 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Anon 12.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Anon 12.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Anon 12.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Field 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Field 01.fs.bsl index be62dae5864..a80fba14e99 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Field 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Field 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Field 01.fs", false, QualifiedNameOfFile Foo, - [], [], + [], [SynModuleOrNamespace ([Foo], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Field 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Field 02.fs.bsl index 41d98a61173..5a70f2f54f5 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Field 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Field 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Field 02.fs", false, QualifiedNameOfFile Foo, - [], [], + [], [SynModuleOrNamespace ([Foo], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Field 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Field 03.fs.bsl index 7ca89a4c8ed..fca8c8554a2 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Field 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Field 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Field 03.fs", false, QualifiedNameOfFile Foo, - [], [], + [], [SynModuleOrNamespace ([Foo], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Field 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Field 04.fs.bsl index d37f41ae725..e15a6a36567 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Field 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Field 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Field 04.fs", false, QualifiedNameOfFile Foo, - [], [], + [], [SynModuleOrNamespace ([Foo], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Field 05.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Field 05.fs.bsl index f0baef9a8ff..7fbe2f2c3ca 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Field 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Field 05.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Field 05.fs", false, QualifiedNameOfFile Foo, - [], [], + [], [SynModuleOrNamespace ([Foo], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Field 06.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Field 06.fs.bsl index a280f304f7d..b076a81bb2d 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Field 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Field 06.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Field 06.fs", false, QualifiedNameOfFile Foo, - [], [], + [], [SynModuleOrNamespace ([Foo], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Field 07.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Field 07.fs.bsl index 58a717c0121..c76a489f02a 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Field 07.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Field 07.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Field 07.fs", false, QualifiedNameOfFile Foo, - [], [], + [], [SynModuleOrNamespace ([Foo], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Field 08.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Field 08.fs.bsl index a9a2cbc8047..771eac840e6 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Field 08.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Field 08.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Field 08.fs", false, QualifiedNameOfFile Foo, - [], [], + [], [SynModuleOrNamespace ([Foo], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Field 09.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Field 09.fs.bsl index 6132a89bd66..541df44f632 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Field 09.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Field 09.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Field 09.fs", false, QualifiedNameOfFile Foo, - [], [], + [], [SynModuleOrNamespace ([Foo], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Field 10.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Field 10.fs.bsl index 0b0379f5dbf..964495bce86 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Field 10.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Field 10.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Field 10.fs", false, QualifiedNameOfFile Foo, - [], [], + [], [SynModuleOrNamespace ([Foo], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Field 11.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Field 11.fs.bsl index 6b20cddae13..0edaee67e4d 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Field 11.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Field 11.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Field 11.fs", false, QualifiedNameOfFile Foo, - [], [], + [], [SynModuleOrNamespace ([Foo], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Field 12.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Field 12.fs.bsl index f1c61f45015..b41e37f43c3 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Field 12.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Field 12.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Field 12.fs", false, QualifiedNameOfFile Foo, - [], [], + [], [SynModuleOrNamespace ([Foo], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Field 13.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Field 13.fs.bsl index 0012edc2639..ea5bdfffd50 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Field 13.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Field 13.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Field 13.fs", false, QualifiedNameOfFile Foo, - [], [], + [], [SynModuleOrNamespace ([Foo], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Field 14.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Field 14.fs.bsl index 1afdd819fb1..d650d481d34 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Field 14.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Field 14.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Field 14.fs", false, QualifiedNameOfFile Foo, - [], [], + [], [SynModuleOrNamespace ([Foo], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Sequential 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Sequential 01.fs.bsl index c42ed608ed2..a79a2bc5d7c 100644 --- a/tests/service/data/SyntaxTree/Expression/Sequential 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Sequential 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Sequential 01.fs", false, - QualifiedNameOfFile Sequential 01, [], [], + QualifiedNameOfFile Sequential 01, [], [SynModuleOrNamespace ([Sequential 01], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Sequential 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Sequential 02.fs.bsl index 7d58b85ed22..0b8d9ebaa8c 100644 --- a/tests/service/data/SyntaxTree/Expression/Sequential 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Sequential 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Sequential 02.fs", false, - QualifiedNameOfFile Sequential 02, [], [], + QualifiedNameOfFile Sequential 02, [], [SynModuleOrNamespace ([Sequential 02], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Sequential 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Sequential 03.fs.bsl index b04598b79fd..6a2717f4ef4 100644 --- a/tests/service/data/SyntaxTree/Expression/Sequential 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Sequential 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Sequential 03.fs", false, - QualifiedNameOfFile Sequential 03, [], [], + QualifiedNameOfFile Sequential 03, [], [SynModuleOrNamespace ([Sequential 03], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Set 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Set 01.fs.bsl index 68e1f2c85c2..5f2ff3334b8 100644 --- a/tests/service/data/SyntaxTree/Expression/Set 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Set 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Set 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Set 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Set 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Set 02.fs.bsl index da5e8af6a69..70539cca9b6 100644 --- a/tests/service/data/SyntaxTree/Expression/Set 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Set 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Set 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Set 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Set 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Set 03.fs.bsl index fc450c30c94..10f1d76716e 100644 --- a/tests/service/data/SyntaxTree/Expression/Set 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Set 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Set 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Set 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Set 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/Set 04.fs.bsl index ee798381576..d15e64de15f 100644 --- a/tests/service/data/SyntaxTree/Expression/Set 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Set 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Set 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Set 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/SynExprAnonRecdWithStructKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprAnonRecdWithStructKeyword.fs.bsl index 4e6e88c4234..8f25a6132c6 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprAnonRecdWithStructKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprAnonRecdWithStructKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/SynExprAnonRecdWithStructKeyword.fs", false, - QualifiedNameOfFile SynExprAnonRecdWithStructKeyword, [], [], + QualifiedNameOfFile SynExprAnonRecdWithStructKeyword, [], [SynModuleOrNamespace ([SynExprAnonRecdWithStructKeyword], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs.bsl index 534c40ade09..844a6a26490 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Expression/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs", false, QualifiedNameOfFile - SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields, [], [], + SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields, [], [SynModuleOrNamespace ([SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Expression/SynExprDoContainsTheRangeOfTheDoKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprDoContainsTheRangeOfTheDoKeyword.fs.bsl index e33ddf8bde9..a859e7f3734 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprDoContainsTheRangeOfTheDoKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprDoContainsTheRangeOfTheDoKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/SynExprDoContainsTheRangeOfTheDoKeyword.fs", false, - QualifiedNameOfFile SynExprDoContainsTheRangeOfTheDoKeyword, [], [], + QualifiedNameOfFile SynExprDoContainsTheRangeOfTheDoKeyword, [], [SynModuleOrNamespace ([SynExprDoContainsTheRangeOfTheDoKeyword], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/SynExprDynamicDoesContainIdent.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprDynamicDoesContainIdent.fs.bsl index fe39cf8a627..770a921000d 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprDynamicDoesContainIdent.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprDynamicDoesContainIdent.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/SynExprDynamicDoesContainIdent.fs", false, - QualifiedNameOfFile SynExprDynamicDoesContainIdent, [], [], + QualifiedNameOfFile SynExprDynamicDoesContainIdent, [], [SynModuleOrNamespace ([SynExprDynamicDoesContainIdent], false, AnonModule, [Expr (Dynamic (Ident x, (2,1--2,2), Ident k, (2,0--2,3)), (2,0--2,3))], diff --git a/tests/service/data/SyntaxTree/Expression/SynExprDynamicDoesContainParentheses.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprDynamicDoesContainParentheses.fs.bsl index 46eee1bf1b6..76f83e002fe 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprDynamicDoesContainParentheses.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprDynamicDoesContainParentheses.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/SynExprDynamicDoesContainParentheses.fs", false, - QualifiedNameOfFile SynExprDynamicDoesContainParentheses, [], [], + QualifiedNameOfFile SynExprDynamicDoesContainParentheses, [], [SynModuleOrNamespace ([SynExprDynamicDoesContainParentheses], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/SynExprForContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprForContainsTheRangeOfTheEqualsSign.fs.bsl index e62b4dc35d8..31c484389e1 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprForContainsTheRangeOfTheEqualsSign.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprForContainsTheRangeOfTheEqualsSign.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/SynExprForContainsTheRangeOfTheEqualsSign.fs", false, - QualifiedNameOfFile SynExprForContainsTheRangeOfTheEqualsSign, [], [], + QualifiedNameOfFile SynExprForContainsTheRangeOfTheEqualsSign, [], [SynModuleOrNamespace ([SynExprForContainsTheRangeOfTheEqualsSign], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs.bsl index 7dfd05fc1ad..55a7d344cf0 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs.bsl @@ -3,7 +3,6 @@ ImplFile ("/root/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs", false, QualifiedNameOfFile SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign, [], - [], [SynModuleOrNamespace ([SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl index f9ce333429a..01902bfb572 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs", false, - QualifiedNameOfFile SynExprLetOrUseContainsTheRangeOfInKeyword, [], [], + QualifiedNameOfFile SynExprLetOrUseContainsTheRangeOfInKeyword, [], [SynModuleOrNamespace ([SynExprLetOrUseContainsTheRangeOfInKeyword], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs.bsl index 54c3f8180e4..35abd078400 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs.bsl @@ -3,7 +3,6 @@ ImplFile ("/root/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs", false, QualifiedNameOfFile SynExprLetOrUseDoesNotContainTheRangeOfInKeyword, [], - [], [SynModuleOrNamespace ([SynExprLetOrUseDoesNotContainTheRangeOfInKeyword], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs.bsl index a5d102356f1..c6a4f878c3c 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs.bsl @@ -4,7 +4,7 @@ ImplFile false, QualifiedNameOfFile SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword, - [], [], + [], [SynModuleOrNamespace ([SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs.bsl index 72352706810..daf50fb841a 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs", false, QualifiedNameOfFile - SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword, [], [], + SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword, [], [SynModuleOrNamespace ([SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Expression/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl index e70d8c752eb..8827eb89356 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Expression/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs", false, QualifiedNameOfFile - SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword, [], [], + SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword, [], [SynModuleOrNamespace ([SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Expression/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl index acbf05115af..9396e35bbfd 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Expression/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs", false, QualifiedNameOfFile SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword, - [], [], + [], [SynModuleOrNamespace ([SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs.bsl index c84d9fb3d27..ac255e6b303 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs", false, - QualifiedNameOfFile SynExprObjExprContainsTheRangeOfWithKeyword, [], [], + QualifiedNameOfFile SynExprObjExprContainsTheRangeOfWithKeyword, [], [SynModuleOrNamespace ([SynExprObjExprContainsTheRangeOfWithKeyword], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/SynExprObjWithSetter.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprObjWithSetter.fs.bsl index 405f967b350..38f4424a25d 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprObjWithSetter.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprObjWithSetter.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/SynExprObjWithSetter.fs", false, - QualifiedNameOfFile SynExprObjWithSetter, [], [], + QualifiedNameOfFile SynExprObjWithSetter, [], [SynModuleOrNamespace ([SynExprObjWithSetter], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Expression/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl index bbd85336307..4d85bb76e81 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Expression/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs", false, QualifiedNameOfFile - SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField, [], [], + SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField, [], [SynModuleOrNamespace ([SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Expression/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs.bsl index 109d053a41d..f05f5b21f95 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs.bsl @@ -2,7 +2,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs", false, QualifiedNameOfFile SynExprRecordFieldsContainCorrectAmountOfTrivia, - [], [], + [], [SynModuleOrNamespace ([SynExprRecordFieldsContainCorrectAmountOfTrivia], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/SynExprSetWithSynExprDynamic.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprSetWithSynExprDynamic.fs.bsl index 4cd0b5776e6..46b7bf2473e 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprSetWithSynExprDynamic.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprSetWithSynExprDynamic.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/SynExprSetWithSynExprDynamic.fs", false, - QualifiedNameOfFile SynExprSetWithSynExprDynamic, [], [], + QualifiedNameOfFile SynExprSetWithSynExprDynamic, [], [SynModuleOrNamespace ([SynExprSetWithSynExprDynamic], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs.bsl index 4e1d438bfe7..89099c61bb8 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Expression/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs", false, QualifiedNameOfFile - SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword, [], [], + SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword, [], [SynModuleOrNamespace ([SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Expression/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs.bsl index 7900862979d..037ee8844ca 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Expression/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs", false, QualifiedNameOfFile SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword, - [], [], + [], [SynModuleOrNamespace ([SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Expression/Try - Finally 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try - Finally 01.fs.bsl index d2437e5ebfc..b5b1f18ac13 100644 --- a/tests/service/data/SyntaxTree/Expression/Try - Finally 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try - Finally 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Try - Finally 01.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Try - Finally 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try - Finally 02.fs.bsl index 4d463ef1077..485ce3440c4 100644 --- a/tests/service/data/SyntaxTree/Expression/Try - Finally 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try - Finally 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Try - Finally 02.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Try - Finally 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try - Finally 03.fs.bsl index 2ad046c6c6a..888a858a0f0 100644 --- a/tests/service/data/SyntaxTree/Expression/Try - Finally 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try - Finally 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Try - Finally 03.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Try - Finally 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try - Finally 04.fs.bsl index 58c6e87e550..b2f136869b9 100644 --- a/tests/service/data/SyntaxTree/Expression/Try - Finally 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try - Finally 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Try - Finally 04.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Try - With 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try - With 01.fs.bsl index beb30aedfe4..08875b8f3a7 100644 --- a/tests/service/data/SyntaxTree/Expression/Try - With 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try - With 01.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Try - With 01.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Try - With 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try - With 02.fs.bsl index 0fa71a2d560..204fd741e18 100644 --- a/tests/service/data/SyntaxTree/Expression/Try - With 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try - With 02.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Try - With 02.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Try - With 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try - With 03.fs.bsl index f357989f6d7..fe5f94352e8 100644 --- a/tests/service/data/SyntaxTree/Expression/Try - With 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try - With 03.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Try - With 03.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Try - With 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try - With 04.fs.bsl index b3ed1e9fdf0..f439d855df0 100644 --- a/tests/service/data/SyntaxTree/Expression/Try - With 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try - With 04.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Try - With 04.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Try - With 05.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try - With 05.fs.bsl index cce7a7716ca..7823ce6089c 100644 --- a/tests/service/data/SyntaxTree/Expression/Try - With 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try - With 05.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Try - With 05.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Try - With 06.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try - With 06.fs.bsl index 2f37ac458b1..603a3901a5e 100644 --- a/tests/service/data/SyntaxTree/Expression/Try - With 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try - With 06.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Try - With 06.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Try - With 07.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try - With 07.fs.bsl index 394af4cbd7c..12b11fc07ee 100644 --- a/tests/service/data/SyntaxTree/Expression/Try - With 07.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try - With 07.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Try - With 07.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Try - With 08.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try - With 08.fs.bsl index bcad7831beb..9c426b9d4fa 100644 --- a/tests/service/data/SyntaxTree/Expression/Try - With 08.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try - With 08.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Try - With 08.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Try - With 09.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try - With 09.fs.bsl index d3557177c85..bcd0d539de1 100644 --- a/tests/service/data/SyntaxTree/Expression/Try - With 09.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try - With 09.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Try - With 09.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Try 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try 01.fs.bsl index 94e5c9c690d..04b9f27838f 100644 --- a/tests/service/data/SyntaxTree/Expression/Try 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Try 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Try 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Try 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try 02.fs.bsl index b1330bbff79..6358f0552af 100644 --- a/tests/service/data/SyntaxTree/Expression/Try 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Try 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Try 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 01.fs.bsl index 8a17abd5fe8..12ae1ac3d16 100644 --- a/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Try with - Missing expr 01.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 02.fs.bsl index 4d6eeb04f62..e31ae30853d 100644 --- a/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Try with - Missing expr 02.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 03.fs.bsl index 74ec0b40076..d5a4c9de2cf 100644 --- a/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Try with - Missing expr 03.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 04.fs.bsl index 94ee31ce8d1..322b6cdcfaf 100644 --- a/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Try with - Missing expr 04.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 05.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 05.fs.bsl index e55f5f0b2ef..54b649fddd2 100644 --- a/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 05.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Try with - Missing expr 05.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Try with 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try with 01.fs.bsl index 3435a66a380..af5551daa63 100644 --- a/tests/service/data/SyntaxTree/Expression/Try with 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try with 01.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Try with 01.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 01.fs.bsl index 6df06c17cc4..53317050cc3 100644 --- a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Tuple - Missing item 01.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 02.fs.bsl index 8478b3cd009..d4aceb87dca 100644 --- a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Tuple - Missing item 02.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 03.fs.bsl index 8690087c0b8..bb8f51816ab 100644 --- a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Tuple - Missing item 03.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 04.fs.bsl index 142fb6f4d4d..9a66f322800 100644 --- a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Tuple - Missing item 04.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 05.fs.bsl b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 05.fs.bsl index 9ff45a09481..489f15001ef 100644 --- a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 05.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Tuple - Missing item 05.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 06.fs.bsl b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 06.fs.bsl index f1ac3a85d0a..05d5e0dc840 100644 --- a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 06.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Tuple - Missing item 06.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 07.fs.bsl b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 07.fs.bsl index 28b3b9ebffd..dc92dd51431 100644 --- a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 07.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 07.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Tuple - Missing item 07.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 08.fs.bsl b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 08.fs.bsl index 750a36647f4..95aec5d71da 100644 --- a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 08.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 08.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Tuple - Missing item 08.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 09.fs.bsl b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 09.fs.bsl index ee4a18e88a0..e5a9e4d42c6 100644 --- a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 09.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 09.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Tuple - Missing item 09.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 10.fs.bsl b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 10.fs.bsl index d44279250a4..189f47b0d4a 100644 --- a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 10.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 10.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Tuple - Missing item 10.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 11.fs.bsl b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 11.fs.bsl index df9f4900d70..122e7abe64d 100644 --- a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 11.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 11.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Tuple - Missing item 11.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Tuple 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Tuple 01.fs.bsl index 5310605d97b..8046ca1a591 100644 --- a/tests/service/data/SyntaxTree/Expression/Tuple 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Tuple 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Tuple 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Tuple 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Tuple 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Tuple 02.fs.bsl index d8ef94b69a8..a62c6c8bf70 100644 --- a/tests/service/data/SyntaxTree/Expression/Tuple 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Tuple 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Tuple 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Tuple 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Type test 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Type test 01.fs.bsl index 7e404d712a8..be4f18af46f 100644 --- a/tests/service/data/SyntaxTree/Expression/Type test 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Type test 01.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Type test 01.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Type test 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Type test 02.fs.bsl index a0c458e845c..d0dfd00f953 100644 --- a/tests/service/data/SyntaxTree/Expression/Type test 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Type test 02.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Type test 02.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Type test 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Type test 03.fs.bsl index 4189996253d..1c19b97ab3a 100644 --- a/tests/service/data/SyntaxTree/Expression/Type test 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Type test 03.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Type test 03.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Type test 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/Type test 04.fs.bsl index ab70a127c9c..5ac7702ccc5 100644 --- a/tests/service/data/SyntaxTree/Expression/Type test 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Type test 04.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Type test 04.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Typed 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Typed 01.fs.bsl index 126033bd3a0..afc885f780b 100644 --- a/tests/service/data/SyntaxTree/Expression/Typed 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Typed 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Typed 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Typed 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr (Ident i, (3,0--3,1))], PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None, diff --git a/tests/service/data/SyntaxTree/Expression/Typed 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Typed 02.fs.bsl index cfca2392376..9649921172f 100644 --- a/tests/service/data/SyntaxTree/Expression/Typed 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Typed 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Typed 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Typed 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr (Ident i, (3,0--3,1))], PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None, diff --git a/tests/service/data/SyntaxTree/Expression/Typed 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Typed 03.fs.bsl index ea133deba4a..152e9469ec8 100644 --- a/tests/service/data/SyntaxTree/Expression/Typed 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Typed 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Typed 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Typed 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Typed 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/Typed 04.fs.bsl index 2bef6b3b004..e66721b9e9d 100644 --- a/tests/service/data/SyntaxTree/Expression/Typed 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Typed 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Typed 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Typed 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Unary - Reserved 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Unary - Reserved 01.fs.bsl index 0ef183357aa..59175a52b46 100644 --- a/tests/service/data/SyntaxTree/Expression/Unary - Reserved 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Unary - Reserved 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Unary - Reserved 01.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Unary - Reserved 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Unary - Reserved 02.fs.bsl index d246acbd5b9..3233fdcb50c 100644 --- a/tests/service/data/SyntaxTree/Expression/Unary - Reserved 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Unary - Reserved 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Unary - Reserved 02.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Unfinished escaped ident 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Unfinished escaped ident 01.fs.bsl index 7e4b6c613c6..b7f2a9d6a32 100644 --- a/tests/service/data/SyntaxTree/Expression/Unfinished escaped ident 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Unfinished escaped ident 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Unfinished escaped ident 01.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Unfinished escaped ident 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Unfinished escaped ident 02.fs.bsl index d85ff5016bd..c2c79d3a93b 100644 --- a/tests/service/data/SyntaxTree/Expression/Unfinished escaped ident 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Unfinished escaped ident 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Unfinished escaped ident 02.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Expression/Unfinished escaped ident 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Unfinished escaped ident 03.fs.bsl index 683dccae609..aa0013699c5 100644 --- a/tests/service/data/SyntaxTree/Expression/Unfinished escaped ident 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Unfinished escaped ident 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Unfinished escaped ident 03.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Upcast 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Upcast 01.fs.bsl index cd9537573ea..e035a107f97 100644 --- a/tests/service/data/SyntaxTree/Expression/Upcast 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Upcast 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Upcast 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Upcast 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Upcast 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Upcast 02.fs.bsl index 3b979512571..6b05aea94d8 100644 --- a/tests/service/data/SyntaxTree/Expression/Upcast 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Upcast 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Upcast 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Upcast 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr (Upcast (Ident i, Anon (4,0--4,2), (3,0--4,2)), (3,0--4,2))], diff --git a/tests/service/data/SyntaxTree/Expression/Upcast 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Upcast 03.fs.bsl index 174f880184b..b9a936a12b9 100644 --- a/tests/service/data/SyntaxTree/Expression/Upcast 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Upcast 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Upcast 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Upcast 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Upcast 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/Upcast 04.fs.bsl index adf29275cb5..f1ecbd819c0 100644 --- a/tests/service/data/SyntaxTree/Expression/Upcast 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Upcast 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Upcast 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Upcast 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Upcast 05.fs.bsl b/tests/service/data/SyntaxTree/Expression/Upcast 05.fs.bsl index 62339dd016f..48d9573f6f0 100644 --- a/tests/service/data/SyntaxTree/Expression/Upcast 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Upcast 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Upcast 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Upcast 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/While 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/While 01.fs.bsl index e8039cbe2cf..3049058555b 100644 --- a/tests/service/data/SyntaxTree/Expression/While 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/While 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/While 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/While 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/While 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/While 02.fs.bsl index 99e63d5e069..3493bdcf886 100644 --- a/tests/service/data/SyntaxTree/Expression/While 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/While 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/While 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/While 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/While 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/While 03.fs.bsl index f8e8df6f239..e374d2e0c35 100644 --- a/tests/service/data/SyntaxTree/Expression/While 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/While 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/While 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/While 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/While 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/While 04.fs.bsl index 525fd0e42a5..4ebc6f63841 100644 --- a/tests/service/data/SyntaxTree/Expression/While 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/While 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/While 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/While 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/While 05.fs.bsl b/tests/service/data/SyntaxTree/Expression/While 05.fs.bsl index b6d3daf4f51..f08e61160f5 100644 --- a/tests/service/data/SyntaxTree/Expression/While 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/While 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/While 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/While 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/While 06.fs.bsl b/tests/service/data/SyntaxTree/Expression/While 06.fs.bsl index e106a73365d..acfb4b1e7b8 100644 --- a/tests/service/data/SyntaxTree/Expression/While 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/While 06.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/While 06.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/While 06.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/WhileBang 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/WhileBang 01.fs.bsl index 936525524f3..21848845316 100644 --- a/tests/service/data/SyntaxTree/Expression/WhileBang 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/WhileBang 01.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/WhileBang 01.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/WhileBang 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/WhileBang 02.fs.bsl index b12f9b0df18..e99b3701f0f 100644 --- a/tests/service/data/SyntaxTree/Expression/WhileBang 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/WhileBang 02.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/WhileBang 02.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/WhileBang 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/WhileBang 03.fs.bsl index a5793465b34..4abd391541a 100644 --- a/tests/service/data/SyntaxTree/Expression/WhileBang 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/WhileBang 03.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/WhileBang 03.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/WhileBang 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/WhileBang 04.fs.bsl index 863c8aaabfe..964f4237a8a 100644 --- a/tests/service/data/SyntaxTree/Expression/WhileBang 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/WhileBang 04.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/WhileBang 04.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/WhileBang 05.fs.bsl b/tests/service/data/SyntaxTree/Expression/WhileBang 05.fs.bsl index e2f5875ef4b..c76eafad3e9 100644 --- a/tests/service/data/SyntaxTree/Expression/WhileBang 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/WhileBang 05.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/WhileBang 05.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/WhileBang 06.fs.bsl b/tests/service/data/SyntaxTree/Expression/WhileBang 06.fs.bsl index 3c8ef1cbebf..86e0325ecf1 100644 --- a/tests/service/data/SyntaxTree/Expression/WhileBang 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/WhileBang 06.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/WhileBang 06.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Extern/Extern 01.fs.bsl b/tests/service/data/SyntaxTree/Extern/Extern 01.fs.bsl index efb3580fda3..4f87de78b2c 100644 --- a/tests/service/data/SyntaxTree/Extern/Extern 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Extern/Extern 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Extern/Extern 01.fs", false, QualifiedNameOfFile Extern 01, [], [], + ("/root/Extern/Extern 01.fs", false, QualifiedNameOfFile Extern 01, [], [SynModuleOrNamespace ([Extern 01], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Extern/ExternKeywordIsPresentInTrivia.fs.bsl b/tests/service/data/SyntaxTree/Extern/ExternKeywordIsPresentInTrivia.fs.bsl index 8b6a9a601fc..28d52f58274 100644 --- a/tests/service/data/SyntaxTree/Extern/ExternKeywordIsPresentInTrivia.fs.bsl +++ b/tests/service/data/SyntaxTree/Extern/ExternKeywordIsPresentInTrivia.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Extern/ExternKeywordIsPresentInTrivia.fs", false, - QualifiedNameOfFile ExternKeywordIsPresentInTrivia, [], [], + QualifiedNameOfFile ExternKeywordIsPresentInTrivia, [], [SynModuleOrNamespace ([ExternKeywordIsPresentInTrivia], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/IfThenElse/Comment after else 01.fs.bsl b/tests/service/data/SyntaxTree/IfThenElse/Comment after else 01.fs.bsl index 6800642d8f9..d7290eedaed 100644 --- a/tests/service/data/SyntaxTree/IfThenElse/Comment after else 01.fs.bsl +++ b/tests/service/data/SyntaxTree/IfThenElse/Comment after else 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/IfThenElse/Comment after else 01.fs", false, - QualifiedNameOfFile Comment after else 01, [], [], + QualifiedNameOfFile Comment after else 01, [], [SynModuleOrNamespace ([Comment after else 01], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/IfThenElse/Comment after else 02.fs.bsl b/tests/service/data/SyntaxTree/IfThenElse/Comment after else 02.fs.bsl index 6fcbf474c2f..ec3583a93f6 100644 --- a/tests/service/data/SyntaxTree/IfThenElse/Comment after else 02.fs.bsl +++ b/tests/service/data/SyntaxTree/IfThenElse/Comment after else 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/IfThenElse/Comment after else 02.fs", false, - QualifiedNameOfFile Comment after else 02, [], [], + QualifiedNameOfFile Comment after else 02, [], [SynModuleOrNamespace ([Comment after else 02], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/IfThenElse/DeeplyNestedIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/IfThenElse/DeeplyNestedIfThenElse.fs.bsl index a94aa49c2f8..b13a3a890d1 100644 --- a/tests/service/data/SyntaxTree/IfThenElse/DeeplyNestedIfThenElse.fs.bsl +++ b/tests/service/data/SyntaxTree/IfThenElse/DeeplyNestedIfThenElse.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/IfThenElse/DeeplyNestedIfThenElse.fs", false, - QualifiedNameOfFile DeeplyNestedIfThenElse, [], [], + QualifiedNameOfFile DeeplyNestedIfThenElse, [], [SynModuleOrNamespace ([DeeplyNestedIfThenElse], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/IfThenElse/ElseKeywordInSimpleIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/IfThenElse/ElseKeywordInSimpleIfThenElse.fs.bsl index 4ee21824e57..4954134e7f3 100644 --- a/tests/service/data/SyntaxTree/IfThenElse/ElseKeywordInSimpleIfThenElse.fs.bsl +++ b/tests/service/data/SyntaxTree/IfThenElse/ElseKeywordInSimpleIfThenElse.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/IfThenElse/ElseKeywordInSimpleIfThenElse.fs", false, - QualifiedNameOfFile ElseKeywordInSimpleIfThenElse, [], [], + QualifiedNameOfFile ElseKeywordInSimpleIfThenElse, [], [SynModuleOrNamespace ([ElseKeywordInSimpleIfThenElse], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/IfThenElse/IfKeywordInIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/IfThenElse/IfKeywordInIfThenElse.fs.bsl index afb0f0222c3..2fbc822ee69 100644 --- a/tests/service/data/SyntaxTree/IfThenElse/IfKeywordInIfThenElse.fs.bsl +++ b/tests/service/data/SyntaxTree/IfThenElse/IfKeywordInIfThenElse.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/IfThenElse/IfKeywordInIfThenElse.fs", false, - QualifiedNameOfFile IfKeywordInIfThenElse, [], [], + QualifiedNameOfFile IfKeywordInIfThenElse, [], [SynModuleOrNamespace ([IfKeywordInIfThenElse], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/IfThenElse/IfThenAndElseKeywordOnSeparateLines.fs.bsl b/tests/service/data/SyntaxTree/IfThenElse/IfThenAndElseKeywordOnSeparateLines.fs.bsl index f1421e566ab..f5c3f698695 100644 --- a/tests/service/data/SyntaxTree/IfThenElse/IfThenAndElseKeywordOnSeparateLines.fs.bsl +++ b/tests/service/data/SyntaxTree/IfThenElse/IfThenAndElseKeywordOnSeparateLines.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/IfThenElse/IfThenAndElseKeywordOnSeparateLines.fs", false, - QualifiedNameOfFile IfThenAndElseKeywordOnSeparateLines, [], [], + QualifiedNameOfFile IfThenAndElseKeywordOnSeparateLines, [], [SynModuleOrNamespace ([IfThenAndElseKeywordOnSeparateLines], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/IfThenElse/NestedElifInIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/IfThenElse/NestedElifInIfThenElse.fs.bsl index 08b9a76501c..2ea8eec9f42 100644 --- a/tests/service/data/SyntaxTree/IfThenElse/NestedElifInIfThenElse.fs.bsl +++ b/tests/service/data/SyntaxTree/IfThenElse/NestedElifInIfThenElse.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/IfThenElse/NestedElifInIfThenElse.fs", false, - QualifiedNameOfFile NestedElifInIfThenElse, [], [], + QualifiedNameOfFile NestedElifInIfThenElse, [], [SynModuleOrNamespace ([NestedElifInIfThenElse], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/IfThenElse/NestedElseIfInIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/IfThenElse/NestedElseIfInIfThenElse.fs.bsl index 07bafab126e..7dc8e1fa8ea 100644 --- a/tests/service/data/SyntaxTree/IfThenElse/NestedElseIfInIfThenElse.fs.bsl +++ b/tests/service/data/SyntaxTree/IfThenElse/NestedElseIfInIfThenElse.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/IfThenElse/NestedElseIfInIfThenElse.fs", false, - QualifiedNameOfFile NestedElseIfInIfThenElse, [], [], + QualifiedNameOfFile NestedElseIfInIfThenElse, [], [SynModuleOrNamespace ([NestedElseIfInIfThenElse], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/IfThenElse/NestedElseIfOnTheSameLineInIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/IfThenElse/NestedElseIfOnTheSameLineInIfThenElse.fs.bsl index da6f78fb889..c6875396818 100644 --- a/tests/service/data/SyntaxTree/IfThenElse/NestedElseIfOnTheSameLineInIfThenElse.fs.bsl +++ b/tests/service/data/SyntaxTree/IfThenElse/NestedElseIfOnTheSameLineInIfThenElse.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/IfThenElse/NestedElseIfOnTheSameLineInIfThenElse.fs", false, - QualifiedNameOfFile NestedElseIfOnTheSameLineInIfThenElse, [], [], + QualifiedNameOfFile NestedElseIfOnTheSameLineInIfThenElse, [], [SynModuleOrNamespace ([NestedElseIfOnTheSameLineInIfThenElse], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Lambda/ComplexArgumentsLambdaHasArrowRange.fs.bsl b/tests/service/data/SyntaxTree/Lambda/ComplexArgumentsLambdaHasArrowRange.fs.bsl index b7334e423de..12c3f53464b 100644 --- a/tests/service/data/SyntaxTree/Lambda/ComplexArgumentsLambdaHasArrowRange.fs.bsl +++ b/tests/service/data/SyntaxTree/Lambda/ComplexArgumentsLambdaHasArrowRange.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs", false, - QualifiedNameOfFile ComplexArgumentsLambdaHasArrowRange, [], [], + QualifiedNameOfFile ComplexArgumentsLambdaHasArrowRange, [], [SynModuleOrNamespace ([ComplexArgumentsLambdaHasArrowRange], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Lambda/DestructedLambdaHasArrowRange.fs.bsl b/tests/service/data/SyntaxTree/Lambda/DestructedLambdaHasArrowRange.fs.bsl index 442d815a3dd..b4d356e54a3 100644 --- a/tests/service/data/SyntaxTree/Lambda/DestructedLambdaHasArrowRange.fs.bsl +++ b/tests/service/data/SyntaxTree/Lambda/DestructedLambdaHasArrowRange.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Lambda/DestructedLambdaHasArrowRange.fs", false, - QualifiedNameOfFile DestructedLambdaHasArrowRange, [], [], + QualifiedNameOfFile DestructedLambdaHasArrowRange, [], [SynModuleOrNamespace ([DestructedLambdaHasArrowRange], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs.bsl b/tests/service/data/SyntaxTree/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs.bsl index af455533914..9379103e026 100644 --- a/tests/service/data/SyntaxTree/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs.bsl +++ b/tests/service/data/SyntaxTree/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs", false, QualifiedNameOfFile LambdaWithTupleParameterWithWildCardGivesCorrectBody, - [], [], + [], [SynModuleOrNamespace ([LambdaWithTupleParameterWithWildCardGivesCorrectBody], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Lambda/LambdaWithTwoParametersGivesCorrectBody.fs.bsl b/tests/service/data/SyntaxTree/Lambda/LambdaWithTwoParametersGivesCorrectBody.fs.bsl index c014aa3236c..c3c75fd45ff 100644 --- a/tests/service/data/SyntaxTree/Lambda/LambdaWithTwoParametersGivesCorrectBody.fs.bsl +++ b/tests/service/data/SyntaxTree/Lambda/LambdaWithTwoParametersGivesCorrectBody.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Lambda/LambdaWithTwoParametersGivesCorrectBody.fs", false, - QualifiedNameOfFile LambdaWithTwoParametersGivesCorrectBody, [], [], + QualifiedNameOfFile LambdaWithTwoParametersGivesCorrectBody, [], [SynModuleOrNamespace ([LambdaWithTwoParametersGivesCorrectBody], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Lambda/LambdaWithWildCardParameterGivesCorrectBody.fs.bsl b/tests/service/data/SyntaxTree/Lambda/LambdaWithWildCardParameterGivesCorrectBody.fs.bsl index 9e2a1e33385..8e83682cda5 100644 --- a/tests/service/data/SyntaxTree/Lambda/LambdaWithWildCardParameterGivesCorrectBody.fs.bsl +++ b/tests/service/data/SyntaxTree/Lambda/LambdaWithWildCardParameterGivesCorrectBody.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Lambda/LambdaWithWildCardParameterGivesCorrectBody.fs", false, - QualifiedNameOfFile LambdaWithWildCardParameterGivesCorrectBody, [], [], + QualifiedNameOfFile LambdaWithWildCardParameterGivesCorrectBody, [], [SynModuleOrNamespace ([LambdaWithWildCardParameterGivesCorrectBody], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Lambda/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs.bsl b/tests/service/data/SyntaxTree/Lambda/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs.bsl index 83435aa48a5..ef6c14bf7e3 100644 --- a/tests/service/data/SyntaxTree/Lambda/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs.bsl +++ b/tests/service/data/SyntaxTree/Lambda/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Lambda/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs", false, QualifiedNameOfFile LambdaWithWildCardThatReturnsALambdaGivesCorrectBody, - [], [], + [], [SynModuleOrNamespace ([LambdaWithWildCardThatReturnsALambdaGivesCorrectBody], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Lambda/MultilineLambdaHasArrowRange.fs.bsl b/tests/service/data/SyntaxTree/Lambda/MultilineLambdaHasArrowRange.fs.bsl index 6d3ea6eea4a..dbd3126d5ac 100644 --- a/tests/service/data/SyntaxTree/Lambda/MultilineLambdaHasArrowRange.fs.bsl +++ b/tests/service/data/SyntaxTree/Lambda/MultilineLambdaHasArrowRange.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Lambda/MultilineLambdaHasArrowRange.fs", false, - QualifiedNameOfFile MultilineLambdaHasArrowRange, [], [], + QualifiedNameOfFile MultilineLambdaHasArrowRange, [], [SynModuleOrNamespace ([MultilineLambdaHasArrowRange], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Lambda/Param - Missing type 01.fs.bsl b/tests/service/data/SyntaxTree/Lambda/Param - Missing type 01.fs.bsl index cf6edce993f..af8ef7d643d 100644 --- a/tests/service/data/SyntaxTree/Lambda/Param - Missing type 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Lambda/Param - Missing type 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Lambda/Param - Missing type 01.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Lambda/Param - Missing type 02.fs.bsl b/tests/service/data/SyntaxTree/Lambda/Param - Missing type 02.fs.bsl index faf86a319e0..51172de35b4 100644 --- a/tests/service/data/SyntaxTree/Lambda/Param - Missing type 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Lambda/Param - Missing type 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Lambda/Param - Missing type 02.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Lambda/Param - Missing type 03.fs.bsl b/tests/service/data/SyntaxTree/Lambda/Param - Missing type 03.fs.bsl index 490a20dd75f..85ec1537c6a 100644 --- a/tests/service/data/SyntaxTree/Lambda/Param - Missing type 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Lambda/Param - Missing type 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Lambda/Param - Missing type 03.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Lambda/Param - Missing type 04.fs.bsl b/tests/service/data/SyntaxTree/Lambda/Param - Missing type 04.fs.bsl index 6c522c46bab..667c05c7ad7 100644 --- a/tests/service/data/SyntaxTree/Lambda/Param - Missing type 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Lambda/Param - Missing type 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Lambda/Param - Missing type 04.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Lambda/SimpleLambdaHasArrowRange.fs.bsl b/tests/service/data/SyntaxTree/Lambda/SimpleLambdaHasArrowRange.fs.bsl index 818107806bf..8bf8ad63cdc 100644 --- a/tests/service/data/SyntaxTree/Lambda/SimpleLambdaHasArrowRange.fs.bsl +++ b/tests/service/data/SyntaxTree/Lambda/SimpleLambdaHasArrowRange.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Lambda/SimpleLambdaHasArrowRange.fs", false, - QualifiedNameOfFile SimpleLambdaHasArrowRange, [], [], + QualifiedNameOfFile SimpleLambdaHasArrowRange, [], [SynModuleOrNamespace ([SimpleLambdaHasArrowRange], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Lambda/TupleInLambdaHasArrowRange.fs.bsl b/tests/service/data/SyntaxTree/Lambda/TupleInLambdaHasArrowRange.fs.bsl index 30442a303f0..6925a9c551d 100644 --- a/tests/service/data/SyntaxTree/Lambda/TupleInLambdaHasArrowRange.fs.bsl +++ b/tests/service/data/SyntaxTree/Lambda/TupleInLambdaHasArrowRange.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Lambda/TupleInLambdaHasArrowRange.fs", false, - QualifiedNameOfFile TupleInLambdaHasArrowRange, [], [], + QualifiedNameOfFile TupleInLambdaHasArrowRange, [], [SynModuleOrNamespace ([TupleInLambdaHasArrowRange], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/AbstractKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/AbstractKeyword.fs.bsl index 9c4b593e133..78e31e502e0 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/AbstractKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/AbstractKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/AbstractKeyword.fs", false, - QualifiedNameOfFile AbstractKeyword, [], [], + QualifiedNameOfFile AbstractKeyword, [], [SynModuleOrNamespace ([AbstractKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/AbstractMemberKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/AbstractMemberKeyword.fs.bsl index 0cbd9b3a434..be486c576bc 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/AbstractMemberKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/AbstractMemberKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/AbstractMemberKeyword.fs", false, - QualifiedNameOfFile AbstractMemberKeyword, [], [], + QualifiedNameOfFile AbstractMemberKeyword, [], [SynModuleOrNamespace ([AbstractMemberKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/AndKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/AndKeyword.fs.bsl index 7376e64e8e4..ba096898c56 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/AndKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/AndKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/AndKeyword.fs", false, - QualifiedNameOfFile AndKeyword, [], [], + QualifiedNameOfFile AndKeyword, [], [SynModuleOrNamespace ([AndKeyword], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/DefaultKeyword.fsi.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/DefaultKeyword.fsi.bsl index ba9b7296835..e77e558de93 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/DefaultKeyword.fsi.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/DefaultKeyword.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/LeadingKeyword/DefaultKeyword.fsi", - QualifiedNameOfFile DefaultKeyword, [], [], + QualifiedNameOfFile DefaultKeyword, [], [SynModuleOrNamespaceSig ([X], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/DefaultValKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/DefaultValKeyword.fs.bsl index 2c243f2ca9d..a7ab9cb90ca 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/DefaultValKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/DefaultValKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/DefaultValKeyword.fs", false, - QualifiedNameOfFile DefaultValKeyword, [], [], + QualifiedNameOfFile DefaultValKeyword, [], [SynModuleOrNamespace ([DefaultValKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/DoKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/DoKeyword.fs.bsl index 41ed25792f7..52f3642b5f4 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/DoKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/DoKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/DoKeyword.fs", false, QualifiedNameOfFile DoKeyword, - [], [], + [], [SynModuleOrNamespace ([DoKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/DoStaticKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/DoStaticKeyword.fs.bsl index 1c7e811ab69..d934ca16c1b 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/DoStaticKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/DoStaticKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/DoStaticKeyword.fs", false, - QualifiedNameOfFile DoStaticKeyword, [], [], + QualifiedNameOfFile DoStaticKeyword, [], [SynModuleOrNamespace ([DoStaticKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/ExternKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/ExternKeyword.fs.bsl index ae6df6a8091..7fa9ead546a 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/ExternKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/ExternKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/ExternKeyword.fs", false, - QualifiedNameOfFile ExternKeyword, [], [], + QualifiedNameOfFile ExternKeyword, [], [SynModuleOrNamespace ([ExternKeyword], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/LetKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/LetKeyword.fs.bsl index c783b4b4354..4bd1292b0fd 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/LetKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/LetKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/LetKeyword.fs", false, - QualifiedNameOfFile LetKeyword, [], [], + QualifiedNameOfFile LetKeyword, [], [SynModuleOrNamespace ([LetKeyword], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/LetRecKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/LetRecKeyword.fs.bsl index a5ecb2a98b5..79aa4994ee9 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/LetRecKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/LetRecKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/LetRecKeyword.fs", false, - QualifiedNameOfFile LetRecKeyword, [], [], + QualifiedNameOfFile LetRecKeyword, [], [SynModuleOrNamespace ([LetRecKeyword], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/MemberKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/MemberKeyword.fs.bsl index d9497db0bfe..44f0903d342 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/MemberKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/MemberKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/MemberKeyword.fs", false, - QualifiedNameOfFile MemberKeyword, [], [], + QualifiedNameOfFile MemberKeyword, [], [SynModuleOrNamespace ([MemberKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/MemberValKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/MemberValKeyword.fs.bsl index 63618be45b7..453116efb30 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/MemberValKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/MemberValKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/MemberValKeyword.fs", false, - QualifiedNameOfFile MemberValKeyword, [], [], + QualifiedNameOfFile MemberValKeyword, [], [SynModuleOrNamespace ([MemberValKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/NewKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/NewKeyword.fs.bsl index 1e408d27f4b..e8f6bedf730 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/NewKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/NewKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/NewKeyword.fs", false, - QualifiedNameOfFile NewKeyword, [], [], + QualifiedNameOfFile NewKeyword, [], [SynModuleOrNamespace ([NewKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/OverrideKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/OverrideKeyword.fs.bsl index 896ea64e69b..388ba7e5607 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/OverrideKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/OverrideKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/OverrideKeyword.fs", false, - QualifiedNameOfFile OverrideKeyword, [], [], + QualifiedNameOfFile OverrideKeyword, [], [SynModuleOrNamespace ([OverrideKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/OverrideValKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/OverrideValKeyword.fs.bsl index 3fff6cb5b0d..0fb8aada856 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/OverrideValKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/OverrideValKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/OverrideValKeyword.fs", false, - QualifiedNameOfFile OverrideValKeyword, [], [], + QualifiedNameOfFile OverrideValKeyword, [], [SynModuleOrNamespace ([OverrideValKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/StaticAbstractKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/StaticAbstractKeyword.fs.bsl index 92d3182daea..32f2dfa026b 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/StaticAbstractKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/StaticAbstractKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/StaticAbstractKeyword.fs", false, - QualifiedNameOfFile StaticAbstractKeyword, [], [], + QualifiedNameOfFile StaticAbstractKeyword, [], [SynModuleOrNamespace ([StaticAbstractKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/StaticAbstractMemberKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/StaticAbstractMemberKeyword.fs.bsl index 8b2dc3b5c8f..e1c0e6a68e4 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/StaticAbstractMemberKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/StaticAbstractMemberKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/StaticAbstractMemberKeyword.fs", false, - QualifiedNameOfFile StaticAbstractMemberKeyword, [], [], + QualifiedNameOfFile StaticAbstractMemberKeyword, [], [SynModuleOrNamespace ([StaticAbstractMemberKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/StaticLetKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/StaticLetKeyword.fs.bsl index 25ad616ec0f..00f1cf9feff 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/StaticLetKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/StaticLetKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/StaticLetKeyword.fs", false, - QualifiedNameOfFile StaticLetKeyword, [], [], + QualifiedNameOfFile StaticLetKeyword, [], [SynModuleOrNamespace ([StaticLetKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/StaticLetRecKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/StaticLetRecKeyword.fs.bsl index a0851241351..dec21949167 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/StaticLetRecKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/StaticLetRecKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/StaticLetRecKeyword.fs", false, - QualifiedNameOfFile StaticLetRecKeyword, [], [], + QualifiedNameOfFile StaticLetRecKeyword, [], [SynModuleOrNamespace ([StaticLetRecKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/StaticMemberKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/StaticMemberKeyword.fs.bsl index 70b40e7ccd2..ea9e474eacb 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/StaticMemberKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/StaticMemberKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/StaticMemberKeyword.fs", false, - QualifiedNameOfFile StaticMemberKeyword, [], [], + QualifiedNameOfFile StaticMemberKeyword, [], [SynModuleOrNamespace ([StaticMemberKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/StaticMemberValKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/StaticMemberValKeyword.fs.bsl index 1ce7e21fea2..7594f065fdb 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/StaticMemberValKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/StaticMemberValKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/StaticMemberValKeyword.fs", false, - QualifiedNameOfFile StaticMemberValKeyword, [], [], + QualifiedNameOfFile StaticMemberValKeyword, [], [SynModuleOrNamespace ([StaticMemberValKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/StaticValKeyword.fsi.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/StaticValKeyword.fsi.bsl index a30354d3b41..3515d71f264 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/StaticValKeyword.fsi.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/StaticValKeyword.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/LeadingKeyword/StaticValKeyword.fsi", - QualifiedNameOfFile StaticValKeyword, [], [], + QualifiedNameOfFile StaticValKeyword, [], [SynModuleOrNamespaceSig ([Meh], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/SyntheticKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/SyntheticKeyword.fs.bsl index b833f40ae10..608501eb6db 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/SyntheticKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/SyntheticKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/SyntheticKeyword.fs", false, - QualifiedNameOfFile SyntheticKeyword, [], [], + QualifiedNameOfFile SyntheticKeyword, [], [SynModuleOrNamespace ([SyntheticKeyword], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/UseKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/UseKeyword.fs.bsl index b2b3420c806..734d01d3539 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/UseKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/UseKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/UseKeyword.fs", false, - QualifiedNameOfFile UseKeyword, [], [], + QualifiedNameOfFile UseKeyword, [], [SynModuleOrNamespace ([UseKeyword], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/UseRecKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/UseRecKeyword.fs.bsl index 7dbbc35edd7..071d34cad2f 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/UseRecKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/UseRecKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/UseRecKeyword.fs", false, - QualifiedNameOfFile UseRecKeyword, [], [], + QualifiedNameOfFile UseRecKeyword, [], [SynModuleOrNamespace ([UseRecKeyword], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/ValKeyword.fsi.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/ValKeyword.fsi.bsl index 1c940b8d6fd..d4db8d69210 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/ValKeyword.fsi.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/ValKeyword.fsi.bsl @@ -1,7 +1,6 @@ SigFile (ParsedSigFileInput ("/root/LeadingKeyword/ValKeyword.fsi", QualifiedNameOfFile ValKeyword, [], - [], [SynModuleOrNamespaceSig ([X], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/MatchClause/Missing expr 01.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/Missing expr 01.fs.bsl index 6f92c909aa0..cfac5d6711e 100644 --- a/tests/service/data/SyntaxTree/MatchClause/Missing expr 01.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/Missing expr 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/MatchClause/Missing expr 01.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/MatchClause/Missing expr 02.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/Missing expr 02.fs.bsl index a38e67668d2..a1d80d4909f 100644 --- a/tests/service/data/SyntaxTree/MatchClause/Missing expr 02.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/Missing expr 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/MatchClause/Missing expr 02.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/MatchClause/Missing expr 03.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/Missing expr 03.fs.bsl index 36e8ecc9e9b..26257f35a14 100644 --- a/tests/service/data/SyntaxTree/MatchClause/Missing expr 03.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/Missing expr 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/MatchClause/Missing expr 03.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/MatchClause/Missing expr 04.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/Missing expr 04.fs.bsl index eae47c2aa83..f330f9319b3 100644 --- a/tests/service/data/SyntaxTree/MatchClause/Missing expr 04.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/Missing expr 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/MatchClause/Missing expr 04.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/MatchClause/Missing expr 05.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/Missing expr 05.fs.bsl index 787b09b31dc..683382cc888 100644 --- a/tests/service/data/SyntaxTree/MatchClause/Missing expr 05.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/Missing expr 05.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/MatchClause/Missing expr 05.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/MatchClause/Missing pat 01.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/Missing pat 01.fs.bsl index 3e5974d65be..cd0f4bf48b8 100644 --- a/tests/service/data/SyntaxTree/MatchClause/Missing pat 01.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/Missing pat 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/MatchClause/Missing pat 01.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/MatchClause/Missing pat 02.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/Missing pat 02.fs.bsl index 0812581e1ff..c71769f1e3f 100644 --- a/tests/service/data/SyntaxTree/MatchClause/Missing pat 02.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/Missing pat 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/MatchClause/Missing pat 02.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/MatchClause/Missing pat 03.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/Missing pat 03.fs.bsl index 8fb3f4b8142..ded83f5f12e 100644 --- a/tests/service/data/SyntaxTree/MatchClause/Missing pat 03.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/Missing pat 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/MatchClause/Missing pat 03.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/MatchClause/Missing pat 04.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/Missing pat 04.fs.bsl index 8fde4f353ee..3e00098d245 100644 --- a/tests/service/data/SyntaxTree/MatchClause/Missing pat 04.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/Missing pat 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/MatchClause/Missing pat 04.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/MatchClause/Missing pat 05.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/Missing pat 05.fs.bsl index e9693065f21..54dbf18b339 100644 --- a/tests/service/data/SyntaxTree/MatchClause/Missing pat 05.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/Missing pat 05.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/MatchClause/Missing pat 05.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/MatchClause/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl index 79e765d0135..f07cb960713 100644 --- a/tests/service/data/SyntaxTree/MatchClause/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/MatchClause/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs", false, QualifiedNameOfFile NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith, - [], [], + [], [SynModuleOrNamespace ([NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfArrowInSynMatchClause.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfArrowInSynMatchClause.fs.bsl index 850422e1df8..17f4aee9ac6 100644 --- a/tests/service/data/SyntaxTree/MatchClause/RangeOfArrowInSynMatchClause.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfArrowInSynMatchClause.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/MatchClause/RangeOfArrowInSynMatchClause.fs", false, - QualifiedNameOfFile RangeOfArrowInSynMatchClause, [], [], + QualifiedNameOfFile RangeOfArrowInSynMatchClause, [], [SynModuleOrNamespace ([RangeOfArrowInSynMatchClause], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfArrowInSynMatchClauseWithWhenClause.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfArrowInSynMatchClauseWithWhenClause.fs.bsl index 3ec91a6aab5..78e5fcbe803 100644 --- a/tests/service/data/SyntaxTree/MatchClause/RangeOfArrowInSynMatchClauseWithWhenClause.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfArrowInSynMatchClauseWithWhenClause.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/MatchClause/RangeOfArrowInSynMatchClauseWithWhenClause.fs", false, - QualifiedNameOfFile RangeOfArrowInSynMatchClauseWithWhenClause, [], [], + QualifiedNameOfFile RangeOfArrowInSynMatchClauseWithWhenClause, [], [SynModuleOrNamespace ([RangeOfArrowInSynMatchClauseWithWhenClause], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs.bsl index 00fd4e2de7b..798697b854c 100644 --- a/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs", false, QualifiedNameOfFile RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith, - [], [], + [], [SynModuleOrNamespace ([RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs.bsl index 744fc813f3c..c8fe46a507a 100644 --- a/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs.bsl @@ -2,7 +2,7 @@ ImplFile (ParsedImplFileInput ("/root/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs", false, QualifiedNameOfFile RangeOfBarInASingleSynMatchClauseInSynExprMatch, - [], [], + [], [SynModuleOrNamespace ([RangeOfBarInASingleSynMatchClauseInSynExprMatch], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl index 8306431f657..55f4d62599f 100644 --- a/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl @@ -3,7 +3,6 @@ ImplFile ("/root/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs", false, QualifiedNameOfFile RangeOfBarInASingleSynMatchClauseInSynExprTryWith, [], - [], [SynModuleOrNamespace ([RangeOfBarInASingleSynMatchClauseInSynExprTryWith], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs.bsl index 02122fba61d..01c34274a54 100644 --- a/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs.bsl @@ -3,7 +3,6 @@ ImplFile ("/root/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs", false, QualifiedNameOfFile RangeOfBarInMultipleSynMatchClausesInSynExprMatch, [], - [], [SynModuleOrNamespace ([RangeOfBarInMultipleSynMatchClausesInSynExprMatch], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfMultipleSynMatchClause.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfMultipleSynMatchClause.fs.bsl index 84ce5019498..0dea35e32dd 100644 --- a/tests/service/data/SyntaxTree/MatchClause/RangeOfMultipleSynMatchClause.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfMultipleSynMatchClause.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/MatchClause/RangeOfMultipleSynMatchClause.fs", false, - QualifiedNameOfFile RangeOfMultipleSynMatchClause, [], [], + QualifiedNameOfFile RangeOfMultipleSynMatchClause, [], [SynModuleOrNamespace ([RangeOfMultipleSynMatchClause], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClause.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClause.fs.bsl index dfa2ad58587..81dc7bcb3b8 100644 --- a/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClause.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClause.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/MatchClause/RangeOfSingleSynMatchClause.fs", false, - QualifiedNameOfFile RangeOfSingleSynMatchClause, [], [], + QualifiedNameOfFile RangeOfSingleSynMatchClause, [], [SynModuleOrNamespace ([RangeOfSingleSynMatchClause], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl index ea10cf70558..e2f461a46e9 100644 --- a/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs", false, - QualifiedNameOfFile RangeOfSingleSynMatchClauseFollowedByBar, [], [], + QualifiedNameOfFile RangeOfSingleSynMatchClauseFollowedByBar, [], [SynModuleOrNamespace ([RangeOfSingleSynMatchClauseFollowedByBar], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Measure/Constant - 01.fs.bsl b/tests/service/data/SyntaxTree/Measure/Constant - 01.fs.bsl index a9bc46a831a..be033366ce9 100644 --- a/tests/service/data/SyntaxTree/Measure/Constant - 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Measure/Constant - 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Measure/Constant - 01.fs", false, QualifiedNameOfFile M, [], [], + ("/root/Measure/Constant - 01.fs", false, QualifiedNameOfFile M, [], [SynModuleOrNamespace ([M], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Measure/Constant - 02.fs.bsl b/tests/service/data/SyntaxTree/Measure/Constant - 02.fs.bsl index 9cc97f47504..92cf6fe29a5 100644 --- a/tests/service/data/SyntaxTree/Measure/Constant - 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Measure/Constant - 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Measure/Constant - 02.fs", false, QualifiedNameOfFile M, [], [], + ("/root/Measure/Constant - 02.fs", false, QualifiedNameOfFile M, [], [SynModuleOrNamespace ([M], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Measure/Constant - 03.fs.bsl b/tests/service/data/SyntaxTree/Measure/Constant - 03.fs.bsl index a28e62906de..e85e2aa0fe8 100644 --- a/tests/service/data/SyntaxTree/Measure/Constant - 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Measure/Constant - 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Measure/Constant - 03.fs", false, QualifiedNameOfFile M, [], [], + ("/root/Measure/Constant - 03.fs", false, QualifiedNameOfFile M, [], [SynModuleOrNamespace ([M], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Measure/Constant - 04.fs.bsl b/tests/service/data/SyntaxTree/Measure/Constant - 04.fs.bsl index bf2ab0c3bd3..99f417c0bdc 100644 --- a/tests/service/data/SyntaxTree/Measure/Constant - 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Measure/Constant - 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Measure/Constant - 04.fs", false, QualifiedNameOfFile M, [], [], + ("/root/Measure/Constant - 04.fs", false, QualifiedNameOfFile M, [], [SynModuleOrNamespace ([M], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Measure/Constant - 05.fs.bsl b/tests/service/data/SyntaxTree/Measure/Constant - 05.fs.bsl index b18f6f4a22f..8d3a97520e0 100644 --- a/tests/service/data/SyntaxTree/Measure/Constant - 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Measure/Constant - 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Measure/Constant - 05.fs", false, QualifiedNameOfFile M, [], [], + ("/root/Measure/Constant - 05.fs", false, QualifiedNameOfFile M, [], [SynModuleOrNamespace ([M], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Measure/Constant - 06.fs.bsl b/tests/service/data/SyntaxTree/Measure/Constant - 06.fs.bsl index 7d5bac5d2e4..44ce7c44e29 100644 --- a/tests/service/data/SyntaxTree/Measure/Constant - 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Measure/Constant - 06.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Measure/Constant - 06.fs", false, QualifiedNameOfFile M, [], [], + ("/root/Measure/Constant - 06.fs", false, QualifiedNameOfFile M, [], [SynModuleOrNamespace ([M], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Measure/Constant - 07.fs.bsl b/tests/service/data/SyntaxTree/Measure/Constant - 07.fs.bsl index db9e83c0fb8..9b522c0b0f1 100644 --- a/tests/service/data/SyntaxTree/Measure/Constant - 07.fs.bsl +++ b/tests/service/data/SyntaxTree/Measure/Constant - 07.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Measure/Constant - 07.fs", false, QualifiedNameOfFile M, [], [], + ("/root/Measure/Constant - 07.fs", false, QualifiedNameOfFile M, [], [SynModuleOrNamespace ([M], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Measure/Constant - 08.fs.bsl b/tests/service/data/SyntaxTree/Measure/Constant - 08.fs.bsl index b4a8f0b48c2..6618ecbaa60 100644 --- a/tests/service/data/SyntaxTree/Measure/Constant - 08.fs.bsl +++ b/tests/service/data/SyntaxTree/Measure/Constant - 08.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Measure/Constant - 08.fs", false, QualifiedNameOfFile M, [], [], + ("/root/Measure/Constant - 08.fs", false, QualifiedNameOfFile M, [], [SynModuleOrNamespace ([M], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Measure/Constant - 09.fs.bsl b/tests/service/data/SyntaxTree/Measure/Constant - 09.fs.bsl index 2eeee44a379..bff140cca4e 100644 --- a/tests/service/data/SyntaxTree/Measure/Constant - 09.fs.bsl +++ b/tests/service/data/SyntaxTree/Measure/Constant - 09.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Measure/Constant - 09.fs", false, QualifiedNameOfFile M, [], [], + ("/root/Measure/Constant - 09.fs", false, QualifiedNameOfFile M, [], [SynModuleOrNamespace ([M], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Measure/Constant - 10.fs.bsl b/tests/service/data/SyntaxTree/Measure/Constant - 10.fs.bsl index f6e6b3d7fee..9b4a689fcba 100644 --- a/tests/service/data/SyntaxTree/Measure/Constant - 10.fs.bsl +++ b/tests/service/data/SyntaxTree/Measure/Constant - 10.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Measure/Constant - 10.fs", false, QualifiedNameOfFile M, [], [], + ("/root/Measure/Constant - 10.fs", false, QualifiedNameOfFile M, [], [SynModuleOrNamespace ([M], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Measure/MeasureContainsTheRangeOfTheConstant.fs.bsl b/tests/service/data/SyntaxTree/Measure/MeasureContainsTheRangeOfTheConstant.fs.bsl index b0150fbdc0b..c9ba8332c0b 100644 --- a/tests/service/data/SyntaxTree/Measure/MeasureContainsTheRangeOfTheConstant.fs.bsl +++ b/tests/service/data/SyntaxTree/Measure/MeasureContainsTheRangeOfTheConstant.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Measure/MeasureContainsTheRangeOfTheConstant.fs", false, - QualifiedNameOfFile MeasureContainsTheRangeOfTheConstant, [], [], + QualifiedNameOfFile MeasureContainsTheRangeOfTheConstant, [], [SynModuleOrNamespace ([MeasureContainsTheRangeOfTheConstant], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Measure/SynMeasureParenHasCorrectRange.fs.bsl b/tests/service/data/SyntaxTree/Measure/SynMeasureParenHasCorrectRange.fs.bsl index 84f544b9146..989fe9b1b6e 100644 --- a/tests/service/data/SyntaxTree/Measure/SynMeasureParenHasCorrectRange.fs.bsl +++ b/tests/service/data/SyntaxTree/Measure/SynMeasureParenHasCorrectRange.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Measure/SynMeasureParenHasCorrectRange.fs", false, - QualifiedNameOfFile SynMeasureParenHasCorrectRange, [], [], + QualifiedNameOfFile SynMeasureParenHasCorrectRange, [], [SynModuleOrNamespace ([SynMeasureParenHasCorrectRange], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithLeadingSlash.fs.bsl b/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithLeadingSlash.fs.bsl index 65535c03d20..23fe857a2c0 100644 --- a/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithLeadingSlash.fs.bsl +++ b/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithLeadingSlash.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Measure/SynTypeTupleInMeasureTypeWithLeadingSlash.fs", false, - QualifiedNameOfFile SynTypeTupleInMeasureTypeWithLeadingSlash, [], [], + QualifiedNameOfFile SynTypeTupleInMeasureTypeWithLeadingSlash, [], [SynModuleOrNamespace ([SynTypeTupleInMeasureTypeWithLeadingSlash], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithNoSlashes.fs.bsl b/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithNoSlashes.fs.bsl index dca088b13db..fb57de4ffa2 100644 --- a/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithNoSlashes.fs.bsl +++ b/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithNoSlashes.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Measure/SynTypeTupleInMeasureTypeWithNoSlashes.fs", false, - QualifiedNameOfFile SynTypeTupleInMeasureTypeWithNoSlashes, [], [], + QualifiedNameOfFile SynTypeTupleInMeasureTypeWithNoSlashes, [], [SynModuleOrNamespace ([SynTypeTupleInMeasureTypeWithNoSlashes], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithStartAndSlash.fs.bsl b/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithStartAndSlash.fs.bsl index f47273a687c..e199893f482 100644 --- a/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithStartAndSlash.fs.bsl +++ b/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithStartAndSlash.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Measure/SynTypeTupleInMeasureTypeWithStartAndSlash.fs", false, - QualifiedNameOfFile SynTypeTupleInMeasureTypeWithStartAndSlash, [], [], + QualifiedNameOfFile SynTypeTupleInMeasureTypeWithStartAndSlash, [], [SynModuleOrNamespace ([SynTypeTupleInMeasureTypeWithStartAndSlash], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Abstract - Property 01.fs.bsl b/tests/service/data/SyntaxTree/Member/Abstract - Property 01.fs.bsl index 9ec3b5452d7..62d6dcb128d 100644 --- a/tests/service/data/SyntaxTree/Member/Abstract - Property 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Abstract - Property 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Abstract - Property 01.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Abstract - Property 02.fs.bsl b/tests/service/data/SyntaxTree/Member/Abstract - Property 02.fs.bsl index 95ced08879b..6aeb84faf96 100644 --- a/tests/service/data/SyntaxTree/Member/Abstract - Property 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Abstract - Property 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Abstract - Property 02.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Abstract - Property 03.fs.bsl b/tests/service/data/SyntaxTree/Member/Abstract - Property 03.fs.bsl index d9393dc8da0..4ca2a6dc24a 100644 --- a/tests/service/data/SyntaxTree/Member/Abstract - Property 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Abstract - Property 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Abstract - Property 03.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Abstract - Property 04.fs.bsl b/tests/service/data/SyntaxTree/Member/Abstract - Property 04.fs.bsl index f315032ac6c..1018995483e 100644 --- a/tests/service/data/SyntaxTree/Member/Abstract - Property 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Abstract - Property 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Abstract - Property 04.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Abstract - Property 05.fs.bsl b/tests/service/data/SyntaxTree/Member/Abstract - Property 05.fs.bsl index e8092cae4f6..1e064665081 100644 --- a/tests/service/data/SyntaxTree/Member/Abstract - Property 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Abstract - Property 05.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Abstract - Property 05.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Auto property 01.fs.bsl b/tests/service/data/SyntaxTree/Member/Auto property 01.fs.bsl index 211a0fed943..60ef1663b5d 100644 --- a/tests/service/data/SyntaxTree/Member/Auto property 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Auto property 01.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Member/Auto property 01.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Auto property 02.fs.bsl b/tests/service/data/SyntaxTree/Member/Auto property 02.fs.bsl index 31f825ba1af..51398f18bbf 100644 --- a/tests/service/data/SyntaxTree/Member/Auto property 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Auto property 02.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Member/Auto property 02.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Auto property 03.fs.bsl b/tests/service/data/SyntaxTree/Member/Auto property 03.fs.bsl index fced13abaa4..3d9347395c7 100644 --- a/tests/service/data/SyntaxTree/Member/Auto property 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Auto property 03.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Member/Auto property 03.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Auto property 04.fs.bsl b/tests/service/data/SyntaxTree/Member/Auto property 04.fs.bsl index 19e8d589688..0328439cf1b 100644 --- a/tests/service/data/SyntaxTree/Member/Auto property 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Auto property 04.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Member/Auto property 04.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Auto property 05.fs.bsl b/tests/service/data/SyntaxTree/Member/Auto property 05.fs.bsl index ca97d03b523..96621f4e06c 100644 --- a/tests/service/data/SyntaxTree/Member/Auto property 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Auto property 05.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Member/Auto property 05.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Auto property 06.fs.bsl b/tests/service/data/SyntaxTree/Member/Auto property 06.fs.bsl index 6a60db20a73..555b6714c71 100644 --- a/tests/service/data/SyntaxTree/Member/Auto property 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Auto property 06.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Member/Auto property 06.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Auto property 07.fs.bsl b/tests/service/data/SyntaxTree/Member/Auto property 07.fs.bsl index 8e6436d4eb4..d16172f698d 100644 --- a/tests/service/data/SyntaxTree/Member/Auto property 07.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Auto property 07.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Auto property 07.fs", false, QualifiedNameOfFile A, [], [], + ("/root/Member/Auto property 07.fs", false, QualifiedNameOfFile A, [], [SynModuleOrNamespace ([A], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Auto property 08.fs.bsl b/tests/service/data/SyntaxTree/Member/Auto property 08.fs.bsl index b4d9c9da2c4..bcaa846ea85 100644 --- a/tests/service/data/SyntaxTree/Member/Auto property 08.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Auto property 08.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Member/Auto property 08.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Auto property 09.fs.bsl b/tests/service/data/SyntaxTree/Member/Auto property 09.fs.bsl index 5599ff4faa3..d0b7368ab15 100644 --- a/tests/service/data/SyntaxTree/Member/Auto property 09.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Auto property 09.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Member/Auto property 09.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Auto property 10.fs.bsl b/tests/service/data/SyntaxTree/Member/Auto property 10.fs.bsl index 0a94591f95a..b5971dd68ef 100644 --- a/tests/service/data/SyntaxTree/Member/Auto property 10.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Auto property 10.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Member/Auto property 10.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Auto property 11.fs.bsl b/tests/service/data/SyntaxTree/Member/Auto property 11.fs.bsl index f6f1fb9e52b..0f1b1a6f59a 100644 --- a/tests/service/data/SyntaxTree/Member/Auto property 11.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Auto property 11.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Member/Auto property 11.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Auto property 12.fs.bsl b/tests/service/data/SyntaxTree/Member/Auto property 12.fs.bsl index da5a5eb7b72..210188e5c48 100644 --- a/tests/service/data/SyntaxTree/Member/Auto property 12.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Auto property 12.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Member/Auto property 12.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Auto property 13.fs.bsl b/tests/service/data/SyntaxTree/Member/Auto property 13.fs.bsl index b28a6d273bb..6b504d3eac1 100644 --- a/tests/service/data/SyntaxTree/Member/Auto property 13.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Auto property 13.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Member/Auto property 13.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Auto property 14.fs.bsl b/tests/service/data/SyntaxTree/Member/Auto property 14.fs.bsl index d9725daa923..61921f11306 100644 --- a/tests/service/data/SyntaxTree/Member/Auto property 14.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Auto property 14.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Auto property 14.fs", false, QualifiedNameOfFile A, [], [], + ("/root/Member/Auto property 14.fs", false, QualifiedNameOfFile A, [], [SynModuleOrNamespace ([A], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Auto property 15.fs.bsl b/tests/service/data/SyntaxTree/Member/Auto property 15.fs.bsl index 417da42ef8a..780a8d2b45d 100644 --- a/tests/service/data/SyntaxTree/Member/Auto property 15.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Auto property 15.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Auto property 15.fs", false, QualifiedNameOfFile A, [], [], + ("/root/Member/Auto property 15.fs", false, QualifiedNameOfFile A, [], [SynModuleOrNamespace ([A], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Do 01.fs.bsl b/tests/service/data/SyntaxTree/Member/Do 01.fs.bsl index 5f63d7bdc38..7c4535a5e7a 100644 --- a/tests/service/data/SyntaxTree/Member/Do 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Do 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Do 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Do 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Do 02.fs.bsl b/tests/service/data/SyntaxTree/Member/Do 02.fs.bsl index 1585d6135ee..959c849d866 100644 --- a/tests/service/data/SyntaxTree/Member/Do 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Do 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Do 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Do 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Do 03.fs.bsl b/tests/service/data/SyntaxTree/Member/Do 03.fs.bsl index b255897d0e8..631d336cb7c 100644 --- a/tests/service/data/SyntaxTree/Member/Do 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Do 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Do 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Do 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Do 04.fs.bsl b/tests/service/data/SyntaxTree/Member/Do 04.fs.bsl index 637426c98df..037cceb93bb 100644 --- a/tests/service/data/SyntaxTree/Member/Do 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Do 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Do 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Do 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Field 01.fs.bsl b/tests/service/data/SyntaxTree/Member/Field 01.fs.bsl index add8ac4adbe..be888b8d1cd 100644 --- a/tests/service/data/SyntaxTree/Member/Field 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Field 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Field 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Field 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Field 02.fs.bsl b/tests/service/data/SyntaxTree/Member/Field 02.fs.bsl index 33eba0a9f87..326fac0c868 100644 --- a/tests/service/data/SyntaxTree/Member/Field 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Field 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Field 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Field 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Field 03.fs.bsl b/tests/service/data/SyntaxTree/Member/Field 03.fs.bsl index 4308cbcfebb..2775859c003 100644 --- a/tests/service/data/SyntaxTree/Member/Field 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Field 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Field 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Field 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Field 04.fs.bsl b/tests/service/data/SyntaxTree/Member/Field 04.fs.bsl index e481768ccb4..70c40c10aaa 100644 --- a/tests/service/data/SyntaxTree/Member/Field 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Field 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Field 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Field 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Field 05.fs.bsl b/tests/service/data/SyntaxTree/Member/Field 05.fs.bsl index 46cf2e29c7f..1b1b74ebb2f 100644 --- a/tests/service/data/SyntaxTree/Member/Field 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Field 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Field 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Field 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Field 06.fs.bsl b/tests/service/data/SyntaxTree/Member/Field 06.fs.bsl index 723a8c44f25..5f843495fff 100644 --- a/tests/service/data/SyntaxTree/Member/Field 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Field 06.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Field 06.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Field 06.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Field 07.fs.bsl b/tests/service/data/SyntaxTree/Member/Field 07.fs.bsl index e62126034db..cdce2dc24d4 100644 --- a/tests/service/data/SyntaxTree/Member/Field 07.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Field 07.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Field 07.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Field 07.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Field 08.fs.bsl b/tests/service/data/SyntaxTree/Member/Field 08.fs.bsl index c74f09be72c..b1827032bea 100644 --- a/tests/service/data/SyntaxTree/Member/Field 08.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Field 08.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Field 08.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Field 08.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Field 09.fs.bsl b/tests/service/data/SyntaxTree/Member/Field 09.fs.bsl index 8b4d8d1fa48..18cb28b4b33 100644 --- a/tests/service/data/SyntaxTree/Member/Field 09.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Field 09.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Field 09.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Field 09.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Field 10.fs.bsl b/tests/service/data/SyntaxTree/Member/Field 10.fs.bsl index 77016903ad5..9f1d0e80091 100644 --- a/tests/service/data/SyntaxTree/Member/Field 10.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Field 10.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Field 10.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Field 10.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Field 11.fs.bsl b/tests/service/data/SyntaxTree/Member/Field 11.fs.bsl index 4f3cfe4b8b4..8eb1bdb43af 100644 --- a/tests/service/data/SyntaxTree/Member/Field 11.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Field 11.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Field 11.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Field 11.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Field 12.fs.bsl b/tests/service/data/SyntaxTree/Member/Field 12.fs.bsl index d29045ba0e7..c6241ae8e53 100644 --- a/tests/service/data/SyntaxTree/Member/Field 12.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Field 12.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Field 12.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Field 12.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Field 13.fs.bsl b/tests/service/data/SyntaxTree/Member/Field 13.fs.bsl index 3b42126b6db..ec73e1f93ad 100644 --- a/tests/service/data/SyntaxTree/Member/Field 13.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Field 13.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Field 13.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Field 13.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Field 14.fs.bsl b/tests/service/data/SyntaxTree/Member/Field 14.fs.bsl index b9ae59996cf..2607772504f 100644 --- a/tests/service/data/SyntaxTree/Member/Field 14.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Field 14.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Field 14.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Field 14.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Field 15.fs.bsl b/tests/service/data/SyntaxTree/Member/Field 15.fs.bsl index 472d5e0c2f9..9b157845ece 100644 --- a/tests/service/data/SyntaxTree/Member/Field 15.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Field 15.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Field 15.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Field 15.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/GetSetMember 01.fs.bsl b/tests/service/data/SyntaxTree/Member/GetSetMember 01.fs.bsl index 55fb27c87bd..2e4c1f12327 100644 --- a/tests/service/data/SyntaxTree/Member/GetSetMember 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/GetSetMember 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/GetSetMember 01.fs", false, QualifiedNameOfFile Foo, [], [], + ("/root/Member/GetSetMember 01.fs", false, QualifiedNameOfFile Foo, [], [SynModuleOrNamespace ([Foo], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/GetSetMemberWithInlineKeyword.fs.bsl b/tests/service/data/SyntaxTree/Member/GetSetMemberWithInlineKeyword.fs.bsl index 3768075ef94..31857360101 100644 --- a/tests/service/data/SyntaxTree/Member/GetSetMemberWithInlineKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/GetSetMemberWithInlineKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/GetSetMemberWithInlineKeyword.fs", false, - QualifiedNameOfFile GetSetMemberWithInlineKeyword, [], [], + QualifiedNameOfFile GetSetMemberWithInlineKeyword, [], [SynModuleOrNamespace ([GetSetMemberWithInlineKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Implicit ctor - Missing type 01.fs.bsl b/tests/service/data/SyntaxTree/Member/Implicit ctor - Missing type 01.fs.bsl index d603121ea71..2de703a9046 100644 --- a/tests/service/data/SyntaxTree/Member/Implicit ctor - Missing type 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Implicit ctor - Missing type 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Implicit ctor - Missing type 01.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Implicit ctor - Missing type 02.fs.bsl b/tests/service/data/SyntaxTree/Member/Implicit ctor - Missing type 02.fs.bsl index d963c4115e8..97aed02699b 100644 --- a/tests/service/data/SyntaxTree/Member/Implicit ctor - Missing type 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Implicit ctor - Missing type 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Implicit ctor - Missing type 02.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Implicit ctor - Pat - Tuple 01.fs.bsl b/tests/service/data/SyntaxTree/Member/Implicit ctor - Pat - Tuple 01.fs.bsl index 2bc4b5f488f..74ce95ad59a 100644 --- a/tests/service/data/SyntaxTree/Member/Implicit ctor - Pat - Tuple 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Implicit ctor - Pat - Tuple 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Implicit ctor - Pat - Tuple 01.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Implicit ctor - Pat - Tuple 02.fs.bsl b/tests/service/data/SyntaxTree/Member/Implicit ctor - Pat - Tuple 02.fs.bsl index 35502745762..d685d70cc14 100644 --- a/tests/service/data/SyntaxTree/Member/Implicit ctor - Pat - Tuple 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Implicit ctor - Pat - Tuple 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Implicit ctor - Pat - Tuple 02.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 01.fs.bsl b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 01.fs.bsl index 424a3619305..b13f07e8d00 100644 --- a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Implicit ctor - Type - Fun 01.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 02.fs.bsl b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 02.fs.bsl index 0146ad5a153..f9b9daf5c24 100644 --- a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Implicit ctor - Type - Fun 02.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 03.fs.bsl b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 03.fs.bsl index 61b3b7f3776..76acdf90cf1 100644 --- a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Implicit ctor - Type - Fun 03.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 04.fs.bsl b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 04.fs.bsl index ca30a8c2327..e223fed4354 100644 --- a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Implicit ctor - Type - Fun 04.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 05.fs.bsl b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 05.fs.bsl index bd89bbaf94e..3e659881def 100644 --- a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 05.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Implicit ctor - Type - Fun 05.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 06.fs.bsl b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 06.fs.bsl index ac58a094acb..64fb82d0e7e 100644 --- a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 06.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Implicit ctor - Type - Fun 06.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Tuple 01.fs.bsl b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Tuple 01.fs.bsl index 473bd768b3c..1fec29a3069 100644 --- a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Tuple 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Tuple 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Implicit ctor - Type - Tuple 01.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Tuple 02.fs.bsl b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Tuple 02.fs.bsl index 57b5279161a..f08eb8a36b8 100644 --- a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Tuple 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Tuple 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Implicit ctor - Type - Tuple 02.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Tuple 03.fs.bsl b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Tuple 03.fs.bsl index 92b69f0c2b2..ce53c83362c 100644 --- a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Tuple 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Tuple 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Implicit ctor - Type - Tuple 03.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Tuple 04.fs.bsl b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Tuple 04.fs.bsl index 5ff10cae81b..3c008d94ffe 100644 --- a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Tuple 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Tuple 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Implicit ctor - Type - Tuple 04.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Tuple 05.fs.bsl b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Tuple 05.fs.bsl index a39da9cc29e..ed91cce2068 100644 --- a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Tuple 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Tuple 05.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Implicit ctor - Type - Tuple 05.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/ImplicitCtorWithAsKeyword.fs.bsl b/tests/service/data/SyntaxTree/Member/ImplicitCtorWithAsKeyword.fs.bsl index 61f182611f8..7a2162f049a 100644 --- a/tests/service/data/SyntaxTree/Member/ImplicitCtorWithAsKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/ImplicitCtorWithAsKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/ImplicitCtorWithAsKeyword.fs", false, - QualifiedNameOfFile ImplicitCtorWithAsKeyword, [], [], + QualifiedNameOfFile ImplicitCtorWithAsKeyword, [], [SynModuleOrNamespace ([ImplicitCtorWithAsKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Inherit 01.fs.bsl b/tests/service/data/SyntaxTree/Member/Inherit 01.fs.bsl index e138535c113..463e5fae508 100644 --- a/tests/service/data/SyntaxTree/Member/Inherit 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Inherit 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Inherit 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Inherit 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Inherit 02.fs.bsl b/tests/service/data/SyntaxTree/Member/Inherit 02.fs.bsl index 51185750c32..3e382c3b622 100644 --- a/tests/service/data/SyntaxTree/Member/Inherit 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Inherit 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Inherit 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Inherit 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Inherit 03.fs.bsl b/tests/service/data/SyntaxTree/Member/Inherit 03.fs.bsl index eeab1704856..97ca5055419 100644 --- a/tests/service/data/SyntaxTree/Member/Inherit 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Inherit 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Inherit 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Inherit 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Inherit 04.fs.bsl b/tests/service/data/SyntaxTree/Member/Inherit 04.fs.bsl index 9c03baf2b56..b2f8c3a069d 100644 --- a/tests/service/data/SyntaxTree/Member/Inherit 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Inherit 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Inherit 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Inherit 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Inherit 05.fs.bsl b/tests/service/data/SyntaxTree/Member/Inherit 05.fs.bsl index ddb47eb7ecc..1cd03dfcbf5 100644 --- a/tests/service/data/SyntaxTree/Member/Inherit 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Inherit 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Inherit 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Inherit 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Inherit 06.fsi.bsl b/tests/service/data/SyntaxTree/Member/Inherit 06.fsi.bsl index 3ac7c9adc29..039e89eb31a 100644 --- a/tests/service/data/SyntaxTree/Member/Inherit 06.fsi.bsl +++ b/tests/service/data/SyntaxTree/Member/Inherit 06.fsi.bsl @@ -1,6 +1,6 @@ SigFile (ParsedSigFileInput - ("/root/Member/Inherit 06.fsi", QualifiedNameOfFile Module, [], [], + ("/root/Member/Inherit 06.fsi", QualifiedNameOfFile Module, [], [SynModuleOrNamespaceSig ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Inherit 07.fsi.bsl b/tests/service/data/SyntaxTree/Member/Inherit 07.fsi.bsl index 7dc4657766f..4ff79f9a937 100644 --- a/tests/service/data/SyntaxTree/Member/Inherit 07.fsi.bsl +++ b/tests/service/data/SyntaxTree/Member/Inherit 07.fsi.bsl @@ -1,6 +1,6 @@ SigFile (ParsedSigFileInput - ("/root/Member/Inherit 07.fsi", QualifiedNameOfFile Module, [], [], + ("/root/Member/Inherit 07.fsi", QualifiedNameOfFile Module, [], [SynModuleOrNamespaceSig ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Inherit 08.fs.bsl b/tests/service/data/SyntaxTree/Member/Inherit 08.fs.bsl index fa0211259a4..748d1fd87e8 100644 --- a/tests/service/data/SyntaxTree/Member/Inherit 08.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Inherit 08.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Inherit 08.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Inherit 08.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Interface 01.fs.bsl b/tests/service/data/SyntaxTree/Member/Interface 01.fs.bsl index 332508f43f8..5019eb05803 100644 --- a/tests/service/data/SyntaxTree/Member/Interface 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Interface 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Interface 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Interface 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Interface 02.fs.bsl b/tests/service/data/SyntaxTree/Member/Interface 02.fs.bsl index 2d699762c27..f1cc9973a6d 100644 --- a/tests/service/data/SyntaxTree/Member/Interface 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Interface 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Interface 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Interface 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Interface 03.fs.bsl b/tests/service/data/SyntaxTree/Member/Interface 03.fs.bsl index 8f563d2c61a..be75c8cda7b 100644 --- a/tests/service/data/SyntaxTree/Member/Interface 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Interface 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Interface 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Interface 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Interface 04.fs.bsl b/tests/service/data/SyntaxTree/Member/Interface 04.fs.bsl index 20db259a02e..73106fcb6a7 100644 --- a/tests/service/data/SyntaxTree/Member/Interface 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Interface 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Interface 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Interface 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Interface 05.fs.bsl b/tests/service/data/SyntaxTree/Member/Interface 05.fs.bsl index 1394c744330..3dc378a8900 100644 --- a/tests/service/data/SyntaxTree/Member/Interface 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Interface 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Interface 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Interface 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Interface 06.fs.bsl b/tests/service/data/SyntaxTree/Member/Interface 06.fs.bsl index b92b4abc202..9e4e6a7a0c9 100644 --- a/tests/service/data/SyntaxTree/Member/Interface 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Interface 06.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Interface 06.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Interface 06.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Interface 07.fs.bsl b/tests/service/data/SyntaxTree/Member/Interface 07.fs.bsl index 66c618d8e44..b48a8d45a4a 100644 --- a/tests/service/data/SyntaxTree/Member/Interface 07.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Interface 07.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Interface 07.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Interface 07.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Interface 08.fs.bsl b/tests/service/data/SyntaxTree/Member/Interface 08.fs.bsl index 301dc4c9570..76815165eea 100644 --- a/tests/service/data/SyntaxTree/Member/Interface 08.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Interface 08.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Interface 08.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Interface 08.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Interface 09.fs.bsl b/tests/service/data/SyntaxTree/Member/Interface 09.fs.bsl index 9260f21ff5b..7cf1a1b7d7e 100644 --- a/tests/service/data/SyntaxTree/Member/Interface 09.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Interface 09.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Interface 09.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Interface 09.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Interface 10.fs.bsl b/tests/service/data/SyntaxTree/Member/Interface 10.fs.bsl index 9ddc6fb80bb..cfa21037a50 100644 --- a/tests/service/data/SyntaxTree/Member/Interface 10.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Interface 10.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Interface 10.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Interface 10.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Let 01.fs.bsl b/tests/service/data/SyntaxTree/Member/Let 01.fs.bsl index c4071e92b4f..aa338b590ff 100644 --- a/tests/service/data/SyntaxTree/Member/Let 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Let 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Let 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Let 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Let 02.fs.bsl b/tests/service/data/SyntaxTree/Member/Let 02.fs.bsl index e8e2862dcc6..6d27f97edd0 100644 --- a/tests/service/data/SyntaxTree/Member/Let 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Let 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Let 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Let 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Let 03.fs.bsl b/tests/service/data/SyntaxTree/Member/Let 03.fs.bsl index 01cb91bbe95..c7c1463fb53 100644 --- a/tests/service/data/SyntaxTree/Member/Let 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Let 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Let 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Let 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Let 04.fs.bsl b/tests/service/data/SyntaxTree/Member/Let 04.fs.bsl index 439bf0d6cb7..730e70f95b6 100644 --- a/tests/service/data/SyntaxTree/Member/Let 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Let 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Let 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Let 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Member - Attributes 01.fs.bsl b/tests/service/data/SyntaxTree/Member/Member - Attributes 01.fs.bsl index 168769ff761..056bc209b4b 100644 --- a/tests/service/data/SyntaxTree/Member/Member - Attributes 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Member - Attributes 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Member - Attributes 01.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Member - Param - Missing type 01.fs.bsl b/tests/service/data/SyntaxTree/Member/Member - Param - Missing type 01.fs.bsl index 432229da76f..dfdd59c9aec 100644 --- a/tests/service/data/SyntaxTree/Member/Member - Param - Missing type 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Member - Param - Missing type 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Member - Param - Missing type 01.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Member 01.fs.bsl b/tests/service/data/SyntaxTree/Member/Member 01.fs.bsl index e5ce844b09e..db4e44904aa 100644 --- a/tests/service/data/SyntaxTree/Member/Member 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Member 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Member 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Member 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Member 02.fs.bsl b/tests/service/data/SyntaxTree/Member/Member 02.fs.bsl index dc24f73a058..68cb2e7a8c2 100644 --- a/tests/service/data/SyntaxTree/Member/Member 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Member 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Member 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Member 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Member 03.fs.bsl b/tests/service/data/SyntaxTree/Member/Member 03.fs.bsl index cb85a85bfc7..42e89101916 100644 --- a/tests/service/data/SyntaxTree/Member/Member 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Member 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Member 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Member 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Member 04.fs.bsl b/tests/service/data/SyntaxTree/Member/Member 04.fs.bsl index c4bfa610f42..d9d33f94bae 100644 --- a/tests/service/data/SyntaxTree/Member/Member 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Member 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Member 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Member 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Member 05.fs.bsl b/tests/service/data/SyntaxTree/Member/Member 05.fs.bsl index 7fdadfeebbc..227a332bb55 100644 --- a/tests/service/data/SyntaxTree/Member/Member 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Member 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Member 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Member 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Member 06.fs.bsl b/tests/service/data/SyntaxTree/Member/Member 06.fs.bsl index d249dd2cc26..9c51e6704a3 100644 --- a/tests/service/data/SyntaxTree/Member/Member 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Member 06.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Member 06.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Member 06.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Member 07.fs.bsl b/tests/service/data/SyntaxTree/Member/Member 07.fs.bsl index 5e5c51e0f2b..d317d097f70 100644 --- a/tests/service/data/SyntaxTree/Member/Member 07.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Member 07.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Member 07.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Member 07.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Member 08.fs.bsl b/tests/service/data/SyntaxTree/Member/Member 08.fs.bsl index b2e10558c6a..712b32837cb 100644 --- a/tests/service/data/SyntaxTree/Member/Member 08.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Member 08.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Member 08.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Member 08.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Member 09.fs.bsl b/tests/service/data/SyntaxTree/Member/Member 09.fs.bsl index e101bf1b6da..eeb22f06461 100644 --- a/tests/service/data/SyntaxTree/Member/Member 09.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Member 09.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Member 09.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Member 09.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Member 10.fs.bsl b/tests/service/data/SyntaxTree/Member/Member 10.fs.bsl index e0e6936d612..1e978a7b66e 100644 --- a/tests/service/data/SyntaxTree/Member/Member 10.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Member 10.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Member 10.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Member 10.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Member 11.fs.bsl b/tests/service/data/SyntaxTree/Member/Member 11.fs.bsl index a4d4b985c40..182de669d22 100644 --- a/tests/service/data/SyntaxTree/Member/Member 11.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Member 11.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Member 11.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Member 11.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Member 12.fs.bsl b/tests/service/data/SyntaxTree/Member/Member 12.fs.bsl index 44e361be813..10a3b6e5fd7 100644 --- a/tests/service/data/SyntaxTree/Member/Member 12.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Member 12.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Member 12.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Member 12.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Member 13.fs.bsl b/tests/service/data/SyntaxTree/Member/Member 13.fs.bsl index 129c9f529ce..c0420341bef 100644 --- a/tests/service/data/SyntaxTree/Member/Member 13.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Member 13.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Member 13.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Member 13.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/MemberMispelledToMeme.fs.bsl b/tests/service/data/SyntaxTree/Member/MemberMispelledToMeme.fs.bsl index 13e0c26b915..3b5ddd957a3 100644 --- a/tests/service/data/SyntaxTree/Member/MemberMispelledToMeme.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/MemberMispelledToMeme.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/MemberMispelledToMeme.fs", false, - QualifiedNameOfFile MemberMispelledToMeme, [], [], + QualifiedNameOfFile MemberMispelledToMeme, [], [SynModuleOrNamespace ([MemberMispelledToMeme], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/MemberWithInlineKeyword.fs.bsl b/tests/service/data/SyntaxTree/Member/MemberWithInlineKeyword.fs.bsl index 7db3831e689..8e1c91c74a2 100644 --- a/tests/service/data/SyntaxTree/Member/MemberWithInlineKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/MemberWithInlineKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/MemberWithInlineKeyword.fs", false, - QualifiedNameOfFile MemberWithInlineKeyword, [], [], + QualifiedNameOfFile MemberWithInlineKeyword, [], [SynModuleOrNamespace ([MemberWithInlineKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl index 6692c520246..42a853180a1 100644 --- a/tests/service/data/SyntaxTree/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl @@ -4,7 +4,7 @@ ImplFile false, QualifiedNameOfFile Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword, - [], [], + [], [SynModuleOrNamespace ([Foo], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl index 8319d790680..ec2dae78b91 100644 --- a/tests/service/data/SyntaxTree/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl @@ -4,7 +4,7 @@ ImplFile false, QualifiedNameOfFile ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword, - [], [], + [], [SynModuleOrNamespace ([ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Member/SignatureMemberWithGet.fsi.bsl b/tests/service/data/SyntaxTree/Member/SignatureMemberWithGet.fsi.bsl index a516a7766cf..f85f36ec7ad 100644 --- a/tests/service/data/SyntaxTree/Member/SignatureMemberWithGet.fsi.bsl +++ b/tests/service/data/SyntaxTree/Member/SignatureMemberWithGet.fsi.bsl @@ -1,6 +1,6 @@ SigFile (ParsedSigFileInput - ("/root/Member/SignatureMemberWithGet.fsi", QualifiedNameOfFile Meh, [], [], + ("/root/Member/SignatureMemberWithGet.fsi", QualifiedNameOfFile Meh, [], [SynModuleOrNamespaceSig ([Meh], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/SignatureMemberWithSet.fsi.bsl b/tests/service/data/SyntaxTree/Member/SignatureMemberWithSet.fsi.bsl index 038b502e256..a6826dedf93 100644 --- a/tests/service/data/SyntaxTree/Member/SignatureMemberWithSet.fsi.bsl +++ b/tests/service/data/SyntaxTree/Member/SignatureMemberWithSet.fsi.bsl @@ -1,6 +1,6 @@ SigFile (ParsedSigFileInput - ("/root/Member/SignatureMemberWithSet.fsi", QualifiedNameOfFile Meh, [], [], + ("/root/Member/SignatureMemberWithSet.fsi", QualifiedNameOfFile Meh, [], [SynModuleOrNamespaceSig ([Meh], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/SignatureMemberWithSetget.fsi.bsl b/tests/service/data/SyntaxTree/Member/SignatureMemberWithSetget.fsi.bsl index acb516b9113..87a96d09948 100644 --- a/tests/service/data/SyntaxTree/Member/SignatureMemberWithSetget.fsi.bsl +++ b/tests/service/data/SyntaxTree/Member/SignatureMemberWithSetget.fsi.bsl @@ -1,7 +1,6 @@ SigFile (ParsedSigFileInput ("/root/Member/SignatureMemberWithSetget.fsi", QualifiedNameOfFile Meh, [], - [], [SynModuleOrNamespaceSig ([Meh], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Static 01.fs.bsl b/tests/service/data/SyntaxTree/Member/Static 01.fs.bsl index 7c47ccf95ec..8a6d7b212a6 100644 --- a/tests/service/data/SyntaxTree/Member/Static 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Static 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Static 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Static 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Static 02.fs.bsl b/tests/service/data/SyntaxTree/Member/Static 02.fs.bsl index ecf86c4e1f6..0f2a2cf7f74 100644 --- a/tests/service/data/SyntaxTree/Member/Static 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Static 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Static 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Static 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Static 03.fs.bsl b/tests/service/data/SyntaxTree/Member/Static 03.fs.bsl index 70d5eb3aba9..ae718beefec 100644 --- a/tests/service/data/SyntaxTree/Member/Static 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Static 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Static 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Static 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs.bsl index 4158e55ca3f..d0a50103d31 100644 --- a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Member/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs", false, QualifiedNameOfFile - SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword, [], [], + SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword, [], [SynModuleOrNamespace ([SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs.bsl index 06e0765a03b..e9705317fea 100644 --- a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs", false, QualifiedNameOfFile - SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign, [], [], + SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign, [], [SynModuleOrNamespace ([SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs.bsl index 95b26eac8a3..3cac28e9078 100644 --- a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs", false, QualifiedNameOfFile - SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword, [], [], + SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword, [], [SynModuleOrNamespace ([SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs.bsl b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs.bsl index b09a60eed84..4151638914d 100644 --- a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs", false, - QualifiedNameOfFile SynTypeDefnWithMemberWithGetHasXmlComment, [], [], + QualifiedNameOfFile SynTypeDefnWithMemberWithGetHasXmlComment, [], [SynModuleOrNamespace ([SynTypeDefnWithMemberWithGetHasXmlComment], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithSetget.fs.bsl b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithSetget.fs.bsl index e3fe9618a23..de611f26400 100644 --- a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithSetget.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithSetget.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/SynTypeDefnWithMemberWithSetget.fs", false, - QualifiedNameOfFile SynTypeDefnWithMemberWithSetget, [], [], + QualifiedNameOfFile SynTypeDefnWithMemberWithSetget, [], [SynModuleOrNamespace ([SynTypeDefnWithMemberWithSetget], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithStaticMemberWithGetset.fs.bsl b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithStaticMemberWithGetset.fs.bsl index 33c1348b561..b16fc3d7187 100644 --- a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithStaticMemberWithGetset.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithStaticMemberWithGetset.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/SynTypeDefnWithStaticMemberWithGetset.fs", false, - QualifiedNameOfFile SynTypeDefnWithStaticMemberWithGetset, [], [], + QualifiedNameOfFile SynTypeDefnWithStaticMemberWithGetset, [], [SynModuleOrNamespace ([SynTypeDefnWithStaticMemberWithGetset], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl index 79a865c5eed..ef4617c60e6 100644 --- a/tests/service/data/SyntaxTree/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl @@ -4,7 +4,7 @@ ImplFile false, QualifiedNameOfFile Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword, - [], [], + [], [SynModuleOrNamespace ([Foo], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs.bsl b/tests/service/data/SyntaxTree/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs.bsl index cb73ae7b1dd..9bf4d3b0575 100644 --- a/tests/service/data/SyntaxTree/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs.bsl +++ b/tests/service/data/SyntaxTree/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs", false, - QualifiedNameOfFile SynExprObjMembersHaveCorrectKeywords, [], [], + QualifiedNameOfFile SynExprObjMembersHaveCorrectKeywords, [], [SynModuleOrNamespace ([SynExprObjMembersHaveCorrectKeywords], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnAbstractSlotHasCorrectKeyword.fs.bsl b/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnAbstractSlotHasCorrectKeyword.fs.bsl index 23d12756c3e..2c56802ac48 100644 --- a/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnAbstractSlotHasCorrectKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnAbstractSlotHasCorrectKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/MemberFlag/SynMemberDefnAbstractSlotHasCorrectKeyword.fs", false, - QualifiedNameOfFile SynMemberDefnAbstractSlotHasCorrectKeyword, [], [], + QualifiedNameOfFile SynMemberDefnAbstractSlotHasCorrectKeyword, [], [SynModuleOrNamespace ([SynMemberDefnAbstractSlotHasCorrectKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs.bsl b/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs.bsl index 76d6b9ac1b5..fcdee7b56f4 100644 --- a/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs", false, - QualifiedNameOfFile SynMemberDefnAutoPropertyHasCorrectKeyword, [], [], + QualifiedNameOfFile SynMemberDefnAutoPropertyHasCorrectKeyword, [], [SynModuleOrNamespace ([SynMemberDefnAutoPropertyHasCorrectKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs.bsl b/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs.bsl index ae8cfbaa083..603baeec5c9 100644 --- a/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs.bsl @@ -2,7 +2,7 @@ ImplFile (ParsedImplFileInput ("/root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs", false, QualifiedNameOfFile SynMemberDefnMemberSynValDataHasCorrectKeyword, - [], [], + [], [SynModuleOrNamespace ([SynMemberDefnMemberSynValDataHasCorrectKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi.bsl b/tests/service/data/SyntaxTree/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi.bsl index 878187410bc..dff27e04746 100644 --- a/tests/service/data/SyntaxTree/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi.bsl +++ b/tests/service/data/SyntaxTree/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi", - QualifiedNameOfFile SynMemberSigMemberHasCorrectKeywords, [], [], + QualifiedNameOfFile SynMemberSigMemberHasCorrectKeywords, [], [SynModuleOrNamespaceSig ([X], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/ModuleMember/Do 01.fs.bsl b/tests/service/data/SyntaxTree/ModuleMember/Do 01.fs.bsl index 0db6971e934..c85c24e00b5 100644 --- a/tests/service/data/SyntaxTree/ModuleMember/Do 01.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleMember/Do 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/ModuleMember/Do 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/ModuleMember/Do 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/ModuleMember/Do 02.fs.bsl b/tests/service/data/SyntaxTree/ModuleMember/Do 02.fs.bsl index 581e4ff62c0..496e552fa1f 100644 --- a/tests/service/data/SyntaxTree/ModuleMember/Do 02.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleMember/Do 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/ModuleMember/Do 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/ModuleMember/Do 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/ModuleMember/Let 01.fs.bsl b/tests/service/data/SyntaxTree/ModuleMember/Let 01.fs.bsl index 92101cded07..1c8c4dccedb 100644 --- a/tests/service/data/SyntaxTree/ModuleMember/Let 01.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleMember/Let 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/ModuleMember/Let 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/ModuleMember/Let 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/ModuleMember/Let 02.fs.bsl b/tests/service/data/SyntaxTree/ModuleMember/Let 02.fs.bsl index cfa14a90cd0..e530a40f54e 100644 --- a/tests/service/data/SyntaxTree/ModuleMember/Let 02.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleMember/Let 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/ModuleMember/Let 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/ModuleMember/Let 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/ModuleMember/Let 03.fs.bsl b/tests/service/data/SyntaxTree/ModuleMember/Let 03.fs.bsl index 374a64bda0e..f941ff3a07d 100644 --- a/tests/service/data/SyntaxTree/ModuleMember/Let 03.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleMember/Let 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/ModuleMember/Let 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/ModuleMember/Let 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/ModuleMember/Let 04.fs.bsl b/tests/service/data/SyntaxTree/ModuleMember/Let 04.fs.bsl index 7d2f30db848..62051453f04 100644 --- a/tests/service/data/SyntaxTree/ModuleMember/Let 04.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleMember/Let 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/ModuleMember/Let 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/ModuleMember/Let 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let (false, [], (3,0--3,3)); diff --git a/tests/service/data/SyntaxTree/ModuleMember/Let 05.fs.bsl b/tests/service/data/SyntaxTree/ModuleMember/Let 05.fs.bsl index 684cfa3cfb0..9148d9593fb 100644 --- a/tests/service/data/SyntaxTree/ModuleMember/Let 05.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleMember/Let 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/ModuleMember/Let 05.fs", false, QualifiedNameOfFile Let 05, [], [], + ("/root/ModuleMember/Let 05.fs", false, QualifiedNameOfFile Let 05, [], [SynModuleOrNamespace ([Let 05], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/ModuleMember/Open 01.fs.bsl b/tests/service/data/SyntaxTree/ModuleMember/Open 01.fs.bsl index 9ba9b81eb53..54a69cef5f9 100644 --- a/tests/service/data/SyntaxTree/ModuleMember/Open 01.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleMember/Open 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/ModuleMember/Open 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/ModuleMember/Open 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Open diff --git a/tests/service/data/SyntaxTree/ModuleMember/Open 02.fs.bsl b/tests/service/data/SyntaxTree/ModuleMember/Open 02.fs.bsl index 2a17ef664a5..3a79d8a40d3 100644 --- a/tests/service/data/SyntaxTree/ModuleMember/Open 02.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleMember/Open 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/ModuleMember/Open 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/ModuleMember/Open 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Open diff --git a/tests/service/data/SyntaxTree/ModuleMember/Open 03.fs.bsl b/tests/service/data/SyntaxTree/ModuleMember/Open 03.fs.bsl index 549a2c50a79..baf94d09558 100644 --- a/tests/service/data/SyntaxTree/ModuleMember/Open 03.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleMember/Open 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/ModuleMember/Open 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/ModuleMember/Open 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Open diff --git a/tests/service/data/SyntaxTree/ModuleMember/Open 04.fs.bsl b/tests/service/data/SyntaxTree/ModuleMember/Open 04.fs.bsl index 26532b885c0..211ce9f819e 100644 --- a/tests/service/data/SyntaxTree/ModuleMember/Open 04.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleMember/Open 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/ModuleMember/Open 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/ModuleMember/Open 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Open diff --git a/tests/service/data/SyntaxTree/ModuleMember/Open 05.fs.bsl b/tests/service/data/SyntaxTree/ModuleMember/Open 05.fs.bsl index d6339de665b..51b91aeb60b 100644 --- a/tests/service/data/SyntaxTree/ModuleMember/Open 05.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleMember/Open 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/ModuleMember/Open 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/ModuleMember/Open 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Open diff --git a/tests/service/data/SyntaxTree/ModuleMember/Open 06.fs.bsl b/tests/service/data/SyntaxTree/ModuleMember/Open 06.fs.bsl index 44453c403fa..49a280c5294 100644 --- a/tests/service/data/SyntaxTree/ModuleMember/Open 06.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleMember/Open 06.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/ModuleMember/Open 06.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/ModuleMember/Open 06.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Open diff --git a/tests/service/data/SyntaxTree/ModuleMember/Open 07.fs.bsl b/tests/service/data/SyntaxTree/ModuleMember/Open 07.fs.bsl index 38af89635b8..3780e042264 100644 --- a/tests/service/data/SyntaxTree/ModuleMember/Open 07.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleMember/Open 07.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/ModuleMember/Open 07.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/ModuleMember/Open 07.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Open diff --git a/tests/service/data/SyntaxTree/ModuleMember/Open 08.fs.bsl b/tests/service/data/SyntaxTree/ModuleMember/Open 08.fs.bsl index 5968d7456b1..6e12aa9e0f1 100644 --- a/tests/service/data/SyntaxTree/ModuleMember/Open 08.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleMember/Open 08.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/ModuleMember/Open 08.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/ModuleMember/Open 08.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Open diff --git a/tests/service/data/SyntaxTree/ModuleMember/Val 01.fsi.bsl b/tests/service/data/SyntaxTree/ModuleMember/Val 01.fsi.bsl index 33a28bec72c..e7b920cf3bb 100644 --- a/tests/service/data/SyntaxTree/ModuleMember/Val 01.fsi.bsl +++ b/tests/service/data/SyntaxTree/ModuleMember/Val 01.fsi.bsl @@ -1,6 +1,6 @@ SigFile (ParsedSigFileInput - ("/root/ModuleMember/Val 01.fsi", QualifiedNameOfFile Module, [], [], + ("/root/ModuleMember/Val 01.fsi", QualifiedNameOfFile Module, [], [SynModuleOrNamespaceSig ([Module], false, NamedModule, [Val diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Anon module 01.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Anon module 01.fs.bsl index 11fc84ec748..299a86738ac 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Anon module 01.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Anon module 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Anon module 01.fs", false, - QualifiedNameOfFile Anon module 01, [], [], + QualifiedNameOfFile Anon module 01, [], [SynModuleOrNamespace ([Anon module 01], false, AnonModule, [Expr (Const (Unit, (1,0--1,2)), (1,0--1,2))], PreXmlDocEmpty, [], diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Anon module 02.fsx.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Anon module 02.fsx.bsl index 448d9bae968..3bfef6b4af3 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Anon module 02.fsx.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Anon module 02.fsx.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Anon module 02.fsx", true, - QualifiedNameOfFile Anon module 02$fsx, [], [], + QualifiedNameOfFile Anon module 02$fsx, [], [SynModuleOrNamespace ([Anon module 02], false, AnonModule, [Expr (Const (Unit, (1,0--1,2)), (1,0--1,2))], PreXmlDocEmpty, [], diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs.bsl index e45507b4a0d..8c83319357d 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/ModuleOrNamespace/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs", false, QualifiedNameOfFile DeclaredNamespaceRangeShouldStartAtNamespaceKeyword, - [], [], + [], [SynModuleOrNamespace ([TypeEquality], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/GlobalInOpenPathShouldContainTrivia.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/GlobalInOpenPathShouldContainTrivia.fs.bsl index 0d822c247fb..4350831d9f7 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/GlobalInOpenPathShouldContainTrivia.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/GlobalInOpenPathShouldContainTrivia.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/GlobalInOpenPathShouldContainTrivia.fs", false, - QualifiedNameOfFile GlobalInOpenPathShouldContainTrivia, [], [], + QualifiedNameOfFile GlobalInOpenPathShouldContainTrivia, [], [SynModuleOrNamespace ([Ionide; VSCode; FSharp], false, DeclaredNamespace, [Open diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/GlobalNamespaceShouldStartAtNamespaceKeyword.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/GlobalNamespaceShouldStartAtNamespaceKeyword.fs.bsl index ab4611ba1fc..92846d05a78 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/GlobalNamespaceShouldStartAtNamespaceKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/GlobalNamespaceShouldStartAtNamespaceKeyword.fs.bsl @@ -2,7 +2,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/GlobalNamespaceShouldStartAtNamespaceKeyword.fs", false, QualifiedNameOfFile GlobalNamespaceShouldStartAtNamespaceKeyword, - [], [], + [], [SynModuleOrNamespace ([], false, GlobalNamespace, [Types diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Module - Attribute 01.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Module - Attribute 01.fs.bsl index 70ca7f64fdb..51e98e1f023 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Module - Attribute 01.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Module - Attribute 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Module - Attribute 01.fs", false, - QualifiedNameOfFile Bar, [], [], + QualifiedNameOfFile Bar, [], [SynModuleOrNamespace ([Bar], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 01.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 01.fs.bsl index 253b83115a7..ae107b348ff 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 01.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Module 01.fs", false, QualifiedNameOfFile A.B.C, - [], [], + [], [SynModuleOrNamespace ([A; B; C], false, NamedModule, [], PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None, diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 02.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 02.fs.bsl index 1ca7710dfcb..22c3612ec3b 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 02.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Module 02.fs", false, QualifiedNameOfFile A.B.C, - [], [], + [], [SynModuleOrNamespace ([A; B; C], false, NamedModule, [Expr (Const (Unit, (3,0--3,2)), (3,0--3,2))], diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 03.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 03.fs.bsl index f71a5daa644..fdb556ac83b 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 03.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Module 03.fs", false, QualifiedNameOfFile A.B.C, - [], [], + [], [SynModuleOrNamespace ([A; B; C], false, NamedModule, [Expr (Const (Unit, (3,2--3,4)), (3,2--3,4))], diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 04.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 04.fs.bsl index 226e6492957..9eeea926035 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 04.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Module 04.fs", false, QualifiedNameOfFile A.B.C, - [], [], + [], [SynModuleOrNamespace ([A; B; C], false, NamedModule, [Expr (Const (Unit, (3,0--3,2)), (3,0--3,2))], diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 05.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 05.fs.bsl index 6f4c8c701d5..fddc1377f63 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 05.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 05.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Module 05.fs", false, QualifiedNameOfFile A, [], - [], [SynModuleOrNamespace ([A], false, NamedModule, [Expr (Const (Unit, (3,0--3,2)), (3,0--3,2))], PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None, diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 06.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 06.fs.bsl index ec0cd02e4ce..7768d80248f 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 06.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 06.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Module 06.fs", false, QualifiedNameOfFile , [], - [], [SynModuleOrNamespace ([], false, NamedModule, [Expr (Const (Unit, (3,0--3,2)), (3,0--3,2))], PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None, diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 07.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 07.fs.bsl index b52a7bcdbf4..49ddcfcd603 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 07.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 07.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Module 07.fs", false, QualifiedNameOfFile , [], - [], [SynModuleOrNamespace ([], true, NamedModule, [Expr (Const (Unit, (3,0--3,2)), (3,0--3,2))], PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None, diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs.bsl index 7e55d2eb57d..e9d1f920f5a 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs", false, - QualifiedNameOfFile FsAutoComplete.FCSPatches, [], [], + QualifiedNameOfFile FsAutoComplete.FCSPatches, [], [SynModuleOrNamespace ([FsAutoComplete; FCSPatches], false, NamedModule, [Open diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs.bsl index 09880fab704..55f704823db 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs.bsl @@ -4,7 +4,7 @@ ImplFile false, QualifiedNameOfFile MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword, - [], [], + [], [SynModuleOrNamespace ([TypeEquality], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 01.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 01.fs.bsl index d4bb61b979b..3909b882997 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 01.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Namespace 01.fs", false, - QualifiedNameOfFile Namespace 01, [], [], + QualifiedNameOfFile Namespace 01, [], [SynModuleOrNamespace ([Ns1], false, DeclaredNamespace, [Expr (Const (Unit, (3,0--3,2)), (3,0--3,2))], PreXmlDocEmpty, [], diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 02.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 02.fs.bsl index 1e5985485f2..e67784b655f 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 02.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Namespace 02.fs", false, - QualifiedNameOfFile Namespace 02, [], [], + QualifiedNameOfFile Namespace 02, [], [SynModuleOrNamespace ([Ns1], false, DeclaredNamespace, [Expr (Const (Unit, (3,0--3,2)), (3,0--3,2))], PreXmlDocEmpty, [], diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 03.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 03.fs.bsl index c822d41e48f..cd9f6e26581 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 03.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Namespace 03.fs", false, - QualifiedNameOfFile Namespace 03, [], [], + QualifiedNameOfFile Namespace 03, [], [SynModuleOrNamespace ([Ns1], false, DeclaredNamespace, [Expr (Const (Unit, (3,0--3,2)), (3,0--3,2))], PreXmlDocEmpty, [], diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 04.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 04.fs.bsl index e012c095c25..171a69cc184 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 04.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Namespace 04.fs", false, - QualifiedNameOfFile Namespace 04, [], [], + QualifiedNameOfFile Namespace 04, [], [SynModuleOrNamespace ([Ns1], false, DeclaredNamespace, [Expr (Const (Unit, (3,0--3,2)), (3,0--3,2))], PreXmlDocEmpty, [], diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 05.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 05.fs.bsl index a41e32b6583..4b06b212184 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 05.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 05.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Namespace 05.fs", false, - QualifiedNameOfFile Namespace 05, [], [], + QualifiedNameOfFile Namespace 05, [], [SynModuleOrNamespace ([], false, DeclaredNamespace, [], PreXmlDocEmpty, [], None, (1,0--2,0), { LeadingKeyword = Namespace (1,0--1,9) })], (true, true), diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 06.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 06.fs.bsl index 06fd6804862..d633d78da5d 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 06.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 06.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Namespace 06.fs", false, - QualifiedNameOfFile Namespace 06, [], [], + QualifiedNameOfFile Namespace 06, [], [SynModuleOrNamespace ([], false, DeclaredNamespace, [Expr (Const (Unit, (3,0--3,2)), (3,0--3,2))], PreXmlDocEmpty, [], diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 07.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 07.fs.bsl index 904371c96d7..2001e63d579 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 07.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 07.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Namespace 07.fs", false, - QualifiedNameOfFile Namespace 07, [], [], + QualifiedNameOfFile Namespace 07, [], [SynModuleOrNamespace ([], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 08.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 08.fs.bsl index 35984038851..99774bdfb2d 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 08.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 08.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Namespace 08.fs", false, - QualifiedNameOfFile Namespace 08, [], [], + QualifiedNameOfFile Namespace 08, [], [SynModuleOrNamespace ([], true, DeclaredNamespace, [], PreXmlDocEmpty, [], None, (1,0--2,0), { LeadingKeyword = Namespace (1,0--1,9) })], (true, true), diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 09.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 09.fs.bsl index c6f1e667ff6..d92df6a3bad 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 09.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 09.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Namespace 09.fs", false, - QualifiedNameOfFile Namespace 09, [], [], + QualifiedNameOfFile Namespace 09, [], [SynModuleOrNamespace ([], false, DeclaredNamespace, [Expr (Const (Unit, (3,0--3,2)), (3,0--3,2))], PreXmlDocEmpty, [], diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/NamespaceShouldContainNamespaceKeyword.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/NamespaceShouldContainNamespaceKeyword.fs.bsl index fddeeca8a03..4770bd12c28 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/NamespaceShouldContainNamespaceKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/NamespaceShouldContainNamespaceKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/NamespaceShouldContainNamespaceKeyword.fs", false, - QualifiedNameOfFile NamespaceShouldContainNamespaceKeyword, [], [], + QualifiedNameOfFile NamespaceShouldContainNamespaceKeyword, [], [SynModuleOrNamespace ([Foo], false, DeclaredNamespace, [NestedModule diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 01.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 01.fs.bsl index 8b74425f9b6..f096330f153 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 01.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Nested module 01.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [NestedModule diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 02.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 02.fs.bsl index e7761029d97..64e42143c82 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 02.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Nested module 02.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [NestedModule diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 03.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 03.fs.bsl index 44ab73f81ad..85c740b97cd 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 03.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Nested module 03.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [NestedModule diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 04.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 04.fs.bsl index 4208cc94225..cc6ea82a8d9 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 04.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Nested module 04.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [NestedModule diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 05.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 05.fs.bsl index 53b4a1f12df..7d668de43d5 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 05.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 05.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Nested module 05.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [NestedModule diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 06.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 06.fs.bsl index d6875779d2f..27f741f4153 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 06.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 06.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Nested module 06.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [NestedModule diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 07.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 07.fs.bsl index 569bdfe5811..32f9e5749c1 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 07.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 07.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Nested module 07.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [NestedModule diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 08.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 08.fs.bsl index 1b6fcc1a41c..9ad6d285ef3 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 08.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 08.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Nested module 08.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [NestedModule diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 09.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 09.fs.bsl index 175f01fc0e0..08e0e408e98 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 09.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 09.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Nested module 09.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [NestedModule diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 10.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 10.fs.bsl index 4605fc9a35d..28b6fdc833d 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 10.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 10.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Nested module 10.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [NestedModule diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 11.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 11.fs.bsl index 181836a8b7f..c3f3f3c2e40 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 11.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 11.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Nested module 11.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [NestedModule diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 12.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 12.fs.bsl index eb79389bb5c..019a46d4811 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 12.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 12.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Nested module 12.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [NestedModule diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 13.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 13.fs.bsl index c57a57743cb..dc6136a18bd 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 13.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 13.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Nested module 13.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [NestedModule diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 14.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 14.fs.bsl index 708fae6dee0..28273f45569 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 14.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 14.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Nested module 14.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [NestedModule diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 15.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 15.fs.bsl index e7aaa7fbdbc..3d649cef854 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 15.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 15.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Nested module 15.fs", false, - QualifiedNameOfFile Nested module 15, [], [], + QualifiedNameOfFile Nested module 15, [], [SynModuleOrNamespace ([Ns], false, DeclaredNamespace, [NestedModule diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 16.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 16.fs.bsl index 2ce127eef5d..5cc142e8798 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 16.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 16.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Nested module 16.fs", false, - QualifiedNameOfFile Nested module 16, [], [], + QualifiedNameOfFile Nested module 16, [], [SynModuleOrNamespace ([Ns], false, DeclaredNamespace, [NestedModule diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 17.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 17.fs.bsl index 4e5dd1a1914..2f93776f291 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 17.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 17.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Nested module 17.fs", false, - QualifiedNameOfFile Nested module 17, [], [], + QualifiedNameOfFile Nested module 17, [], [SynModuleOrNamespace ([Ns], false, DeclaredNamespace, [NestedModule diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi.bsl index 13f845e312a..72959c8147a 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/ModuleOrNamespaceSig/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi", - QualifiedNameOfFile GlobalNamespaceShouldStartAtNamespaceKeyword, [], [], + QualifiedNameOfFile GlobalNamespaceShouldStartAtNamespaceKeyword, [], [SynModuleOrNamespaceSig ([], false, GlobalNamespace, [Types diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleAbbreviation.fsi.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleAbbreviation.fsi.bsl index 045e4931a62..4c68ef8caf6 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleAbbreviation.fsi.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleAbbreviation.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/ModuleOrNamespaceSig/ModuleAbbreviation.fsi", - QualifiedNameOfFile Foo, [], [], + QualifiedNameOfFile Foo, [], [SynModuleOrNamespaceSig ([Foo], false, NamedModule, [Open diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleRangeShouldStartAtFirstAttribute.fsi.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleRangeShouldStartAtFirstAttribute.fsi.bsl index 833995c7304..6e11069d964 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleRangeShouldStartAtFirstAttribute.fsi.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleRangeShouldStartAtFirstAttribute.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/ModuleOrNamespaceSig/ModuleRangeShouldStartAtFirstAttribute.fsi", - QualifiedNameOfFile Bar, [], [], + QualifiedNameOfFile Bar, [], [SynModuleOrNamespaceSig ([Bar], false, NamedModule, [Val diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleShouldContainModuleKeyword.fsi.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleShouldContainModuleKeyword.fsi.bsl index 9c4dbafc6cd..e816eae1175 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleShouldContainModuleKeyword.fsi.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleShouldContainModuleKeyword.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/ModuleOrNamespaceSig/ModuleShouldContainModuleKeyword.fsi", - QualifiedNameOfFile Bar, [], [], + QualifiedNameOfFile Bar, [], [SynModuleOrNamespaceSig ([Bar], false, NamedModule, [Val diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/Namespace - Keyword 01.fsi.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/Namespace - Keyword 01.fsi.bsl index a2d8deea5fe..8ca9b252eff 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/Namespace - Keyword 01.fsi.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/Namespace - Keyword 01.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/ModuleOrNamespaceSig/Namespace - Keyword 01.fsi", - QualifiedNameOfFile Namespace - Keyword 01, [], [], + QualifiedNameOfFile Namespace - Keyword 01, [], [SynModuleOrNamespaceSig ([Foo], false, DeclaredNamespace, [NestedModule diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/Nested module 01.fsi.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/Nested module 01.fsi.bsl index 2ca7d9b108a..688224fe4ea 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/Nested module 01.fsi.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/Nested module 01.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/ModuleOrNamespaceSig/Nested module 01.fsi", - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespaceSig ([Module], false, NamedModule, [NestedModule diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi.bsl index 8a0f981091f..3cb6f1282c4 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi.bsl @@ -2,7 +2,6 @@ SigFile (ParsedSigFileInput ("/root/ModuleOrNamespaceSig/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi", QualifiedNameOfFile RangeMemberReturnsRangeOfSynModuleOrNamespaceSig, [], - [], [SynModuleOrNamespaceSig ([Foobar], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/NestedModule/IncompleteNestedModuleSigShouldBePresent.fsi.bsl b/tests/service/data/SyntaxTree/NestedModule/IncompleteNestedModuleSigShouldBePresent.fsi.bsl index d9d1e49ae74..63aa45d782f 100644 --- a/tests/service/data/SyntaxTree/NestedModule/IncompleteNestedModuleSigShouldBePresent.fsi.bsl +++ b/tests/service/data/SyntaxTree/NestedModule/IncompleteNestedModuleSigShouldBePresent.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/NestedModule/IncompleteNestedModuleSigShouldBePresent.fsi", - QualifiedNameOfFile A.B, [], [], + QualifiedNameOfFile A.B, [], [SynModuleOrNamespaceSig ([A; B], false, NamedModule, [NestedModule diff --git a/tests/service/data/SyntaxTree/NestedModule/NestedModuleWithBeginEndAndDecls.fs.bsl b/tests/service/data/SyntaxTree/NestedModule/NestedModuleWithBeginEndAndDecls.fs.bsl index 24837f66d09..a42d49b79bd 100644 --- a/tests/service/data/SyntaxTree/NestedModule/NestedModuleWithBeginEndAndDecls.fs.bsl +++ b/tests/service/data/SyntaxTree/NestedModule/NestedModuleWithBeginEndAndDecls.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/NestedModule/NestedModuleWithBeginEndAndDecls.fs", false, - QualifiedNameOfFile NestedModuleWithBeginEndAndDecls, [], [], + QualifiedNameOfFile NestedModuleWithBeginEndAndDecls, [], [SynModuleOrNamespace ([X], false, DeclaredNamespace, [NestedModule diff --git a/tests/service/data/SyntaxTree/NestedModule/NestedModuleWithBeginEndAndDecls.fsi.bsl b/tests/service/data/SyntaxTree/NestedModule/NestedModuleWithBeginEndAndDecls.fsi.bsl index 878125cde66..aff271ecfe3 100644 --- a/tests/service/data/SyntaxTree/NestedModule/NestedModuleWithBeginEndAndDecls.fsi.bsl +++ b/tests/service/data/SyntaxTree/NestedModule/NestedModuleWithBeginEndAndDecls.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/NestedModule/NestedModuleWithBeginEndAndDecls.fsi", - QualifiedNameOfFile NestedModuleWithBeginEndAndDecls, [], [], + QualifiedNameOfFile NestedModuleWithBeginEndAndDecls, [], [SynModuleOrNamespaceSig ([X], false, DeclaredNamespace, [NestedModule diff --git a/tests/service/data/SyntaxTree/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs.bsl b/tests/service/data/SyntaxTree/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs.bsl index 0160f4068bf..6aba4e114e8 100644 --- a/tests/service/data/SyntaxTree/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs.bsl +++ b/tests/service/data/SyntaxTree/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs", - false, QualifiedNameOfFile TopLevel, [], [], + false, QualifiedNameOfFile TopLevel, [], [SynModuleOrNamespace ([TopLevel], false, NamedModule, [NestedModule diff --git a/tests/service/data/SyntaxTree/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi.bsl b/tests/service/data/SyntaxTree/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi.bsl index 2d2eb425be6..da4768cef87 100644 --- a/tests/service/data/SyntaxTree/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi.bsl +++ b/tests/service/data/SyntaxTree/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi.bsl @@ -2,7 +2,7 @@ SigFile (ParsedSigFileInput ("/root/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi", QualifiedNameOfFile - RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule, [], [], + RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule, [], [SynModuleOrNamespaceSig ([SomeNamespace], false, DeclaredNamespace, [NestedModule diff --git a/tests/service/data/SyntaxTree/NestedModule/RangeOfBeginEnd.fs.bsl b/tests/service/data/SyntaxTree/NestedModule/RangeOfBeginEnd.fs.bsl index 45d8f088c57..2833d4ffd98 100644 --- a/tests/service/data/SyntaxTree/NestedModule/RangeOfBeginEnd.fs.bsl +++ b/tests/service/data/SyntaxTree/NestedModule/RangeOfBeginEnd.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/NestedModule/RangeOfBeginEnd.fs", false, - QualifiedNameOfFile RangeOfBeginEnd, [], [], + QualifiedNameOfFile RangeOfBeginEnd, [], [SynModuleOrNamespace ([X], false, DeclaredNamespace, [NestedModule diff --git a/tests/service/data/SyntaxTree/NestedModule/RangeOfBeginEnd.fsi.bsl b/tests/service/data/SyntaxTree/NestedModule/RangeOfBeginEnd.fsi.bsl index 33815671eb9..b1b30b523cd 100644 --- a/tests/service/data/SyntaxTree/NestedModule/RangeOfBeginEnd.fsi.bsl +++ b/tests/service/data/SyntaxTree/NestedModule/RangeOfBeginEnd.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/NestedModule/RangeOfBeginEnd.fsi", - QualifiedNameOfFile RangeOfBeginEnd, [], [], + QualifiedNameOfFile RangeOfBeginEnd, [], [SynModuleOrNamespaceSig ([X], false, DeclaredNamespace, [NestedModule diff --git a/tests/service/data/SyntaxTree/NestedModule/RangeOfEqualSignShouldBePresent.fs.bsl b/tests/service/data/SyntaxTree/NestedModule/RangeOfEqualSignShouldBePresent.fs.bsl index da9c0e154f4..610571d60c5 100644 --- a/tests/service/data/SyntaxTree/NestedModule/RangeOfEqualSignShouldBePresent.fs.bsl +++ b/tests/service/data/SyntaxTree/NestedModule/RangeOfEqualSignShouldBePresent.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/NestedModule/RangeOfEqualSignShouldBePresent.fs", false, - QualifiedNameOfFile RangeOfEqualSignShouldBePresent, [], [], + QualifiedNameOfFile RangeOfEqualSignShouldBePresent, [], [SynModuleOrNamespace ([RangeOfEqualSignShouldBePresent], false, AnonModule, [NestedModule diff --git a/tests/service/data/SyntaxTree/NestedModule/RangeOfEqualSignShouldBePresentSignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/NestedModule/RangeOfEqualSignShouldBePresentSignatureFile.fsi.bsl index d9575b21a86..cb57ecdd9ed 100644 --- a/tests/service/data/SyntaxTree/NestedModule/RangeOfEqualSignShouldBePresentSignatureFile.fsi.bsl +++ b/tests/service/data/SyntaxTree/NestedModule/RangeOfEqualSignShouldBePresentSignatureFile.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/NestedModule/RangeOfEqualSignShouldBePresentSignatureFile.fsi", - QualifiedNameOfFile RangeOfEqualSignShouldBePresentSignatureFile, [], [], + QualifiedNameOfFile RangeOfEqualSignShouldBePresentSignatureFile, [], [SynModuleOrNamespaceSig ([Foo], false, DeclaredNamespace, [NestedModule diff --git a/tests/service/data/SyntaxTree/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi.bsl b/tests/service/data/SyntaxTree/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi.bsl index d1d8882f2a0..a7c40ad9209 100644 --- a/tests/service/data/SyntaxTree/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi.bsl +++ b/tests/service/data/SyntaxTree/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi.bsl @@ -3,7 +3,6 @@ SigFile ("/root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi", QualifiedNameOfFile RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl, [], - [], [SynModuleOrNamespaceSig ([Microsoft; FSharp; Core], false, DeclaredNamespace, [Open diff --git a/tests/service/data/SyntaxTree/Nullness/AbstractClassProperty.fs.bsl b/tests/service/data/SyntaxTree/Nullness/AbstractClassProperty.fs.bsl index fa15e544c36..3661fdb9a96 100644 --- a/tests/service/data/SyntaxTree/Nullness/AbstractClassProperty.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/AbstractClassProperty.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/AbstractClassProperty.fs", false, - QualifiedNameOfFile AbstractClassProperty, [], [], + QualifiedNameOfFile AbstractClassProperty, [], [SynModuleOrNamespace ([AbstractClassProperty], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Nullness/DuCaseStringOrNull.fs.bsl b/tests/service/data/SyntaxTree/Nullness/DuCaseStringOrNull.fs.bsl index e60a05e853d..42e8d6b842f 100644 --- a/tests/service/data/SyntaxTree/Nullness/DuCaseStringOrNull.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/DuCaseStringOrNull.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/DuCaseStringOrNull.fs", false, - QualifiedNameOfFile DuCaseStringOrNull, [], [], + QualifiedNameOfFile DuCaseStringOrNull, [], [SynModuleOrNamespace ([DuCaseStringOrNull], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Nullness/DuCaseTuplePrecedence.fs.bsl b/tests/service/data/SyntaxTree/Nullness/DuCaseTuplePrecedence.fs.bsl index 1ae968787e3..3adaaad24fc 100644 --- a/tests/service/data/SyntaxTree/Nullness/DuCaseTuplePrecedence.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/DuCaseTuplePrecedence.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/DuCaseTuplePrecedence.fs", false, - QualifiedNameOfFile DuCaseTuplePrecedence, [], [], + QualifiedNameOfFile DuCaseTuplePrecedence, [], [SynModuleOrNamespace ([DuCaseTuplePrecedence], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Nullness/ExplicitField.fs.bsl b/tests/service/data/SyntaxTree/Nullness/ExplicitField.fs.bsl index b590e85bce5..301776765e5 100644 --- a/tests/service/data/SyntaxTree/Nullness/ExplicitField.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/ExplicitField.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/ExplicitField.fs", false, - QualifiedNameOfFile ExplicitField, [], [], + QualifiedNameOfFile ExplicitField, [], [SynModuleOrNamespace ([ExplicitField], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Nullness/FunctionArgAsPatternWithNullCase.fs.bsl b/tests/service/data/SyntaxTree/Nullness/FunctionArgAsPatternWithNullCase.fs.bsl index 1d72ceec00a..f0d46ce9461 100644 --- a/tests/service/data/SyntaxTree/Nullness/FunctionArgAsPatternWithNullCase.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/FunctionArgAsPatternWithNullCase.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/FunctionArgAsPatternWithNullCase.fs", false, - QualifiedNameOfFile FunctionArgAsPatternWithNullCase, [], [], + QualifiedNameOfFile FunctionArgAsPatternWithNullCase, [], [SynModuleOrNamespace ([FunctionArgAsPatternWithNullCase], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Nullness/GenericFunctionReturnTypeNotStructNull.fs.bsl b/tests/service/data/SyntaxTree/Nullness/GenericFunctionReturnTypeNotStructNull.fs.bsl index d155f74abba..dea9102a521 100644 --- a/tests/service/data/SyntaxTree/Nullness/GenericFunctionReturnTypeNotStructNull.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/GenericFunctionReturnTypeNotStructNull.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/GenericFunctionReturnTypeNotStructNull.fs", false, - QualifiedNameOfFile GenericFunctionReturnTypeNotStructNull, [], [], + QualifiedNameOfFile GenericFunctionReturnTypeNotStructNull, [], [SynModuleOrNamespace ([GenericFunctionReturnTypeNotStructNull], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Nullness/GenericFunctionTyparNotNull.fs.bsl b/tests/service/data/SyntaxTree/Nullness/GenericFunctionTyparNotNull.fs.bsl index f03151197dd..6a96a915afb 100644 --- a/tests/service/data/SyntaxTree/Nullness/GenericFunctionTyparNotNull.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/GenericFunctionTyparNotNull.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/GenericFunctionTyparNotNull.fs", false, - QualifiedNameOfFile GenericFunctionTyparNotNull, [], [], + QualifiedNameOfFile GenericFunctionTyparNotNull, [], [SynModuleOrNamespace ([GenericFunctionTyparNotNull], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Nullness/GenericFunctionTyparNull.fs.bsl b/tests/service/data/SyntaxTree/Nullness/GenericFunctionTyparNull.fs.bsl index db83d1ddcbf..c7d1be5131d 100644 --- a/tests/service/data/SyntaxTree/Nullness/GenericFunctionTyparNull.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/GenericFunctionTyparNull.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/GenericFunctionTyparNull.fs", false, - QualifiedNameOfFile GenericFunctionTyparNull, [], [], + QualifiedNameOfFile GenericFunctionTyparNull, [], [SynModuleOrNamespace ([GenericFunctionTyparNull], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Nullness/GenericTypeNotNull.fs.bsl b/tests/service/data/SyntaxTree/Nullness/GenericTypeNotNull.fs.bsl index 92d0d1a136c..c4356b6f53b 100644 --- a/tests/service/data/SyntaxTree/Nullness/GenericTypeNotNull.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/GenericTypeNotNull.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/GenericTypeNotNull.fs", false, - QualifiedNameOfFile GenericTypeNotNull, [], [], + QualifiedNameOfFile GenericTypeNotNull, [], [SynModuleOrNamespace ([GenericTypeNotNull], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Nullness/GenericTypeNotNullAndOtherConstraint.fs.bsl b/tests/service/data/SyntaxTree/Nullness/GenericTypeNotNullAndOtherConstraint.fs.bsl index 0906d86df22..4fe24f7379b 100644 --- a/tests/service/data/SyntaxTree/Nullness/GenericTypeNotNullAndOtherConstraint.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/GenericTypeNotNullAndOtherConstraint.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/GenericTypeNotNullAndOtherConstraint.fs", false, - QualifiedNameOfFile GenericTypeNotNullAndOtherConstraint, [], [], + QualifiedNameOfFile GenericTypeNotNullAndOtherConstraint, [], [SynModuleOrNamespace ([GenericTypeNotNullAndOtherConstraint], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Nullness/GenericTypeNotStructAndOtherConstraint-I_am_Still_Sane.fs.bsl b/tests/service/data/SyntaxTree/Nullness/GenericTypeNotStructAndOtherConstraint-I_am_Still_Sane.fs.bsl index 6ebe197154b..6bfc279f6f3 100644 --- a/tests/service/data/SyntaxTree/Nullness/GenericTypeNotStructAndOtherConstraint-I_am_Still_Sane.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/GenericTypeNotStructAndOtherConstraint-I_am_Still_Sane.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Nullness/GenericTypeNotStructAndOtherConstraint-I_am_Still_Sane.fs", false, QualifiedNameOfFile GenericTypeNotStructAndOtherConstraint-I_am_Still_Sane, - [], [], + [], [SynModuleOrNamespace ([GenericTypeNotStructAndOtherConstraint-I_am_Still_Sane], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Nullness/GenericTypeNull.fs.bsl b/tests/service/data/SyntaxTree/Nullness/GenericTypeNull.fs.bsl index 184b29d69d3..d1c295fd484 100644 --- a/tests/service/data/SyntaxTree/Nullness/GenericTypeNull.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/GenericTypeNull.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/GenericTypeNull.fs", false, - QualifiedNameOfFile GenericTypeNull, [], [], + QualifiedNameOfFile GenericTypeNull, [], [SynModuleOrNamespace ([GenericTypeNull], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Nullness/GenericTypeOtherConstraintAndThenNotNull.fs.bsl b/tests/service/data/SyntaxTree/Nullness/GenericTypeOtherConstraintAndThenNotNull.fs.bsl index c6f6f52d871..027c30db9da 100644 --- a/tests/service/data/SyntaxTree/Nullness/GenericTypeOtherConstraintAndThenNotNull.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/GenericTypeOtherConstraintAndThenNotNull.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/GenericTypeOtherConstraintAndThenNotNull.fs", false, - QualifiedNameOfFile GenericTypeOtherConstraintAndThenNotNull, [], [], + QualifiedNameOfFile GenericTypeOtherConstraintAndThenNotNull, [], [SynModuleOrNamespace ([GenericTypeOtherConstraintAndThenNotNull], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Nullness/IntListOrNull.fs.bsl b/tests/service/data/SyntaxTree/Nullness/IntListOrNull.fs.bsl index c678aa83577..ab336ed3594 100644 --- a/tests/service/data/SyntaxTree/Nullness/IntListOrNull.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/IntListOrNull.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/IntListOrNull.fs", false, - QualifiedNameOfFile IntListOrNull, [], [], + QualifiedNameOfFile IntListOrNull, [], [SynModuleOrNamespace ([IntListOrNull], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Nullness/IntListOrNullOrNullOrNull.fs.bsl b/tests/service/data/SyntaxTree/Nullness/IntListOrNullOrNullOrNull.fs.bsl index 2ba94607f41..ff5a413899b 100644 --- a/tests/service/data/SyntaxTree/Nullness/IntListOrNullOrNullOrNull.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/IntListOrNullOrNullOrNull.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/IntListOrNullOrNullOrNull.fs", false, - QualifiedNameOfFile IntListOrNullOrNullOrNull, [], [], + QualifiedNameOfFile IntListOrNullOrNullOrNull, [], [SynModuleOrNamespace ([IntListOrNullOrNullOrNull], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Nullness/MatchWithTypeCast.fs.bsl b/tests/service/data/SyntaxTree/Nullness/MatchWithTypeCast.fs.bsl index 86094715714..594d54a0f80 100644 --- a/tests/service/data/SyntaxTree/Nullness/MatchWithTypeCast.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/MatchWithTypeCast.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/MatchWithTypeCast.fs", false, - QualifiedNameOfFile MatchWithTypeCast, [], [], + QualifiedNameOfFile MatchWithTypeCast, [], [SynModuleOrNamespace ([MatchWithTypeCast], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Nullness/MatchWithTypeCastParens.fs.bsl b/tests/service/data/SyntaxTree/Nullness/MatchWithTypeCastParens.fs.bsl index 2c465e58091..89075b825ff 100644 --- a/tests/service/data/SyntaxTree/Nullness/MatchWithTypeCastParens.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/MatchWithTypeCastParens.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/MatchWithTypeCastParens.fs", false, - QualifiedNameOfFile MatchWithTypeCastParens, [], [], + QualifiedNameOfFile MatchWithTypeCastParens, [], [SynModuleOrNamespace ([MatchWithTypeCastParens], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Nullness/MatchWithTypeCastParensAndSeparateNullCase.fs.bsl b/tests/service/data/SyntaxTree/Nullness/MatchWithTypeCastParensAndSeparateNullCase.fs.bsl index aa2e5f0787c..5a490553bb0 100644 --- a/tests/service/data/SyntaxTree/Nullness/MatchWithTypeCastParensAndSeparateNullCase.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/MatchWithTypeCastParensAndSeparateNullCase.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/MatchWithTypeCastParensAndSeparateNullCase.fs", false, - QualifiedNameOfFile MatchWithTypeCastParensAndSeparateNullCase, [], [], + QualifiedNameOfFile MatchWithTypeCastParensAndSeparateNullCase, [], [SynModuleOrNamespace ([MatchWithTypeCastParensAndSeparateNullCase], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Nullness/NullAnnotatedExpression.fs.bsl b/tests/service/data/SyntaxTree/Nullness/NullAnnotatedExpression.fs.bsl index 207a76250e4..a739143e2b4 100644 --- a/tests/service/data/SyntaxTree/Nullness/NullAnnotatedExpression.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/NullAnnotatedExpression.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/NullAnnotatedExpression.fs", false, - QualifiedNameOfFile NullAnnotatedExpression, [], [], + QualifiedNameOfFile NullAnnotatedExpression, [], [SynModuleOrNamespace ([NullAnnotatedExpression], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Nullness/RegressionAnnotatedInlinePatternMatch.fs.bsl b/tests/service/data/SyntaxTree/Nullness/RegressionAnnotatedInlinePatternMatch.fs.bsl index aaa2b2bafc3..f9a2416f122 100644 --- a/tests/service/data/SyntaxTree/Nullness/RegressionAnnotatedInlinePatternMatch.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/RegressionAnnotatedInlinePatternMatch.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/RegressionAnnotatedInlinePatternMatch.fs", false, - QualifiedNameOfFile RegressionAnnotatedInlinePatternMatch, [], [], + QualifiedNameOfFile RegressionAnnotatedInlinePatternMatch, [], [SynModuleOrNamespace ([RegressionAnnotatedInlinePatternMatch], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Nullness/RegressionChoiceType.fs.bsl b/tests/service/data/SyntaxTree/Nullness/RegressionChoiceType.fs.bsl index aa2b6752d76..2394eab8d93 100644 --- a/tests/service/data/SyntaxTree/Nullness/RegressionChoiceType.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/RegressionChoiceType.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/RegressionChoiceType.fs", false, - QualifiedNameOfFile RegressionChoiceType, [], [], + QualifiedNameOfFile RegressionChoiceType, [], [SynModuleOrNamespace ([RegressionChoiceType], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Nullness/RegressionListType.fs.bsl b/tests/service/data/SyntaxTree/Nullness/RegressionListType.fs.bsl index 5b1a914a438..39fcbd0a2cc 100644 --- a/tests/service/data/SyntaxTree/Nullness/RegressionListType.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/RegressionListType.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/RegressionListType.fs", false, - QualifiedNameOfFile RegressionListType, [], [], + QualifiedNameOfFile RegressionListType, [], [SynModuleOrNamespace ([RegressionListType], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Nullness/RegressionOneLinerOptionType.fs.bsl b/tests/service/data/SyntaxTree/Nullness/RegressionOneLinerOptionType.fs.bsl index 7a062070cb7..356e5f7b676 100644 --- a/tests/service/data/SyntaxTree/Nullness/RegressionOneLinerOptionType.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/RegressionOneLinerOptionType.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/RegressionOneLinerOptionType.fs", false, - QualifiedNameOfFile RegressionOneLinerOptionType, [], [], + QualifiedNameOfFile RegressionOneLinerOptionType, [], [SynModuleOrNamespace ([RegressionOneLinerOptionType], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Nullness/RegressionOptionType.fs.bsl b/tests/service/data/SyntaxTree/Nullness/RegressionOptionType.fs.bsl index 5491684ccaa..3ca156ee1d9 100644 --- a/tests/service/data/SyntaxTree/Nullness/RegressionOptionType.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/RegressionOptionType.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/RegressionOptionType.fs", false, - QualifiedNameOfFile RegressionOptionType, [], [], + QualifiedNameOfFile RegressionOptionType, [], [SynModuleOrNamespace ([RegressionOptionType], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Nullness/RegressionOrPattern.fs.bsl b/tests/service/data/SyntaxTree/Nullness/RegressionOrPattern.fs.bsl index 82fe5cb33d5..62d3701a2af 100644 --- a/tests/service/data/SyntaxTree/Nullness/RegressionOrPattern.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/RegressionOrPattern.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/RegressionOrPattern.fs", false, - QualifiedNameOfFile RegressionOrPattern, [], [], + QualifiedNameOfFile RegressionOrPattern, [], [SynModuleOrNamespace ([RegressionOrPattern], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Nullness/RegressionResultType.fs.bsl b/tests/service/data/SyntaxTree/Nullness/RegressionResultType.fs.bsl index c36213899e7..caa6326fb1b 100644 --- a/tests/service/data/SyntaxTree/Nullness/RegressionResultType.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/RegressionResultType.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/RegressionResultType.fs", false, - QualifiedNameOfFile RegressionResultType, [], [], + QualifiedNameOfFile RegressionResultType, [], [SynModuleOrNamespace ([RegressionResultType], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Nullness/SignatureInAbstractMember.fs.bsl b/tests/service/data/SyntaxTree/Nullness/SignatureInAbstractMember.fs.bsl index f1ba6080294..dd5c9ddbed8 100644 --- a/tests/service/data/SyntaxTree/Nullness/SignatureInAbstractMember.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/SignatureInAbstractMember.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/SignatureInAbstractMember.fs", false, - QualifiedNameOfFile SignatureInAbstractMember, [], [], + QualifiedNameOfFile SignatureInAbstractMember, [], [SynModuleOrNamespace ([SignatureInAbstractMember], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Nullness/StringOrNull.fs.bsl b/tests/service/data/SyntaxTree/Nullness/StringOrNull.fs.bsl index 4e8240dd5fb..2c13aae4b70 100644 --- a/tests/service/data/SyntaxTree/Nullness/StringOrNull.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/StringOrNull.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/StringOrNull.fs", false, QualifiedNameOfFile StringOrNull, - [], [], + [], [SynModuleOrNamespace ([StringOrNull], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Nullness/StringOrNullInFunctionArg.fs.bsl b/tests/service/data/SyntaxTree/Nullness/StringOrNullInFunctionArg.fs.bsl index 864e6e38365..80872046550 100644 --- a/tests/service/data/SyntaxTree/Nullness/StringOrNullInFunctionArg.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/StringOrNullInFunctionArg.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/StringOrNullInFunctionArg.fs", false, - QualifiedNameOfFile StringOrNullInFunctionArg, [], [], + QualifiedNameOfFile StringOrNullInFunctionArg, [], [SynModuleOrNamespace ([StringOrNullInFunctionArg], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Nullness/TypeAbbreviationAddingWithNull.fs.bsl b/tests/service/data/SyntaxTree/Nullness/TypeAbbreviationAddingWithNull.fs.bsl index 61d17ea291a..c81b5f343cc 100644 --- a/tests/service/data/SyntaxTree/Nullness/TypeAbbreviationAddingWithNull.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/TypeAbbreviationAddingWithNull.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/TypeAbbreviationAddingWithNull.fs", false, - QualifiedNameOfFile TypeAbbreviationAddingWithNull, [], [], + QualifiedNameOfFile TypeAbbreviationAddingWithNull, [], [SynModuleOrNamespace ([TypeAbbreviationAddingWithNull], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 01.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 01.fs.bsl index 43d64f45a98..cbc11003bb7 100644 --- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 01.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/ActivePatternAnd 01.fs", false, - QualifiedNameOfFile ActivePatternAnd 01, [], [], + QualifiedNameOfFile ActivePatternAnd 01, [], [SynModuleOrNamespace ([ActivePatternAnd 01], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 02.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 02.fs.bsl index 23ebdc7c8da..26c363d69bf 100644 --- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 02.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/ActivePatternAnd 02.fs", false, - QualifiedNameOfFile ActivePatternAnd 02, [], [], + QualifiedNameOfFile ActivePatternAnd 02, [], [SynModuleOrNamespace ([ActivePatternAnd 02], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 03.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 03.fs.bsl index f59e50d9403..90680cc0b71 100644 --- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 03.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/ActivePatternAnd 03.fs", false, - QualifiedNameOfFile ActivePatternAnd 03, [], [], + QualifiedNameOfFile ActivePatternAnd 03, [], [SynModuleOrNamespace ([ActivePatternAnd 03], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 04.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 04.fs.bsl index 37b343fad98..2b18069688a 100644 --- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 04.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/ActivePatternAnd 04.fs", false, - QualifiedNameOfFile ActivePatternAnd 04, [], [], + QualifiedNameOfFile ActivePatternAnd 04, [], [SynModuleOrNamespace ([ActivePatternAnd 04], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 05.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 05.fs.bsl index 062a413ccde..6fff959e01b 100644 --- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 05.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 05.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/ActivePatternAnd 05.fs", false, - QualifiedNameOfFile ActivePatternAnd 05, [], [], + QualifiedNameOfFile ActivePatternAnd 05, [], [SynModuleOrNamespace ([ActivePatternAnd 05], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 06.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 06.fs.bsl index 7c8649824d5..1a811b779e8 100644 --- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 06.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 06.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/ActivePatternAnd 06.fs", false, - QualifiedNameOfFile ActivePatternAnd 06, [], [], + QualifiedNameOfFile ActivePatternAnd 06, [], [SynModuleOrNamespace ([ActivePatternAnd 06], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 07.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 07.fs.bsl index 71db7cf842c..592c465c453 100644 --- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 07.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 07.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/ActivePatternAnd 07.fs", false, - QualifiedNameOfFile ActivePatternAnd 07, [], [], + QualifiedNameOfFile ActivePatternAnd 07, [], [SynModuleOrNamespace ([ActivePatternAnd 07], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 08.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 08.fs.bsl index c2c958503a8..2117ecaae3e 100644 --- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 08.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 08.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/ActivePatternAnd 08.fs", false, - QualifiedNameOfFile ActivePatternAnd 08, [], [], + QualifiedNameOfFile ActivePatternAnd 08, [], [SynModuleOrNamespace ([ActivePatternAnd 08], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternAsFunction.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternAsFunction.fs.bsl index 83e6005fd33..df31775ed4e 100644 --- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternAsFunction.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternAsFunction.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/ActivePatternAsFunction.fs", false, - QualifiedNameOfFile ActivePatternAsFunction, [], [], + QualifiedNameOfFile ActivePatternAsFunction, [], [SynModuleOrNamespace ([ActivePatternAsFunction], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternDefinition.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternDefinition.fs.bsl index 9741e505625..012655dcbe0 100644 --- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternDefinition.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternDefinition.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/ActivePatternDefinition.fs", false, - QualifiedNameOfFile ActivePatternDefinition, [], [], + QualifiedNameOfFile ActivePatternDefinition, [], [SynModuleOrNamespace ([ActivePatternDefinition], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 01.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 01.fs.bsl index f90393a139b..c97100e78ef 100644 --- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 01.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/ActivePatternExceptionAnd 01.fs", false, - QualifiedNameOfFile ActivePatternExceptionAnd 01, [], [], + QualifiedNameOfFile ActivePatternExceptionAnd 01, [], [SynModuleOrNamespace ([ActivePatternExceptionAnd 01], false, AnonModule, [Exception diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 02.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 02.fs.bsl index ad1420869f1..a6702952344 100644 --- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 02.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/ActivePatternExceptionAnd 02.fs", false, - QualifiedNameOfFile ActivePatternExceptionAnd 02, [], [], + QualifiedNameOfFile ActivePatternExceptionAnd 02, [], [SynModuleOrNamespace ([ActivePatternExceptionAnd 02], false, AnonModule, [Exception diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 03.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 03.fs.bsl index 1b4bdf7dfd9..74d522e8553 100644 --- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 03.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/ActivePatternExceptionAnd 03.fs", false, - QualifiedNameOfFile ActivePatternExceptionAnd 03, [], [], + QualifiedNameOfFile ActivePatternExceptionAnd 03, [], [SynModuleOrNamespace ([ActivePatternExceptionAnd 03], false, AnonModule, [Exception diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 04.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 04.fs.bsl index ea96f1966b4..54b831828ff 100644 --- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 04.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/ActivePatternExceptionAnd 04.fs", false, - QualifiedNameOfFile ActivePatternExceptionAnd 04, [], [], + QualifiedNameOfFile ActivePatternExceptionAnd 04, [], [SynModuleOrNamespace ([ActivePatternExceptionAnd 04], false, AnonModule, [Exception diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 05.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 05.fs.bsl index 2517eb3918d..4155388cf8d 100644 --- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 05.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 05.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/ActivePatternExceptionAnd 05.fs", false, - QualifiedNameOfFile ActivePatternExceptionAnd 05, [], [], + QualifiedNameOfFile ActivePatternExceptionAnd 05, [], [SynModuleOrNamespace ([ActivePatternExceptionAnd 05], false, AnonModule, [Exception diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 06.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 06.fs.bsl index 91e95536c83..5bdf4c59fb8 100644 --- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 06.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 06.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/ActivePatternExceptionAnd 06.fs", false, - QualifiedNameOfFile ActivePatternExceptionAnd 06, [], [], + QualifiedNameOfFile ActivePatternExceptionAnd 06, [], [SynModuleOrNamespace ([ActivePatternExceptionAnd 06], false, AnonModule, [Exception diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 07.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 07.fs.bsl index 35c7d986cf3..2341e1a1b7e 100644 --- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 07.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 07.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/ActivePatternExceptionAnd 07.fs", false, - QualifiedNameOfFile ActivePatternExceptionAnd 07, [], [], + QualifiedNameOfFile ActivePatternExceptionAnd 07, [], [SynModuleOrNamespace ([ActivePatternExceptionAnd 07], false, AnonModule, [Exception diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 08.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 08.fs.bsl index d61d4fa3ef0..0a32a6a2b80 100644 --- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 08.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 08.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/ActivePatternExceptionAnd 08.fs", false, - QualifiedNameOfFile ActivePatternExceptionAnd 08, [], [], + QualifiedNameOfFile ActivePatternExceptionAnd 08, [], [SynModuleOrNamespace ([ActivePatternExceptionAnd 08], false, AnonModule, [Exception diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternIdentifierInPrivateMember.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternIdentifierInPrivateMember.fs.bsl index a91a973e4e5..360bb27a52f 100644 --- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternIdentifierInPrivateMember.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternIdentifierInPrivateMember.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/ActivePatternIdentifierInPrivateMember.fs", false, - QualifiedNameOfFile ActivePatternIdentifierInPrivateMember, [], [], + QualifiedNameOfFile ActivePatternIdentifierInPrivateMember, [], [SynModuleOrNamespace ([ActivePatternIdentifierInPrivateMember], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/OperatorName/CustomOperatorDefinition.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/CustomOperatorDefinition.fs.bsl index 33ebeafb08c..88ecf1de842 100644 --- a/tests/service/data/SyntaxTree/OperatorName/CustomOperatorDefinition.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/CustomOperatorDefinition.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/CustomOperatorDefinition.fs", false, - QualifiedNameOfFile CustomOperatorDefinition, [], [], + QualifiedNameOfFile CustomOperatorDefinition, [], [SynModuleOrNamespace ([CustomOperatorDefinition], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/OperatorName/DetectDifferenceBetweenCompiledOperators.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/DetectDifferenceBetweenCompiledOperators.fs.bsl index 51389ae62c8..e44d429bd80 100644 --- a/tests/service/data/SyntaxTree/OperatorName/DetectDifferenceBetweenCompiledOperators.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/DetectDifferenceBetweenCompiledOperators.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/DetectDifferenceBetweenCompiledOperators.fs", false, - QualifiedNameOfFile DetectDifferenceBetweenCompiledOperators, [], [], + QualifiedNameOfFile DetectDifferenceBetweenCompiledOperators, [], [SynModuleOrNamespace ([DetectDifferenceBetweenCompiledOperators], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/OperatorName/InfixOperation.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/InfixOperation.fs.bsl index 20572a95193..19ec78e77a5 100644 --- a/tests/service/data/SyntaxTree/OperatorName/InfixOperation.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/InfixOperation.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/InfixOperation.fs", false, - QualifiedNameOfFile InfixOperation, [], [], + QualifiedNameOfFile InfixOperation, [], [SynModuleOrNamespace ([InfixOperation], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/OperatorName/NamedParameter.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/NamedParameter.fs.bsl index bc0bf9748b4..421436b43bb 100644 --- a/tests/service/data/SyntaxTree/OperatorName/NamedParameter.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/NamedParameter.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/NamedParameter.fs", false, - QualifiedNameOfFile NamedParameter, [], [], + QualifiedNameOfFile NamedParameter, [], [SynModuleOrNamespace ([NamedParameter], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/OperatorName/NameofOperator.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/NameofOperator.fs.bsl index 49f2b8a4332..a76f41f16cc 100644 --- a/tests/service/data/SyntaxTree/OperatorName/NameofOperator.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/NameofOperator.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/NameofOperator.fs", false, - QualifiedNameOfFile NameofOperator, [], [], + QualifiedNameOfFile NameofOperator, [], [SynModuleOrNamespace ([NameofOperator], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/OperatorName/ObjectModelWithTwoMembers.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ObjectModelWithTwoMembers.fs.bsl index 760c3f64ca3..5f7548cb360 100644 --- a/tests/service/data/SyntaxTree/OperatorName/ObjectModelWithTwoMembers.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/ObjectModelWithTwoMembers.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/ObjectModelWithTwoMembers.fs", false, - QualifiedNameOfFile ObjectModelWithTwoMembers, [], [], + QualifiedNameOfFile ObjectModelWithTwoMembers, [], [SynModuleOrNamespace ([ObjectModelWithTwoMembers], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/OperatorName/OperatorAsFunction.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/OperatorAsFunction.fs.bsl index a18485248e6..81238865b85 100644 --- a/tests/service/data/SyntaxTree/OperatorName/OperatorAsFunction.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/OperatorAsFunction.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/OperatorAsFunction.fs", false, - QualifiedNameOfFile OperatorAsFunction, [], [], + QualifiedNameOfFile OperatorAsFunction, [], [SynModuleOrNamespace ([OperatorAsFunction], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/OperatorName/OperatorInMemberDefinition.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/OperatorInMemberDefinition.fs.bsl index 4e05d9cbd83..d1e04d886b8 100644 --- a/tests/service/data/SyntaxTree/OperatorName/OperatorInMemberDefinition.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/OperatorInMemberDefinition.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/OperatorInMemberDefinition.fs", false, - QualifiedNameOfFile OperatorInMemberDefinition, [], [], + QualifiedNameOfFile OperatorInMemberDefinition, [], [SynModuleOrNamespace ([OperatorInMemberDefinition], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/OperatorName/OperatorNameInSynValSig.fsi.bsl b/tests/service/data/SyntaxTree/OperatorName/OperatorNameInSynValSig.fsi.bsl index b90adbf927e..259f60816de 100644 --- a/tests/service/data/SyntaxTree/OperatorName/OperatorNameInSynValSig.fsi.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/OperatorNameInSynValSig.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/OperatorName/OperatorNameInSynValSig.fsi", - QualifiedNameOfFile IntrinsicOperators, [], [], + QualifiedNameOfFile IntrinsicOperators, [], [SynModuleOrNamespaceSig ([IntrinsicOperators], false, NamedModule, [Val diff --git a/tests/service/data/SyntaxTree/OperatorName/OperatorNameInValConstraint.fsi.bsl b/tests/service/data/SyntaxTree/OperatorName/OperatorNameInValConstraint.fsi.bsl index d31043ea99c..c2af4e7f89b 100644 --- a/tests/service/data/SyntaxTree/OperatorName/OperatorNameInValConstraint.fsi.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/OperatorNameInValConstraint.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/OperatorName/OperatorNameInValConstraint.fsi", - QualifiedNameOfFile Operators, [], [], + QualifiedNameOfFile Operators, [], [SynModuleOrNamespaceSig ([Operators], false, NamedModule, [Val diff --git a/tests/service/data/SyntaxTree/OperatorName/OptionalExpression.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/OptionalExpression.fs.bsl index 2db0610b10d..0fb3fe398bd 100644 --- a/tests/service/data/SyntaxTree/OperatorName/OptionalExpression.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/OptionalExpression.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/OptionalExpression.fs", false, - QualifiedNameOfFile OptionalExpression, [], [], + QualifiedNameOfFile OptionalExpression, [], [SynModuleOrNamespace ([OptionalExpression], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternAsFunction.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternAsFunction.fs.bsl index 81d08cb1074..6ff91c33e3a 100644 --- a/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternAsFunction.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternAsFunction.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/PartialActivePatternAsFunction.fs", false, - QualifiedNameOfFile PartialActivePatternAsFunction, [], [], + QualifiedNameOfFile PartialActivePatternAsFunction, [], [SynModuleOrNamespace ([PartialActivePatternAsFunction], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinition.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinition.fs.bsl index 6b6c5b59524..c9c9acd625f 100644 --- a/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinition.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinition.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/PartialActivePatternDefinition.fs", false, - QualifiedNameOfFile PartialActivePatternDefinition, [], [], + QualifiedNameOfFile PartialActivePatternDefinition, [], [SynModuleOrNamespace ([PartialActivePatternDefinition], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinitionWithoutParameters.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinitionWithoutParameters.fs.bsl index be0b81e8577..7b269ec6cf6 100644 --- a/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinitionWithoutParameters.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinitionWithoutParameters.fs.bsl @@ -2,7 +2,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/PartialActivePatternDefinitionWithoutParameters.fs", false, QualifiedNameOfFile PartialActivePatternDefinitionWithoutParameters, - [], [], + [], [SynModuleOrNamespace ([PartialActivePatternDefinitionWithoutParameters], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/OperatorName/PrefixOperation.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/PrefixOperation.fs.bsl index 15193e63278..c07f18855fd 100644 --- a/tests/service/data/SyntaxTree/OperatorName/PrefixOperation.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/PrefixOperation.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/PrefixOperation.fs", false, - QualifiedNameOfFile PrefixOperation, [], [], + QualifiedNameOfFile PrefixOperation, [], [SynModuleOrNamespace ([PrefixOperation], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/OperatorName/PrefixOperationWithTwoCharacters.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/PrefixOperationWithTwoCharacters.fs.bsl index f73ff914587..d25ce9b329a 100644 --- a/tests/service/data/SyntaxTree/OperatorName/PrefixOperationWithTwoCharacters.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/PrefixOperationWithTwoCharacters.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/PrefixOperationWithTwoCharacters.fs", false, - QualifiedNameOfFile PrefixOperationWithTwoCharacters, [], [], + QualifiedNameOfFile PrefixOperationWithTwoCharacters, [], [SynModuleOrNamespace ([PrefixOperationWithTwoCharacters], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/OperatorName/QualifiedOperatorExpression.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/QualifiedOperatorExpression.fs.bsl index b83fc4ecf68..9925af284c5 100644 --- a/tests/service/data/SyntaxTree/OperatorName/QualifiedOperatorExpression.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/QualifiedOperatorExpression.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/QualifiedOperatorExpression.fs", false, - QualifiedNameOfFile QualifiedOperatorExpression, [], [], + QualifiedNameOfFile QualifiedOperatorExpression, [], [SynModuleOrNamespace ([QualifiedOperatorExpression], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/ParsedHashDirective/RegularStringAsParsedHashDirectiveArgument.fs.bsl b/tests/service/data/SyntaxTree/ParsedHashDirective/RegularStringAsParsedHashDirectiveArgument.fs.bsl index 360f4117e4b..8bac0d35794 100644 --- a/tests/service/data/SyntaxTree/ParsedHashDirective/RegularStringAsParsedHashDirectiveArgument.fs.bsl +++ b/tests/service/data/SyntaxTree/ParsedHashDirective/RegularStringAsParsedHashDirectiveArgument.fs.bsl @@ -2,7 +2,6 @@ ImplFile (ParsedImplFileInput ("/root/ParsedHashDirective/RegularStringAsParsedHashDirectiveArgument.fs", false, QualifiedNameOfFile RegularStringAsParsedHashDirectiveArgument, [], - [], [SynModuleOrNamespace ([RegularStringAsParsedHashDirectiveArgument], false, AnonModule, [HashDirective diff --git a/tests/service/data/SyntaxTree/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs.bsl b/tests/service/data/SyntaxTree/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs.bsl index 8434a2be591..ef095020b9a 100644 --- a/tests/service/data/SyntaxTree/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs.bsl +++ b/tests/service/data/SyntaxTree/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs.bsl @@ -2,7 +2,7 @@ ImplFile (ParsedImplFileInput ("/root/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs", false, QualifiedNameOfFile SourceIdentifierAsParsedHashDirectiveArgument, - [], [], + [], [SynModuleOrNamespace ([SourceIdentifierAsParsedHashDirectiveArgument], false, AnonModule, [HashDirective diff --git a/tests/service/data/SyntaxTree/ParsedHashDirective/TripleQuoteStringAsParsedHashDirectiveArgument.fs.bsl b/tests/service/data/SyntaxTree/ParsedHashDirective/TripleQuoteStringAsParsedHashDirectiveArgument.fs.bsl index 391a462d0b8..7450b5cc375 100644 --- a/tests/service/data/SyntaxTree/ParsedHashDirective/TripleQuoteStringAsParsedHashDirectiveArgument.fs.bsl +++ b/tests/service/data/SyntaxTree/ParsedHashDirective/TripleQuoteStringAsParsedHashDirectiveArgument.fs.bsl @@ -2,13 +2,9 @@ ImplFile (ParsedImplFileInput ("/root/ParsedHashDirective/TripleQuoteStringAsParsedHashDirectiveArgument.fs", false, QualifiedNameOfFile TripleQuoteStringAsParsedHashDirectiveArgument, - [WarningOff ((2,0--2,16), 40)], [], + [], [SynModuleOrNamespace ([TripleQuoteStringAsParsedHashDirectiveArgument], false, AnonModule, - [HashDirective - (ParsedHashDirective - ("nowarn", [String ("40", TripleQuote, (2,8--2,16))], - (2,0--2,16)), (2,0--2,16))], PreXmlDocEmpty, [], None, - (2,0--2,16), { LeadingKeyword = None })], (true, true), - { ConditionalDirectives = [] - CodeComments = [] }, set [])) + [], PreXmlDocEmpty, [], None, (3,0--3,0), { LeadingKeyword = None })], + (true, true), { ConditionalDirectives = [] + CodeComments = [] }, set [])) diff --git a/tests/service/data/SyntaxTree/ParsedHashDirective/VerbatimStringAsParsedHashDirectiveArgument.fs.bsl b/tests/service/data/SyntaxTree/ParsedHashDirective/VerbatimStringAsParsedHashDirectiveArgument.fs.bsl index 2dbceeacd80..e80cc800e59 100644 --- a/tests/service/data/SyntaxTree/ParsedHashDirective/VerbatimStringAsParsedHashDirectiveArgument.fs.bsl +++ b/tests/service/data/SyntaxTree/ParsedHashDirective/VerbatimStringAsParsedHashDirectiveArgument.fs.bsl @@ -2,7 +2,6 @@ ImplFile (ParsedImplFileInput ("/root/ParsedHashDirective/VerbatimStringAsParsedHashDirectiveArgument.fs", false, QualifiedNameOfFile VerbatimStringAsParsedHashDirectiveArgument, [], - [], [SynModuleOrNamespace ([VerbatimStringAsParsedHashDirectiveArgument], false, AnonModule, [HashDirective diff --git a/tests/service/data/SyntaxTree/Pattern/And 01.fs.bsl b/tests/service/data/SyntaxTree/Pattern/And 01.fs.bsl index 679d264dfcc..1a6fd9254e9 100644 --- a/tests/service/data/SyntaxTree/Pattern/And 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/And 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/And 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/And 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/And 02.fs.bsl b/tests/service/data/SyntaxTree/Pattern/And 02.fs.bsl index f533ba83b0a..d07733cd127 100644 --- a/tests/service/data/SyntaxTree/Pattern/And 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/And 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/And 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/And 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/And 03.fs.bsl b/tests/service/data/SyntaxTree/Pattern/And 03.fs.bsl index b75921e2808..0204ba0921c 100644 --- a/tests/service/data/SyntaxTree/Pattern/And 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/And 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/And 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/And 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/And 04.fs.bsl b/tests/service/data/SyntaxTree/Pattern/And 04.fs.bsl index 7a0fa1f4c89..864712ff84b 100644 --- a/tests/service/data/SyntaxTree/Pattern/And 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/And 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/And 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/And 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/As 01.fs.bsl b/tests/service/data/SyntaxTree/Pattern/As 01.fs.bsl index f0277e7a075..fe2af8673fb 100644 --- a/tests/service/data/SyntaxTree/Pattern/As 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/As 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/As 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/As 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/As 02.fs.bsl b/tests/service/data/SyntaxTree/Pattern/As 02.fs.bsl index dc9ff5caae9..e4ebd19812a 100644 --- a/tests/service/data/SyntaxTree/Pattern/As 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/As 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/As 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/As 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/As 03.fs.bsl b/tests/service/data/SyntaxTree/Pattern/As 03.fs.bsl index 87eeb9e821a..8e8fe561927 100644 --- a/tests/service/data/SyntaxTree/Pattern/As 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/As 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/As 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/As 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/As 04.fs.bsl b/tests/service/data/SyntaxTree/Pattern/As 04.fs.bsl index dbbdbdd9f3e..6497c92f1ad 100644 --- a/tests/service/data/SyntaxTree/Pattern/As 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/As 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/As 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/As 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/As 05.fs.bsl b/tests/service/data/SyntaxTree/Pattern/As 05.fs.bsl index 07a1aac463e..2f77f51b6e2 100644 --- a/tests/service/data/SyntaxTree/Pattern/As 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/As 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/As 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/As 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/As 06.fs.bsl b/tests/service/data/SyntaxTree/Pattern/As 06.fs.bsl index 5ce6e55db4d..dad977042ab 100644 --- a/tests/service/data/SyntaxTree/Pattern/As 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/As 06.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/As 06.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/As 06.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/As 07.fs.bsl b/tests/service/data/SyntaxTree/Pattern/As 07.fs.bsl index b462b81d90b..7dd91055a37 100644 --- a/tests/service/data/SyntaxTree/Pattern/As 07.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/As 07.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/As 07.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/As 07.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/As 08.fs.bsl b/tests/service/data/SyntaxTree/Pattern/As 08.fs.bsl index bfe069db512..547bce231b7 100644 --- a/tests/service/data/SyntaxTree/Pattern/As 08.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/As 08.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/As 08.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/As 08.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/As 09.fs.bsl b/tests/service/data/SyntaxTree/Pattern/As 09.fs.bsl index ad9aa2247c1..35407e85c8d 100644 --- a/tests/service/data/SyntaxTree/Pattern/As 09.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/As 09.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/As 09.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/As 09.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/As 10.fs.bsl b/tests/service/data/SyntaxTree/Pattern/As 10.fs.bsl index 384bd2c6d06..f5dfb760f5e 100644 --- a/tests/service/data/SyntaxTree/Pattern/As 10.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/As 10.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/As 10.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/As 10.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/As 11.fs.bsl b/tests/service/data/SyntaxTree/Pattern/As 11.fs.bsl index 84773ba8ee6..5b2d5f457b5 100644 --- a/tests/service/data/SyntaxTree/Pattern/As 11.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/As 11.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/As 11.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/As 11.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/As 12.fs.bsl b/tests/service/data/SyntaxTree/Pattern/As 12.fs.bsl index f77b92aba46..bfef9de7176 100644 --- a/tests/service/data/SyntaxTree/Pattern/As 12.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/As 12.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/As 12.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/As 12.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Cons 01.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Cons 01.fs.bsl index c48f71c8ab2..ee3ab440e79 100644 --- a/tests/service/data/SyntaxTree/Pattern/Cons 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Cons 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/Cons 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/Cons 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Cons 02.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Cons 02.fs.bsl index a88741e666c..a47e7dac324 100644 --- a/tests/service/data/SyntaxTree/Pattern/Cons 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Cons 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/Cons 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/Cons 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Cons 03.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Cons 03.fs.bsl index fda13199e97..e269339f89e 100644 --- a/tests/service/data/SyntaxTree/Pattern/Cons 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Cons 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/Cons 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/Cons 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Cons 04.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Cons 04.fs.bsl index 90d727b5f30..7edb3d119ae 100644 --- a/tests/service/data/SyntaxTree/Pattern/Cons 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Cons 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/Cons 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/Cons 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/InHeadPattern.fs.bsl b/tests/service/data/SyntaxTree/Pattern/InHeadPattern.fs.bsl index 13a1e99ea00..8189cb8f290 100644 --- a/tests/service/data/SyntaxTree/Pattern/InHeadPattern.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/InHeadPattern.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/InHeadPattern.fs", false, QualifiedNameOfFile InHeadPattern, - [], [], + [], [SynModuleOrNamespace ([InHeadPattern], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/IsInst 01.fs.bsl b/tests/service/data/SyntaxTree/Pattern/IsInst 01.fs.bsl index 3b690e54512..deb80c5f4d8 100644 --- a/tests/service/data/SyntaxTree/Pattern/IsInst 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/IsInst 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/IsInst 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/IsInst 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/IsInst 02.fs.bsl b/tests/service/data/SyntaxTree/Pattern/IsInst 02.fs.bsl index dd1e86fabe4..18b4bd7f75d 100644 --- a/tests/service/data/SyntaxTree/Pattern/IsInst 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/IsInst 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/IsInst 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/IsInst 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/IsInst 03.fs.bsl b/tests/service/data/SyntaxTree/Pattern/IsInst 03.fs.bsl index 320a8c97f75..3772fa64f68 100644 --- a/tests/service/data/SyntaxTree/Pattern/IsInst 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/IsInst 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/IsInst 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/IsInst 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/IsInst 04.fs.bsl b/tests/service/data/SyntaxTree/Pattern/IsInst 04.fs.bsl index 1cf58c17dbc..1035177f690 100644 --- a/tests/service/data/SyntaxTree/Pattern/IsInst 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/IsInst 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/IsInst 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/IsInst 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/IsInst 05.fs.bsl b/tests/service/data/SyntaxTree/Pattern/IsInst 05.fs.bsl index 136e844c2ef..65f3afa33b8 100644 --- a/tests/service/data/SyntaxTree/Pattern/IsInst 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/IsInst 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/IsInst 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/IsInst 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Named field 01.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Named field 01.fs.bsl index 4a3050eb9f9..041d7aab3d3 100644 --- a/tests/service/data/SyntaxTree/Pattern/Named field 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Named field 01.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Named field 01.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Named field 02.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Named field 02.fs.bsl index b7bfc84c6d6..cd398f6c9b2 100644 --- a/tests/service/data/SyntaxTree/Pattern/Named field 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Named field 02.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Named field 02.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Named field 03.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Named field 03.fs.bsl index 0740dee26d8..7ae43154a9c 100644 --- a/tests/service/data/SyntaxTree/Pattern/Named field 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Named field 03.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Named field 03.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Named field 04.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Named field 04.fs.bsl index 33a958c138e..d0412f69e42 100644 --- a/tests/service/data/SyntaxTree/Pattern/Named field 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Named field 04.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Named field 04.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Named field 05.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Named field 05.fs.bsl index 969fb6c2b32..6969994de57 100644 --- a/tests/service/data/SyntaxTree/Pattern/Named field 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Named field 05.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Named field 05.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/OperatorInMatchPattern.fs.bsl b/tests/service/data/SyntaxTree/Pattern/OperatorInMatchPattern.fs.bsl index d9f4fc99fd0..4c6ba4479ce 100644 --- a/tests/service/data/SyntaxTree/Pattern/OperatorInMatchPattern.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/OperatorInMatchPattern.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/OperatorInMatchPattern.fs", false, - QualifiedNameOfFile OperatorInMatchPattern, [], [], + QualifiedNameOfFile OperatorInMatchPattern, [], [SynModuleOrNamespace ([OperatorInMatchPattern], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/OperatorInSynPatLongIdent.fs.bsl b/tests/service/data/SyntaxTree/Pattern/OperatorInSynPatLongIdent.fs.bsl index 90a60008ec8..b9c2a518bf3 100644 --- a/tests/service/data/SyntaxTree/Pattern/OperatorInSynPatLongIdent.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/OperatorInSynPatLongIdent.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/OperatorInSynPatLongIdent.fs", false, - QualifiedNameOfFile OperatorInSynPatLongIdent, [], [], + QualifiedNameOfFile OperatorInSynPatLongIdent, [], [SynModuleOrNamespace ([OperatorInSynPatLongIdent], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs.bsl b/tests/service/data/SyntaxTree/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs.bsl index e260f077c31..44ecd079413 100644 --- a/tests/service/data/SyntaxTree/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs", false, - QualifiedNameOfFile ParenthesesOfSynArgPatsNamePatPairs, [], [], + QualifiedNameOfFile ParenthesesOfSynArgPatsNamePatPairs, [], [SynModuleOrNamespace ([ParenthesesOfSynArgPatsNamePatPairs], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Record 01.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Record 01.fs.bsl index 9feca15fc45..0e25143cd03 100644 --- a/tests/service/data/SyntaxTree/Pattern/Record 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Record 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/Record 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/Record 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Record 02.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Record 02.fs.bsl index 57d597dab55..74b2d16784a 100644 --- a/tests/service/data/SyntaxTree/Pattern/Record 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Record 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/Record 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/Record 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Record 03.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Record 03.fs.bsl index 6ce17ab990c..f3901c89570 100644 --- a/tests/service/data/SyntaxTree/Pattern/Record 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Record 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/Record 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/Record 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Record 04.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Record 04.fs.bsl index e96ed95a57c..9fd5fc5ddbd 100644 --- a/tests/service/data/SyntaxTree/Pattern/Record 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Record 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/Record 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/Record 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Record 05.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Record 05.fs.bsl index ef0a9a11727..7b5cdc38484 100644 --- a/tests/service/data/SyntaxTree/Pattern/Record 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Record 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/Record 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/Record 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Record 06.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Record 06.fs.bsl index 7781aa39c9b..5d326421074 100644 --- a/tests/service/data/SyntaxTree/Pattern/Record 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Record 06.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/Record 06.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/Record 06.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/Pattern/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs.bsl index 61afba6c7a8..ae47f650909 100644 --- a/tests/service/data/SyntaxTree/Pattern/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Pattern/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs", false, QualifiedNameOfFile SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign, - [], [], + [], [SynModuleOrNamespace ([SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Pattern/SynPatOrContainsTheRangeOfTheBar.fs.bsl b/tests/service/data/SyntaxTree/Pattern/SynPatOrContainsTheRangeOfTheBar.fs.bsl index 61046ffea4e..8085e22a55b 100644 --- a/tests/service/data/SyntaxTree/Pattern/SynPatOrContainsTheRangeOfTheBar.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/SynPatOrContainsTheRangeOfTheBar.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/SynPatOrContainsTheRangeOfTheBar.fs", false, - QualifiedNameOfFile SynPatOrContainsTheRangeOfTheBar, [], [], + QualifiedNameOfFile SynPatOrContainsTheRangeOfTheBar, [], [SynModuleOrNamespace ([SynPatOrContainsTheRangeOfTheBar], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Tuple - HeadPat 01.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Tuple - HeadPat 01.fs.bsl index a81579964af..1873238bf24 100644 --- a/tests/service/data/SyntaxTree/Pattern/Tuple - HeadPat 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Tuple - HeadPat 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Tuple - HeadPat 01.fs", false, QualifiedNameOfFile Tuple, - [], [], + [], [SynModuleOrNamespace ([Tuple], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/Tuple - HeadPat 02.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Tuple - HeadPat 02.fs.bsl index 61bc7ef99b7..3b6f36dae28 100644 --- a/tests/service/data/SyntaxTree/Pattern/Tuple - HeadPat 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Tuple - HeadPat 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Tuple - HeadPat 02.fs", false, QualifiedNameOfFile Tuple, - [], [], + [], [SynModuleOrNamespace ([Tuple], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 01.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 01.fs.bsl index ed30e1a4690..7ec5d9c8b32 100644 --- a/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Tuple - Recover 01.fs", false, QualifiedNameOfFile Tuple, - [], [], + [], [SynModuleOrNamespace ([Tuple], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 02.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 02.fs.bsl index 5a07aa0debc..a9bd2fdef0a 100644 --- a/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Tuple - Recover 02.fs", false, QualifiedNameOfFile Tuple, - [], [], + [], [SynModuleOrNamespace ([Tuple], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 03.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 03.fs.bsl index ada6c9b8de0..eb7da283a86 100644 --- a/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Tuple - Recover 03.fs", false, QualifiedNameOfFile Tuple, - [], [], + [], [SynModuleOrNamespace ([Tuple], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 04.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 04.fs.bsl index 98ed45e9cfd..6b98966b6bf 100644 --- a/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Tuple - Recover 04.fs", false, QualifiedNameOfFile Tuple, - [], [], + [], [SynModuleOrNamespace ([Tuple], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/Tuple - Struct 01.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Tuple - Struct 01.fs.bsl index 0b605142320..3d79c343825 100644 --- a/tests/service/data/SyntaxTree/Pattern/Tuple - Struct 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Tuple - Struct 01.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Tuple - Struct 01.fs", false, QualifiedNameOfFile Tuple, [], - [], [SynModuleOrNamespace ([Tuple], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 01.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 01.fs.bsl index 39999d8f69c..0bc93fdd063 100644 --- a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Typed - Missing type 01.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 02.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 02.fs.bsl index b5b4b6e28e2..207de5569ea 100644 --- a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Typed - Missing type 02.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 03.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 03.fs.bsl index 609bc09a6fe..a18c86356f0 100644 --- a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Typed - Missing type 03.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 04.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 04.fs.bsl index 6ac283f7a93..0252822b055 100644 --- a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Typed - Missing type 04.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 05.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 05.fs.bsl index 54749497087..7816c5b5ced 100644 --- a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 05.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Typed - Missing type 05.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 06.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 06.fs.bsl index 55a07b60288..00fa285df54 100644 --- a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 06.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Typed - Missing type 06.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 07.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 07.fs.bsl index c96b5fc8d5e..e8d8865d65d 100644 --- a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 07.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 07.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Typed - Missing type 07.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 08.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 08.fs.bsl index 394f1e21eac..5c351f3dd30 100644 --- a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 08.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 08.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Typed - Missing type 08.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 09.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 09.fs.bsl index 89a4af5ce5c..0192145c5d1 100644 --- a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 09.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 09.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Typed - Missing type 09.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 10.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 10.fs.bsl index f3fa83db96a..77af407dfcc 100644 --- a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 10.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 10.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Typed - Missing type 10.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 11.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 11.fs.bsl index e89431a48e0..2fad3aceb3e 100644 --- a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 11.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 11.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Typed - Missing type 11.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 12.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 12.fs.bsl index 97ad7191e25..f016150d2de 100644 --- a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 12.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 12.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Typed - Missing type 12.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SignatureType/EqualsTokenIsPresentInSynValSigMember.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/EqualsTokenIsPresentInSynValSigMember.fsi.bsl index ab9078c270c..797a3c95b65 100644 --- a/tests/service/data/SyntaxTree/SignatureType/EqualsTokenIsPresentInSynValSigMember.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/EqualsTokenIsPresentInSynValSigMember.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/SignatureType/EqualsTokenIsPresentInSynValSigMember.fsi", - QualifiedNameOfFile Meh, [], [], + QualifiedNameOfFile Meh, [], [SynModuleOrNamespaceSig ([Meh], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/SignatureType/EqualsTokenIsPresentInSynValSigValue.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/EqualsTokenIsPresentInSynValSigValue.fsi.bsl index c63121096fa..805a083f8a4 100644 --- a/tests/service/data/SyntaxTree/SignatureType/EqualsTokenIsPresentInSynValSigValue.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/EqualsTokenIsPresentInSynValSigValue.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/SignatureType/EqualsTokenIsPresentInSynValSigValue.fsi", - QualifiedNameOfFile Meh, [], [], + QualifiedNameOfFile Meh, [], [SynModuleOrNamespaceSig ([Meh], false, NamedModule, [Val diff --git a/tests/service/data/SyntaxTree/SignatureType/LeadingKeywordInRecursiveTypes.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/LeadingKeywordInRecursiveTypes.fsi.bsl index 8a2cf2cb845..15ca7c4fd96 100644 --- a/tests/service/data/SyntaxTree/SignatureType/LeadingKeywordInRecursiveTypes.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/LeadingKeywordInRecursiveTypes.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/SignatureType/LeadingKeywordInRecursiveTypes.fsi", - QualifiedNameOfFile LeadingKeywordInRecursiveTypes, [], [], + QualifiedNameOfFile LeadingKeywordInRecursiveTypes, [], [SynModuleOrNamespaceSig ([LeadingKeywordInRecursiveTypes], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/SignatureType/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi.bsl index 493d3b104ad..898d6e3fc36 100644 --- a/tests/service/data/SyntaxTree/SignatureType/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi.bsl @@ -3,7 +3,6 @@ SigFile ("/root/SignatureType/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi", QualifiedNameOfFile MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword, [], - [], [SynModuleOrNamespaceSig ([X], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/SignatureType/NestedTypeHasStaticTypeAsLeadingKeyword.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/NestedTypeHasStaticTypeAsLeadingKeyword.fsi.bsl index 1c3c8bc8d23..13ccfe80ac8 100644 --- a/tests/service/data/SyntaxTree/SignatureType/NestedTypeHasStaticTypeAsLeadingKeyword.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/NestedTypeHasStaticTypeAsLeadingKeyword.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/SignatureType/NestedTypeHasStaticTypeAsLeadingKeyword.fsi", - QualifiedNameOfFile NestedTypeHasStaticTypeAsLeadingKeyword, [], [], + QualifiedNameOfFile NestedTypeHasStaticTypeAsLeadingKeyword, [], [SynModuleOrNamespaceSig ([NestedTypeHasStaticTypeAsLeadingKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi.bsl index e92edcc8113..bc2173a5ce1 100644 --- a/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/SignatureType/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi", - QualifiedNameOfFile FSharp.Compiler.ParseHelpers, [], [], + QualifiedNameOfFile FSharp.Compiler.ParseHelpers, [], [SynModuleOrNamespaceSig ([FSharp; Compiler; ParseHelpers], false, NamedModule, [Exception diff --git a/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi.bsl index 0e7eac31934..5c0b55e4196 100644 --- a/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi.bsl @@ -2,7 +2,6 @@ SigFile (ParsedSigFileInput ("/root/SignatureType/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi", QualifiedNameOfFile RangeOfAttributeShouldBeIncludedInSynTypeDefnSig, [], - [], [SynModuleOrNamespaceSig ([SomeNamespace], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi.bsl index 920c9e5a472..a92285dbf01 100644 --- a/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi.bsl @@ -2,7 +2,7 @@ SigFile (ParsedSigFileInput ("/root/SignatureType/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi", QualifiedNameOfFile RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember, - [], [], + [], [SynModuleOrNamespaceSig ([SomeNamespace], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi.bsl index 9788067cd7c..68801c9da9f 100644 --- a/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi.bsl @@ -2,7 +2,6 @@ SigFile (ParsedSigFileInput ("/root/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi", QualifiedNameOfFile RangeOfAttributesShouldBeIncludedInRecursiveTypes, [], - [], [SynModuleOrNamespaceSig ([SomeNamespace], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/SignatureType/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi.bsl index 7025f3aadc2..7e605fe4b2b 100644 --- a/tests/service/data/SyntaxTree/SignatureType/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/SignatureType/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi", - QualifiedNameOfFile FSharp.Compiler.ParseHelpers, [], [], + QualifiedNameOfFile FSharp.Compiler.ParseHelpers, [], [SynModuleOrNamespaceSig ([FSharp; Compiler; ParseHelpers], false, NamedModule, [Exception diff --git a/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi.bsl index 0dcb3eb2e73..2e5b28ee770 100644 --- a/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi.bsl @@ -2,7 +2,6 @@ SigFile (ParsedSigFileInput ("/root/SignatureType/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi", QualifiedNameOfFile RangeOfSynTypeDefnSigDelegateOfShouldStartFromName, [], - [], [SynModuleOrNamespaceSig ([Y], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi.bsl index 4ed17f26304..9e922714079 100644 --- a/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi.bsl @@ -2,7 +2,7 @@ SigFile (ParsedSigFileInput ("/root/SignatureType/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi", QualifiedNameOfFile RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember, - [], [], + [], [SynModuleOrNamespaceSig ([X], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi.bsl index 553c900522d..7fff1b42d63 100644 --- a/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi.bsl @@ -2,7 +2,6 @@ SigFile (ParsedSigFileInput ("/root/SignatureType/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi", QualifiedNameOfFile RangeOfSynTypeDefnSigRecordShouldEndAtLastMember, [], - [], [SynModuleOrNamespaceSig ([X], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi.bsl index 7829833143a..b46577c1a7d 100644 --- a/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/SignatureType/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi", - QualifiedNameOfFile RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal, [], [], + QualifiedNameOfFile RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal, [], [SynModuleOrNamespaceSig ([Z], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/SignatureType/RangeOfTypeShouldEndAtEndKeyword.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/RangeOfTypeShouldEndAtEndKeyword.fsi.bsl index ebb3921ac38..00725a41983 100644 --- a/tests/service/data/SyntaxTree/SignatureType/RangeOfTypeShouldEndAtEndKeyword.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/RangeOfTypeShouldEndAtEndKeyword.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/SignatureType/RangeOfTypeShouldEndAtEndKeyword.fsi", - QualifiedNameOfFile RangeOfTypeShouldEndAtEndKeyword, [], [], + QualifiedNameOfFile RangeOfTypeShouldEndAtEndKeyword, [], [SynModuleOrNamespaceSig ([GreatProjectThing], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/SignatureType/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl index ef541678686..96a8f67c5cb 100644 --- a/tests/service/data/SyntaxTree/SignatureType/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl @@ -2,7 +2,7 @@ SigFile (ParsedSigFileInput ("/root/SignatureType/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi", QualifiedNameOfFile SynExceptionSigShouldContainsTheRangeOfTheWithKeyword, - [], [], + [], [SynModuleOrNamespaceSig ([X], false, DeclaredNamespace, [Exception diff --git a/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi.bsl index ab21d9a361f..097b01263fd 100644 --- a/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi.bsl @@ -2,7 +2,7 @@ SigFile (ParsedSigFileInput ("/root/SignatureType/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi", QualifiedNameOfFile SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign, - [], [], + [], [SynModuleOrNamespaceSig ([SomeNamespace], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi.bsl index d512ca1ef68..dd52d87a9be 100644 --- a/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi.bsl @@ -3,7 +3,6 @@ SigFile ("/root/SignatureType/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi", QualifiedNameOfFile SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign, [], - [], [SynModuleOrNamespaceSig ([SomeNamespace], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi.bsl index 25b5feb9ae6..75cb679757f 100644 --- a/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi.bsl @@ -3,7 +3,6 @@ SigFile ("/root/SignatureType/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi", QualifiedNameOfFile SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign, [], - [], [SynModuleOrNamespaceSig ([Foo], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi.bsl index bfc76db57f5..f6e53376828 100644 --- a/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi.bsl @@ -2,7 +2,7 @@ SigFile (ParsedSigFileInput ("/root/SignatureType/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi", QualifiedNameOfFile SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign, - [], [], + [], [SynModuleOrNamespaceSig ([SomeNamespace], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/SignatureType/SynValSigContainsParameterNames.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/SynValSigContainsParameterNames.fsi.bsl index edb06fea795..32972c86082 100644 --- a/tests/service/data/SyntaxTree/SignatureType/SynValSigContainsParameterNames.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/SynValSigContainsParameterNames.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/SignatureType/SynValSigContainsParameterNames.fsi", - QualifiedNameOfFile Meh, [], [], + QualifiedNameOfFile Meh, [], [SynModuleOrNamespaceSig ([Meh], false, NamedModule, [Val diff --git a/tests/service/data/SyntaxTree/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi.bsl index 53962cae2b9..021232ddd47 100644 --- a/tests/service/data/SyntaxTree/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi", - QualifiedNameOfFile Meh, [], [], + QualifiedNameOfFile Meh, [], [SynModuleOrNamespaceSig ([Meh], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/SignatureType/ValKeywordIsPresentInSynValSig.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/ValKeywordIsPresentInSynValSig.fsi.bsl index 599315bef28..679fdc5c241 100644 --- a/tests/service/data/SyntaxTree/SignatureType/ValKeywordIsPresentInSynValSig.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/ValKeywordIsPresentInSynValSig.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/SignatureType/ValKeywordIsPresentInSynValSig.fsi", - QualifiedNameOfFile Meh, [], [], + QualifiedNameOfFile Meh, [], [SynModuleOrNamespaceSig ([Meh], false, NamedModule, [Val diff --git a/tests/service/data/SyntaxTree/SignatureType/With 01.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/With 01.fsi.bsl index f6ef4571fd9..dda970bf730 100644 --- a/tests/service/data/SyntaxTree/SignatureType/With 01.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/With 01.fsi.bsl @@ -1,6 +1,6 @@ SigFile (ParsedSigFileInput - ("/root/SignatureType/With 01.fsi", QualifiedNameOfFile With 01, [], [], + ("/root/SignatureType/With 01.fsi", QualifiedNameOfFile With 01, [], [SynModuleOrNamespaceSig ([X], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/SimplePats/SimplePats - Recover 01.fs.bsl b/tests/service/data/SyntaxTree/SimplePats/SimplePats - Recover 01.fs.bsl index 9f74ed36236..33db66f5639 100644 --- a/tests/service/data/SyntaxTree/SimplePats/SimplePats - Recover 01.fs.bsl +++ b/tests/service/data/SyntaxTree/SimplePats/SimplePats - Recover 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SimplePats/SimplePats - Recover 01.fs", false, - QualifiedNameOfFile SimplePats, [], [], + QualifiedNameOfFile SimplePats, [], [SynModuleOrNamespace ([SimplePats], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/SimplePats/SimplePats 01.fs.bsl b/tests/service/data/SyntaxTree/SimplePats/SimplePats 01.fs.bsl index 512fa280b98..4cb7a28362c 100644 --- a/tests/service/data/SyntaxTree/SimplePats/SimplePats 01.fs.bsl +++ b/tests/service/data/SyntaxTree/SimplePats/SimplePats 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SimplePats/SimplePats 01.fs", false, QualifiedNameOfFile SimplePats, - [], [], + [], [SynModuleOrNamespace ([SimplePats], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/SimplePats/SimplePats 02.fs.bsl b/tests/service/data/SyntaxTree/SimplePats/SimplePats 02.fs.bsl index fc92f2e4767..259efdf7dff 100644 --- a/tests/service/data/SyntaxTree/SimplePats/SimplePats 02.fs.bsl +++ b/tests/service/data/SyntaxTree/SimplePats/SimplePats 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SimplePats/SimplePats 02.fs", false, QualifiedNameOfFile SimplePats, - [], [], + [], [SynModuleOrNamespace ([SimplePats], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/SourceIdentifier/_LINE_.fs.bsl b/tests/service/data/SyntaxTree/SourceIdentifier/_LINE_.fs.bsl index 2ac2c71f433..e6e7cc7b985 100644 --- a/tests/service/data/SyntaxTree/SourceIdentifier/_LINE_.fs.bsl +++ b/tests/service/data/SyntaxTree/SourceIdentifier/_LINE_.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/SourceIdentifier/_LINE_.fs", false, QualifiedNameOfFile _LINE_, [], - [], [SynModuleOrNamespace ([_LINE_], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEDIRECTORY_.fs.bsl b/tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEDIRECTORY_.fs.bsl index cc7fb97f4fa..953660aaeb7 100644 --- a/tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEDIRECTORY_.fs.bsl +++ b/tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEDIRECTORY_.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SourceIdentifier/_SOURCEDIRECTORY_.fs", false, - QualifiedNameOfFile _SOURCEDIRECTORY_, [], [], + QualifiedNameOfFile _SOURCEDIRECTORY_, [], [SynModuleOrNamespace ([_SOURCEDIRECTORY_], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEFILE_.fs.bsl b/tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEFILE_.fs.bsl index abf6b7aca84..3badb607f3c 100644 --- a/tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEFILE_.fs.bsl +++ b/tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEFILE_.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SourceIdentifier/_SOURCEFILE_.fs", false, - QualifiedNameOfFile _SOURCEFILE_, [], [], + QualifiedNameOfFile _SOURCEFILE_, [], [SynModuleOrNamespace ([_SOURCEFILE_], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/String/InterpolatedStringOffsideInModule.fs.bsl b/tests/service/data/SyntaxTree/String/InterpolatedStringOffsideInModule.fs.bsl index 7e6563219a6..cd5f88470cc 100644 --- a/tests/service/data/SyntaxTree/String/InterpolatedStringOffsideInModule.fs.bsl +++ b/tests/service/data/SyntaxTree/String/InterpolatedStringOffsideInModule.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/String/InterpolatedStringOffsideInModule.fs", false, - QualifiedNameOfFile InterpolatedStringOffsideInModule, [], [], + QualifiedNameOfFile InterpolatedStringOffsideInModule, [], [SynModuleOrNamespace ([InterpolatedStringOffsideInModule], false, AnonModule, [NestedModule diff --git a/tests/service/data/SyntaxTree/String/InterpolatedStringOffsideInNestedLet.fs.bsl b/tests/service/data/SyntaxTree/String/InterpolatedStringOffsideInNestedLet.fs.bsl index d91bffd331d..9515e542eab 100644 --- a/tests/service/data/SyntaxTree/String/InterpolatedStringOffsideInNestedLet.fs.bsl +++ b/tests/service/data/SyntaxTree/String/InterpolatedStringOffsideInNestedLet.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/String/InterpolatedStringOffsideInNestedLet.fs", false, - QualifiedNameOfFile InterpolatedStringOffsideInNestedLet, [], [], + QualifiedNameOfFile InterpolatedStringOffsideInNestedLet, [], [SynModuleOrNamespace ([InterpolatedStringOffsideInNestedLet], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindRegular.fs.bsl b/tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindRegular.fs.bsl index be0c3ae5c30..4aafaa808a3 100644 --- a/tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindRegular.fs.bsl +++ b/tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindRegular.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/String/SynConstBytesWithSynByteStringKindRegular.fs", false, - QualifiedNameOfFile SynConstBytesWithSynByteStringKindRegular, [], [], + QualifiedNameOfFile SynConstBytesWithSynByteStringKindRegular, [], [SynModuleOrNamespace ([SynConstBytesWithSynByteStringKindRegular], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindVerbatim.fs.bsl b/tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindVerbatim.fs.bsl index 178873fb61e..4ba09c64d64 100644 --- a/tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindVerbatim.fs.bsl +++ b/tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindVerbatim.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/String/SynConstBytesWithSynByteStringKindVerbatim.fs", false, - QualifiedNameOfFile SynConstBytesWithSynByteStringKindVerbatim, [], [], + QualifiedNameOfFile SynConstBytesWithSynByteStringKindVerbatim, [], [SynModuleOrNamespace ([SynConstBytesWithSynByteStringKindVerbatim], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindRegular.fs.bsl b/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindRegular.fs.bsl index aaba1c57606..675897813ca 100644 --- a/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindRegular.fs.bsl +++ b/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindRegular.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/String/SynConstStringWithSynStringKindRegular.fs", false, - QualifiedNameOfFile SynConstStringWithSynStringKindRegular, [], [], + QualifiedNameOfFile SynConstStringWithSynStringKindRegular, [], [SynModuleOrNamespace ([SynConstStringWithSynStringKindRegular], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindTripleQuote.fs.bsl b/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindTripleQuote.fs.bsl index 2ad18580156..5ef5d9d5095 100644 --- a/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindTripleQuote.fs.bsl +++ b/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindTripleQuote.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/String/SynConstStringWithSynStringKindTripleQuote.fs", false, - QualifiedNameOfFile SynConstStringWithSynStringKindTripleQuote, [], [], + QualifiedNameOfFile SynConstStringWithSynStringKindTripleQuote, [], [SynModuleOrNamespace ([SynConstStringWithSynStringKindTripleQuote], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindVerbatim.fs.bsl b/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindVerbatim.fs.bsl index 2bbac831810..4eb69eb760b 100644 --- a/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindVerbatim.fs.bsl +++ b/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindVerbatim.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/String/SynConstStringWithSynStringKindVerbatim.fs", false, - QualifiedNameOfFile SynConstStringWithSynStringKindVerbatim, [], [], + QualifiedNameOfFile SynConstStringWithSynStringKindVerbatim, [], [SynModuleOrNamespace ([SynConstStringWithSynStringKindVerbatim], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindRegular.fs.bsl b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindRegular.fs.bsl index 601a0e5e9da..bba81224765 100644 --- a/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindRegular.fs.bsl +++ b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindRegular.fs.bsl @@ -2,7 +2,6 @@ ImplFile (ParsedImplFileInput ("/root/String/SynExprInterpolatedStringWithSynStringKindRegular.fs", false, QualifiedNameOfFile SynExprInterpolatedStringWithSynStringKindRegular, [], - [], [SynModuleOrNamespace ([SynExprInterpolatedStringWithSynStringKindRegular], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs.bsl b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs.bsl index 8eafe3c8745..ae0b204b07b 100644 --- a/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs.bsl +++ b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/String/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs", false, QualifiedNameOfFile SynExprInterpolatedStringWithSynStringKindTripleQuote, - [], [], + [], [SynModuleOrNamespace ([SynExprInterpolatedStringWithSynStringKindTripleQuote], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindVerbatim.fs.bsl b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindVerbatim.fs.bsl index 486b527607a..7e01e53f5ed 100644 --- a/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindVerbatim.fs.bsl +++ b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindVerbatim.fs.bsl @@ -3,7 +3,6 @@ ImplFile ("/root/String/SynExprInterpolatedStringWithSynStringKindVerbatim.fs", false, QualifiedNameOfFile SynExprInterpolatedStringWithSynStringKindVerbatim, [], - [], [SynModuleOrNamespace ([SynExprInterpolatedStringWithSynStringKindVerbatim], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithTripleQuoteMultipleDollars.fs.bsl b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithTripleQuoteMultipleDollars.fs.bsl index db6d4bcdc96..65ee95b04cb 100644 --- a/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithTripleQuoteMultipleDollars.fs.bsl +++ b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithTripleQuoteMultipleDollars.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/String/SynExprInterpolatedStringWithTripleQuoteMultipleDollars.fs", false, QualifiedNameOfFile - SynExprInterpolatedStringWithTripleQuoteMultipleDollars, [], [], + SynExprInterpolatedStringWithTripleQuoteMultipleDollars, [], [SynModuleOrNamespace ([SynExprInterpolatedStringWithTripleQuoteMultipleDollars], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithTripleQuoteMultipleDollars2.fs.bsl b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithTripleQuoteMultipleDollars2.fs.bsl index 152cb27e9b3..c7f6052468b 100644 --- a/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithTripleQuoteMultipleDollars2.fs.bsl +++ b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithTripleQuoteMultipleDollars2.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/String/SynExprInterpolatedStringWithTripleQuoteMultipleDollars2.fs", false, QualifiedNameOfFile - SynExprInterpolatedStringWithTripleQuoteMultipleDollars2, [], [], + SynExprInterpolatedStringWithTripleQuoteMultipleDollars2, [], [SynModuleOrNamespace ([SynExprInterpolatedStringWithTripleQuoteMultipleDollars2], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/SynIdent/IncompleteLongIdent 01.fs.bsl b/tests/service/data/SyntaxTree/SynIdent/IncompleteLongIdent 01.fs.bsl index 493efcfa2b7..a663aa978e9 100644 --- a/tests/service/data/SyntaxTree/SynIdent/IncompleteLongIdent 01.fs.bsl +++ b/tests/service/data/SyntaxTree/SynIdent/IncompleteLongIdent 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SynIdent/IncompleteLongIdent 01.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynIdent/IncompleteLongIdent 02.fs.bsl b/tests/service/data/SyntaxTree/SynIdent/IncompleteLongIdent 02.fs.bsl index 9df8951773d..4dba0e6c85d 100644 --- a/tests/service/data/SyntaxTree/SynIdent/IncompleteLongIdent 02.fs.bsl +++ b/tests/service/data/SyntaxTree/SynIdent/IncompleteLongIdent 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SynIdent/IncompleteLongIdent 02.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynTyparDecl/Constraint intersection 01.fs.bsl b/tests/service/data/SyntaxTree/SynTyparDecl/Constraint intersection 01.fs.bsl index 96d2a16e16c..3d11337f385 100644 --- a/tests/service/data/SyntaxTree/SynTyparDecl/Constraint intersection 01.fs.bsl +++ b/tests/service/data/SyntaxTree/SynTyparDecl/Constraint intersection 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SynTyparDecl/Constraint intersection 01.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/SynType/Constraint intersection 01.fs.bsl b/tests/service/data/SyntaxTree/SynType/Constraint intersection 01.fs.bsl index 64e8fd7c7a8..c033ffceb3b 100644 --- a/tests/service/data/SyntaxTree/SynType/Constraint intersection 01.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Constraint intersection 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SynType/Constraint intersection 01.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/SynType/Constraint intersection 02.fs.bsl b/tests/service/data/SyntaxTree/SynType/Constraint intersection 02.fs.bsl index 039915cb522..dffe2d6d94f 100644 --- a/tests/service/data/SyntaxTree/SynType/Constraint intersection 02.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Constraint intersection 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SynType/Constraint intersection 02.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/SynType/Constraint intersection 03.fs.bsl b/tests/service/data/SyntaxTree/SynType/Constraint intersection 03.fs.bsl index f28ed328e25..b2aa3a108b3 100644 --- a/tests/service/data/SyntaxTree/SynType/Constraint intersection 03.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Constraint intersection 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SynType/Constraint intersection 03.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/SynType/Div 01.fs.bsl b/tests/service/data/SyntaxTree/SynType/Div 01.fs.bsl index ea6b5ee5e6d..2430f96bbe4 100644 --- a/tests/service/data/SyntaxTree/SynType/Div 01.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Div 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Div 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Div 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Div 02.fs.bsl b/tests/service/data/SyntaxTree/SynType/Div 02.fs.bsl index 2ed151d5ecf..0af9e624823 100644 --- a/tests/service/data/SyntaxTree/SynType/Div 02.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Div 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Div 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Div 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Div 03.fs.bsl b/tests/service/data/SyntaxTree/SynType/Div 03.fs.bsl index 411cff73657..e05310e22b5 100644 --- a/tests/service/data/SyntaxTree/SynType/Div 03.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Div 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Div 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Div 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Div 04.fs.bsl b/tests/service/data/SyntaxTree/SynType/Div 04.fs.bsl index 9b036b95e12..8a30b9a038b 100644 --- a/tests/service/data/SyntaxTree/SynType/Div 04.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Div 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Div 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Div 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Div 05.fs.bsl b/tests/service/data/SyntaxTree/SynType/Div 05.fs.bsl index 56f07e3876e..7443b2ccc21 100644 --- a/tests/service/data/SyntaxTree/SynType/Div 05.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Div 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Div 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Div 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Div 06.fs.bsl b/tests/service/data/SyntaxTree/SynType/Div 06.fs.bsl index 354ee8e4e9b..3b7c2589d6e 100644 --- a/tests/service/data/SyntaxTree/SynType/Div 06.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Div 06.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Div 06.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Div 06.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Fun 01.fs.bsl b/tests/service/data/SyntaxTree/SynType/Fun 01.fs.bsl index d723fe968b4..521263ec54f 100644 --- a/tests/service/data/SyntaxTree/SynType/Fun 01.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Fun 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Fun 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Fun 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Fun 02.fs.bsl b/tests/service/data/SyntaxTree/SynType/Fun 02.fs.bsl index 4413b33b2c2..bb1bb168c93 100644 --- a/tests/service/data/SyntaxTree/SynType/Fun 02.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Fun 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Fun 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Fun 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Fun 03.fs.bsl b/tests/service/data/SyntaxTree/SynType/Fun 03.fs.bsl index c92a2eaa29a..fa9371d9a43 100644 --- a/tests/service/data/SyntaxTree/SynType/Fun 03.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Fun 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Fun 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Fun 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Fun 04.fs.bsl b/tests/service/data/SyntaxTree/SynType/Fun 04.fs.bsl index 90cb7ec281f..bfc0d51c350 100644 --- a/tests/service/data/SyntaxTree/SynType/Fun 04.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Fun 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Fun 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Fun 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Fun 05.fs.bsl b/tests/service/data/SyntaxTree/SynType/Fun 05.fs.bsl index 51bd3d1f6c3..8effc77fd9b 100644 --- a/tests/service/data/SyntaxTree/SynType/Fun 05.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Fun 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Fun 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Fun 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Fun 06.fs.bsl b/tests/service/data/SyntaxTree/SynType/Fun 06.fs.bsl index 79fba7f21d4..a96e7c69146 100644 --- a/tests/service/data/SyntaxTree/SynType/Fun 06.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Fun 06.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Fun 06.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Fun 06.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/SynType/Fun 07.fs.bsl b/tests/service/data/SyntaxTree/SynType/Fun 07.fs.bsl index fc09b3f737f..c59294bd019 100644 --- a/tests/service/data/SyntaxTree/SynType/Fun 07.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Fun 07.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Fun 07.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Fun 07.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/SynType/Fun 08.fs.bsl b/tests/service/data/SyntaxTree/SynType/Fun 08.fs.bsl index 914be23e3c5..1ab6a488969 100644 --- a/tests/service/data/SyntaxTree/SynType/Fun 08.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Fun 08.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Fun 08.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Fun 08.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/SynType/Fun 09.fs.bsl b/tests/service/data/SyntaxTree/SynType/Fun 09.fs.bsl index 3a7ecdba3cf..3329b78b608 100644 --- a/tests/service/data/SyntaxTree/SynType/Fun 09.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Fun 09.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Fun 09.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Fun 09.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/SynType/Fun 10.fs.bsl b/tests/service/data/SyntaxTree/SynType/Fun 10.fs.bsl index 061982252ad..f0a17a8257a 100644 --- a/tests/service/data/SyntaxTree/SynType/Fun 10.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Fun 10.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Fun 10.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Fun 10.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs.bsl b/tests/service/data/SyntaxTree/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs.bsl index 1c58087b0d8..4411a8d9af2 100644 --- a/tests/service/data/SyntaxTree/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs", false, - QualifiedNameOfFile NestedSynTypeOrInsideSynExprTraitCall, [], [], + QualifiedNameOfFile NestedSynTypeOrInsideSynExprTraitCall, [], [SynModuleOrNamespace ([NestedSynTypeOrInsideSynExprTraitCall], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/SynType/SingleSynTypeInsideSynExprTraitCall.fs.bsl b/tests/service/data/SyntaxTree/SynType/SingleSynTypeInsideSynExprTraitCall.fs.bsl index 5c1cd55a5bf..992544278eb 100644 --- a/tests/service/data/SyntaxTree/SynType/SingleSynTypeInsideSynExprTraitCall.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/SingleSynTypeInsideSynExprTraitCall.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SynType/SingleSynTypeInsideSynExprTraitCall.fs", false, - QualifiedNameOfFile SingleSynTypeInsideSynExprTraitCall, [], [], + QualifiedNameOfFile SingleSynTypeInsideSynExprTraitCall, [], [SynModuleOrNamespace ([SingleSynTypeInsideSynExprTraitCall], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynExprTraitCall.fs.bsl b/tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynExprTraitCall.fs.bsl index 24fb731523f..19672ed336d 100644 --- a/tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynExprTraitCall.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynExprTraitCall.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SynType/SynTypeOrInsideSynExprTraitCall.fs", false, - QualifiedNameOfFile SynTypeOrInsideSynExprTraitCall, [], [], + QualifiedNameOfFile SynTypeOrInsideSynExprTraitCall, [], [SynModuleOrNamespace ([SynTypeOrInsideSynExprTraitCall], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs.bsl b/tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs.bsl index c2de9ccff5c..77cc622836a 100644 --- a/tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs", false, QualifiedNameOfFile - SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember, [], [], + SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember, [], [SynModuleOrNamespace ([SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs.bsl b/tests/service/data/SyntaxTree/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs.bsl index f509494f211..748356200ee 100644 --- a/tests/service/data/SyntaxTree/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs", false, - QualifiedNameOfFile SynTypeOrWithAppTypeOnTheRightHandSide, [], [], + QualifiedNameOfFile SynTypeOrWithAppTypeOnTheRightHandSide, [], [SynModuleOrNamespace ([SynTypeOrWithAppTypeOnTheRightHandSide], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi.bsl b/tests/service/data/SyntaxTree/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi.bsl index 6d0202252ea..3b1fa906abb 100644 --- a/tests/service/data/SyntaxTree/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi.bsl +++ b/tests/service/data/SyntaxTree/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi.bsl @@ -2,7 +2,6 @@ SigFile (ParsedSigFileInput ("/root/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi", QualifiedNameOfFile SynTypeTupleDoesIncludeLeadingParameterAttributes, [], - [], [SynModuleOrNamespaceSig ([SynTypeTupleDoesIncludeLeadingParameterAttributes], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/SynType/SynTypeTupleDoesIncludeLeadingParameterName.fsi.bsl b/tests/service/data/SyntaxTree/SynType/SynTypeTupleDoesIncludeLeadingParameterName.fsi.bsl index 662002f0c87..49ba491f2c3 100644 --- a/tests/service/data/SyntaxTree/SynType/SynTypeTupleDoesIncludeLeadingParameterName.fsi.bsl +++ b/tests/service/data/SyntaxTree/SynType/SynTypeTupleDoesIncludeLeadingParameterName.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/SynType/SynTypeTupleDoesIncludeLeadingParameterName.fsi", - QualifiedNameOfFile SynTypeTupleDoesIncludeLeadingParameterName, [], [], + QualifiedNameOfFile SynTypeTupleDoesIncludeLeadingParameterName, [], [SynModuleOrNamespaceSig ([SynTypeTupleDoesIncludeLeadingParameterName], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/SynType/Tuple - Nested 01.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple - Nested 01.fs.bsl index cb47bf69176..6a5eb6c4a60 100644 --- a/tests/service/data/SyntaxTree/SynType/Tuple - Nested 01.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Tuple - Nested 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SynType/Tuple - Nested 01.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Tuple - Nested 02.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple - Nested 02.fs.bsl index 31c6f32e32e..867c71b8e50 100644 --- a/tests/service/data/SyntaxTree/SynType/Tuple - Nested 02.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Tuple - Nested 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SynType/Tuple - Nested 02.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Tuple - Nested 03.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple - Nested 03.fs.bsl index d2a8a234b88..e8bbb944fbf 100644 --- a/tests/service/data/SyntaxTree/SynType/Tuple - Nested 03.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Tuple - Nested 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SynType/Tuple - Nested 03.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Tuple - Nested 04.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple - Nested 04.fs.bsl index 5ceab06a988..f9bc1043c34 100644 --- a/tests/service/data/SyntaxTree/SynType/Tuple - Nested 04.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Tuple - Nested 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SynType/Tuple - Nested 04.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Tuple - Nested 05.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple - Nested 05.fs.bsl index e72167dde44..4f2b8d91ce3 100644 --- a/tests/service/data/SyntaxTree/SynType/Tuple - Nested 05.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Tuple - Nested 05.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SynType/Tuple - Nested 05.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Tuple - Nested 06.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple - Nested 06.fs.bsl index f90be5ac2f2..3a423cda4ca 100644 --- a/tests/service/data/SyntaxTree/SynType/Tuple - Nested 06.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Tuple - Nested 06.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SynType/Tuple - Nested 06.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Tuple 01.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple 01.fs.bsl index 85497901333..fb75335cb94 100644 --- a/tests/service/data/SyntaxTree/SynType/Tuple 01.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Tuple 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Tuple 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Tuple 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Tuple 02.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple 02.fs.bsl index b35e5fb5bda..4457b838e0a 100644 --- a/tests/service/data/SyntaxTree/SynType/Tuple 02.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Tuple 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Tuple 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Tuple 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Tuple 03.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple 03.fs.bsl index c83be44e69b..ec5dfc24377 100644 --- a/tests/service/data/SyntaxTree/SynType/Tuple 03.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Tuple 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Tuple 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Tuple 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Tuple 04.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple 04.fs.bsl index de61cb515a6..e59aa270e41 100644 --- a/tests/service/data/SyntaxTree/SynType/Tuple 04.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Tuple 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Tuple 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Tuple 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Tuple 05.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple 05.fs.bsl index 7d02d692052..8939f6566e3 100644 --- a/tests/service/data/SyntaxTree/SynType/Tuple 05.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Tuple 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Tuple 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Tuple 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Tuple 06.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple 06.fs.bsl index aa3c77a6051..b78f34afec7 100644 --- a/tests/service/data/SyntaxTree/SynType/Tuple 06.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Tuple 06.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Tuple 06.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Tuple 06.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Tuple 07.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple 07.fs.bsl index af8c1af77d0..4ca1d2f2ad1 100644 --- a/tests/service/data/SyntaxTree/SynType/Tuple 07.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Tuple 07.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Tuple 07.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Tuple 07.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Tuple 08.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple 08.fs.bsl index 658dd4661e2..19049fc4cd4 100644 --- a/tests/service/data/SyntaxTree/SynType/Tuple 08.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Tuple 08.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Tuple 08.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Tuple 08.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Tuple 09.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple 09.fs.bsl index c0d052bcc9f..7a7d8b70bd4 100644 --- a/tests/service/data/SyntaxTree/SynType/Tuple 09.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Tuple 09.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Tuple 09.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Tuple 09.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/SynType/Tuple 10.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple 10.fs.bsl index dc553f72214..51ccddda4ca 100644 --- a/tests/service/data/SyntaxTree/SynType/Tuple 10.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Tuple 10.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Tuple 10.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Tuple 10.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/SynType/Tuple 11.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple 11.fs.bsl index 31ca0e7d595..e9335f05032 100644 --- a/tests/service/data/SyntaxTree/SynType/Tuple 11.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Tuple 11.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Tuple 11.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Tuple 11.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/SynType/Tuple 12.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple 12.fs.bsl index 48dd1654f53..10016228daa 100644 --- a/tests/service/data/SyntaxTree/SynType/Tuple 12.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Tuple 12.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Tuple 12.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Tuple 12.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/SynType/Tuple 13.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple 13.fs.bsl index 1c4baa1ad5b..dabd1ab1736 100644 --- a/tests/service/data/SyntaxTree/SynType/Tuple 13.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Tuple 13.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Tuple 13.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Tuple 13.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/SynType/Tuple 14.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple 14.fs.bsl index 8f40539042b..99e47aab3f4 100644 --- a/tests/service/data/SyntaxTree/SynType/Tuple 14.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Tuple 14.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Tuple 14.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Tuple 14.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Type/Abbreviation 01.fs.bsl b/tests/service/data/SyntaxTree/Type/Abbreviation 01.fs.bsl index f5ca6da29e6..bd094b2a457 100644 --- a/tests/service/data/SyntaxTree/Type/Abbreviation 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Abbreviation 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Abbreviation 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Abbreviation 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Abbreviation 02.fs.bsl b/tests/service/data/SyntaxTree/Type/Abbreviation 02.fs.bsl index 6d0a7728993..05836b227fd 100644 --- a/tests/service/data/SyntaxTree/Type/Abbreviation 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Abbreviation 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Abbreviation 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Abbreviation 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Abbreviation 03.fs.bsl b/tests/service/data/SyntaxTree/Type/Abbreviation 03.fs.bsl index d2fb3a0cb2b..0c8ec15eee9 100644 --- a/tests/service/data/SyntaxTree/Type/Abbreviation 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Abbreviation 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Abbreviation 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Abbreviation 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Abbreviation 04.fs.bsl b/tests/service/data/SyntaxTree/Type/Abbreviation 04.fs.bsl index 53dd6bbce50..be0d67013e9 100644 --- a/tests/service/data/SyntaxTree/Type/Abbreviation 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Abbreviation 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Abbreviation 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Abbreviation 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/And 01.fs.bsl b/tests/service/data/SyntaxTree/Type/And 01.fs.bsl index a9d16c93758..7d99711c88a 100644 --- a/tests/service/data/SyntaxTree/Type/And 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/And 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/And 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/And 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/And 02.fs.bsl b/tests/service/data/SyntaxTree/Type/And 02.fs.bsl index 9c68fa0b125..2f0d4d0b82f 100644 --- a/tests/service/data/SyntaxTree/Type/And 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/And 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/And 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/And 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/And 03.fs.bsl b/tests/service/data/SyntaxTree/Type/And 03.fs.bsl index 0334d8da564..c93ff3ad48f 100644 --- a/tests/service/data/SyntaxTree/Type/And 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/And 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/And 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/And 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/And 04.fs.bsl b/tests/service/data/SyntaxTree/Type/And 04.fs.bsl index 05c052ddda5..cb407b52bc9 100644 --- a/tests/service/data/SyntaxTree/Type/And 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/And 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/And 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/And 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/And 05.fs.bsl b/tests/service/data/SyntaxTree/Type/And 05.fs.bsl index 60a23a89c19..a92c4236e43 100644 --- a/tests/service/data/SyntaxTree/Type/And 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/And 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/And 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/And 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/And 06.fs.bsl b/tests/service/data/SyntaxTree/Type/And 06.fs.bsl index cb3337443f1..343730bccea 100644 --- a/tests/service/data/SyntaxTree/Type/And 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/And 06.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/And 06.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/And 06.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/As 01.fs.bsl b/tests/service/data/SyntaxTree/Type/As 01.fs.bsl index bec2d3a7121..de85e4e3118 100644 --- a/tests/service/data/SyntaxTree/Type/As 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/As 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/As 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/As 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/As 02.fs.bsl b/tests/service/data/SyntaxTree/Type/As 02.fs.bsl index f40ff1a13d0..6ff2e6c63db 100644 --- a/tests/service/data/SyntaxTree/Type/As 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/As 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/As 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/As 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/As 03.fs.bsl b/tests/service/data/SyntaxTree/Type/As 03.fs.bsl index 42c054e0dbf..9d3eea9b4b4 100644 --- a/tests/service/data/SyntaxTree/Type/As 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/As 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/As 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/As 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/As 04.fs.bsl b/tests/service/data/SyntaxTree/Type/As 04.fs.bsl index 82bef8fffce..e51d6cda798 100644 --- a/tests/service/data/SyntaxTree/Type/As 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/As 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/As 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/As 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/As 05.fs.bsl b/tests/service/data/SyntaxTree/Type/As 05.fs.bsl index 52ea9524fef..622e07959a5 100644 --- a/tests/service/data/SyntaxTree/Type/As 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/As 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/As 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/As 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/As 06.fs.bsl b/tests/service/data/SyntaxTree/Type/As 06.fs.bsl index ed933552272..a9974e85664 100644 --- a/tests/service/data/SyntaxTree/Type/As 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/As 06.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/As 06.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/As 06.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/As 07.fs.bsl b/tests/service/data/SyntaxTree/Type/As 07.fs.bsl index a491491159b..62a9366bad8 100644 --- a/tests/service/data/SyntaxTree/Type/As 07.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/As 07.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/As 07.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/As 07.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/As 08.fs.bsl b/tests/service/data/SyntaxTree/Type/As 08.fs.bsl index 24254ea6064..6001010a369 100644 --- a/tests/service/data/SyntaxTree/Type/As 08.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/As 08.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/As 08.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/As 08.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/AttributesInOptionalNamedMemberParameter.fs.bsl b/tests/service/data/SyntaxTree/Type/AttributesInOptionalNamedMemberParameter.fs.bsl index 6ed7fe97af5..51e4ee662ba 100644 --- a/tests/service/data/SyntaxTree/Type/AttributesInOptionalNamedMemberParameter.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/AttributesInOptionalNamedMemberParameter.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Type/AttributesInOptionalNamedMemberParameter.fs", false, - QualifiedNameOfFile AttributesInOptionalNamedMemberParameter, [], [], + QualifiedNameOfFile AttributesInOptionalNamedMemberParameter, [], [SynModuleOrNamespace ([AttributesInOptionalNamedMemberParameter], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Class 01.fs.bsl b/tests/service/data/SyntaxTree/Type/Class 01.fs.bsl index fe8be852708..39e6fa5a399 100644 --- a/tests/service/data/SyntaxTree/Type/Class 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Class 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Class 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Class 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Class 02.fs.bsl b/tests/service/data/SyntaxTree/Type/Class 02.fs.bsl index f7e959d10a0..491bc809083 100644 --- a/tests/service/data/SyntaxTree/Type/Class 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Class 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Class 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Class 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Class 03.fs.bsl b/tests/service/data/SyntaxTree/Type/Class 03.fs.bsl index 77f8ca8cea0..bfa960ed91b 100644 --- a/tests/service/data/SyntaxTree/Type/Class 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Class 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Class 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Class 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Class 04.fs.bsl b/tests/service/data/SyntaxTree/Type/Class 04.fs.bsl index 80c75b7d5da..aefc9202636 100644 --- a/tests/service/data/SyntaxTree/Type/Class 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Class 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Class 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Class 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Class 05.fs.bsl b/tests/service/data/SyntaxTree/Type/Class 05.fs.bsl index 6516bdc8320..14915f1e1a2 100644 --- a/tests/service/data/SyntaxTree/Type/Class 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Class 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Class 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Class 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Enum 01.fs.bsl b/tests/service/data/SyntaxTree/Type/Enum 01.fs.bsl index e10f9194831..9eff05a3ff3 100644 --- a/tests/service/data/SyntaxTree/Type/Enum 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Enum 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Enum 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Enum 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Enum 02.fs.bsl b/tests/service/data/SyntaxTree/Type/Enum 02.fs.bsl index e586e137997..211598e3612 100644 --- a/tests/service/data/SyntaxTree/Type/Enum 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Enum 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Enum 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Enum 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Enum 03.fs.bsl b/tests/service/data/SyntaxTree/Type/Enum 03.fs.bsl index 17ed2baa172..8350322ebaa 100644 --- a/tests/service/data/SyntaxTree/Type/Enum 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Enum 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Enum 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Enum 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Enum 04.fs.bsl b/tests/service/data/SyntaxTree/Type/Enum 04.fs.bsl index faed14098e3..c230d0e45f0 100644 --- a/tests/service/data/SyntaxTree/Type/Enum 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Enum 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Enum 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Enum 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Enum 05.fs.bsl b/tests/service/data/SyntaxTree/Type/Enum 05.fs.bsl index fd808927027..b9e9a0c70eb 100644 --- a/tests/service/data/SyntaxTree/Type/Enum 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Enum 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Enum 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Enum 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Enum 06.fs.bsl b/tests/service/data/SyntaxTree/Type/Enum 06.fs.bsl index b7fd06cbbd2..f890ba16437 100644 --- a/tests/service/data/SyntaxTree/Type/Enum 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Enum 06.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Enum 06.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Enum 06.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Enum 07 - Eof.fs.bsl b/tests/service/data/SyntaxTree/Type/Enum 07 - Eof.fs.bsl index 5278e60ecd8..f7f2d4b8525 100644 --- a/tests/service/data/SyntaxTree/Type/Enum 07 - Eof.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Enum 07 - Eof.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Enum 07 - Eof.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Enum 07 - Eof.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Enum 08 - Eof.fs.bsl b/tests/service/data/SyntaxTree/Type/Enum 08 - Eof.fs.bsl index b715aa57067..34918ee2e0e 100644 --- a/tests/service/data/SyntaxTree/Type/Enum 08 - Eof.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Enum 08 - Eof.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Enum 08 - Eof.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Enum 08 - Eof.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Enum 09 - Eof.fs.bsl b/tests/service/data/SyntaxTree/Type/Enum 09 - Eof.fs.bsl index c1756aeb77a..010ae7603c5 100644 --- a/tests/service/data/SyntaxTree/Type/Enum 09 - Eof.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Enum 09 - Eof.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Enum 09 - Eof.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Enum 09 - Eof.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Enum 10 - Eof.fs.bsl b/tests/service/data/SyntaxTree/Type/Enum 10 - Eof.fs.bsl index 6a6bf175b1d..718d600211b 100644 --- a/tests/service/data/SyntaxTree/Type/Enum 10 - Eof.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Enum 10 - Eof.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Enum 10 - Eof.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Enum 10 - Eof.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Interface 01.fs.bsl b/tests/service/data/SyntaxTree/Type/Interface 01.fs.bsl index 27d0bc70287..14907cf22c9 100644 --- a/tests/service/data/SyntaxTree/Type/Interface 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Interface 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Interface 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Interface 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Interface 02.fs.bsl b/tests/service/data/SyntaxTree/Type/Interface 02.fs.bsl index 9a516b1a4a4..b438bf9ea14 100644 --- a/tests/service/data/SyntaxTree/Type/Interface 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Interface 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Interface 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Interface 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Interface 03.fs.bsl b/tests/service/data/SyntaxTree/Type/Interface 03.fs.bsl index beaa9fae234..e23921df237 100644 --- a/tests/service/data/SyntaxTree/Type/Interface 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Interface 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Interface 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Interface 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Interface 04.fs.bsl b/tests/service/data/SyntaxTree/Type/Interface 04.fs.bsl index 3c5776cc025..7d4d0cafe06 100644 --- a/tests/service/data/SyntaxTree/Type/Interface 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Interface 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Interface 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Interface 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Interface 05.fs.bsl b/tests/service/data/SyntaxTree/Type/Interface 05.fs.bsl index 25c830d341d..b91181ec396 100644 --- a/tests/service/data/SyntaxTree/Type/Interface 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Interface 05.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Type/Interface 05.fs", false, QualifiedNameOfFile Interface 05, [], - [], [SynModuleOrNamespace ([Interface 05], false, AnonModule, [], PreXmlDocEmpty, [], None, (8,0--8,0), { LeadingKeyword = None })], (true, true), diff --git a/tests/service/data/SyntaxTree/Type/Interface 06.fs.bsl b/tests/service/data/SyntaxTree/Type/Interface 06.fs.bsl index b8201474aa2..2868b31d486 100644 --- a/tests/service/data/SyntaxTree/Type/Interface 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Interface 06.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Type/Interface 06.fs", false, QualifiedNameOfFile Interface 06, [], - [], [SynModuleOrNamespace ([Interface 06], false, AnonModule, [], PreXmlDocEmpty, [], None, (7,0--7,0), { LeadingKeyword = None })], (true, true), diff --git a/tests/service/data/SyntaxTree/Type/Interface 07.fs.bsl b/tests/service/data/SyntaxTree/Type/Interface 07.fs.bsl index 7776c39507b..e06d5ff762e 100644 --- a/tests/service/data/SyntaxTree/Type/Interface 07.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Interface 07.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Interface 07.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Interface 07.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/MultipleSynEnumCaseContainsRangeOfConstant.fs.bsl b/tests/service/data/SyntaxTree/Type/MultipleSynEnumCaseContainsRangeOfConstant.fs.bsl index 85c646eae41..46a27b7a712 100644 --- a/tests/service/data/SyntaxTree/Type/MultipleSynEnumCaseContainsRangeOfConstant.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/MultipleSynEnumCaseContainsRangeOfConstant.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Type/MultipleSynEnumCaseContainsRangeOfConstant.fs", false, - QualifiedNameOfFile MultipleSynEnumCaseContainsRangeOfConstant, [], [], + QualifiedNameOfFile MultipleSynEnumCaseContainsRangeOfConstant, [], [SynModuleOrNamespace ([MultipleSynEnumCaseContainsRangeOfConstant], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/NamedParametersInDelegateType.fs.bsl b/tests/service/data/SyntaxTree/Type/NamedParametersInDelegateType.fs.bsl index daea0ab5026..3d70d6898e7 100644 --- a/tests/service/data/SyntaxTree/Type/NamedParametersInDelegateType.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/NamedParametersInDelegateType.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Type/NamedParametersInDelegateType.fs", false, - QualifiedNameOfFile NamedParametersInDelegateType, [], [], + QualifiedNameOfFile NamedParametersInDelegateType, [], [SynModuleOrNamespace ([NamedParametersInDelegateType], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/NestedTypeHasStaticTypeAsLeadingKeyword.fs.bsl b/tests/service/data/SyntaxTree/Type/NestedTypeHasStaticTypeAsLeadingKeyword.fs.bsl index ae482a08271..c463b269478 100644 --- a/tests/service/data/SyntaxTree/Type/NestedTypeHasStaticTypeAsLeadingKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/NestedTypeHasStaticTypeAsLeadingKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Type/NestedTypeHasStaticTypeAsLeadingKeyword.fs", false, - QualifiedNameOfFile NestedTypeHasStaticTypeAsLeadingKeyword, [], [], + QualifiedNameOfFile NestedTypeHasStaticTypeAsLeadingKeyword, [], [SynModuleOrNamespace ([NestedTypeHasStaticTypeAsLeadingKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Primary ctor 01.fs.bsl b/tests/service/data/SyntaxTree/Type/Primary ctor 01.fs.bsl index 6717cb55b41..0a52551eeff 100644 --- a/tests/service/data/SyntaxTree/Type/Primary ctor 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Primary ctor 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Primary ctor 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Primary ctor 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Primary ctor 02.fs.bsl b/tests/service/data/SyntaxTree/Type/Primary ctor 02.fs.bsl index fbb48e2fd0a..aec0ec81fbd 100644 --- a/tests/service/data/SyntaxTree/Type/Primary ctor 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Primary ctor 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Primary ctor 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Primary ctor 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Primary ctor 03.fs.bsl b/tests/service/data/SyntaxTree/Type/Primary ctor 03.fs.bsl index 7bf4dedee58..57aec3cf52f 100644 --- a/tests/service/data/SyntaxTree/Type/Primary ctor 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Primary ctor 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Primary ctor 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Primary ctor 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Primary ctor 04.fs.bsl b/tests/service/data/SyntaxTree/Type/Primary ctor 04.fs.bsl index a46c198cdfe..fd12e152398 100644 --- a/tests/service/data/SyntaxTree/Type/Primary ctor 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Primary ctor 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Primary ctor 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Primary ctor 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Primary ctor 05.fs.bsl b/tests/service/data/SyntaxTree/Type/Primary ctor 05.fs.bsl index 17215f552fc..434fc7d1cc2 100644 --- a/tests/service/data/SyntaxTree/Type/Primary ctor 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Primary ctor 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Primary ctor 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Primary ctor 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs.bsl b/tests/service/data/SyntaxTree/Type/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs.bsl index 3d954e3c37d..4253f983bad 100644 --- a/tests/service/data/SyntaxTree/Type/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Type/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs", false, - QualifiedNameOfFile RangeOfAttributeShouldBeIncludedInSynTypeDefn, [], [], + QualifiedNameOfFile RangeOfAttributeShouldBeIncludedInSynTypeDefn, [], [SynModuleOrNamespace ([RangeOfAttributeShouldBeIncludedInSynTypeDefn], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs.bsl b/tests/service/data/SyntaxTree/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs.bsl index 0b685986fc4..7bc7b8dbb94 100644 --- a/tests/service/data/SyntaxTree/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs.bsl @@ -2,7 +2,6 @@ ImplFile (ParsedImplFileInput ("/root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs", false, QualifiedNameOfFile RangeOfAttributesShouldBeIncludedInRecursiveTypes, [], - [], [SynModuleOrNamespace ([RangeOfAttributesShouldBeIncludedInRecursiveTypes], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Record - Access 01.fs.bsl b/tests/service/data/SyntaxTree/Type/Record - Access 01.fs.bsl index 95895538080..3aefae6e4cd 100644 --- a/tests/service/data/SyntaxTree/Type/Record - Access 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Record - Access 01.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Type/Record - Access 01.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Record - Access 02.fs.bsl b/tests/service/data/SyntaxTree/Type/Record - Access 02.fs.bsl index dac1c3f6255..735a202cf0e 100644 --- a/tests/service/data/SyntaxTree/Type/Record - Access 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Record - Access 02.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Type/Record - Access 02.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Record - Access 03.fs.bsl b/tests/service/data/SyntaxTree/Type/Record - Access 03.fs.bsl index f819d61d7c4..f5d6d66387f 100644 --- a/tests/service/data/SyntaxTree/Type/Record - Access 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Record - Access 03.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Type/Record - Access 03.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Record - Access 04.fs.bsl b/tests/service/data/SyntaxTree/Type/Record - Access 04.fs.bsl index 1bcbe107b49..5a624b823c8 100644 --- a/tests/service/data/SyntaxTree/Type/Record - Access 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Record - Access 04.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Type/Record - Access 04.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Record - Mutable 01.fs.bsl b/tests/service/data/SyntaxTree/Type/Record - Mutable 01.fs.bsl index 1b629ceaf6f..2889181e162 100644 --- a/tests/service/data/SyntaxTree/Type/Record - Mutable 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Record - Mutable 01.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Type/Record - Mutable 01.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Record - Mutable 02.fs.bsl b/tests/service/data/SyntaxTree/Type/Record - Mutable 02.fs.bsl index 6d7a08f3caa..e32f56c275c 100644 --- a/tests/service/data/SyntaxTree/Type/Record - Mutable 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Record - Mutable 02.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Type/Record - Mutable 02.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Record - Mutable 03.fs.bsl b/tests/service/data/SyntaxTree/Type/Record - Mutable 03.fs.bsl index 34b8bfe0d51..0bd0fd37b90 100644 --- a/tests/service/data/SyntaxTree/Type/Record - Mutable 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Record - Mutable 03.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Type/Record - Mutable 03.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Record - Mutable 04.fs.bsl b/tests/service/data/SyntaxTree/Type/Record - Mutable 04.fs.bsl index e8067343cd8..34a3d73a0c5 100644 --- a/tests/service/data/SyntaxTree/Type/Record - Mutable 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Record - Mutable 04.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Type/Record - Mutable 04.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Record - Mutable 05.fs.bsl b/tests/service/data/SyntaxTree/Type/Record - Mutable 05.fs.bsl index 3679671665f..6ae97678dd5 100644 --- a/tests/service/data/SyntaxTree/Type/Record - Mutable 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Record - Mutable 05.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Type/Record - Mutable 05.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Record 01.fs.bsl b/tests/service/data/SyntaxTree/Type/Record 01.fs.bsl index 1eabb2b2f62..c7b7b1de73b 100644 --- a/tests/service/data/SyntaxTree/Type/Record 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Record 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Record 01.fs", false, QualifiedNameOfFile Foo, [], [], + ("/root/Type/Record 01.fs", false, QualifiedNameOfFile Foo, [], [SynModuleOrNamespace ([Foo], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Record 02.fs.bsl b/tests/service/data/SyntaxTree/Type/Record 02.fs.bsl index 11cabe541de..6e34c49dee7 100644 --- a/tests/service/data/SyntaxTree/Type/Record 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Record 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Record 02.fs", false, QualifiedNameOfFile Foo, [], [], + ("/root/Type/Record 02.fs", false, QualifiedNameOfFile Foo, [], [SynModuleOrNamespace ([Foo], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Record 03.fs.bsl b/tests/service/data/SyntaxTree/Type/Record 03.fs.bsl index 8777aa1b200..7f5fd12edec 100644 --- a/tests/service/data/SyntaxTree/Type/Record 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Record 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Record 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Record 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Record 04.fs.bsl b/tests/service/data/SyntaxTree/Type/Record 04.fs.bsl index db457dd8de3..56f3272248b 100644 --- a/tests/service/data/SyntaxTree/Type/Record 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Record 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Record 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Record 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Record 05.fs.bsl b/tests/service/data/SyntaxTree/Type/Record 05.fs.bsl index 19883a9e8c9..bcbd0edf540 100644 --- a/tests/service/data/SyntaxTree/Type/Record 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Record 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Record 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Record 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/SingleSynEnumCaseContainsRangeOfConstant.fs.bsl b/tests/service/data/SyntaxTree/Type/SingleSynEnumCaseContainsRangeOfConstant.fs.bsl index e901d3eac2f..9730753b60a 100644 --- a/tests/service/data/SyntaxTree/Type/SingleSynEnumCaseContainsRangeOfConstant.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/SingleSynEnumCaseContainsRangeOfConstant.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Type/SingleSynEnumCaseContainsRangeOfConstant.fs", false, - QualifiedNameOfFile SingleSynEnumCaseContainsRangeOfConstant, [], [], + QualifiedNameOfFile SingleSynEnumCaseContainsRangeOfConstant, [], [SynModuleOrNamespace ([SingleSynEnumCaseContainsRangeOfConstant], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Struct 01.fs.bsl b/tests/service/data/SyntaxTree/Type/Struct 01.fs.bsl index 9996befe9da..2ab68391a02 100644 --- a/tests/service/data/SyntaxTree/Type/Struct 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Struct 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Struct 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Struct 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Struct 02.fs.bsl b/tests/service/data/SyntaxTree/Type/Struct 02.fs.bsl index 3ca9cf08ae3..f13c18f4987 100644 --- a/tests/service/data/SyntaxTree/Type/Struct 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Struct 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Struct 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Struct 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs.bsl index cc2e1a3997f..83c681128e3 100644 --- a/tests/service/data/SyntaxTree/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs", false, QualifiedNameOfFile SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword, - [], [], + [], [SynModuleOrNamespace ([SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs.bsl index 6b465047993..4576fce11a3 100644 --- a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Type/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs", false, QualifiedNameOfFile - SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword, [], [], + SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword, [], [SynModuleOrNamespace ([SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs.bsl index 285ecf0975e..37e30d480b8 100644 --- a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Type/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs", false, QualifiedNameOfFile - SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword, [], [], + SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword, [], [SynModuleOrNamespace ([SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs.bsl index f4a425b596d..583bc63a082 100644 --- a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs.bsl @@ -2,7 +2,6 @@ ImplFile (ParsedImplFileInput ("/root/Type/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs", false, QualifiedNameOfFile SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign, [], - [], [SynModuleOrNamespace ([SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs.bsl index 3809962658a..80c2c66f000 100644 --- a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs.bsl @@ -4,7 +4,6 @@ ImplFile false, QualifiedNameOfFile SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign, [], - [], [SynModuleOrNamespace ([SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs.bsl index 35e334478f0..d60b0697fc7 100644 --- a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs", false, QualifiedNameOfFile SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword, - [], [], + [], [SynModuleOrNamespace ([SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs.bsl index 5e5b3b7fc3b..3ab19de13c9 100644 --- a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs.bsl @@ -2,7 +2,7 @@ ImplFile (ParsedImplFileInput ("/root/Type/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs", false, QualifiedNameOfFile SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign, - [], [], + [], [SynModuleOrNamespace ([SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs.bsl index 06a95ae7aa5..cda809b09f5 100644 --- a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Type/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs", false, QualifiedNameOfFile SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword, - [], [], + [], [SynModuleOrNamespace ([SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Type/SynTypeFunHasRangeOfArrow.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeFunHasRangeOfArrow.fs.bsl index 21eb149bb10..0bb997cc4ec 100644 --- a/tests/service/data/SyntaxTree/Type/SynTypeFunHasRangeOfArrow.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/SynTypeFunHasRangeOfArrow.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Type/SynTypeFunHasRangeOfArrow.fs", false, - QualifiedNameOfFile SynTypeFunHasRangeOfArrow, [], [], + QualifiedNameOfFile SynTypeFunHasRangeOfArrow, [], [SynModuleOrNamespace ([SynTypeFunHasRangeOfArrow], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/SynTypeTupleWithStruct.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeTupleWithStruct.fs.bsl index e0f51c6ee46..bd0c3ae61d3 100644 --- a/tests/service/data/SyntaxTree/Type/SynTypeTupleWithStruct.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/SynTypeTupleWithStruct.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Type/SynTypeTupleWithStruct.fs", false, - QualifiedNameOfFile SynTypeTupleWithStruct, [], [], + QualifiedNameOfFile SynTypeTupleWithStruct, [], [SynModuleOrNamespace ([SynTypeTupleWithStruct], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Type/SynTypeTupleWithStructRecovery.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeTupleWithStructRecovery.fs.bsl index c69d94938c8..adc62beb271 100644 --- a/tests/service/data/SyntaxTree/Type/SynTypeTupleWithStructRecovery.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/SynTypeTupleWithStructRecovery.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Type/SynTypeTupleWithStructRecovery.fs", false, - QualifiedNameOfFile SynTypeTupleWithStructRecovery, [], [], + QualifiedNameOfFile SynTypeTupleWithStructRecovery, [], [SynModuleOrNamespace ([SynTypeTupleWithStructRecovery], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Type/Type 01.fs.bsl b/tests/service/data/SyntaxTree/Type/Type 01.fs.bsl index f34d5eb126b..9677804b583 100644 --- a/tests/service/data/SyntaxTree/Type/Type 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Type 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Type 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Type 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Type 02.fs.bsl b/tests/service/data/SyntaxTree/Type/Type 02.fs.bsl index a670186b978..d12ecd1c004 100644 --- a/tests/service/data/SyntaxTree/Type/Type 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Type 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Type 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Type 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Type 03.fs.bsl b/tests/service/data/SyntaxTree/Type/Type 03.fs.bsl index 9cb15932e4c..09a6f352831 100644 --- a/tests/service/data/SyntaxTree/Type/Type 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Type 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Type 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Type 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Type 04.fs.bsl b/tests/service/data/SyntaxTree/Type/Type 04.fs.bsl index 83a744a8417..ae3109e9ca6 100644 --- a/tests/service/data/SyntaxTree/Type/Type 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Type 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Type 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Type 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Type 05.fs.bsl b/tests/service/data/SyntaxTree/Type/Type 05.fs.bsl index ab92f140113..b04274172f2 100644 --- a/tests/service/data/SyntaxTree/Type/Type 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Type 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Type 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Type 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Type 06.fs.bsl b/tests/service/data/SyntaxTree/Type/Type 06.fs.bsl index c987c0d38f5..e7464b29027 100644 --- a/tests/service/data/SyntaxTree/Type/Type 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Type 06.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Type 06.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Type 06.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Type 07.fs.bsl b/tests/service/data/SyntaxTree/Type/Type 07.fs.bsl index 0eb812102a6..8f409b661c8 100644 --- a/tests/service/data/SyntaxTree/Type/Type 07.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Type 07.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Type 07.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Type 07.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Type 08.fs.bsl b/tests/service/data/SyntaxTree/Type/Type 08.fs.bsl index fea4942c9fa..4aba8af8616 100644 --- a/tests/service/data/SyntaxTree/Type/Type 08.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Type 08.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Type 08.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Type 08.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Type 09.fs.bsl b/tests/service/data/SyntaxTree/Type/Type 09.fs.bsl index c4361033429..c19788af60f 100644 --- a/tests/service/data/SyntaxTree/Type/Type 09.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Type 09.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Type 09.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Type 09.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Type 10.fs.bsl b/tests/service/data/SyntaxTree/Type/Type 10.fs.bsl index 979759d4dbf..5a37de6356d 100644 --- a/tests/service/data/SyntaxTree/Type/Type 10.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Type 10.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Type 10.fs", false, QualifiedNameOfFile Type 10, [], [], + ("/root/Type/Type 10.fs", false, QualifiedNameOfFile Type 10, [], [SynModuleOrNamespace ([N], false, DeclaredNamespace, [NestedModule diff --git a/tests/service/data/SyntaxTree/Type/Type 11.fs.bsl b/tests/service/data/SyntaxTree/Type/Type 11.fs.bsl index 074cead59e8..068eef07152 100644 --- a/tests/service/data/SyntaxTree/Type/Type 11.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Type 11.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Type 11.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Type 11.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Type 12.fs.bsl b/tests/service/data/SyntaxTree/Type/Type 12.fs.bsl index 9bacae3a626..b5d3c290ca9 100644 --- a/tests/service/data/SyntaxTree/Type/Type 12.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Type 12.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Type 12.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Type 12.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Union - Field 01.fs.bsl b/tests/service/data/SyntaxTree/Type/Union - Field 01.fs.bsl index bb78f6b332f..dac7a485157 100644 --- a/tests/service/data/SyntaxTree/Type/Union - Field 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Union - Field 01.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Type/Union - Field 01.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Union - Field 02.fs.bsl b/tests/service/data/SyntaxTree/Type/Union - Field 02.fs.bsl index 4d3b58b4440..e262f48a772 100644 --- a/tests/service/data/SyntaxTree/Type/Union - Field 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Union - Field 02.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Type/Union - Field 02.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Union - Field 03.fs.bsl b/tests/service/data/SyntaxTree/Type/Union - Field 03.fs.bsl index 378ecc0220d..ab664437a53 100644 --- a/tests/service/data/SyntaxTree/Type/Union - Field 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Union - Field 03.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Type/Union - Field 03.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Union 01.fs.bsl b/tests/service/data/SyntaxTree/Type/Union 01.fs.bsl index d652bfba1e6..9525bcf2e2c 100644 --- a/tests/service/data/SyntaxTree/Type/Union 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Union 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Union 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Union 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Union 02.fs.bsl b/tests/service/data/SyntaxTree/Type/Union 02.fs.bsl index 55d2c0c07e6..8a6381bb535 100644 --- a/tests/service/data/SyntaxTree/Type/Union 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Union 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Union 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Union 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Union 03.fs.bsl b/tests/service/data/SyntaxTree/Type/Union 03.fs.bsl index 2906039ff99..69d408d0697 100644 --- a/tests/service/data/SyntaxTree/Type/Union 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Union 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Union 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Union 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Union 04.fs.bsl b/tests/service/data/SyntaxTree/Type/Union 04.fs.bsl index 65be844f376..7a3cb76f5fd 100644 --- a/tests/service/data/SyntaxTree/Type/Union 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Union 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Union 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Union 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Union 05.fs.bsl b/tests/service/data/SyntaxTree/Type/Union 05.fs.bsl index 36eb5dae412..b59546acdf5 100644 --- a/tests/service/data/SyntaxTree/Type/Union 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Union 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Union 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Union 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Union 06.fs.bsl b/tests/service/data/SyntaxTree/Type/Union 06.fs.bsl index 90b09522783..57d18768349 100644 --- a/tests/service/data/SyntaxTree/Type/Union 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Union 06.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Union 06.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Union 06.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Union 07.fs.bsl b/tests/service/data/SyntaxTree/Type/Union 07.fs.bsl index 2f0f76e6131..5be3edddfab 100644 --- a/tests/service/data/SyntaxTree/Type/Union 07.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Union 07.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Union 07.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Union 07.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/With 01.fs.bsl b/tests/service/data/SyntaxTree/Type/With 01.fs.bsl index 7fd1e7479f6..a57b78983c2 100644 --- a/tests/service/data/SyntaxTree/Type/With 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/With 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/With 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/With 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/With 02.fs.bsl b/tests/service/data/SyntaxTree/Type/With 02.fs.bsl index afef8b79973..b0b5a5d5568 100644 --- a/tests/service/data/SyntaxTree/Type/With 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/With 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/With 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/With 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/With 03.fs.bsl b/tests/service/data/SyntaxTree/Type/With 03.fs.bsl index 690a827af17..30170838157 100644 --- a/tests/service/data/SyntaxTree/Type/With 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/With 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/With 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/With 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/With 04.fs.bsl b/tests/service/data/SyntaxTree/Type/With 04.fs.bsl index 99ddf674425..cee74baae73 100644 --- a/tests/service/data/SyntaxTree/Type/With 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/With 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/With 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/With 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/With 05.fs.bsl b/tests/service/data/SyntaxTree/Type/With 05.fs.bsl index af2e4a0317a..4e323f3b2af 100644 --- a/tests/service/data/SyntaxTree/Type/With 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/With 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/With 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/With 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/UnionCase/Missing keyword of.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/Missing keyword of.fs.bsl index 2bac019ca23..7e20b1c0a9c 100644 --- a/tests/service/data/SyntaxTree/UnionCase/Missing keyword of.fs.bsl +++ b/tests/service/data/SyntaxTree/UnionCase/Missing keyword of.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/UnionCase/Missing keyword of.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/UnionCase/Missing name 01.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/Missing name 01.fs.bsl index a67e4eb8783..3f11d875232 100644 --- a/tests/service/data/SyntaxTree/UnionCase/Missing name 01.fs.bsl +++ b/tests/service/data/SyntaxTree/UnionCase/Missing name 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/UnionCase/Missing name 01.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/UnionCase/Missing name 02.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/Missing name 02.fs.bsl index 02c674e6a1f..199a903bf66 100644 --- a/tests/service/data/SyntaxTree/UnionCase/Missing name 02.fs.bsl +++ b/tests/service/data/SyntaxTree/UnionCase/Missing name 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/UnionCase/Missing name 02.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/UnionCase/Missing name 03.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/Missing name 03.fs.bsl index 4a272764df0..78bfdfb9248 100644 --- a/tests/service/data/SyntaxTree/UnionCase/Missing name 03.fs.bsl +++ b/tests/service/data/SyntaxTree/UnionCase/Missing name 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/UnionCase/Missing name 03.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/UnionCase/Missing name 04.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/Missing name 04.fs.bsl index 8913b904cea..9187f29d234 100644 --- a/tests/service/data/SyntaxTree/UnionCase/Missing name 04.fs.bsl +++ b/tests/service/data/SyntaxTree/UnionCase/Missing name 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/UnionCase/Missing name 04.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/UnionCase/Missing name 05.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/Missing name 05.fs.bsl index 9d7a69011ef..19ebcf9b59a 100644 --- a/tests/service/data/SyntaxTree/UnionCase/Missing name 05.fs.bsl +++ b/tests/service/data/SyntaxTree/UnionCase/Missing name 05.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/UnionCase/Missing name 05.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/UnionCase/Missing name 06.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/Missing name 06.fs.bsl index 27516955a99..48d435cfe63 100644 --- a/tests/service/data/SyntaxTree/UnionCase/Missing name 06.fs.bsl +++ b/tests/service/data/SyntaxTree/UnionCase/Missing name 06.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/UnionCase/Missing name 06.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/UnionCase/Missing name 07.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/Missing name 07.fs.bsl index c4d3efa237f..6f41854a232 100644 --- a/tests/service/data/SyntaxTree/UnionCase/Missing name 07.fs.bsl +++ b/tests/service/data/SyntaxTree/UnionCase/Missing name 07.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/UnionCase/Missing name 07.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/UnionCase/Missing name 08.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/Missing name 08.fs.bsl index 238d9916e07..e1b5cadbba8 100644 --- a/tests/service/data/SyntaxTree/UnionCase/Missing name 08.fs.bsl +++ b/tests/service/data/SyntaxTree/UnionCase/Missing name 08.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/UnionCase/Missing name 08.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/UnionCase/Missing name 09.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/Missing name 09.fs.bsl index 47c92aa67e0..a52e7b434ac 100644 --- a/tests/service/data/SyntaxTree/UnionCase/Missing name 09.fs.bsl +++ b/tests/service/data/SyntaxTree/UnionCase/Missing name 09.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/UnionCase/Missing name 09.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/UnionCase/MultipleSynUnionCasesHaveBarRange.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/MultipleSynUnionCasesHaveBarRange.fs.bsl index 8691d476cc6..faec3705370 100644 --- a/tests/service/data/SyntaxTree/UnionCase/MultipleSynUnionCasesHaveBarRange.fs.bsl +++ b/tests/service/data/SyntaxTree/UnionCase/MultipleSynUnionCasesHaveBarRange.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/UnionCase/MultipleSynUnionCasesHaveBarRange.fs", false, - QualifiedNameOfFile MultipleSynUnionCasesHaveBarRange, [], [], + QualifiedNameOfFile MultipleSynUnionCasesHaveBarRange, [], [SynModuleOrNamespace ([MultipleSynUnionCasesHaveBarRange], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/UnionCase/PrivateKeywordHasRange.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/PrivateKeywordHasRange.fs.bsl index 21d1081b55d..d6be6d42c53 100644 --- a/tests/service/data/SyntaxTree/UnionCase/PrivateKeywordHasRange.fs.bsl +++ b/tests/service/data/SyntaxTree/UnionCase/PrivateKeywordHasRange.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/UnionCase/PrivateKeywordHasRange.fs", false, - QualifiedNameOfFile PrivateKeywordHasRange, [], [], + QualifiedNameOfFile PrivateKeywordHasRange, [], [SynModuleOrNamespace ([PrivateKeywordHasRange], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/UnionCase/Recover Function Type 01.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/Recover Function Type 01.fs.bsl index 4817546864d..83c6e4917ce 100644 --- a/tests/service/data/SyntaxTree/UnionCase/Recover Function Type 01.fs.bsl +++ b/tests/service/data/SyntaxTree/UnionCase/Recover Function Type 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/UnionCase/Recover Function Type 01.fs", false, - QualifiedNameOfFile Recover Function Type 01, [], [], + QualifiedNameOfFile Recover Function Type 01, [], [SynModuleOrNamespace ([Foo], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/UnionCase/Recover Function Type 02.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/Recover Function Type 02.fs.bsl index 0b908ef60f6..55e9eddd220 100644 --- a/tests/service/data/SyntaxTree/UnionCase/Recover Function Type 02.fs.bsl +++ b/tests/service/data/SyntaxTree/UnionCase/Recover Function Type 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/UnionCase/Recover Function Type 02.fs", false, - QualifiedNameOfFile Recover Function Type 02, [], [], + QualifiedNameOfFile Recover Function Type 02, [], [SynModuleOrNamespace ([Foo], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/UnionCase/Recover Function Type 03.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/Recover Function Type 03.fs.bsl index 97defcda3ce..10bb97ba64e 100644 --- a/tests/service/data/SyntaxTree/UnionCase/Recover Function Type 03.fs.bsl +++ b/tests/service/data/SyntaxTree/UnionCase/Recover Function Type 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/UnionCase/Recover Function Type 03.fs", false, - QualifiedNameOfFile Recover Function Type 03, [], [], + QualifiedNameOfFile Recover Function Type 03, [], [SynModuleOrNamespace ([Foo], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/UnionCase/SingleSynUnionCaseHasBarRange.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/SingleSynUnionCaseHasBarRange.fs.bsl index d5c4b3f2f80..355c2741f72 100644 --- a/tests/service/data/SyntaxTree/UnionCase/SingleSynUnionCaseHasBarRange.fs.bsl +++ b/tests/service/data/SyntaxTree/UnionCase/SingleSynUnionCaseHasBarRange.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/UnionCase/SingleSynUnionCaseHasBarRange.fs", false, - QualifiedNameOfFile SingleSynUnionCaseHasBarRange, [], [], + QualifiedNameOfFile SingleSynUnionCaseHasBarRange, [], [SynModuleOrNamespace ([SingleSynUnionCaseHasBarRange], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/UnionCase/SingleSynUnionCaseWithoutBar.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/SingleSynUnionCaseWithoutBar.fs.bsl index 32910732a1c..58f0ea60cf0 100644 --- a/tests/service/data/SyntaxTree/UnionCase/SingleSynUnionCaseWithoutBar.fs.bsl +++ b/tests/service/data/SyntaxTree/UnionCase/SingleSynUnionCaseWithoutBar.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/UnionCase/SingleSynUnionCaseWithoutBar.fs", false, - QualifiedNameOfFile SingleSynUnionCaseWithoutBar, [], [], + QualifiedNameOfFile SingleSynUnionCaseWithoutBar, [], [SynModuleOrNamespace ([SingleSynUnionCaseWithoutBar], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/UnionCase/SynUnionCaseKindFullType.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/SynUnionCaseKindFullType.fs.bsl index 20e3a15d262..71057648c5b 100644 --- a/tests/service/data/SyntaxTree/UnionCase/SynUnionCaseKindFullType.fs.bsl +++ b/tests/service/data/SyntaxTree/UnionCase/SynUnionCaseKindFullType.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/UnionCase/SynUnionCaseKindFullType.fs", false, - QualifiedNameOfFile SynUnionCaseKindFullType, [], [], + QualifiedNameOfFile SynUnionCaseKindFullType, [], [SynModuleOrNamespace ([SynUnionCaseKindFullType], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/UnionCase/UnionCaseFieldsCanHaveComments.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/UnionCaseFieldsCanHaveComments.fs.bsl index 51363b02c37..6c144a55a13 100644 --- a/tests/service/data/SyntaxTree/UnionCase/UnionCaseFieldsCanHaveComments.fs.bsl +++ b/tests/service/data/SyntaxTree/UnionCase/UnionCaseFieldsCanHaveComments.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/UnionCase/UnionCaseFieldsCanHaveComments.fs", false, - QualifiedNameOfFile UnionCaseFieldsCanHaveComments, [], [], + QualifiedNameOfFile UnionCaseFieldsCanHaveComments, [], [SynModuleOrNamespace ([UnionCaseFieldsCanHaveComments], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Val/InlineKeyword.fsi.bsl b/tests/service/data/SyntaxTree/Val/InlineKeyword.fsi.bsl index 8c04d7ba275..eca0b22aa41 100644 --- a/tests/service/data/SyntaxTree/Val/InlineKeyword.fsi.bsl +++ b/tests/service/data/SyntaxTree/Val/InlineKeyword.fsi.bsl @@ -1,6 +1,6 @@ SigFile (ParsedSigFileInput - ("/root/Val/InlineKeyword.fsi", QualifiedNameOfFile InlineKeyword, [], [], + ("/root/Val/InlineKeyword.fsi", QualifiedNameOfFile InlineKeyword, [], [SynModuleOrNamespaceSig ([X], false, DeclaredNamespace, [Val From 3f566a9e69f36ba27c4f4ced46bcd19a6399172f Mon Sep 17 00:00:00 2001 From: Martin521 <29605222+Martin521@users.noreply.github.com> Date: Sat, 21 Sep 2024 19:49:34 +0000 Subject: [PATCH 17/35] fantomas --- src/Compiler/Driver/fsc.fs | 3 +-- src/Compiler/Facilities/DiagnosticOptions.fs | 6 +++-- src/Compiler/Facilities/DiagnosticOptions.fsi | 6 +++-- src/Compiler/SyntaxTree/WarnScopes.fs | 27 +++++++++++-------- src/Compiler/SyntaxTree/WarnScopes.fsi | 4 +-- 5 files changed, 27 insertions(+), 19 deletions(-) diff --git a/src/Compiler/Driver/fsc.fs b/src/Compiler/Driver/fsc.fs index 24a6c0fad1b..4e084c1f288 100644 --- a/src/Compiler/Driver/fsc.fs +++ b/src/Compiler/Driver/fsc.fs @@ -283,8 +283,7 @@ let ProcessCommandLineFlags (tcConfigB: TcConfigBuilder, lcidFromCodePage, argv) // This is where flags are interpreted by the command line fsc.exe. ParseCompilerOptions(collect, GetCoreFscCompilerOptions tcConfigB, List.tail (PostProcessCompilerArgs abbrevArgs argv)) - tcConfigB.diagnosticsOptions.FSharp9CompatibleNowarn <- - not <| tcConfigB.langVersion.SupportsFeature LanguageFeature.ScopedNowarn + tcConfigB.diagnosticsOptions.FSharp9CompatibleNowarn <- not <| tcConfigB.langVersion.SupportsFeature LanguageFeature.ScopedNowarn let inputFiles = List.rev inputFilesRef diff --git a/src/Compiler/Facilities/DiagnosticOptions.fs b/src/Compiler/Facilities/DiagnosticOptions.fs index e619cfd5985..b62e95d3332 100644 --- a/src/Compiler/Facilities/DiagnosticOptions.fs +++ b/src/Compiler/Facilities/DiagnosticOptions.fs @@ -16,8 +16,10 @@ type WarnScope = type WarnScopeMap = WarnScopeMap of Map -type LineMap = LineMap of Map - with static member Empty = LineMap Map.empty +type LineMap = + | LineMap of Map + + static member Empty = LineMap Map.empty [] type FSharpDiagnosticSeverity = diff --git a/src/Compiler/Facilities/DiagnosticOptions.fsi b/src/Compiler/Facilities/DiagnosticOptions.fsi index 663e6ba06d3..5a8f37fc20b 100644 --- a/src/Compiler/Facilities/DiagnosticOptions.fsi +++ b/src/Compiler/Facilities/DiagnosticOptions.fsi @@ -21,8 +21,10 @@ type WarnScope = type WarnScopeMap = WarnScopeMap of Map /// Information about the mapping implied by the #line directives -type LineMap = LineMap of Map - with static member Empty : LineMap +type LineMap = + | LineMap of Map + + static member Empty: LineMap [] type FSharpDiagnosticSeverity = diff --git a/src/Compiler/SyntaxTree/WarnScopes.fs b/src/Compiler/SyntaxTree/WarnScopes.fs index ea272d697ca..f764d99f7bf 100644 --- a/src/Compiler/SyntaxTree/WarnScopes.fs +++ b/src/Compiler/SyntaxTree/WarnScopes.fs @@ -16,7 +16,6 @@ module internal WarnScopes = let private warnScopeKey = "WarnScopes" let private lineMapKey = "WarnScopes.LineMaps" - // ************************************* // Collect the line directives to correctly interact with them // ************************************* @@ -24,20 +23,22 @@ module internal WarnScopes = let private getLineMap (lexbuf: Lexbuf) = if not <| lexbuf.BufferLocalStore.ContainsKey lineMapKey then lexbuf.BufferLocalStore.Add(lineMapKey, LineMap.Empty) + lexbuf.BufferLocalStore[lineMapKey] :?> LineMap - + let private setLineMap (lexbuf: Lexbuf) lineMap = lexbuf.BufferLocalStore[lineMapKey] <- LineMap lineMap - let RegisterLineDirective(lexbuf, previousFileIndex, fileIndex, line: int) = + let RegisterLineDirective (lexbuf, previousFileIndex, fileIndex, line: int) = let (LineMap lineMap) = getLineMap lexbuf + if not <| lineMap.ContainsKey fileIndex then lineMap |> Map.add fileIndex previousFileIndex - |> Map.add previousFileIndex previousFileIndex // to flag that it contains a line directive + |> Map.add previousFileIndex previousFileIndex // to flag that it contains a line directive |> setLineMap lexbuf - ignore line // for now + ignore line // for now // ************************************* // Collect the warn scopes during lexing @@ -46,6 +47,7 @@ module internal WarnScopes = let private getWarnScopes (lexbuf: Lexbuf) = if not <| lexbuf.BufferLocalStore.ContainsKey warnScopeKey then lexbuf.BufferLocalStore.Add(warnScopeKey, WarnScopeMap Map.empty) + lexbuf.BufferLocalStore[warnScopeKey] :?> WarnScopeMap [] @@ -67,8 +69,7 @@ module internal WarnScopes = | false, _ -> None let private regex = - Regex(" *#(nowarn|warnon)(?: +([^ \r\n/;]+))*(?: *(?:;;|\\/\\/).*)?\r?\n", - RegexOptions.Compiled ||| RegexOptions.CultureInvariant) + Regex(" *#(nowarn|warnon)(?: +([^ \r\n/;]+))*(?: *(?:;;|\\/\\/).*)?\r?\n", RegexOptions.Compiled ||| RegexOptions.CultureInvariant) let private getDirectives text m = let mkDirective (directiveId: string) (m: range) (c: Capture) = @@ -121,7 +122,10 @@ module internal WarnScopes = let m = mkFileIndexRange idx (convert lexbuf.StartPos) (convert lexbuf.EndPos) let text = Lexbuf.LexemeString lexbuf let directives = getDirectives text m - let warnScopes = (getWarnScopes lexbuf, directives) ||> List.fold processWarnDirective + + let warnScopes = + (getWarnScopes lexbuf, directives) ||> List.fold processWarnDirective + lexbuf.BufferLocalStore[warnScopeKey] <- warnScopes // ************************************* @@ -138,8 +142,7 @@ module internal WarnScopes = diagnosticOptions.WarnScopes <- WarnScopeMap warnScopes' let (LineMap clm) = diagnosticOptions.LineMap let lineMap' = Map.fold (fun lms idx oidx -> Map.add idx oidx lms) clm lineMap - diagnosticOptions.LineMap <- LineMap lineMap' - ) + diagnosticOptions.LineMap <- LineMap lineMap') let ClearLexbufStore (lexbuf: Lexbuf) = lexbuf.BufferLocalStore.Remove warnScopeKey |> ignore @@ -173,6 +176,7 @@ module internal WarnScopes = let IsWarnon (diagnosticOptions: FSharpDiagnosticOptions) warningNumber (mo: range option) = let (WarnScopeMap warnScopes) = diagnosticOptions.WarnScopes let (LineMap lineMap) = diagnosticOptions.LineMap + match mo with | None -> false | Some m -> @@ -185,13 +189,14 @@ module internal WarnScopes = let IsNowarn (diagnosticOptions: FSharpDiagnosticOptions) warningNumber (mo: range option) = let (WarnScopeMap warnScopes) = diagnosticOptions.WarnScopes let (LineMap lineMap) = diagnosticOptions.LineMap + match mo, diagnosticOptions.FSharp9CompatibleNowarn with | Some m, false -> match lineMap.TryFind m.FileIndex with | None -> let scopes = getScopes (index (m.FileIndex, warningNumber)) warnScopes List.exists (isEnclosingNowarnScope m) scopes - | Some fileIndex -> // file has #line directives + | Some fileIndex -> // file has #line directives let scopes = getScopes (index (fileIndex, warningNumber)) warnScopes List.exists isOffScope scopes | _ -> warnScopes |> Map.exists (fun idx _ -> warnNumFromIndex idx = warningNumber) diff --git a/src/Compiler/SyntaxTree/WarnScopes.fsi b/src/Compiler/SyntaxTree/WarnScopes.fsi index 4497b3385e0..835faa7a38d 100644 --- a/src/Compiler/SyntaxTree/WarnScopes.fsi +++ b/src/Compiler/SyntaxTree/WarnScopes.fsi @@ -10,10 +10,10 @@ module internal WarnScopes = /// To be called from lex.fsl to register the line directives for warn scope processing val RegisterLineDirective: lexbuf: Lexbuf * previousFileIndex: int * fileIndex: int * line: int -> unit - + /// To be called from lex.fsl: #nowarn / #warnon directives are turned into warn scopes and saved val ParseAndRegisterWarnDirective: lexbuf: Lexbuf -> unit - + /// Clear the WarnScopes data in lexbuf.BufferLocalStore for reuse of the lexbuf val ClearLexbufStore: Lexbuf -> unit From c82daef246df0cb9502ce5179a04bf3e29d89a16 Mon Sep 17 00:00:00 2001 From: Martin521 <29605222+Martin521@users.noreply.github.com> Date: Fri, 4 Oct 2024 13:44:28 +0000 Subject: [PATCH 18/35] handling warn directives for interactive and service (LineTokenizer) --- src/Compiler/Checking/CheckDeclarations.fs | 4 +- src/Compiler/CodeGen/IlxGen.fs | 2 +- src/Compiler/Driver/CompilerDiagnostics.fs | 95 ++---- src/Compiler/Driver/CompilerDiagnostics.fsi | 17 +- src/Compiler/Driver/ParseAndCheckInputs.fs | 201 +++++-------- src/Compiler/Driver/ParseAndCheckInputs.fsi | 5 +- src/Compiler/Driver/ScriptClosure.fs | 51 +--- src/Compiler/Driver/ScriptClosure.fsi | 3 - src/Compiler/Driver/fsc.fs | 25 +- src/Compiler/FSComp.txt | 4 +- src/Compiler/FSharp.Compiler.Service.fsproj | 2 + src/Compiler/Facilities/DiagnosticOptions.fs | 22 ++ src/Compiler/Facilities/DiagnosticOptions.fsi | 25 +- src/Compiler/Facilities/LanguageFeatures.fs | 3 + src/Compiler/Facilities/LanguageFeatures.fsi | 1 + src/Compiler/Facilities/prim-parsing.fs | 14 +- src/Compiler/Interactive/fsi.fs | 46 ++- .../Optimize/InnerLambdasToTopLevelFuncs.fs | 4 +- src/Compiler/Optimize/Optimizer.fs | 4 +- src/Compiler/Service/BackgroundCompiler.fs | 2 - src/Compiler/Service/FSharpCheckerResults.fs | 4 - src/Compiler/Service/IncrementalBuild.fs | 3 +- src/Compiler/Service/ServiceLexing.fs | 18 +- src/Compiler/Service/ServiceLexing.fsi | 1 + src/Compiler/Service/TransparentCompiler.fs | 13 +- src/Compiler/Symbols/Exprs.fs | 2 +- src/Compiler/Symbols/FSharpDiagnostic.fs | 26 +- src/Compiler/SyntaxTree/ParseHelpers.fs | 5 + src/Compiler/SyntaxTree/SyntaxTree.fs | 17 +- src/Compiler/SyntaxTree/SyntaxTree.fsi | 16 +- src/Compiler/SyntaxTree/WarnScopes.fs | 202 +++++++++++++ src/Compiler/SyntaxTree/WarnScopes.fsi | 24 ++ src/Compiler/TypedTree/TypedTree.fs | 4 +- src/Compiler/TypedTree/TypedTree.fsi | 4 +- src/Compiler/TypedTree/TypedTreeOps.fs | 8 +- src/Compiler/lex.fsl | 13 +- src/Compiler/pars.fsy | 5 +- src/Compiler/xlf/FSComp.txt.cs.xlf | 10 + src/Compiler/xlf/FSComp.txt.de.xlf | 10 + src/Compiler/xlf/FSComp.txt.es.xlf | 10 + src/Compiler/xlf/FSComp.txt.fr.xlf | 10 + src/Compiler/xlf/FSComp.txt.it.xlf | 10 + src/Compiler/xlf/FSComp.txt.ja.xlf | 10 + src/Compiler/xlf/FSComp.txt.ko.xlf | 10 + src/Compiler/xlf/FSComp.txt.pl.xlf | 10 + src/Compiler/xlf/FSComp.txt.pt-BR.xlf | 10 + src/Compiler/xlf/FSComp.txt.ru.xlf | 10 + src/Compiler/xlf/FSComp.txt.tr.xlf | 10 + src/Compiler/xlf/FSComp.txt.zh-Hans.xlf | 10 + src/Compiler/xlf/FSComp.txt.zh-Hant.xlf | 10 + .../CompilerDirectives/NonStringArgs.fs | 129 +------- .../CompilerDirectives/Nowarn.fs | 275 ++++++++++++++++++ .../FSharp.Compiler.ComponentTests.fsproj | 1 + ...ervice.SurfaceArea.netstandard20.debug.bsl | 115 +++++--- ...vice.SurfaceArea.netstandard20.release.bsl | 136 ++++++--- .../FSharp.Compiler.Service.Tests.fsproj | 27 +- .../SyntaxTreeTests.fs | 5 +- .../WarnScopeTests.fs | 30 ++ .../Attribute/RangeOfAttribute.fs.bsl | 2 +- .../Attribute/RangeOfAttributeWithPath.fs.bsl | 2 +- .../RangeOfAttributeWithTarget.fs.bsl | 2 +- ...ColonBeforeReturnTypeIsPartOfTrivia.fs.bsl | 2 +- ...eturnTypeIsPartOfTriviaInProperties.fs.bsl | 1 - ...itionalDirectiveAroundInlineKeyword.fs.bsl | 2 +- .../Binding/InlineKeywordInBinding.fs.bsl | 2 +- ...nShouldBeIncludedInSynModuleDeclLet.fs.bsl | 2 +- ...BeIncludedInBindingOfSynExprObjExpr.fs.bsl | 2 +- ...dedInConstructorSynMemberDefnMember.fs.bsl | 2 +- ...tructorSynMemberDefnMemberOptAsSpec.fs.bsl | 2 +- ...edInFullSynMemberDefnMemberProperty.fs.bsl | 1 - ...uldBeIncludedInSecondaryConstructor.fs.bsl | 2 +- ...eIncludedInSynMemberDefnLetBindings.fs.bsl | 2 +- ...ouldBeIncludedInSynMemberDefnMember.fs.bsl | 2 +- ...eShouldBeIncludedInSynModuleDeclLet.fs.bsl | 1 - ...riteOnlySynMemberDefnMemberProperty.fs.bsl | 2 +- ...ignShouldBePresentInLocalLetBinding.fs.bsl | 1 - ...ouldBePresentInLocalLetBindingTyped.fs.bsl | 2 +- ...lSignShouldBePresentInMemberBinding.fs.bsl | 2 +- ...resentInMemberBindingWithParameters.fs.bsl | 2 +- ...resentInMemberBindingWithReturnType.fs.bsl | 2 +- ...fEqualSignShouldBePresentInProperty.fs.bsl | 2 +- ...dBePresentInSynModuleDeclLetBinding.fs.bsl | 2 +- ...esentInSynModuleDeclLetBindingTyped.fs.bsl | 2 +- ...ldBePresentInSynExprLetOrUseBinding.fs.bsl | 2 +- ...dBePresentInSynModuleDeclLetBinding.fs.bsl | 2 +- ...nModuleDeclLetBindingWithAttributes.fs.bsl | 2 +- ...turnTypeOfBindingShouldContainStars.fs.bsl | 2 +- .../BlockCommentInSourceCode.fs.bsl | 2 +- ...ckCommentInSourceCodeSignatureFile.fsi.bsl | 2 +- .../CodeComment/CommentAfterSourceCode.fs.bsl | 2 +- ...ommentAfterSourceCodeSignatureFile.fsi.bsl | 2 +- .../CodeComment/CommentAtEndOfFile.fs.bsl | 2 +- .../CodeComment/CommentOnSingleLine.fs.bsl | 2 +- .../CommentOnSingleLineSignatureFile.fsi.bsl | 2 +- ...BeCapturedIfUsedInAnInvalidLocation.fs.bsl | 2 +- ...ipleSlashCommentShouldNotBeCaptured.fs.bsl | 2 +- ...atStartsAtAndAndEndsAfterExpression.fs.bsl | 1 - ...geStartsAtAndAndEndsAfterExpression.fs.bsl | 2 +- ...tilineCommentAreNotReportedAsTrivia.fs.bsl | 1 - ...reNotReportedAsTriviaSignatureFile.fsi.bsl | 2 +- ...ltilineStringAreNotReportedAsTrivia.fs.bsl | 1 - ...reNotReportedAsTriviaSignatureFile.fsi.bsl | 2 +- .../NestedIfElseEndif.fs.bsl | 2 +- .../NestedIfElseEndifSignatureFile.fsi.bsl | 2 +- ...NestedIfEndifWithComplexExpressions.fs.bsl | 2 +- ...ithComplexExpressionsSignatureFile.fsi.bsl | 1 - .../SingleIfElseEndif.fs.bsl | 2 +- .../SingleIfElseEndifSignatureFile.fsi.bsl | 2 +- .../ConditionalDirective/SingleIfEndif.fs.bsl | 2 +- .../SingleIfEndifSignatureFile.fsi.bsl | 2 +- .../MultipleSynEnumCasesHaveBarRange.fs.bsl | 2 +- .../SingleSynEnumCaseHasBarRange.fs.bsl | 2 +- .../SingleSynEnumCaseWithoutBar.fs.bsl | 2 +- .../Exception/Missing name 01.fs.bsl | 2 +- .../Exception/Missing name 02.fs.bsl | 2 +- .../Exception/Missing name 03.fs.bsl | 2 +- .../Exception/Recover Function Type 01.fs.bsl | 2 +- ...uldContainsTheRangeOfTheWithKeyword.fs.bsl | 2 +- .../Expression/AnonymousRecords-01.fs.bsl | 2 +- .../Expression/AnonymousRecords-02.fs.bsl | 2 +- .../Expression/AnonymousRecords-03.fs.bsl | 2 +- .../Expression/AnonymousRecords-04.fs.bsl | 2 +- .../Expression/AnonymousRecords-05.fs.bsl | 2 +- .../Expression/AnonymousRecords-06.fs.bsl | 2 +- .../Expression/Binary - Eq 01.fs.bsl | 2 +- .../Expression/Binary - Eq 02.fs.bsl | 2 +- .../Expression/Binary - Eq 03.fs.bsl | 2 +- .../Expression/Binary - Eq 04.fs.bsl | 2 +- .../Expression/Binary - Eq 05.fs.bsl | 2 +- .../Expression/Binary - Eq 06.fs.bsl | 2 +- .../Expression/Binary - Eq 07.fs.bsl | 2 +- .../Expression/Binary - Plus 01.fs.bsl | 2 +- .../Expression/Binary - Plus 02.fs.bsl | 2 +- .../Expression/Binary - Plus 03.fs.bsl | 2 +- .../Expression/Binary - Plus 04.fs.bsl | 2 +- .../Expression/Binary - Plus 05.fs.bsl | 2 +- .../SyntaxTree/Expression/Binary 01.fs.bsl | 2 +- .../SyntaxTree/Expression/Binary 02.fs.bsl | 2 +- ...OfTheEqualsSignInSynExprRecordField.fs.bsl | 1 - .../data/SyntaxTree/Expression/Do 01.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Do 02.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Do 03.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Do 04.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Do 05.fs.bsl | 2 +- .../DotLambda - _ Recovery - Casts.fsx.bsl | 2 +- .../DotLambda - _ Recovery - Eof.fsx.bsl | 2 +- .../Expression/DotLambda - _ Recovery.fsx.bsl | 2 +- .../DotLambda - _. Recovery - Eof.fsx.bsl | 2 +- .../DotLambda - _. Recovery.fsx.bsl | 2 +- ...umentExpressionInInnerAppExpression.fs.bsl | 1 - ...bda_FunctionWithUnderscoreDotLambda.fs.bsl | 2 +- ...bda_NestedPropertiesAfterUnderscore.fs.bsl | 2 +- ...NotAllowedFunctionExpressionWithArg.fs.bsl | 2 +- .../Expression/DotLambda_TopLevelLet.fs.bsl | 2 +- ...tLambda_TopLevelStandaloneDotLambda.fs.bsl | 2 +- ...tionCallWithSpaceAndUnitApplication.fs.bsl | 2 +- .../DotLambda_UnderscoreToString.fs.bsl | 2 +- ...DotLambda_WithNonTupledFunctionCall.fs.bsl | 2 +- .../Expression/DotLambda_WithoutDot.fs.bsl | 2 +- .../DotLambda_WithoutUnderscore.fs.bsl | 2 +- .../SyntaxTree/Expression/Downcast 01.fs.bsl | 1 - .../SyntaxTree/Expression/Downcast 02.fs.bsl | 1 - .../SyntaxTree/Expression/Downcast 03.fs.bsl | 1 - .../data/SyntaxTree/Expression/For 01.fs.bsl | 2 +- .../data/SyntaxTree/Expression/For 02.fs.bsl | 2 +- .../data/SyntaxTree/Expression/For 03.fs.bsl | 2 +- .../data/SyntaxTree/Expression/For 04.fs.bsl | 2 +- .../data/SyntaxTree/Expression/For 05.fs.bsl | 2 +- .../Expression/GlobalKeywordAsSynExpr.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Id 01.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Id 02.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Id 03.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Id 04.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Id 05.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Id 06.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Id 07.fs.bsl | 2 +- .../data/SyntaxTree/Expression/If 01.fs.bsl | 2 +- .../data/SyntaxTree/Expression/If 02.fs.bsl | 2 +- .../data/SyntaxTree/Expression/If 03.fs.bsl | 2 +- .../data/SyntaxTree/Expression/If 04.fs.bsl | 2 +- .../data/SyntaxTree/Expression/If 05.fs.bsl | 2 +- .../data/SyntaxTree/Expression/If 06.fs.bsl | 2 +- .../data/SyntaxTree/Expression/If 07.fs.bsl | 2 +- .../data/SyntaxTree/Expression/If 08.fs.bsl | 2 +- .../data/SyntaxTree/Expression/If 09.fs.bsl | 2 +- .../data/SyntaxTree/Expression/If 10.fs.bsl | 2 +- ...OfTheEqualsSignInSynExprRecordField.fs.bsl | 2 +- .../Lambda - Missing expr 01.fs.bsl | 2 +- .../Lambda - Missing expr 02.fs.bsl | 2 +- .../SyntaxTree/Expression/Lambda 01.fs.bsl | 2 +- .../SyntaxTree/Expression/Lambda 02.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Lazy 01.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Lazy 02.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Lazy 03.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Let 01.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Let 02.fs.bsl | 2 +- .../Expression/List - Comprehension 01.fs.bsl | 2 +- .../Expression/List - Comprehension 02.fs.bsl | 2 +- ...LetOrUseContainsTheRangeOfInKeyword.fs.bsl | 1 - .../Expression/Object - Class 01.fs.bsl | 2 +- .../Expression/Object - Class 02.fs.bsl | 2 +- .../Expression/Object - Class 03.fs.bsl | 2 +- .../Expression/Object - Class 04.fs.bsl | 2 +- .../Expression/Object - Class 05.fs.bsl | 2 +- .../Expression/Object - Class 06.fs.bsl | 2 +- .../Expression/Object - Class 07.fs.bsl | 2 +- .../Expression/Object - Class 08.fs.bsl | 2 +- .../Expression/Object - Class 09.fs.bsl | 2 +- .../Expression/Object - Class 10.fs.bsl | 2 +- .../Expression/Object - Class 11.fs.bsl | 2 +- .../Expression/Object - Class 12.fs.bsl | 2 +- .../Expression/Object - Class 13.fs.bsl | 2 +- .../Expression/Object - Class 14.fs.bsl | 2 +- .../Expression/Object - Class 15.fs.bsl | 2 +- .../SyntaxTree/Expression/Rarrow 01.fs.bsl | 2 +- .../SyntaxTree/Expression/Rarrow 02.fs.bsl | 2 +- .../SyntaxTree/Expression/Rarrow 03.fs.bsl | 2 +- .../Expression/Record - Anon 01.fs.bsl | 2 +- .../Expression/Record - Anon 02.fs.bsl | 2 +- .../Expression/Record - Anon 03.fs.bsl | 2 +- .../Expression/Record - Anon 04.fs.bsl | 2 +- .../Expression/Record - Anon 05.fs.bsl | 2 +- .../Expression/Record - Anon 06.fs.bsl | 2 +- .../Expression/Record - Anon 07.fs.bsl | 2 +- .../Expression/Record - Anon 08.fs.bsl | 2 +- .../Expression/Record - Anon 09.fs.bsl | 2 +- .../Expression/Record - Anon 10.fs.bsl | 2 +- .../Expression/Record - Anon 11.fs.bsl | 2 +- .../Expression/Record - Anon 12.fs.bsl | 2 +- .../Expression/Record - Field 01.fs.bsl | 2 +- .../Expression/Record - Field 02.fs.bsl | 2 +- .../Expression/Record - Field 03.fs.bsl | 2 +- .../Expression/Record - Field 04.fs.bsl | 2 +- .../Expression/Record - Field 05.fs.bsl | 2 +- .../Expression/Record - Field 06.fs.bsl | 2 +- .../Expression/Record - Field 07.fs.bsl | 2 +- .../Expression/Record - Field 08.fs.bsl | 2 +- .../Expression/Record - Field 09.fs.bsl | 2 +- .../Expression/Record - Field 10.fs.bsl | 2 +- .../Expression/Record - Field 11.fs.bsl | 2 +- .../Expression/Record - Field 12.fs.bsl | 2 +- .../Expression/Record - Field 13.fs.bsl | 2 +- .../Expression/Record - Field 14.fs.bsl | 2 +- .../Expression/Sequential 01.fs.bsl | 2 +- .../Expression/Sequential 02.fs.bsl | 2 +- .../Expression/Sequential 03.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Set 01.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Set 02.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Set 03.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Set 04.fs.bsl | 2 +- .../SynExprAnonRecdWithStructKeyword.fs.bsl | 2 +- ...sTheRangeOfTheEqualsSignInTheFields.fs.bsl | 2 +- ...xprDoContainsTheRangeOfTheDoKeyword.fs.bsl | 2 +- .../SynExprDynamicDoesContainIdent.fs.bsl | 2 +- ...ynExprDynamicDoesContainParentheses.fs.bsl | 2 +- ...rForContainsTheRangeOfTheEqualsSign.fs.bsl | 2 +- ...BangContainsTheRangeOfTheEqualsSign.fs.bsl | 1 - ...LetOrUseContainsTheRangeOfInKeyword.fs.bsl | 2 +- ...seDoesNotContainTheRangeOfInKeyword.fs.bsl | 1 - ...rsDoesNotContainTheRangeOfInKeyword.fs.bsl | 2 +- ...eBindingContainsTheRangeOfInKeyword.fs.bsl | 2 +- ...insTheRangeOfTheMatchAndWithKeyword.fs.bsl | 2 +- ...insTheRangeOfTheMatchAndWithKeyword.fs.bsl | 2 +- ...bjExprContainsTheRangeOfWithKeyword.fs.bsl | 2 +- .../Expression/SynExprObjWithSetter.fs.bsl | 2 +- ...OfTheEqualsSignInSynExprRecordField.fs.bsl | 2 +- ...dFieldsContainCorrectAmountOfTrivia.fs.bsl | 2 +- .../SynExprSetWithSynExprDynamic.fs.bsl | 2 +- ...tainsTheRangeOfTheTryAndWithKeyword.fs.bsl | 2 +- ...tainsTheRangeOfTheTryAndWithKeyword.fs.bsl | 2 +- .../Expression/Try - Finally 01.fs.bsl | 2 +- .../Expression/Try - Finally 02.fs.bsl | 2 +- .../Expression/Try - Finally 03.fs.bsl | 2 +- .../Expression/Try - Finally 04.fs.bsl | 2 +- .../Expression/Try - With 01.fs.bsl | 1 - .../Expression/Try - With 02.fs.bsl | 1 - .../Expression/Try - With 03.fs.bsl | 1 - .../Expression/Try - With 04.fs.bsl | 1 - .../Expression/Try - With 05.fs.bsl | 1 - .../Expression/Try - With 06.fs.bsl | 1 - .../Expression/Try - With 07.fs.bsl | 1 - .../Expression/Try - With 08.fs.bsl | 1 - .../Expression/Try - With 09.fs.bsl | 1 - .../data/SyntaxTree/Expression/Try 01.fs.bsl | 2 +- .../data/SyntaxTree/Expression/Try 02.fs.bsl | 2 +- .../Try with - Missing expr 01.fs.bsl | 2 +- .../Try with - Missing expr 02.fs.bsl | 2 +- .../Try with - Missing expr 03.fs.bsl | 2 +- .../Try with - Missing expr 04.fs.bsl | 2 +- .../Try with - Missing expr 05.fs.bsl | 2 +- .../SyntaxTree/Expression/Try with 01.fs.bsl | 1 - .../Expression/Tuple - Missing item 01.fs.bsl | 2 +- .../Expression/Tuple - Missing item 02.fs.bsl | 2 +- .../Expression/Tuple - Missing item 03.fs.bsl | 2 +- .../Expression/Tuple - Missing item 04.fs.bsl | 2 +- .../Expression/Tuple - Missing item 05.fs.bsl | 2 +- .../Expression/Tuple - Missing item 06.fs.bsl | 2 +- .../Expression/Tuple - Missing item 07.fs.bsl | 2 +- .../Expression/Tuple - Missing item 08.fs.bsl | 2 +- .../Expression/Tuple - Missing item 09.fs.bsl | 2 +- .../Expression/Tuple - Missing item 10.fs.bsl | 2 +- .../Expression/Tuple - Missing item 11.fs.bsl | 2 +- .../SyntaxTree/Expression/Tuple 01.fs.bsl | 2 +- .../SyntaxTree/Expression/Tuple 02.fs.bsl | 2 +- .../SyntaxTree/Expression/Type test 01.fs.bsl | 1 - .../SyntaxTree/Expression/Type test 02.fs.bsl | 1 - .../SyntaxTree/Expression/Type test 03.fs.bsl | 1 - .../SyntaxTree/Expression/Type test 04.fs.bsl | 1 - .../SyntaxTree/Expression/Typed 01.fs.bsl | 2 +- .../SyntaxTree/Expression/Typed 02.fs.bsl | 2 +- .../SyntaxTree/Expression/Typed 03.fs.bsl | 2 +- .../SyntaxTree/Expression/Typed 04.fs.bsl | 2 +- .../Expression/Unary - Reserved 01.fs.bsl | 2 +- .../Expression/Unary - Reserved 02.fs.bsl | 2 +- .../Unfinished escaped ident 01.fs.bsl | 2 +- .../Unfinished escaped ident 02.fs.bsl | 2 +- .../Unfinished escaped ident 03.fs.bsl | 2 +- .../SyntaxTree/Expression/Upcast 01.fs.bsl | 2 +- .../SyntaxTree/Expression/Upcast 02.fs.bsl | 2 +- .../SyntaxTree/Expression/Upcast 03.fs.bsl | 2 +- .../SyntaxTree/Expression/Upcast 04.fs.bsl | 2 +- .../SyntaxTree/Expression/Upcast 05.fs.bsl | 2 +- .../SyntaxTree/Expression/While 01.fs.bsl | 2 +- .../SyntaxTree/Expression/While 02.fs.bsl | 2 +- .../SyntaxTree/Expression/While 03.fs.bsl | 2 +- .../SyntaxTree/Expression/While 04.fs.bsl | 2 +- .../SyntaxTree/Expression/While 05.fs.bsl | 2 +- .../SyntaxTree/Expression/While 06.fs.bsl | 2 +- .../SyntaxTree/Expression/WhileBang 01.fs.bsl | 1 - .../SyntaxTree/Expression/WhileBang 02.fs.bsl | 1 - .../SyntaxTree/Expression/WhileBang 03.fs.bsl | 1 - .../SyntaxTree/Expression/WhileBang 04.fs.bsl | 1 - .../SyntaxTree/Expression/WhileBang 05.fs.bsl | 1 - .../SyntaxTree/Expression/WhileBang 06.fs.bsl | 1 - .../data/SyntaxTree/Extern/Extern 01.fs.bsl | 2 +- .../ExternKeywordIsPresentInTrivia.fs.bsl | 2 +- .../IfThenElse/Comment after else 01.fs.bsl | 2 +- .../IfThenElse/Comment after else 02.fs.bsl | 2 +- .../IfThenElse/DeeplyNestedIfThenElse.fs.bsl | 2 +- .../ElseKeywordInSimpleIfThenElse.fs.bsl | 2 +- .../IfThenElse/IfKeywordInIfThenElse.fs.bsl | 2 +- ...IfThenAndElseKeywordOnSeparateLines.fs.bsl | 2 +- .../IfThenElse/NestedElifInIfThenElse.fs.bsl | 2 +- .../NestedElseIfInIfThenElse.fs.bsl | 2 +- ...stedElseIfOnTheSameLineInIfThenElse.fs.bsl | 2 +- ...ComplexArgumentsLambdaHasArrowRange.fs.bsl | 2 +- .../DestructedLambdaHasArrowRange.fs.bsl | 2 +- ...rameterWithWildCardGivesCorrectBody.fs.bsl | 2 +- ...daWithTwoParametersGivesCorrectBody.fs.bsl | 2 +- ...thWildCardParameterGivesCorrectBody.fs.bsl | 2 +- ...dThatReturnsALambdaGivesCorrectBody.fs.bsl | 2 +- .../MultilineLambdaHasArrowRange.fs.bsl | 2 +- .../Lambda/Param - Missing type 01.fs.bsl | 2 +- .../Lambda/Param - Missing type 02.fs.bsl | 2 +- .../Lambda/Param - Missing type 03.fs.bsl | 2 +- .../Lambda/Param - Missing type 04.fs.bsl | 2 +- .../Lambda/SimpleLambdaHasArrowRange.fs.bsl | 2 +- .../Lambda/TupleInLambdaHasArrowRange.fs.bsl | 2 +- .../LeadingKeyword/AbstractKeyword.fs.bsl | 2 +- .../AbstractMemberKeyword.fs.bsl | 2 +- .../LeadingKeyword/AndKeyword.fs.bsl | 2 +- .../LeadingKeyword/DefaultKeyword.fsi.bsl | 2 +- .../LeadingKeyword/DefaultValKeyword.fs.bsl | 2 +- .../LeadingKeyword/DoKeyword.fs.bsl | 2 +- .../LeadingKeyword/DoStaticKeyword.fs.bsl | 2 +- .../LeadingKeyword/ExternKeyword.fs.bsl | 2 +- .../LeadingKeyword/LetKeyword.fs.bsl | 2 +- .../LeadingKeyword/LetRecKeyword.fs.bsl | 2 +- .../LeadingKeyword/MemberKeyword.fs.bsl | 2 +- .../LeadingKeyword/MemberValKeyword.fs.bsl | 2 +- .../LeadingKeyword/NewKeyword.fs.bsl | 2 +- .../LeadingKeyword/OverrideKeyword.fs.bsl | 2 +- .../LeadingKeyword/OverrideValKeyword.fs.bsl | 2 +- .../StaticAbstractKeyword.fs.bsl | 2 +- .../StaticAbstractMemberKeyword.fs.bsl | 2 +- .../LeadingKeyword/StaticLetKeyword.fs.bsl | 2 +- .../LeadingKeyword/StaticLetRecKeyword.fs.bsl | 2 +- .../LeadingKeyword/StaticMemberKeyword.fs.bsl | 2 +- .../StaticMemberValKeyword.fs.bsl | 2 +- .../LeadingKeyword/StaticValKeyword.fsi.bsl | 2 +- .../LeadingKeyword/SyntheticKeyword.fs.bsl | 2 +- .../LeadingKeyword/UseKeyword.fs.bsl | 2 +- .../LeadingKeyword/UseRecKeyword.fs.bsl | 2 +- .../LeadingKeyword/ValKeyword.fsi.bsl | 1 - .../MatchClause/Missing expr 01.fs.bsl | 2 +- .../MatchClause/Missing expr 02.fs.bsl | 2 +- .../MatchClause/Missing expr 03.fs.bsl | 2 +- .../MatchClause/Missing expr 04.fs.bsl | 2 +- .../MatchClause/Missing expr 05.fs.bsl | 2 +- .../MatchClause/Missing pat 01.fs.bsl | 2 +- .../MatchClause/Missing pat 02.fs.bsl | 2 +- .../MatchClause/Missing pat 03.fs.bsl | 2 +- .../MatchClause/Missing pat 04.fs.bsl | 2 +- .../MatchClause/Missing pat 05.fs.bsl | 2 +- ...ingleSynMatchClauseInSynExprTryWith.fs.bsl | 2 +- .../RangeOfArrowInSynMatchClause.fs.bsl | 2 +- ...ArrowInSynMatchClauseWithWhenClause.fs.bsl | 2 +- ...ipleSynMatchClausesInSynExprTryWith.fs.bsl | 2 +- ...ASingleSynMatchClauseInSynExprMatch.fs.bsl | 2 +- ...ingleSynMatchClauseInSynExprTryWith.fs.bsl | 1 - ...ltipleSynMatchClausesInSynExprMatch.fs.bsl | 1 - .../RangeOfMultipleSynMatchClause.fs.bsl | 2 +- .../RangeOfSingleSynMatchClause.fs.bsl | 2 +- ...OfSingleSynMatchClauseFollowedByBar.fs.bsl | 2 +- .../SyntaxTree/Measure/Constant - 01.fs.bsl | 2 +- .../SyntaxTree/Measure/Constant - 02.fs.bsl | 2 +- .../SyntaxTree/Measure/Constant - 03.fs.bsl | 2 +- .../SyntaxTree/Measure/Constant - 04.fs.bsl | 2 +- .../SyntaxTree/Measure/Constant - 05.fs.bsl | 2 +- .../SyntaxTree/Measure/Constant - 06.fs.bsl | 2 +- .../SyntaxTree/Measure/Constant - 07.fs.bsl | 2 +- .../SyntaxTree/Measure/Constant - 08.fs.bsl | 2 +- .../SyntaxTree/Measure/Constant - 09.fs.bsl | 2 +- .../SyntaxTree/Measure/Constant - 10.fs.bsl | 2 +- ...easureContainsTheRangeOfTheConstant.fs.bsl | 2 +- .../SynMeasureParenHasCorrectRange.fs.bsl | 2 +- ...eTupleInMeasureTypeWithLeadingSlash.fs.bsl | 2 +- ...TypeTupleInMeasureTypeWithNoSlashes.fs.bsl | 2 +- ...TupleInMeasureTypeWithStartAndSlash.fs.bsl | 2 +- .../Member/Abstract - Property 01.fs.bsl | 2 +- .../Member/Abstract - Property 02.fs.bsl | 2 +- .../Member/Abstract - Property 03.fs.bsl | 2 +- .../Member/Abstract - Property 04.fs.bsl | 2 +- .../Member/Abstract - Property 05.fs.bsl | 2 +- .../SyntaxTree/Member/Auto property 01.fs.bsl | 1 - .../SyntaxTree/Member/Auto property 02.fs.bsl | 1 - .../SyntaxTree/Member/Auto property 03.fs.bsl | 1 - .../SyntaxTree/Member/Auto property 04.fs.bsl | 1 - .../SyntaxTree/Member/Auto property 05.fs.bsl | 1 - .../SyntaxTree/Member/Auto property 06.fs.bsl | 1 - .../SyntaxTree/Member/Auto property 07.fs.bsl | 2 +- .../SyntaxTree/Member/Auto property 08.fs.bsl | 1 - .../SyntaxTree/Member/Auto property 09.fs.bsl | 1 - .../SyntaxTree/Member/Auto property 10.fs.bsl | 1 - .../SyntaxTree/Member/Auto property 11.fs.bsl | 1 - .../SyntaxTree/Member/Auto property 12.fs.bsl | 1 - .../SyntaxTree/Member/Auto property 13.fs.bsl | 1 - .../SyntaxTree/Member/Auto property 14.fs.bsl | 2 +- .../SyntaxTree/Member/Auto property 15.fs.bsl | 2 +- .../data/SyntaxTree/Member/Do 01.fs.bsl | 2 +- .../data/SyntaxTree/Member/Do 02.fs.bsl | 2 +- .../data/SyntaxTree/Member/Do 03.fs.bsl | 2 +- .../data/SyntaxTree/Member/Do 04.fs.bsl | 2 +- .../data/SyntaxTree/Member/Field 01.fs.bsl | 2 +- .../data/SyntaxTree/Member/Field 02.fs.bsl | 2 +- .../data/SyntaxTree/Member/Field 03.fs.bsl | 2 +- .../data/SyntaxTree/Member/Field 04.fs.bsl | 2 +- .../data/SyntaxTree/Member/Field 05.fs.bsl | 2 +- .../data/SyntaxTree/Member/Field 06.fs.bsl | 2 +- .../data/SyntaxTree/Member/Field 07.fs.bsl | 2 +- .../data/SyntaxTree/Member/Field 08.fs.bsl | 2 +- .../data/SyntaxTree/Member/Field 09.fs.bsl | 2 +- .../data/SyntaxTree/Member/Field 10.fs.bsl | 2 +- .../data/SyntaxTree/Member/Field 11.fs.bsl | 2 +- .../data/SyntaxTree/Member/Field 12.fs.bsl | 2 +- .../data/SyntaxTree/Member/Field 13.fs.bsl | 2 +- .../data/SyntaxTree/Member/Field 14.fs.bsl | 2 +- .../data/SyntaxTree/Member/Field 15.fs.bsl | 2 +- .../SyntaxTree/Member/GetSetMember 01.fs.bsl | 2 +- .../GetSetMemberWithInlineKeyword.fs.bsl | 2 +- .../Implicit ctor - Missing type 01.fs.bsl | 2 +- .../Implicit ctor - Missing type 02.fs.bsl | 2 +- .../Implicit ctor - Pat - Tuple 01.fs.bsl | 2 +- .../Implicit ctor - Pat - Tuple 02.fs.bsl | 2 +- .../Implicit ctor - Type - Fun 01.fs.bsl | 2 +- .../Implicit ctor - Type - Fun 02.fs.bsl | 2 +- .../Implicit ctor - Type - Fun 03.fs.bsl | 2 +- .../Implicit ctor - Type - Fun 04.fs.bsl | 2 +- .../Implicit ctor - Type - Fun 05.fs.bsl | 2 +- .../Implicit ctor - Type - Fun 06.fs.bsl | 2 +- .../Implicit ctor - Type - Tuple 01.fs.bsl | 2 +- .../Implicit ctor - Type - Tuple 02.fs.bsl | 2 +- .../Implicit ctor - Type - Tuple 03.fs.bsl | 2 +- .../Implicit ctor - Type - Tuple 04.fs.bsl | 2 +- .../Implicit ctor - Type - Tuple 05.fs.bsl | 2 +- .../Member/ImplicitCtorWithAsKeyword.fs.bsl | 2 +- .../data/SyntaxTree/Member/Inherit 01.fs.bsl | 2 +- .../data/SyntaxTree/Member/Inherit 02.fs.bsl | 2 +- .../data/SyntaxTree/Member/Inherit 03.fs.bsl | 2 +- .../data/SyntaxTree/Member/Inherit 04.fs.bsl | 2 +- .../data/SyntaxTree/Member/Inherit 05.fs.bsl | 2 +- .../data/SyntaxTree/Member/Inherit 06.fsi.bsl | 2 +- .../data/SyntaxTree/Member/Inherit 07.fsi.bsl | 2 +- .../data/SyntaxTree/Member/Inherit 08.fs.bsl | 2 +- .../SyntaxTree/Member/Interface 01.fs.bsl | 2 +- .../SyntaxTree/Member/Interface 02.fs.bsl | 2 +- .../SyntaxTree/Member/Interface 03.fs.bsl | 2 +- .../SyntaxTree/Member/Interface 04.fs.bsl | 2 +- .../SyntaxTree/Member/Interface 05.fs.bsl | 2 +- .../SyntaxTree/Member/Interface 06.fs.bsl | 2 +- .../SyntaxTree/Member/Interface 07.fs.bsl | 2 +- .../SyntaxTree/Member/Interface 08.fs.bsl | 2 +- .../SyntaxTree/Member/Interface 09.fs.bsl | 2 +- .../SyntaxTree/Member/Interface 10.fs.bsl | 2 +- .../data/SyntaxTree/Member/Let 01.fs.bsl | 2 +- .../data/SyntaxTree/Member/Let 02.fs.bsl | 2 +- .../data/SyntaxTree/Member/Let 03.fs.bsl | 2 +- .../data/SyntaxTree/Member/Let 04.fs.bsl | 2 +- .../Member/Member - Attributes 01.fs.bsl | 2 +- .../Member - Param - Missing type 01.fs.bsl | 2 +- .../data/SyntaxTree/Member/Member 01.fs.bsl | 2 +- .../data/SyntaxTree/Member/Member 02.fs.bsl | 2 +- .../data/SyntaxTree/Member/Member 03.fs.bsl | 2 +- .../data/SyntaxTree/Member/Member 04.fs.bsl | 2 +- .../data/SyntaxTree/Member/Member 05.fs.bsl | 2 +- .../data/SyntaxTree/Member/Member 06.fs.bsl | 2 +- .../data/SyntaxTree/Member/Member 07.fs.bsl | 2 +- .../data/SyntaxTree/Member/Member 08.fs.bsl | 2 +- .../data/SyntaxTree/Member/Member 09.fs.bsl | 2 +- .../data/SyntaxTree/Member/Member 10.fs.bsl | 2 +- .../data/SyntaxTree/Member/Member 11.fs.bsl | 2 +- .../data/SyntaxTree/Member/Member 12.fs.bsl | 2 +- .../data/SyntaxTree/Member/Member 13.fs.bsl | 2 +- .../Member/MemberMispelledToMeme.fs.bsl | 2 +- .../Member/MemberWithInlineKeyword.fs.bsl | 2 +- ...berContainsTheRangeOfTheWithKeyword.fs.bsl | 2 +- ...berContainsTheRangeOfTheWithKeyword.fs.bsl | 2 +- .../Member/SignatureMemberWithGet.fsi.bsl | 2 +- .../Member/SignatureMemberWithSet.fsi.bsl | 2 +- .../Member/SignatureMemberWithSetget.fsi.bsl | 1 - .../data/SyntaxTree/Member/Static 01.fs.bsl | 2 +- .../data/SyntaxTree/Member/Static 02.fs.bsl | 2 +- .../data/SyntaxTree/Member/Static 03.fs.bsl | 2 +- ...lotContainsTheRangeOfTheWithKeyword.fs.bsl | 2 +- ...ertyContainsTheRangeOfTheEqualsSign.fs.bsl | 2 +- ...rtyContainsTheRangeOfTheWithKeyword.fs.bsl | 2 +- ...eDefnWithMemberWithGetHasXmlComment.fs.bsl | 2 +- .../SynTypeDefnWithMemberWithSetget.fs.bsl | 2 +- ...nTypeDefnWithStaticMemberWithGetset.fs.bsl | 2 +- ...berContainsTheRangeOfTheWithKeyword.fs.bsl | 2 +- ...ynExprObjMembersHaveCorrectKeywords.fs.bsl | 2 +- ...erDefnAbstractSlotHasCorrectKeyword.fs.bsl | 2 +- ...erDefnAutoPropertyHasCorrectKeyword.fs.bsl | 2 +- ...fnMemberSynValDataHasCorrectKeyword.fs.bsl | 2 +- ...nMemberSigMemberHasCorrectKeywords.fsi.bsl | 2 +- .../data/SyntaxTree/ModuleMember/Do 01.fs.bsl | 2 +- .../data/SyntaxTree/ModuleMember/Do 02.fs.bsl | 2 +- .../SyntaxTree/ModuleMember/Let 01.fs.bsl | 2 +- .../SyntaxTree/ModuleMember/Let 02.fs.bsl | 2 +- .../SyntaxTree/ModuleMember/Let 03.fs.bsl | 2 +- .../SyntaxTree/ModuleMember/Let 04.fs.bsl | 2 +- .../SyntaxTree/ModuleMember/Let 05.fs.bsl | 2 +- .../SyntaxTree/ModuleMember/Open 01.fs.bsl | 2 +- .../SyntaxTree/ModuleMember/Open 02.fs.bsl | 2 +- .../SyntaxTree/ModuleMember/Open 03.fs.bsl | 2 +- .../SyntaxTree/ModuleMember/Open 04.fs.bsl | 2 +- .../SyntaxTree/ModuleMember/Open 05.fs.bsl | 2 +- .../SyntaxTree/ModuleMember/Open 06.fs.bsl | 2 +- .../SyntaxTree/ModuleMember/Open 07.fs.bsl | 2 +- .../SyntaxTree/ModuleMember/Open 08.fs.bsl | 2 +- .../SyntaxTree/ModuleMember/Val 01.fsi.bsl | 2 +- .../ModuleOrNamespace/Anon module 01.fs.bsl | 2 +- .../ModuleOrNamespace/Anon module 02.fsx.bsl | 2 +- ...eRangeShouldStartAtNamespaceKeyword.fs.bsl | 2 +- ...GlobalInOpenPathShouldContainTrivia.fs.bsl | 2 +- ...espaceShouldStartAtNamespaceKeyword.fs.bsl | 2 +- .../Module - Attribute 01.fs.bsl | 2 +- .../ModuleOrNamespace/Module 01.fs.bsl | 2 +- .../ModuleOrNamespace/Module 02.fs.bsl | 2 +- .../ModuleOrNamespace/Module 03.fs.bsl | 2 +- .../ModuleOrNamespace/Module 04.fs.bsl | 2 +- .../ModuleOrNamespace/Module 05.fs.bsl | 1 - .../ModuleOrNamespace/Module 06.fs.bsl | 1 - .../ModuleOrNamespace/Module 07.fs.bsl | 1 - .../ModuleShouldContainModuleKeyword.fs.bsl | 2 +- ...angeThatStartsAtTheNamespaceKeyword.fs.bsl | 2 +- .../ModuleOrNamespace/Namespace 01.fs.bsl | 2 +- .../ModuleOrNamespace/Namespace 02.fs.bsl | 2 +- .../ModuleOrNamespace/Namespace 03.fs.bsl | 2 +- .../ModuleOrNamespace/Namespace 04.fs.bsl | 2 +- .../ModuleOrNamespace/Namespace 05.fs.bsl | 2 +- .../ModuleOrNamespace/Namespace 06.fs.bsl | 2 +- .../ModuleOrNamespace/Namespace 07.fs.bsl | 2 +- .../ModuleOrNamespace/Namespace 08.fs.bsl | 2 +- .../ModuleOrNamespace/Namespace 09.fs.bsl | 2 +- ...espaceShouldContainNamespaceKeyword.fs.bsl | 2 +- .../ModuleOrNamespace/Nested module 01.fs.bsl | 2 +- .../ModuleOrNamespace/Nested module 02.fs.bsl | 2 +- .../ModuleOrNamespace/Nested module 03.fs.bsl | 2 +- .../ModuleOrNamespace/Nested module 04.fs.bsl | 2 +- .../ModuleOrNamespace/Nested module 05.fs.bsl | 2 +- .../ModuleOrNamespace/Nested module 06.fs.bsl | 2 +- .../ModuleOrNamespace/Nested module 07.fs.bsl | 2 +- .../ModuleOrNamespace/Nested module 08.fs.bsl | 2 +- .../ModuleOrNamespace/Nested module 09.fs.bsl | 2 +- .../ModuleOrNamespace/Nested module 10.fs.bsl | 2 +- .../ModuleOrNamespace/Nested module 11.fs.bsl | 2 +- .../ModuleOrNamespace/Nested module 12.fs.bsl | 2 +- .../ModuleOrNamespace/Nested module 13.fs.bsl | 2 +- .../ModuleOrNamespace/Nested module 14.fs.bsl | 2 +- .../ModuleOrNamespace/Nested module 15.fs.bsl | 2 +- .../ModuleOrNamespace/Nested module 16.fs.bsl | 2 +- .../ModuleOrNamespace/Nested module 17.fs.bsl | 2 +- ...spaceShouldStartAtNamespaceKeyword.fsi.bsl | 2 +- .../ModuleAbbreviation.fsi.bsl | 2 +- ...leRangeShouldStartAtFirstAttribute.fsi.bsl | 2 +- .../ModuleShouldContainModuleKeyword.fsi.bsl | 2 +- .../Namespace - Keyword 01.fsi.bsl | 2 +- .../Nested module 01.fsi.bsl | 2 +- ...urnsRangeOfSynModuleOrNamespaceSig.fsi.bsl | 1 - ...leteNestedModuleSigShouldBePresent.fsi.bsl | 2 +- .../NestedModuleWithBeginEndAndDecls.fs.bsl | 2 +- .../NestedModuleWithBeginEndAndDecls.fsi.bsl | 2 +- ...IncludedInSynModuleDeclNestedModule.fs.bsl | 2 +- ...udedInSynModuleSigDeclNestedModule.fsi.bsl | 2 +- .../NestedModule/RangeOfBeginEnd.fs.bsl | 2 +- .../NestedModule/RangeOfBeginEnd.fsi.bsl | 2 +- .../RangeOfEqualSignShouldBePresent.fs.bsl | 2 +- ...alSignShouldBePresentSignatureFile.fsi.bsl | 2 +- ...ShouldEndAtTheLastSynModuleSigDecl.fsi.bsl | 1 - .../Nullness/AbstractClassProperty.fs.bsl | 2 +- .../Nullness/DuCaseStringOrNull.fs.bsl | 2 +- .../Nullness/DuCaseTuplePrecedence.fs.bsl | 2 +- .../SyntaxTree/Nullness/ExplicitField.fs.bsl | 2 +- .../FunctionArgAsPatternWithNullCase.fs.bsl | 2 +- ...ericFunctionReturnTypeNotStructNull.fs.bsl | 2 +- .../GenericFunctionTyparNotNull.fs.bsl | 2 +- .../Nullness/GenericFunctionTyparNull.fs.bsl | 2 +- .../Nullness/GenericTypeNotNull.fs.bsl | 2 +- ...enericTypeNotNullAndOtherConstraint.fs.bsl | 2 +- ...tAndOtherConstraint-I_am_Still_Sane.fs.bsl | 2 +- .../Nullness/GenericTypeNull.fs.bsl | 2 +- ...icTypeOtherConstraintAndThenNotNull.fs.bsl | 2 +- .../SyntaxTree/Nullness/IntListOrNull.fs.bsl | 2 +- .../Nullness/IntListOrNullOrNullOrNull.fs.bsl | 2 +- .../Nullness/MatchWithTypeCast.fs.bsl | 2 +- .../Nullness/MatchWithTypeCastParens.fs.bsl | 2 +- ...thTypeCastParensAndSeparateNullCase.fs.bsl | 2 +- .../Nullness/NullAnnotatedExpression.fs.bsl | 2 +- ...gressionAnnotatedInlinePatternMatch.fs.bsl | 2 +- .../Nullness/RegressionChoiceType.fs.bsl | 2 +- .../Nullness/RegressionListType.fs.bsl | 2 +- .../RegressionOneLinerOptionType.fs.bsl | 2 +- .../Nullness/RegressionOptionType.fs.bsl | 2 +- .../Nullness/RegressionOrPattern.fs.bsl | 2 +- .../Nullness/RegressionResultType.fs.bsl | 2 +- .../Nullness/SignatureInAbstractMember.fs.bsl | 2 +- .../SyntaxTree/Nullness/StringOrNull.fs.bsl | 2 +- .../Nullness/StringOrNullInFunctionArg.fs.bsl | 2 +- .../TypeAbbreviationAddingWithNull.fs.bsl | 2 +- .../OperatorName/ActivePatternAnd 01.fs.bsl | 2 +- .../OperatorName/ActivePatternAnd 02.fs.bsl | 2 +- .../OperatorName/ActivePatternAnd 03.fs.bsl | 2 +- .../OperatorName/ActivePatternAnd 04.fs.bsl | 2 +- .../OperatorName/ActivePatternAnd 05.fs.bsl | 2 +- .../OperatorName/ActivePatternAnd 06.fs.bsl | 2 +- .../OperatorName/ActivePatternAnd 07.fs.bsl | 2 +- .../OperatorName/ActivePatternAnd 08.fs.bsl | 2 +- .../ActivePatternAsFunction.fs.bsl | 2 +- .../ActivePatternDefinition.fs.bsl | 2 +- .../ActivePatternExceptionAnd 01.fs.bsl | 2 +- .../ActivePatternExceptionAnd 02.fs.bsl | 2 +- .../ActivePatternExceptionAnd 03.fs.bsl | 2 +- .../ActivePatternExceptionAnd 04.fs.bsl | 2 +- .../ActivePatternExceptionAnd 05.fs.bsl | 2 +- .../ActivePatternExceptionAnd 06.fs.bsl | 2 +- .../ActivePatternExceptionAnd 07.fs.bsl | 2 +- .../ActivePatternExceptionAnd 08.fs.bsl | 2 +- ...ivePatternIdentifierInPrivateMember.fs.bsl | 2 +- .../CustomOperatorDefinition.fs.bsl | 2 +- ...tDifferenceBetweenCompiledOperators.fs.bsl | 2 +- .../OperatorName/InfixOperation.fs.bsl | 2 +- .../OperatorName/NamedParameter.fs.bsl | 2 +- .../OperatorName/NameofOperator.fs.bsl | 2 +- .../ObjectModelWithTwoMembers.fs.bsl | 2 +- .../OperatorName/OperatorAsFunction.fs.bsl | 2 +- .../OperatorInMemberDefinition.fs.bsl | 2 +- .../OperatorNameInSynValSig.fsi.bsl | 2 +- .../OperatorNameInValConstraint.fsi.bsl | 2 +- .../OperatorName/OptionalExpression.fs.bsl | 2 +- .../PartialActivePatternAsFunction.fs.bsl | 2 +- .../PartialActivePatternDefinition.fs.bsl | 2 +- ...ePatternDefinitionWithoutParameters.fs.bsl | 2 +- .../OperatorName/PrefixOperation.fs.bsl | 2 +- .../PrefixOperationWithTwoCharacters.fs.bsl | 2 +- .../QualifiedOperatorExpression.fs.bsl | 2 +- ...StringAsParsedHashDirectiveArgument.fs.bsl | 1 - ...tifierAsParsedHashDirectiveArgument.fs.bsl | 2 +- ...StringAsParsedHashDirectiveArgument.fs.bsl | 9 +- ...StringAsParsedHashDirectiveArgument.fs.bsl | 1 - .../data/SyntaxTree/Pattern/And 01.fs.bsl | 2 +- .../data/SyntaxTree/Pattern/And 02.fs.bsl | 2 +- .../data/SyntaxTree/Pattern/And 03.fs.bsl | 2 +- .../data/SyntaxTree/Pattern/And 04.fs.bsl | 2 +- .../data/SyntaxTree/Pattern/As 01.fs.bsl | 2 +- .../data/SyntaxTree/Pattern/As 02.fs.bsl | 2 +- .../data/SyntaxTree/Pattern/As 03.fs.bsl | 2 +- .../data/SyntaxTree/Pattern/As 04.fs.bsl | 2 +- .../data/SyntaxTree/Pattern/As 05.fs.bsl | 2 +- .../data/SyntaxTree/Pattern/As 06.fs.bsl | 2 +- .../data/SyntaxTree/Pattern/As 07.fs.bsl | 2 +- .../data/SyntaxTree/Pattern/As 08.fs.bsl | 2 +- .../data/SyntaxTree/Pattern/As 09.fs.bsl | 2 +- .../data/SyntaxTree/Pattern/As 10.fs.bsl | 2 +- .../data/SyntaxTree/Pattern/As 11.fs.bsl | 2 +- .../data/SyntaxTree/Pattern/As 12.fs.bsl | 2 +- .../data/SyntaxTree/Pattern/Cons 01.fs.bsl | 2 +- .../data/SyntaxTree/Pattern/Cons 02.fs.bsl | 2 +- .../data/SyntaxTree/Pattern/Cons 03.fs.bsl | 2 +- .../data/SyntaxTree/Pattern/Cons 04.fs.bsl | 2 +- .../SyntaxTree/Pattern/InHeadPattern.fs.bsl | 2 +- .../data/SyntaxTree/Pattern/IsInst 01.fs.bsl | 2 +- .../data/SyntaxTree/Pattern/IsInst 02.fs.bsl | 2 +- .../data/SyntaxTree/Pattern/IsInst 03.fs.bsl | 2 +- .../data/SyntaxTree/Pattern/IsInst 04.fs.bsl | 2 +- .../data/SyntaxTree/Pattern/IsInst 05.fs.bsl | 2 +- .../SyntaxTree/Pattern/Named field 01.fs.bsl | 1 - .../SyntaxTree/Pattern/Named field 02.fs.bsl | 1 - .../SyntaxTree/Pattern/Named field 03.fs.bsl | 1 - .../SyntaxTree/Pattern/Named field 04.fs.bsl | 1 - .../SyntaxTree/Pattern/Named field 05.fs.bsl | 1 - .../Pattern/OperatorInMatchPattern.fs.bsl | 2 +- .../Pattern/OperatorInSynPatLongIdent.fs.bsl | 2 +- ...ParenthesesOfSynArgPatsNamePatPairs.fs.bsl | 2 +- .../data/SyntaxTree/Pattern/Record 01.fs.bsl | 2 +- .../data/SyntaxTree/Pattern/Record 02.fs.bsl | 2 +- .../data/SyntaxTree/Pattern/Record 03.fs.bsl | 2 +- .../data/SyntaxTree/Pattern/Record 04.fs.bsl | 2 +- .../data/SyntaxTree/Pattern/Record 05.fs.bsl | 2 +- .../data/SyntaxTree/Pattern/Record 06.fs.bsl | 2 +- ...airsContainsTheRangeOfTheEqualsSign.fs.bsl | 2 +- .../SynPatOrContainsTheRangeOfTheBar.fs.bsl | 2 +- .../Pattern/Tuple - HeadPat 01.fs.bsl | 2 +- .../Pattern/Tuple - HeadPat 02.fs.bsl | 2 +- .../Pattern/Tuple - Recover 01.fs.bsl | 2 +- .../Pattern/Tuple - Recover 02.fs.bsl | 2 +- .../Pattern/Tuple - Recover 03.fs.bsl | 2 +- .../Pattern/Tuple - Recover 04.fs.bsl | 2 +- .../Pattern/Tuple - Struct 01.fs.bsl | 1 - .../Pattern/Typed - Missing type 01.fs.bsl | 2 +- .../Pattern/Typed - Missing type 02.fs.bsl | 2 +- .../Pattern/Typed - Missing type 03.fs.bsl | 2 +- .../Pattern/Typed - Missing type 04.fs.bsl | 2 +- .../Pattern/Typed - Missing type 05.fs.bsl | 2 +- .../Pattern/Typed - Missing type 06.fs.bsl | 2 +- .../Pattern/Typed - Missing type 07.fs.bsl | 2 +- .../Pattern/Typed - Missing type 08.fs.bsl | 2 +- .../Pattern/Typed - Missing type 09.fs.bsl | 2 +- .../Pattern/Typed - Missing type 10.fs.bsl | 2 +- .../Pattern/Typed - Missing type 11.fs.bsl | 2 +- .../Pattern/Typed - Missing type 12.fs.bsl | 2 +- ...alsTokenIsPresentInSynValSigMember.fsi.bsl | 2 +- ...ualsTokenIsPresentInSynValSigValue.fsi.bsl | 2 +- .../LeadingKeywordInRecursiveTypes.fsi.bsl | 2 +- ...ldContainsTheRangeOfTheWithKeyword.fsi.bsl | 1 - ...dTypeHasStaticTypeAsLeadingKeyword.fsi.bsl | 2 +- ...xceptionDefnReprAndSynExceptionSig.fsi.bsl | 2 +- ...teShouldBeIncludedInSynTypeDefnSig.fsi.bsl | 1 - ...uldBeIncludedInSynValSpfnAndMember.fsi.bsl | 2 +- ...esShouldBeIncludedInRecursiveTypes.fsi.bsl | 1 - ...ionSigAndSynModuleSigDeclException.fsi.bsl | 2 +- ...fnSigDelegateOfShouldStartFromName.fsi.bsl | 1 - ...igObjectModelShouldEndAtLastMember.fsi.bsl | 2 +- ...DefnSigRecordShouldEndAtLastMember.fsi.bsl | 1 - ...ypeDefnSigSimpleShouldEndAtLastVal.fsi.bsl | 2 +- .../RangeOfTypeShouldEndAtEndKeyword.fsi.bsl | 2 +- ...ldContainsTheRangeOfTheWithKeyword.fsi.bsl | 2 +- ...numContainsTheRangeOfTheEqualsSign.fsi.bsl | 2 +- ...assContainsTheRangeOfTheEqualsSign.fsi.bsl | 1 - ...ateContainsTheRangeOfTheEqualsSign.fsi.bsl | 1 - ...ionContainsTheRangeOfTheEqualsSign.fsi.bsl | 2 +- .../SynValSigContainsParameterNames.fsi.bsl | 2 +- .../TriviaIsPresentInSynTypeDefnSig.fsi.bsl | 2 +- .../ValKeywordIsPresentInSynValSig.fsi.bsl | 2 +- .../SyntaxTree/SignatureType/With 01.fsi.bsl | 2 +- .../SimplePats/SimplePats - Recover 01.fs.bsl | 2 +- .../SimplePats/SimplePats 01.fs.bsl | 2 +- .../SimplePats/SimplePats 02.fs.bsl | 2 +- .../SyntaxTree/SourceIdentifier/_LINE_.fs.bsl | 1 - .../SourceIdentifier/_SOURCEDIRECTORY_.fs.bsl | 2 +- .../SourceIdentifier/_SOURCEFILE_.fs.bsl | 2 +- .../InterpolatedStringOffsideInModule.fs.bsl | 2 +- ...nterpolatedStringOffsideInNestedLet.fs.bsl | 2 +- ...stBytesWithSynByteStringKindRegular.fs.bsl | 2 +- ...tBytesWithSynByteStringKindVerbatim.fs.bsl | 2 +- ...ConstStringWithSynStringKindRegular.fs.bsl | 2 +- ...tStringWithSynStringKindTripleQuote.fs.bsl | 2 +- ...onstStringWithSynStringKindVerbatim.fs.bsl | 2 +- ...latedStringWithSynStringKindRegular.fs.bsl | 1 - ...dStringWithSynStringKindTripleQuote.fs.bsl | 2 +- ...atedStringWithSynStringKindVerbatim.fs.bsl | 1 - ...tringWithTripleQuoteMultipleDollars.fs.bsl | 2 +- ...ringWithTripleQuoteMultipleDollars2.fs.bsl | 2 +- .../SynIdent/IncompleteLongIdent 01.fs.bsl | 2 +- .../SynIdent/IncompleteLongIdent 02.fs.bsl | 2 +- .../Constraint intersection 01.fs.bsl | 2 +- .../SynType/Constraint intersection 01.fs.bsl | 2 +- .../SynType/Constraint intersection 02.fs.bsl | 2 +- .../SynType/Constraint intersection 03.fs.bsl | 2 +- .../data/SyntaxTree/SynType/Div 01.fs.bsl | 2 +- .../data/SyntaxTree/SynType/Div 02.fs.bsl | 2 +- .../data/SyntaxTree/SynType/Div 03.fs.bsl | 2 +- .../data/SyntaxTree/SynType/Div 04.fs.bsl | 2 +- .../data/SyntaxTree/SynType/Div 05.fs.bsl | 2 +- .../data/SyntaxTree/SynType/Div 06.fs.bsl | 2 +- .../data/SyntaxTree/SynType/Fun 01.fs.bsl | 2 +- .../data/SyntaxTree/SynType/Fun 02.fs.bsl | 2 +- .../data/SyntaxTree/SynType/Fun 03.fs.bsl | 2 +- .../data/SyntaxTree/SynType/Fun 04.fs.bsl | 2 +- .../data/SyntaxTree/SynType/Fun 05.fs.bsl | 2 +- .../data/SyntaxTree/SynType/Fun 06.fs.bsl | 2 +- .../data/SyntaxTree/SynType/Fun 07.fs.bsl | 2 +- .../data/SyntaxTree/SynType/Fun 08.fs.bsl | 2 +- .../data/SyntaxTree/SynType/Fun 09.fs.bsl | 2 +- .../data/SyntaxTree/SynType/Fun 10.fs.bsl | 2 +- ...stedSynTypeOrInsideSynExprTraitCall.fs.bsl | 2 +- ...SingleSynTypeInsideSynExprTraitCall.fs.bsl | 2 +- .../SynTypeOrInsideSynExprTraitCall.fs.bsl | 2 +- ...eConstraintWhereTyparSupportsMember.fs.bsl | 2 +- ...TypeOrWithAppTypeOnTheRightHandSide.fs.bsl | 2 +- ...sIncludeLeadingParameterAttributes.fsi.bsl | 1 - ...pleDoesIncludeLeadingParameterName.fsi.bsl | 2 +- .../SynType/Tuple - Nested 01.fs.bsl | 2 +- .../SynType/Tuple - Nested 02.fs.bsl | 2 +- .../SynType/Tuple - Nested 03.fs.bsl | 2 +- .../SynType/Tuple - Nested 04.fs.bsl | 2 +- .../SynType/Tuple - Nested 05.fs.bsl | 2 +- .../SynType/Tuple - Nested 06.fs.bsl | 2 +- .../data/SyntaxTree/SynType/Tuple 01.fs.bsl | 2 +- .../data/SyntaxTree/SynType/Tuple 02.fs.bsl | 2 +- .../data/SyntaxTree/SynType/Tuple 03.fs.bsl | 2 +- .../data/SyntaxTree/SynType/Tuple 04.fs.bsl | 2 +- .../data/SyntaxTree/SynType/Tuple 05.fs.bsl | 2 +- .../data/SyntaxTree/SynType/Tuple 06.fs.bsl | 2 +- .../data/SyntaxTree/SynType/Tuple 07.fs.bsl | 2 +- .../data/SyntaxTree/SynType/Tuple 08.fs.bsl | 2 +- .../data/SyntaxTree/SynType/Tuple 09.fs.bsl | 2 +- .../data/SyntaxTree/SynType/Tuple 10.fs.bsl | 2 +- .../data/SyntaxTree/SynType/Tuple 11.fs.bsl | 2 +- .../data/SyntaxTree/SynType/Tuple 12.fs.bsl | 2 +- .../data/SyntaxTree/SynType/Tuple 13.fs.bsl | 2 +- .../data/SyntaxTree/SynType/Tuple 14.fs.bsl | 2 +- .../SyntaxTree/Type/Abbreviation 01.fs.bsl | 2 +- .../SyntaxTree/Type/Abbreviation 02.fs.bsl | 2 +- .../SyntaxTree/Type/Abbreviation 03.fs.bsl | 2 +- .../SyntaxTree/Type/Abbreviation 04.fs.bsl | 2 +- .../data/SyntaxTree/Type/And 01.fs.bsl | 2 +- .../data/SyntaxTree/Type/And 02.fs.bsl | 2 +- .../data/SyntaxTree/Type/And 03.fs.bsl | 2 +- .../data/SyntaxTree/Type/And 04.fs.bsl | 2 +- .../data/SyntaxTree/Type/And 05.fs.bsl | 2 +- .../data/SyntaxTree/Type/And 06.fs.bsl | 2 +- .../service/data/SyntaxTree/Type/As 01.fs.bsl | 2 +- .../service/data/SyntaxTree/Type/As 02.fs.bsl | 2 +- .../service/data/SyntaxTree/Type/As 03.fs.bsl | 2 +- .../service/data/SyntaxTree/Type/As 04.fs.bsl | 2 +- .../service/data/SyntaxTree/Type/As 05.fs.bsl | 2 +- .../service/data/SyntaxTree/Type/As 06.fs.bsl | 2 +- .../service/data/SyntaxTree/Type/As 07.fs.bsl | 2 +- .../service/data/SyntaxTree/Type/As 08.fs.bsl | 2 +- ...butesInOptionalNamedMemberParameter.fs.bsl | 2 +- .../data/SyntaxTree/Type/Class 01.fs.bsl | 2 +- .../data/SyntaxTree/Type/Class 02.fs.bsl | 2 +- .../data/SyntaxTree/Type/Class 03.fs.bsl | 2 +- .../data/SyntaxTree/Type/Class 04.fs.bsl | 2 +- .../data/SyntaxTree/Type/Class 05.fs.bsl | 2 +- .../data/SyntaxTree/Type/Enum 01.fs.bsl | 2 +- .../data/SyntaxTree/Type/Enum 02.fs.bsl | 2 +- .../data/SyntaxTree/Type/Enum 03.fs.bsl | 2 +- .../data/SyntaxTree/Type/Enum 04.fs.bsl | 2 +- .../data/SyntaxTree/Type/Enum 05.fs.bsl | 2 +- .../data/SyntaxTree/Type/Enum 06.fs.bsl | 2 +- .../data/SyntaxTree/Type/Enum 07 - Eof.fs.bsl | 2 +- .../data/SyntaxTree/Type/Enum 08 - Eof.fs.bsl | 2 +- .../data/SyntaxTree/Type/Enum 09 - Eof.fs.bsl | 2 +- .../data/SyntaxTree/Type/Enum 10 - Eof.fs.bsl | 2 +- .../data/SyntaxTree/Type/Interface 01.fs.bsl | 2 +- .../data/SyntaxTree/Type/Interface 02.fs.bsl | 2 +- .../data/SyntaxTree/Type/Interface 03.fs.bsl | 2 +- .../data/SyntaxTree/Type/Interface 04.fs.bsl | 2 +- .../data/SyntaxTree/Type/Interface 05.fs.bsl | 1 - .../data/SyntaxTree/Type/Interface 06.fs.bsl | 1 - .../data/SyntaxTree/Type/Interface 07.fs.bsl | 2 +- ...eSynEnumCaseContainsRangeOfConstant.fs.bsl | 2 +- .../Type/NamedParametersInDelegateType.fs.bsl | 2 +- ...edTypeHasStaticTypeAsLeadingKeyword.fs.bsl | 2 +- .../SyntaxTree/Type/Primary ctor 01.fs.bsl | 2 +- .../SyntaxTree/Type/Primary ctor 02.fs.bsl | 2 +- .../SyntaxTree/Type/Primary ctor 03.fs.bsl | 2 +- .../SyntaxTree/Type/Primary ctor 04.fs.bsl | 2 +- .../SyntaxTree/Type/Primary ctor 05.fs.bsl | 2 +- ...ributeShouldBeIncludedInSynTypeDefn.fs.bsl | 2 +- ...tesShouldBeIncludedInRecursiveTypes.fs.bsl | 1 - .../SyntaxTree/Type/Record - Access 01.fs.bsl | 1 - .../SyntaxTree/Type/Record - Access 02.fs.bsl | 1 - .../SyntaxTree/Type/Record - Access 03.fs.bsl | 1 - .../SyntaxTree/Type/Record - Access 04.fs.bsl | 1 - .../Type/Record - Mutable 01.fs.bsl | 1 - .../Type/Record - Mutable 02.fs.bsl | 1 - .../Type/Record - Mutable 03.fs.bsl | 1 - .../Type/Record - Mutable 04.fs.bsl | 1 - .../Type/Record - Mutable 05.fs.bsl | 1 - .../data/SyntaxTree/Type/Record 01.fs.bsl | 2 +- .../data/SyntaxTree/Type/Record 02.fs.bsl | 2 +- .../data/SyntaxTree/Type/Record 03.fs.bsl | 2 +- .../data/SyntaxTree/Type/Record 04.fs.bsl | 2 +- .../data/SyntaxTree/Type/Record 05.fs.bsl | 2 +- ...eSynEnumCaseContainsRangeOfConstant.fs.bsl | 2 +- .../data/SyntaxTree/Type/Struct 01.fs.bsl | 2 +- .../data/SyntaxTree/Type/Struct 02.fs.bsl | 2 +- ...aceContainsTheRangeOfTheWithKeyword.fs.bsl | 2 +- ...uteContainsTheRangeOfTheTypeKeyword.fs.bsl | 2 +- ...ionContainsTheRangeOfTheWithKeyword.fs.bsl | 2 +- ...EnumContainsTheRangeOfTheEqualsSign.fs.bsl | 1 - ...gateContainsTheRangeOfTheEqualsSign.fs.bsl | 1 - ...ordContainsTheRangeOfTheWithKeyword.fs.bsl | 2 +- ...nionContainsTheRangeOfTheEqualsSign.fs.bsl | 2 +- ...DocContainsTheRangeOfTheTypeKeyword.fs.bsl | 2 +- .../Type/SynTypeFunHasRangeOfArrow.fs.bsl | 2 +- .../Type/SynTypeTupleWithStruct.fs.bsl | 2 +- .../SynTypeTupleWithStructRecovery.fs.bsl | 2 +- .../data/SyntaxTree/Type/Type 01.fs.bsl | 2 +- .../data/SyntaxTree/Type/Type 02.fs.bsl | 2 +- .../data/SyntaxTree/Type/Type 03.fs.bsl | 2 +- .../data/SyntaxTree/Type/Type 04.fs.bsl | 2 +- .../data/SyntaxTree/Type/Type 05.fs.bsl | 2 +- .../data/SyntaxTree/Type/Type 06.fs.bsl | 2 +- .../data/SyntaxTree/Type/Type 07.fs.bsl | 2 +- .../data/SyntaxTree/Type/Type 08.fs.bsl | 2 +- .../data/SyntaxTree/Type/Type 09.fs.bsl | 2 +- .../data/SyntaxTree/Type/Type 10.fs.bsl | 2 +- .../data/SyntaxTree/Type/Type 11.fs.bsl | 2 +- .../data/SyntaxTree/Type/Type 12.fs.bsl | 2 +- .../SyntaxTree/Type/Union - Field 01.fs.bsl | 1 - .../SyntaxTree/Type/Union - Field 02.fs.bsl | 1 - .../SyntaxTree/Type/Union - Field 03.fs.bsl | 1 - .../data/SyntaxTree/Type/Union 01.fs.bsl | 2 +- .../data/SyntaxTree/Type/Union 02.fs.bsl | 2 +- .../data/SyntaxTree/Type/Union 03.fs.bsl | 2 +- .../data/SyntaxTree/Type/Union 04.fs.bsl | 2 +- .../data/SyntaxTree/Type/Union 05.fs.bsl | 2 +- .../data/SyntaxTree/Type/Union 06.fs.bsl | 2 +- .../data/SyntaxTree/Type/Union 07.fs.bsl | 2 +- .../data/SyntaxTree/Type/With 01.fs.bsl | 2 +- .../data/SyntaxTree/Type/With 02.fs.bsl | 2 +- .../data/SyntaxTree/Type/With 03.fs.bsl | 2 +- .../data/SyntaxTree/Type/With 04.fs.bsl | 2 +- .../data/SyntaxTree/Type/With 05.fs.bsl | 2 +- .../UnionCase/Missing keyword of.fs.bsl | 2 +- .../UnionCase/Missing name 01.fs.bsl | 2 +- .../UnionCase/Missing name 02.fs.bsl | 2 +- .../UnionCase/Missing name 03.fs.bsl | 2 +- .../UnionCase/Missing name 04.fs.bsl | 2 +- .../UnionCase/Missing name 05.fs.bsl | 2 +- .../UnionCase/Missing name 06.fs.bsl | 2 +- .../UnionCase/Missing name 07.fs.bsl | 2 +- .../UnionCase/Missing name 08.fs.bsl | 2 +- .../UnionCase/Missing name 09.fs.bsl | 2 +- .../MultipleSynUnionCasesHaveBarRange.fs.bsl | 2 +- .../UnionCase/PrivateKeywordHasRange.fs.bsl | 2 +- .../UnionCase/Recover Function Type 01.fs.bsl | 2 +- .../UnionCase/Recover Function Type 02.fs.bsl | 2 +- .../UnionCase/Recover Function Type 03.fs.bsl | 2 +- .../SingleSynUnionCaseHasBarRange.fs.bsl | 2 +- .../SingleSynUnionCaseWithoutBar.fs.bsl | 2 +- .../UnionCase/SynUnionCaseKindFullType.fs.bsl | 2 +- .../UnionCaseFieldsCanHaveComments.fs.bsl | 2 +- .../data/SyntaxTree/Val/InlineKeyword.fsi.bsl | 2 +- 958 files changed, 1934 insertions(+), 1523 deletions(-) create mode 100644 src/Compiler/SyntaxTree/WarnScopes.fs create mode 100644 src/Compiler/SyntaxTree/WarnScopes.fsi create mode 100644 tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Nowarn.fs create mode 100644 tests/FSharp.Compiler.Service.Tests/WarnScopeTests.fs diff --git a/src/Compiler/Checking/CheckDeclarations.fs b/src/Compiler/Checking/CheckDeclarations.fs index e739169ea9c..ebf8c286ab9 100644 --- a/src/Compiler/Checking/CheckDeclarations.fs +++ b/src/Compiler/Checking/CheckDeclarations.fs @@ -5722,7 +5722,7 @@ let CheckOneImplFile synImplFile, diagnosticOptions) = - let (ParsedImplFileInput (fileName, isScript, qualNameOfFile, scopedPragmas, _, implFileFrags, isLastCompiland, _, _)) = synImplFile + let (ParsedImplFileInput (fileName, isScript, qualNameOfFile, _, implFileFrags, isLastCompiland, _, _)) = synImplFile let infoReader = InfoReader(g, amap) cancellable { @@ -5861,7 +5861,7 @@ let CheckOneImplFile |> Array.map (fun (KeyValue(k,v)) -> (k,v)) |> Map - let implFile = CheckedImplFile (qualNameOfFile, scopedPragmas, implFileTy, implFileContents, hasExplicitEntryPoint, isScript, anonRecdTypes, namedDebugPointsForInlinedCode) + let implFile = CheckedImplFile (qualNameOfFile, implFileTy, implFileContents, hasExplicitEntryPoint, isScript, anonRecdTypes, namedDebugPointsForInlinedCode) return (topAttrs, implFile, envAtEnd, cenv.createsGeneratedProvidedTypes) } diff --git a/src/Compiler/CodeGen/IlxGen.fs b/src/Compiler/CodeGen/IlxGen.fs index 2a1c876b8f5..10296213167 100644 --- a/src/Compiler/CodeGen/IlxGen.fs +++ b/src/Compiler/CodeGen/IlxGen.fs @@ -10382,7 +10382,7 @@ and GenModuleBinding cenv (cgbuf: CodeGenBuffer) (qname: QualifiedNameOfFile) la /// Generate the namespace fragments in a single file and GenImplFile cenv (mgbuf: AssemblyBuilder) mainInfoOpt eenv (implFile: CheckedImplFileAfterOptimization) = - let (CheckedImplFile(qname, _, signature, contents, hasExplicitEntryPoint, isScript, anonRecdTypes, _)) = + let (CheckedImplFile(qname, signature, contents, hasExplicitEntryPoint, isScript, anonRecdTypes, _)) = implFile.ImplFile let optimizeDuringCodeGen = implFile.OptimizeDuringCodeGen diff --git a/src/Compiler/Driver/CompilerDiagnostics.fs b/src/Compiler/Driver/CompilerDiagnostics.fs index 1c50ca26781..0c01165db59 100644 --- a/src/Compiler/Driver/CompilerDiagnostics.fs +++ b/src/Compiler/Driver/CompilerDiagnostics.fs @@ -24,6 +24,7 @@ open FSharp.Compiler.ConstraintSolver open FSharp.Compiler.DiagnosticMessage open FSharp.Compiler.Diagnostics open FSharp.Compiler.DiagnosticsLogger +open FSharp.Compiler.Features open FSharp.Compiler.Infos open FSharp.Compiler.IO open FSharp.Compiler.Lexhelp @@ -379,7 +380,7 @@ type PhasedDiagnostic with // Level 2 | _ -> 2 - member x.IsEnabled(severity, options) = + member private x.IsEnabled(severity, options) = let level = options.WarnLevel let specificWarnOn = options.WarnOn let n = x.Number @@ -409,47 +410,33 @@ type PhasedDiagnostic with (severity = FSharpDiagnosticSeverity.Info && level > 0) || (severity = FSharpDiagnosticSeverity.Warning && level >= x.WarningLevel) - /// Indicates if a diagnostic should be reported as an informational - member x.ReportAsInfo(options, severity) = - match severity with - | FSharpDiagnosticSeverity.Error -> false - | FSharpDiagnosticSeverity.Warning -> false - | FSharpDiagnosticSeverity.Info -> x.IsEnabled(severity, options) && not (List.contains x.Number options.WarnOff) - | FSharpDiagnosticSeverity.Hidden -> false - - /// Indicates if a diagnostic should be reported as a warning - member x.ReportAsWarning(options, severity) = - match severity with - | FSharpDiagnosticSeverity.Error -> false - - | FSharpDiagnosticSeverity.Warning -> x.IsEnabled(severity, options) && not (List.contains x.Number options.WarnOff) + member x.AdjustedSeverity(options, severity) = + let n = x.Number - // Informational become warning if explicitly on and not explicitly off - | FSharpDiagnosticSeverity.Info -> - let n = x.Number - List.contains n options.WarnOn && not (List.contains n options.WarnOff) + let localWarnon () = WarnScopes.IsWarnon options n x.Range - | FSharpDiagnosticSeverity.Hidden -> false + let localNowarn () = WarnScopes.IsNowarn options n x.Range - /// Indicates if a diagnostic should be reported as an error - member x.ReportAsError(options, severity) = + let warnOff () = + List.contains n options.WarnOff && not (localWarnon ()) || localNowarn () match severity with - | FSharpDiagnosticSeverity.Error -> true - - // Warnings become errors in some situations - | FSharpDiagnosticSeverity.Warning -> - let n = x.Number - + | FSharpDiagnosticSeverity.Error -> FSharpDiagnosticSeverity.Error + | FSharpDiagnosticSeverity.Warning when x.IsEnabled(severity, options) && not (List.contains n options.WarnAsWarn) - && ((options.GlobalWarnAsError && not (List.contains n options.WarnOff)) - || List.contains n options.WarnAsError) + && ((options.GlobalWarnAsError && not (warnOff ())) + || List.contains n options.WarnAsError && not (localNowarn ())) + -> + FSharpDiagnosticSeverity.Error + | FSharpDiagnosticSeverity.Info when List.contains n options.WarnAsError && not (localNowarn ()) -> FSharpDiagnosticSeverity.Error + + | FSharpDiagnosticSeverity.Warning when x.IsEnabled(severity, options) && not (warnOff ()) -> FSharpDiagnosticSeverity.Warning + | FSharpDiagnosticSeverity.Info when List.contains n options.WarnOn && not (warnOff ()) -> FSharpDiagnosticSeverity.Warning - // Informational become errors if explicitly WarnAsError - | FSharpDiagnosticSeverity.Info -> List.contains x.Number options.WarnAsError + | FSharpDiagnosticSeverity.Info when x.IsEnabled(severity, options) && not (warnOff ()) -> FSharpDiagnosticSeverity.Info - | FSharpDiagnosticSeverity.Hidden -> false + | _ -> FSharpDiagnosticSeverity.Hidden [] module OldStyleMessages = @@ -2298,51 +2285,25 @@ type PhasedDiagnostic with //---------------------------------------------------------------------------- // Scoped #nowarn pragmas -/// Build an DiagnosticsLogger that delegates to another DiagnosticsLogger but filters warnings turned off by the given pragma declarations -// -// NOTE: we allow a flag to turn of strict file checking. This is because file names sometimes don't match due to use of -// #line directives, e.g. for pars.fs/pars.fsy. In this case we just test by line number - in most cases this is sufficient -// because we install a filtering error handler on a file-by-file basis for parsing and type-checking. -// However this is indicative of a more systematic problem where source-line -// sensitive operations (lexfilter and warning filtering) do not always -// interact well with #line directives. -type DiagnosticsLoggerFilteringByScopedPragmas - (checkFile, scopedPragmas, diagnosticOptions: FSharpDiagnosticOptions, diagnosticsLogger: DiagnosticsLogger) = +/// Build an DiagnosticsLogger that delegates to another DiagnosticsLogger but filters warnings (still needed??) +type DiagnosticsLoggerFilteringByScopedPragmas(diagnosticOptions: FSharpDiagnosticOptions, diagnosticsLogger: DiagnosticsLogger) = inherit DiagnosticsLogger("DiagnosticsLoggerFilteringByScopedPragmas") let mutable realErrorPresent = false override _.DiagnosticSink(diagnostic: PhasedDiagnostic, severity) = + if severity = FSharpDiagnosticSeverity.Error then realErrorPresent <- true diagnosticsLogger.DiagnosticSink(diagnostic, severity) else - let report = - let warningNum = diagnostic.Number - - match diagnostic.Range with - | Some m -> - scopedPragmas - |> List.exists (fun pragma -> - let (ScopedPragma.WarningOff(pragmaRange, warningNumFromPragma)) = pragma - - warningNum = warningNumFromPragma - && (not checkFile || m.FileIndex = pragmaRange.FileIndex) - && posGeq m.Start pragmaRange.Start) - |> not - | None -> true - - if report then - if diagnostic.ReportAsError(diagnosticOptions, severity) then - diagnosticsLogger.DiagnosticSink(diagnostic, FSharpDiagnosticSeverity.Error) - elif diagnostic.ReportAsWarning(diagnosticOptions, severity) then - diagnosticsLogger.DiagnosticSink(diagnostic, FSharpDiagnosticSeverity.Warning) - elif diagnostic.ReportAsInfo(diagnosticOptions, severity) then - diagnosticsLogger.DiagnosticSink(diagnostic, severity) + match diagnostic.AdjustedSeverity(diagnosticOptions, severity) with + | FSharpDiagnosticSeverity.Hidden -> () + | s -> diagnosticsLogger.DiagnosticSink(diagnostic, s) override _.ErrorCount = diagnosticsLogger.ErrorCount override _.CheckForRealErrorsIgnoringWarnings = realErrorPresent -let GetDiagnosticsLoggerFilteringByScopedPragmas (checkFile, scopedPragmas, diagnosticOptions, diagnosticsLogger) = - DiagnosticsLoggerFilteringByScopedPragmas(checkFile, scopedPragmas, diagnosticOptions, diagnosticsLogger) :> DiagnosticsLogger +let GetDiagnosticsLoggerFilteringByScopedPragmas (diagnosticOptions, diagnosticsLogger) = + DiagnosticsLoggerFilteringByScopedPragmas(diagnosticOptions, diagnosticsLogger) :> DiagnosticsLogger diff --git a/src/Compiler/Driver/CompilerDiagnostics.fsi b/src/Compiler/Driver/CompilerDiagnostics.fsi index 6139da434cf..877daa0a66a 100644 --- a/src/Compiler/Driver/CompilerDiagnostics.fsi +++ b/src/Compiler/Driver/CompilerDiagnostics.fsi @@ -7,6 +7,7 @@ open System.Text open FSharp.Compiler.CompilerConfig open FSharp.Compiler.Diagnostics open FSharp.Compiler.DiagnosticsLogger +open FSharp.Compiler.Features open FSharp.Compiler.Syntax open FSharp.Compiler.Text @@ -61,14 +62,8 @@ type PhasedDiagnostic with /// Format the core of the diagnostic as a string. Doesn't include the range information. member FormatCore: flattenErrors: bool * suggestNames: bool -> string - /// Indicates if a diagnostic should be reported as an informational - member ReportAsInfo: FSharpDiagnosticOptions * FSharpDiagnosticSeverity -> bool - - /// Indicates if a diagnostic should be reported as a warning - member ReportAsWarning: FSharpDiagnosticOptions * FSharpDiagnosticSeverity -> bool - - /// Indicates if a diagnostic should be reported as an error - member ReportAsError: FSharpDiagnosticOptions * FSharpDiagnosticSeverity -> bool + /// Compute new severity according to the various diagnostics options + member AdjustedSeverity: FSharpDiagnosticOptions * FSharpDiagnosticSeverity -> FSharpDiagnosticSeverity /// Output all of a diagnostic to a buffer, including range member Output: buf: StringBuilder * tcConfig: TcConfig * severity: FSharpDiagnosticSeverity -> unit @@ -84,11 +79,7 @@ type PhasedDiagnostic with /// Get a diagnostics logger that filters the reporting of warnings based on scoped pragma information val GetDiagnosticsLoggerFilteringByScopedPragmas: - checkFile: bool * - scopedPragmas: ScopedPragma list * - diagnosticOptions: FSharpDiagnosticOptions * - diagnosticsLogger: DiagnosticsLogger -> - DiagnosticsLogger + diagnosticOptions: FSharpDiagnosticOptions * diagnosticsLogger: DiagnosticsLogger -> DiagnosticsLogger /// Remove 'implicitIncludeDir' from a file name before output val SanitizeFileName: fileName: string -> implicitIncludeDir: string -> string diff --git a/src/Compiler/Driver/ParseAndCheckInputs.fs b/src/Compiler/Driver/ParseAndCheckInputs.fs index a6804bfe746..c5c3bf72f26 100644 --- a/src/Compiler/Driver/ParseAndCheckInputs.fs +++ b/src/Compiler/Driver/ParseAndCheckInputs.fs @@ -95,13 +95,13 @@ let PrependPathToSpec x (SynModuleOrNamespaceSig(longId, isRecursive, kind, decl let PrependPathToInput x inp = match inp with - | ParsedInput.ImplFile(ParsedImplFileInput(b, c, q, d, hd, impls, e, trivia, i)) -> + | ParsedInput.ImplFile(ParsedImplFileInput(b, c, q, hd, impls, e, trivia, i)) -> ParsedInput.ImplFile( - ParsedImplFileInput(b, c, PrependPathToQualFileName x q, d, hd, List.map (PrependPathToImpl x) impls, e, trivia, i) + ParsedImplFileInput(b, c, PrependPathToQualFileName x q, hd, List.map (PrependPathToImpl x) impls, e, trivia, i) ) - | ParsedInput.SigFile(ParsedSigFileInput(b, q, d, hd, specs, trivia, i)) -> - ParsedInput.SigFile(ParsedSigFileInput(b, PrependPathToQualFileName x q, d, hd, List.map (PrependPathToSpec x) specs, trivia, i)) + | ParsedInput.SigFile(ParsedSigFileInput(b, q, hd, specs, trivia, i)) -> + ParsedInput.SigFile(ParsedSigFileInput(b, PrependPathToQualFileName x q, hd, List.map (PrependPathToSpec x) specs, trivia, i)) let IsValidAnonModuleName (modname: string) = modname |> String.forall (fun c -> Char.IsLetterOrDigit c || c = '_') @@ -216,29 +216,6 @@ let PostParseModuleSpec (_i, defaultNamespace, isLastCompiland, fileName, intf) SynModuleOrNamespaceSig(lid, isRecursive, kind, decls, xmlDoc, attributes, None, range, trivia) -let GetScopedPragmasForHashDirective hd (langVersion: LanguageVersion) = - let supportsNonStringArguments = - langVersion.SupportsFeature(LanguageFeature.ParsedHashDirectiveArgumentNonQuotes) - - [ - match hd with - | ParsedHashDirective("nowarn", numbers, m) -> - for s in numbers do - let warningNumber = - match supportsNonStringArguments, s with - | _, ParsedHashDirectiveArgument.SourceIdentifier _ -> None - | true, ParsedHashDirectiveArgument.LongIdent _ -> None - | true, ParsedHashDirectiveArgument.Int32(n, _) -> GetWarningNumber(m, string n, true) - | true, ParsedHashDirectiveArgument.Ident(s, _) -> GetWarningNumber(m, s.idText, true) - | _, ParsedHashDirectiveArgument.String(s, _, _) -> GetWarningNumber(m, s, true) - | _ -> None - - match warningNumber with - | None -> () - | Some n -> ScopedPragma.WarningOff(m, n) - | _ -> () - ] - let private collectCodeComments (lexbuf: UnicodeLexing.Lexbuf) (tripleSlashComments: range list) = [ yield! LexbufCommentStore.GetComments(lexbuf) @@ -276,17 +253,6 @@ let PostParseModuleImpls let qualName = QualFileNameOfImpls fileName impls let isScript = IsScript fileName - let scopedPragmas = - [ - for SynModuleOrNamespace(decls = decls) in impls do - for d in decls do - match d with - | SynModuleDecl.HashDirective(hd, _) -> yield! GetScopedPragmasForHashDirective hd lexbuf.LanguageVersion - | _ -> () - for hd in hashDirectives do - yield! GetScopedPragmasForHashDirective hd lexbuf.LanguageVersion - ] - let conditionalDirectives = LexbufIfdefStore.GetTrivia(lexbuf) let codeComments = collectCodeComments lexbuf tripleSlashComments @@ -296,9 +262,7 @@ let PostParseModuleImpls CodeComments = codeComments } - ParsedInput.ImplFile( - ParsedImplFileInput(fileName, isScript, qualName, scopedPragmas, hashDirectives, impls, isLastCompiland, trivia, identifiers) - ) + ParsedInput.ImplFile(ParsedImplFileInput(fileName, isScript, qualName, hashDirectives, impls, isLastCompiland, trivia, identifiers)) let PostParseModuleSpecs ( @@ -327,17 +291,6 @@ let PostParseModuleSpecs let qualName = QualFileNameOfSpecs fileName specs - let scopedPragmas = - [ - for SynModuleOrNamespaceSig(decls = decls) in specs do - for d in decls do - match d with - | SynModuleSigDecl.HashDirective(hd, _) -> yield! GetScopedPragmasForHashDirective hd lexbuf.LanguageVersion - | _ -> () - for hd in hashDirectives do - yield! GetScopedPragmasForHashDirective hd lexbuf.LanguageVersion - ] - let conditionalDirectives = LexbufIfdefStore.GetTrivia(lexbuf) let codeComments = collectCodeComments lexbuf tripleSlashComments @@ -347,7 +300,7 @@ let PostParseModuleSpecs CodeComments = codeComments } - ParsedInput.SigFile(ParsedSigFileInput(fileName, qualName, scopedPragmas, hashDirectives, specs, trivia, identifiers)) + ParsedInput.SigFile(ParsedSigFileInput(fileName, qualName, hashDirectives, specs, trivia, identifiers)) type ModuleNamesDict = Map> @@ -392,26 +345,26 @@ let DeduplicateModuleName (moduleNamesDict: ModuleNamesDict) (fileName: string) let DeduplicateParsedInputModuleName (moduleNamesDict: ModuleNamesDict) input = match input with | ParsedInput.ImplFile implFile -> - let (ParsedImplFileInput(fileName, isScript, qualNameOfFile, scopedPragmas, hashDirectives, modules, flags, trivia, identifiers)) = + let (ParsedImplFileInput(fileName, isScript, qualNameOfFile, hashDirectives, modules, flags, trivia, identifiers)) = implFile let qualNameOfFileR, moduleNamesDictR = DeduplicateModuleName moduleNamesDict fileName qualNameOfFile let implFileR = - ParsedImplFileInput(fileName, isScript, qualNameOfFileR, scopedPragmas, hashDirectives, modules, flags, trivia, identifiers) + ParsedImplFileInput(fileName, isScript, qualNameOfFileR, hashDirectives, modules, flags, trivia, identifiers) let inputR = ParsedInput.ImplFile implFileR inputR, moduleNamesDictR | ParsedInput.SigFile sigFile -> - let (ParsedSigFileInput(fileName, qualNameOfFile, scopedPragmas, hashDirectives, modules, trivia, identifiers)) = + let (ParsedSigFileInput(fileName, qualNameOfFile, hashDirectives, modules, trivia, identifiers)) = sigFile let qualNameOfFileR, moduleNamesDictR = DeduplicateModuleName moduleNamesDict fileName qualNameOfFile let sigFileR = - ParsedSigFileInput(fileName, qualNameOfFileR, scopedPragmas, hashDirectives, modules, trivia, identifiers) + ParsedSigFileInput(fileName, qualNameOfFileR, hashDirectives, modules, trivia, identifiers) let inputT = ParsedInput.SigFile sigFileR inputT, moduleNamesDictR @@ -450,68 +403,66 @@ let ParseInput use _ = UseDiagnosticsLogger delayLogger use _ = UseBuildPhase BuildPhase.Parse - let mutable scopedPragmas = [] - try - let input = - let identStore = HashSet() - - let lexer = - if identCapture then - (fun x -> - let token = lexer x - - match token with - | Parser.token.PERCENT_OP ident - | Parser.token.FUNKY_OPERATOR_NAME ident - | Parser.token.ADJACENT_PREFIX_OP ident - | Parser.token.PLUS_MINUS_OP ident - | Parser.token.INFIX_AMP_OP ident - | Parser.token.INFIX_STAR_DIV_MOD_OP ident - | Parser.token.PREFIX_OP ident - | Parser.token.INFIX_BAR_OP ident - | Parser.token.INFIX_AT_HAT_OP ident - | Parser.token.INFIX_COMPARE_OP ident - | Parser.token.INFIX_STAR_STAR_OP ident - | Parser.token.IDENT ident -> identStore.Add ident |> ignore - | _ -> () - - token) - else - lexer + let identStore = HashSet() + + let lexer = + if identCapture then + (fun x -> + let token = lexer x + + match token with + | Parser.token.PERCENT_OP ident + | Parser.token.FUNKY_OPERATOR_NAME ident + | Parser.token.ADJACENT_PREFIX_OP ident + | Parser.token.PLUS_MINUS_OP ident + | Parser.token.INFIX_AMP_OP ident + | Parser.token.INFIX_STAR_DIV_MOD_OP ident + | Parser.token.PREFIX_OP ident + | Parser.token.INFIX_BAR_OP ident + | Parser.token.INFIX_AT_HAT_OP ident + | Parser.token.INFIX_COMPARE_OP ident + | Parser.token.INFIX_STAR_STAR_OP ident + | Parser.token.IDENT ident -> identStore.Add ident |> ignore + | _ -> () - if FSharpMLCompatFileSuffixes |> List.exists (FileSystemUtils.checkSuffix fileName) then - if lexbuf.SupportsFeature LanguageFeature.MLCompatRevisions then - errorR (Error(FSComp.SR.buildInvalidSourceFileExtensionML fileName, rangeStartup)) - else - mlCompatWarning (FSComp.SR.buildCompilingExtensionIsForML ()) rangeStartup + token) + else + lexer - // Call the appropriate parser - for signature files or implementation files - if FSharpImplFileSuffixes |> List.exists (FileSystemUtils.checkSuffix fileName) then - let impl = Parser.implementationFile lexer lexbuf + if FSharpMLCompatFileSuffixes |> List.exists (FileSystemUtils.checkSuffix fileName) then + if lexbuf.SupportsFeature LanguageFeature.MLCompatRevisions then + errorR (Error(FSComp.SR.buildInvalidSourceFileExtensionML fileName, rangeStartup)) + else + mlCompatWarning (FSComp.SR.buildCompilingExtensionIsForML ()) rangeStartup - let tripleSlashComments = - LexbufLocalXmlDocStore.ReportInvalidXmlDocPositions(lexbuf) + // Call the appropriate parser - for signature files or implementation files + if FSharpImplFileSuffixes |> List.exists (FileSystemUtils.checkSuffix fileName) then + let impl = Parser.implementationFile lexer lexbuf - PostParseModuleImpls(defaultNamespace, fileName, isLastCompiland, impl, lexbuf, tripleSlashComments, Set identStore) - elif FSharpSigFileSuffixes |> List.exists (FileSystemUtils.checkSuffix fileName) then - let intfs = Parser.signatureFile lexer lexbuf + lexbuf |> WarnScopes.MergeInto diagnosticOptions - let tripleSlashComments = - LexbufLocalXmlDocStore.ReportInvalidXmlDocPositions(lexbuf) + let tripleSlashComments = + LexbufLocalXmlDocStore.ReportInvalidXmlDocPositions(lexbuf) - PostParseModuleSpecs(defaultNamespace, fileName, isLastCompiland, intfs, lexbuf, tripleSlashComments, Set identStore) - else if lexbuf.SupportsFeature LanguageFeature.MLCompatRevisions then - error (Error(FSComp.SR.buildInvalidSourceFileExtensionUpdated fileName, rangeStartup)) - else - error (Error(FSComp.SR.buildInvalidSourceFileExtension fileName, rangeStartup)) + PostParseModuleImpls(defaultNamespace, fileName, isLastCompiland, impl, lexbuf, tripleSlashComments, Set identStore) + elif FSharpSigFileSuffixes |> List.exists (FileSystemUtils.checkSuffix fileName) then + let intfs = Parser.signatureFile lexer lexbuf - scopedPragmas <- input.ScopedPragmas - input + lexbuf |> WarnScopes.MergeInto diagnosticOptions + + let tripleSlashComments = + LexbufLocalXmlDocStore.ReportInvalidXmlDocPositions(lexbuf) + + PostParseModuleSpecs(defaultNamespace, fileName, isLastCompiland, intfs, lexbuf, tripleSlashComments, Set identStore) + else if lexbuf.SupportsFeature LanguageFeature.MLCompatRevisions then + error (Error(FSComp.SR.buildInvalidSourceFileExtensionUpdated fileName, rangeStartup)) + else + error (Error(FSComp.SR.buildInvalidSourceFileExtension fileName, rangeStartup)) finally // OK, now commit the errors, since the ScopedPragmas will (hopefully) have been scraped let filteringDiagnosticsLogger = - GetDiagnosticsLoggerFilteringByScopedPragmas(false, scopedPragmas, diagnosticOptions, diagnosticsLogger) + GetDiagnosticsLoggerFilteringByScopedPragmas(diagnosticOptions, diagnosticsLogger) delayLogger.CommitDelayedDiagnostics filteringDiagnosticsLogger @@ -581,7 +532,6 @@ let EmptyParsedInput (fileName, isLastCompiland) = QualFileNameOfImpls fileName [], [], [], - [], { ConditionalDirectives = [] CodeComments = [] @@ -597,7 +547,6 @@ let EmptyParsedInput (fileName, isLastCompiland) = QualFileNameOfImpls fileName [], [], [], - [], isLastCompiland, { ConditionalDirectives = [] @@ -865,9 +814,7 @@ let ParseInputFiles (tcConfig: TcConfig, lexResourceManager, sourceFiles, diagno tcConfig.exiter.Exit 1 let ProcessMetaCommandsFromInput - (nowarnF: 'state -> range * string -> 'state, - hashReferenceF: 'state -> range * string * Directive -> 'state, - loadSourceF: 'state -> range * string -> unit) + (hashReferenceF: 'state -> range * string * Directive -> 'state, loadSourceF: 'state -> range * string -> unit) (tcConfig: TcConfigBuilder, inp: ParsedInput, pathOfMetaCommandSource, state0) = @@ -911,10 +858,6 @@ let ProcessMetaCommandsFromInput state - | ParsedHashDirective("nowarn", hashArguments, m) -> - let arguments = parsedHashDirectiveArguments hashArguments tcConfig.langVersion - List.fold (fun state d -> nowarnF state (m, d)) state arguments - | ParsedHashDirective(("reference" | "r") as c, [], m) -> if not canHaveScriptMetaCommands then errorR (HashDirectiveNotAllowedInNonScript m) @@ -989,6 +932,7 @@ let ProcessMetaCommandsFromInput decls |> List.iter (fun d -> match d with + | SynModuleSigDecl.HashDirective(ParsedHashDirective("WARN_DIRECTIVE_DUMMY",_,_), _) -> () | SynModuleSigDecl.HashDirective(_, m) -> warning (Error(FSComp.SR.buildDirectivesInModulesAreIgnored (), m)) | SynModuleSigDecl.NestedModule(moduleDecls = subDecls) -> WarnOnIgnoredSpecDecls subDecls | _ -> ()) @@ -997,6 +941,7 @@ let ProcessMetaCommandsFromInput decls |> List.iter (fun d -> match d with + | SynModuleDecl.HashDirective(ParsedHashDirective("WARN_DIRECTIVE_DUMMY",_,_), _) -> () | SynModuleDecl.HashDirective(_, m) -> warning (Error(FSComp.SR.buildDirectivesInModulesAreIgnored (), m)) | SynModuleDecl.NestedModule(decls = subDecls) -> WarnOnIgnoredImplDecls subDecls | _ -> ()) @@ -1035,19 +980,9 @@ let ProcessMetaCommandsFromInput let state = List.fold ProcessMetaCommandsFromModuleImpl state implFile.Contents state -let ApplyNoWarnsToTcConfig (tcConfig: TcConfig, inp: ParsedInput, pathOfMetaCommandSource) = - // Clone - let tcConfigB = tcConfig.CloneToBuilder() - let addNoWarn = fun () (m, s) -> tcConfigB.TurnWarningOff(m, s) - let addReference = fun () (_m, _s, _) -> () - let addLoadedSource = fun () (_m, _s) -> () - ProcessMetaCommandsFromInput (addNoWarn, addReference, addLoadedSource) (tcConfigB, inp, pathOfMetaCommandSource, ()) - TcConfig.Create(tcConfigB, validate = false) - let ApplyMetaCommandsFromInputToTcConfig (tcConfig: TcConfig, inp: ParsedInput, pathOfMetaCommandSource, dependencyProvider) = // Clone let tcConfigB = tcConfig.CloneToBuilder() - let getWarningNumber = fun () _ -> () let addReferenceDirective = fun () (m, path, directive) -> tcConfigB.AddReferenceDirective(dependencyProvider, m, path, directive) @@ -1055,7 +990,7 @@ let ApplyMetaCommandsFromInputToTcConfig (tcConfig: TcConfig, inp: ParsedInput, let addLoadedSource = fun () (m, s) -> tcConfigB.AddLoadedSource(m, s, pathOfMetaCommandSource) - ProcessMetaCommandsFromInput (getWarningNumber, addReferenceDirective, addLoadedSource) (tcConfigB, inp, pathOfMetaCommandSource, ()) + ProcessMetaCommandsFromInput (addReferenceDirective, addLoadedSource) (tcConfigB, inp, pathOfMetaCommandSource, ()) TcConfig.Create(tcConfigB, validate = false) /// Build the initial type checking environment @@ -1295,7 +1230,7 @@ let SkippedImplFilePlaceholder (tcConfig: TcConfig, tcImports: TcImports, tcGlob tcState let emptyImplFile = - CheckedImplFile(qualNameOfFile, [], rootSigTy, ModuleOrNamespaceContents.TMDefs [], false, false, StampMap [], Map.empty) + CheckedImplFile(qualNameOfFile, rootSigTy, ModuleOrNamespaceContents.TMDefs [], false, false, StampMap [], Map.empty) let tcEnvAtEnd = tcStateForImplFile.TcEnvFromImpls Some((tcEnvAtEnd, EmptyTopAttrs, Some emptyImplFile, ccuSigForFile), tcState) @@ -1428,15 +1363,15 @@ let CheckOneInput } // Within a file, equip loggers to locally filter w.r.t. scope pragmas in each input -let DiagnosticsLoggerForInput (tcConfig: TcConfig, input: ParsedInput, oldLogger) = - GetDiagnosticsLoggerFilteringByScopedPragmas(false, input.ScopedPragmas, tcConfig.diagnosticsOptions, oldLogger) +let DiagnosticsLoggerForInput (tcConfig: TcConfig, oldLogger) = + GetDiagnosticsLoggerFilteringByScopedPragmas(tcConfig.diagnosticsOptions, oldLogger) /// Typecheck a single file (or interactive entry into F# Interactive) let CheckOneInputEntry (ctok, checkForErrors, tcConfig: TcConfig, tcImports, tcGlobals, prefixPathOpt) tcState input = cancellable { // Equip loggers to locally filter w.r.t. scope pragmas in each input use _ = - UseTransformedDiagnosticsLogger(fun oldLogger -> DiagnosticsLoggerForInput(tcConfig, input, oldLogger)) + UseTransformedDiagnosticsLogger(fun oldLogger -> DiagnosticsLoggerForInput(tcConfig, oldLogger)) use _ = UseBuildPhase BuildPhase.TypeCheck @@ -1936,7 +1871,7 @@ let CheckMultipleInputsUsingGraphMode inputsWithLoggers |> List.toArray |> Array.map (fun (input, oldLogger) -> - let logger = DiagnosticsLoggerForInput(tcConfig, input, oldLogger) + let logger = DiagnosticsLoggerForInput(tcConfig, oldLogger) input, logger) let processFile (node: NodeToTypeCheck) (state: State) : Finisher = diff --git a/src/Compiler/Driver/ParseAndCheckInputs.fsi b/src/Compiler/Driver/ParseAndCheckInputs.fsi index fb32a4557cd..495ed9341d8 100644 --- a/src/Compiler/Driver/ParseAndCheckInputs.fsi +++ b/src/Compiler/Driver/ParseAndCheckInputs.fsi @@ -78,16 +78,13 @@ val ParseInput: /// A general routine to process hash directives val ProcessMetaCommandsFromInput: - ('T -> range * string -> 'T) * ('T -> range * string * Directive -> 'T) * ('T -> range * string -> unit) -> + ('T -> range * string * Directive -> 'T) * ('T -> range * string -> unit) -> TcConfigBuilder * ParsedInput * string * 'T -> 'T /// Process all the #r, #I etc. in an input. For non-scripts report warnings about ignored directives. val ApplyMetaCommandsFromInputToTcConfig: TcConfig * ParsedInput * string * DependencyProvider -> TcConfig -/// Process the #nowarn in an input and integrate them into the TcConfig -val ApplyNoWarnsToTcConfig: TcConfig * ParsedInput * string -> TcConfig - /// Parse one input stream val ParseOneInputStream: tcConfig: TcConfig * diff --git a/src/Compiler/Driver/ScriptClosure.fs b/src/Compiler/Driver/ScriptClosure.fs index 0e22231abb8..1ce3227dce3 100644 --- a/src/Compiler/Driver/ScriptClosure.fs +++ b/src/Compiler/Driver/ScriptClosure.fs @@ -60,9 +60,6 @@ type LoadClosure = /// The #load, including those that didn't resolve OriginalLoadReferences: (range * string * string) list - /// The #nowarns - NoWarns: (string * range list) list - /// Diagnostics seen while processing resolutions ResolutionDiagnostics: (PhasedDiagnostic * FSharpDiagnosticSeverity) list @@ -91,8 +88,7 @@ module ScriptPreprocessClosure = range: range * parsedInput: ParsedInput option * parseDiagnostics: (PhasedDiagnostic * FSharpDiagnosticSeverity) list * - metaDiagnostics: (PhasedDiagnostic * FSharpDiagnosticSeverity) list * - nowarns: (string * range) list + metaDiagnostics: (PhasedDiagnostic * FSharpDiagnosticSeverity) list type Observed() = let seen = Dictionary<_, bool>() @@ -267,8 +263,6 @@ module ScriptPreprocessClosure = ) = let tcConfigB = tcConfig.CloneToBuilder() - let mutable nowarns = [] - let getWarningNumber () (m, s) = nowarns <- (s, m) :: nowarns let addReferenceDirective () (m, s, directive) = tcConfigB.AddReferenceDirective(dependencyProvider, m, s, directive) @@ -278,18 +272,18 @@ module ScriptPreprocessClosure = try ProcessMetaCommandsFromInput - (getWarningNumber, addReferenceDirective, addLoadedSource) + (addReferenceDirective, addLoadedSource) (tcConfigB, inp, pathOfMetaCommandSource, ()) with ReportedError _ -> // Recover by using whatever did end up in the tcConfig () try - TcConfig.Create(tcConfigB, validate = false), nowarns + TcConfig.Create(tcConfigB, validate = false) with ReportedError _ -> // Recover by using a default TcConfig. let tcConfigB = tcConfig.CloneToBuilder() - TcConfig.Create(tcConfigB, validate = false), nowarns + TcConfig.Create(tcConfigB, validate = false) let getDirective d = match d with @@ -463,7 +457,7 @@ module ScriptPreprocessClosure = let pathOfMetaCommandSource = !! Path.GetDirectoryName(fileName) let preSources = tcConfig.GetAvailableLoadedSources() - let tcConfigResult, noWarns = + let tcConfigResult = ApplyMetaCommandsFromInputToTcConfigAndGatherNoWarn( tcConfig, parseResult, @@ -490,14 +484,14 @@ module ScriptPreprocessClosure = for subSource in ClosureSourceOfFilename(subFile, m, tcConfigResult.inputCodePage, false) do yield! processClosureSource subSource else - ClosureFile(subFile, m, None, [], [], []) + ClosureFile(subFile, m, None, [], []) - ClosureFile(fileName, m, Some parseResult, parseDiagnostics, diagnosticsLogger.Diagnostics, noWarns) + ClosureFile(fileName, m, Some parseResult, parseDiagnostics, diagnosticsLogger.Diagnostics) else // Don't traverse into .fs leafs. printfn "yielding non-script source %s" fileName - ClosureFile(fileName, m, None, [], [], []) + ClosureFile(fileName, m, None, [], []) ] let sources = closureSources |> List.collect processClosureSource @@ -509,32 +503,22 @@ module ScriptPreprocessClosure = /// Mark the last file as isLastCompiland. let MarkLastCompiland (tcConfig: TcConfig, lastClosureFile) = - let (ClosureFile(fileName, m, lastParsedInput, parseDiagnostics, metaDiagnostics, nowarns)) = + let (ClosureFile(fileName, m, lastParsedInput, parseDiagnostics, metaDiagnostics)) = lastClosureFile match lastParsedInput with | Some(ParsedInput.ImplFile lastParsedImplFile) -> - let (ParsedImplFileInput(name, isScript, qualNameOfFile, scopedPragmas, hashDirectives, implFileFlags, _, trivia, identifiers)) = + let (ParsedImplFileInput(name, isScript, qualNameOfFile, hashDirectives, implFileFlags, _, trivia, identifiers)) = lastParsedImplFile let isLastCompiland = (true, tcConfig.target.IsExe) let lastParsedImplFileR = - ParsedImplFileInput( - name, - isScript, - qualNameOfFile, - scopedPragmas, - hashDirectives, - implFileFlags, - isLastCompiland, - trivia, - identifiers - ) + ParsedImplFileInput(name, isScript, qualNameOfFile, hashDirectives, implFileFlags, isLastCompiland, trivia, identifiers) let lastClosureFileR = - ClosureFile(fileName, m, Some(ParsedInput.ImplFile lastParsedImplFileR), parseDiagnostics, metaDiagnostics, nowarns) + ClosureFile(fileName, m, Some(ParsedInput.ImplFile lastParsedImplFileR), parseDiagnostics, metaDiagnostics) lastClosureFileR | _ -> lastClosureFile @@ -552,12 +536,12 @@ module ScriptPreprocessClosure = // Get all source files. let sourceFiles = - [ for ClosureFile(fileName, m, _, _, _, _) in closureFiles -> (fileName, m) ] + [ for ClosureFile(fileName, m, _, _, _) in closureFiles -> (fileName, m) ] let sourceInputs = [ for closureFile in closureFiles -> - let (ClosureFile(fileName, _, input, parseDiagnostics, metaDiagnostics, _nowarns)) = + let (ClosureFile(fileName, _, input, parseDiagnostics, metaDiagnostics)) = closureFile let closureInput: LoadClosureInput = @@ -571,10 +555,6 @@ module ScriptPreprocessClosure = closureInput ] - let globalNoWarns = - closureFiles - |> List.collect (fun (ClosureFile(_, _, _, _, _, noWarns)) -> noWarns) - // Resolve all references. let references, unresolvedReferences, resolutionDiagnostics = let diagnosticsLogger = CapturingDiagnosticsLogger("GetLoadClosure") @@ -590,7 +570,7 @@ module ScriptPreprocessClosure = // Root errors and warnings - look at the last item in the closureFiles list let loadClosureRootDiagnostics, allRootDiagnostics = match List.rev closureFiles with - | ClosureFile(_, _, _, parseDiagnostics, metaDiagnostics, _) :: _ -> + | ClosureFile(_, _, _, parseDiagnostics, metaDiagnostics) :: _ -> (earlierDiagnostics @ metaDiagnostics @ resolutionDiagnostics), (parseDiagnostics @ earlierDiagnostics @ metaDiagnostics @ resolutionDiagnostics) | _ -> [], [] // When no file existed. @@ -621,7 +601,6 @@ module ScriptPreprocessClosure = SdkDirOverride = tcConfig.sdkDirOverride UnresolvedReferences = unresolvedReferences Inputs = sourceInputs - NoWarns = List.groupBy fst globalNoWarns |> List.map (map2Of2 (List.map snd)) OriginalLoadReferences = tcConfig.loadedSources ResolutionDiagnostics = resolutionDiagnostics AllRootFileDiagnostics = allRootDiagnostics diff --git a/src/Compiler/Driver/ScriptClosure.fsi b/src/Compiler/Driver/ScriptClosure.fsi index 6f764b299a9..1613ba3fe32 100644 --- a/src/Compiler/Driver/ScriptClosure.fsi +++ b/src/Compiler/Driver/ScriptClosure.fsi @@ -57,9 +57,6 @@ type LoadClosure = /// The original #load references, including those that didn't resolve OriginalLoadReferences: (range * string * string) list - /// The #nowarns - NoWarns: (string * range list) list - /// Diagnostics seen while processing resolutions ResolutionDiagnostics: (PhasedDiagnostic * FSharpDiagnosticSeverity) list diff --git a/src/Compiler/Driver/fsc.fs b/src/Compiler/Driver/fsc.fs index ac4ee179538..27163f3de2a 100644 --- a/src/Compiler/Driver/fsc.fs +++ b/src/Compiler/Driver/fsc.fs @@ -76,7 +76,8 @@ type DiagnosticsLoggerUpToMaxErrors(tcConfigB: TcConfigBuilder, exiter: Exiter, override x.DiagnosticSink(diagnostic, severity) = let tcConfig = TcConfig.Create(tcConfigB, validate = false) - if diagnostic.ReportAsError(tcConfig.diagnosticsOptions, severity) then + match diagnostic.AdjustedSeverity(tcConfigB.diagnosticsOptions, severity) with + | FSharpDiagnosticSeverity.Error -> if errors >= tcConfig.maxErrors then x.HandleTooManyErrors(FSComp.SR.fscTooManyErrors ()) exiter.Exit 1 @@ -92,11 +93,8 @@ type DiagnosticsLoggerUpToMaxErrors(tcConfigB: TcConfigBuilder, exiter: Exiter, Debug.Assert(false, sprintf "Lookup exception in compiler: %s" (diagnostic.Exception.ToString())) | _ -> () - elif diagnostic.ReportAsWarning(tcConfig.diagnosticsOptions, severity) then - x.HandleIssue(tcConfig, diagnostic, FSharpDiagnosticSeverity.Warning) - - elif diagnostic.ReportAsInfo(tcConfig.diagnosticsOptions, severity) then - x.HandleIssue(tcConfig, diagnostic, severity) + | FSharpDiagnosticSeverity.Hidden -> () + | s -> x.HandleIssue(tcConfig, diagnostic, s) /// Create an error logger that counts and prints errors let ConsoleDiagnosticsLogger (tcConfigB: TcConfigBuilder, exiter: Exiter) = @@ -236,11 +234,6 @@ let AdjustForScriptCompile (tcConfigB: TcConfigBuilder, commandLineSourceFiles, references |> List.iter (fun r -> tcConfigB.AddReferencedAssemblyByPath(r.originalReference.Range, r.resolvedPath)) - // Also record the other declarations from the script. - closure.NoWarns - |> List.collect (fun (n, ms) -> ms |> List.map (fun m -> m, n)) - |> List.iter (fun (x, m) -> tcConfigB.TurnWarningOff(x, m)) - closure.SourceFiles |> List.map fst |> List.iter AddIfNotPresent closure.AllRootFileDiagnostics |> List.iter diagnosticSink @@ -290,6 +283,8 @@ let ProcessCommandLineFlags (tcConfigB: TcConfigBuilder, lcidFromCodePage, argv) // This is where flags are interpreted by the command line fsc.exe. ParseCompilerOptions(collect, GetCoreFscCompilerOptions tcConfigB, List.tail (PostProcessCompilerArgs abbrevArgs argv)) + tcConfigB.diagnosticsOptions.FSharp9CompatibleNowarn <- not <| tcConfigB.langVersion.SupportsFeature LanguageFeature.ScopedNowarn + let inputFiles = List.rev inputFilesRef // Check if we have a codepage from the console @@ -739,13 +734,7 @@ let main2 let oldLogger = diagnosticsLogger let diagnosticsLogger = - let scopedPragmas = - [ - for CheckedImplFile(pragmas = pragmas) in typedImplFiles do - yield! pragmas - ] - - GetDiagnosticsLoggerFilteringByScopedPragmas(true, scopedPragmas, tcConfig.diagnosticsOptions, oldLogger) + GetDiagnosticsLoggerFilteringByScopedPragmas(tcConfig.diagnosticsOptions, oldLogger) SetThreadDiagnosticsLoggerNoUnwind diagnosticsLogger diff --git a/src/Compiler/FSComp.txt b/src/Compiler/FSComp.txt index b5a50afc7c0..c0f2692f69b 100644 --- a/src/Compiler/FSComp.txt +++ b/src/Compiler/FSComp.txt @@ -1783,4 +1783,6 @@ featureEmptyBodiedComputationExpressions,"Support for computation expressions wi featureAllowAccessModifiersToAutoPropertiesGettersAndSetters,"Allow access modifiers to auto properties getters and setters" 3871,tcAccessModifiersNotAllowedInSRTPConstraint,"Access modifiers cannot be applied to an SRTP constraint." featureAllowObjectExpressionWithoutOverrides,"Allow object expressions without overrides" -3872,tcPartialActivePattern,"Multi-case partial active patterns are not supported. Consider using a single-case partial active pattern or a full active pattern." \ No newline at end of file +3872,tcPartialActivePattern,"Multi-case partial active patterns are not supported. Consider using a single-case partial active pattern or a full active pattern." +featureScopedNowarn,"Support for scoped enabling / disabling of warnings by #warn and #nowarn directives" +3873,lexWarnDirectiveMustBeFirst,"#nowarn/#warnon directives must appear as the first non-whitespace characters on a line" \ No newline at end of file diff --git a/src/Compiler/FSharp.Compiler.Service.fsproj b/src/Compiler/FSharp.Compiler.Service.fsproj index 45b5bda0d10..6a3b3921d65 100644 --- a/src/Compiler/FSharp.Compiler.Service.fsproj +++ b/src/Compiler/FSharp.Compiler.Service.fsproj @@ -269,6 +269,8 @@ + + diff --git a/src/Compiler/Facilities/DiagnosticOptions.fs b/src/Compiler/Facilities/DiagnosticOptions.fs index 2a3a6ffe742..b62e95d3332 100644 --- a/src/Compiler/Facilities/DiagnosticOptions.fs +++ b/src/Compiler/Facilities/DiagnosticOptions.fs @@ -5,6 +5,22 @@ // F# compiler. namespace FSharp.Compiler.Diagnostics +open FSharp.Compiler.Text + +[] +type WarnScope = + | Off of range + | On of range + | OpenOff of range + | OpenOn of range + +type WarnScopeMap = WarnScopeMap of Map + +type LineMap = + | LineMap of Map + + static member Empty = LineMap Map.empty + [] type FSharpDiagnosticSeverity = | Hidden @@ -20,6 +36,9 @@ type FSharpDiagnosticOptions = WarnOn: int list WarnAsError: int list WarnAsWarn: int list + mutable FSharp9CompatibleNowarn: bool // set after setting compiler options + mutable LineMap: LineMap // set after lexing + mutable WarnScopes: WarnScopeMap // set after lexing } static member Default = @@ -30,6 +49,9 @@ type FSharpDiagnosticOptions = WarnOn = [] WarnAsError = [] WarnAsWarn = [] + FSharp9CompatibleNowarn = false + LineMap = LineMap.Empty + WarnScopes = WarnScopeMap Map.empty } member x.CheckXmlDocs = diff --git a/src/Compiler/Facilities/DiagnosticOptions.fsi b/src/Compiler/Facilities/DiagnosticOptions.fsi index 8ff6b3d2f88..5a8f37fc20b 100644 --- a/src/Compiler/Facilities/DiagnosticOptions.fsi +++ b/src/Compiler/Facilities/DiagnosticOptions.fsi @@ -6,6 +6,26 @@ namespace FSharp.Compiler.Diagnostics +open FSharp.Compiler.Text + +/// The range between #nowarn and #warnon, or #warnon and #nowarn, for a warning number. +/// Or between the directive and eof, for the "Open" cases. +[] +type WarnScope = + | Off of range + | On of range + | OpenOff of range + | OpenOn of range + +/// The collected WarnScope objects (collected during lexing) +type WarnScopeMap = WarnScopeMap of Map + +/// Information about the mapping implied by the #line directives +type LineMap = + | LineMap of Map + + static member Empty: LineMap + [] type FSharpDiagnosticSeverity = | Hidden @@ -19,7 +39,10 @@ type FSharpDiagnosticOptions = WarnOff: int list WarnOn: int list WarnAsError: int list - WarnAsWarn: int list } + WarnAsWarn: int list + mutable FSharp9CompatibleNowarn: bool + mutable LineMap: LineMap + mutable WarnScopes: WarnScopeMap } static member Default: FSharpDiagnosticOptions diff --git a/src/Compiler/Facilities/LanguageFeatures.fs b/src/Compiler/Facilities/LanguageFeatures.fs index 5c311237594..25632458d08 100644 --- a/src/Compiler/Facilities/LanguageFeatures.fs +++ b/src/Compiler/Facilities/LanguageFeatures.fs @@ -94,6 +94,7 @@ type LanguageFeature = | ParsedHashDirectiveArgumentNonQuotes | EmptyBodiedComputationExpressions | AllowObjectExpressionWithoutOverrides + | ScopedNowarn /// LanguageVersion management type LanguageVersion(versionText) = @@ -219,6 +220,7 @@ type LanguageVersion(versionText) = LanguageFeature.FromEndSlicing, previewVersion // Unfinished features --- needs work LanguageFeature.AllowAccessModifiersToAutoPropertiesGettersAndSetters, previewVersion LanguageFeature.AllowObjectExpressionWithoutOverrides, previewVersion + LanguageFeature.ScopedNowarn, previewVersion ] static let defaultLanguageVersion = LanguageVersion("default") @@ -375,6 +377,7 @@ type LanguageVersion(versionText) = | LanguageFeature.ParsedHashDirectiveArgumentNonQuotes -> FSComp.SR.featureParsedHashDirectiveArgumentNonString () | LanguageFeature.EmptyBodiedComputationExpressions -> FSComp.SR.featureEmptyBodiedComputationExpressions () | LanguageFeature.AllowObjectExpressionWithoutOverrides -> FSComp.SR.featureAllowObjectExpressionWithoutOverrides () + | LanguageFeature.ScopedNowarn -> FSComp.SR.featureScopedNowarn () /// Get a version string associated with the given feature. static member GetFeatureVersionString feature = diff --git a/src/Compiler/Facilities/LanguageFeatures.fsi b/src/Compiler/Facilities/LanguageFeatures.fsi index 7408300b943..03fb649b6e3 100644 --- a/src/Compiler/Facilities/LanguageFeatures.fsi +++ b/src/Compiler/Facilities/LanguageFeatures.fsi @@ -85,6 +85,7 @@ type LanguageFeature = | ParsedHashDirectiveArgumentNonQuotes | EmptyBodiedComputationExpressions | AllowObjectExpressionWithoutOverrides + | ScopedNowarn /// LanguageVersion management type LanguageVersion = diff --git a/src/Compiler/Facilities/prim-parsing.fs b/src/Compiler/Facilities/prim-parsing.fs index bb61e76e5f3..7fb0d7fca41 100644 --- a/src/Compiler/Facilities/prim-parsing.fs +++ b/src/Compiler/Facilities/prim-parsing.fs @@ -151,7 +151,10 @@ module internal Implementation = //------------------------------------------------------------------------- // Read the tables written by FSYACC. - type AssocTable(elemTab: uint16[], offsetTab: uint16[], cache: int[], cacheSize: int) = + type AssocTable(elemTab: uint16[], offsetTab: uint16[], cache: int[]) = + + do Array.fill cache 0 cache.Length -1 + let cacheSize = cache.Length / 2 member t.ReadAssoc(minElemNum, maxElemNum, defaultValueOfAssoc, keyToFind) = // do a binary chop on the table @@ -273,13 +276,8 @@ module internal Implementation = let lhsPos = (Array.zeroCreate 2: Position[]) let reductions = tables.reductions let cacheSize = 7919 // the 1000'th prime - // Use a simpler hash table with faster lookup, but only one - // hash bucket per key. let actionTableCache = ArrayPool.Shared.Rent(cacheSize * 2) let gotoTableCache = ArrayPool.Shared.Rent(cacheSize * 2) - // Clear the arrays since ArrayPool does not - Array.Clear(actionTableCache, 0, actionTableCache.Length) - Array.Clear(gotoTableCache, 0, gotoTableCache.Length) use _cacheDisposal = { new IDisposable with @@ -289,10 +287,10 @@ module internal Implementation = } let actionTable = - AssocTable(tables.actionTableElements, tables.actionTableRowOffsets, actionTableCache, cacheSize) + AssocTable(tables.actionTableElements, tables.actionTableRowOffsets, actionTableCache) let gotoTable = - AssocTable(tables.gotos, tables.sparseGotoTableRowOffsets, gotoTableCache, cacheSize) + AssocTable(tables.gotos, tables.sparseGotoTableRowOffsets, gotoTableCache) let stateToProdIdxsTable = IdxToIdxListTable(tables.stateToProdIdxsTableElements, tables.stateToProdIdxsTableRowOffsets) diff --git a/src/Compiler/Interactive/fsi.fs b/src/Compiler/Interactive/fsi.fs index 74fcc37340c..e81cffd93f1 100644 --- a/src/Compiler/Interactive/fsi.fs +++ b/src/Compiler/Interactive/fsi.fs @@ -898,7 +898,8 @@ type internal DiagnosticsLoggerThatStopsOnFirstError override _.DiagnosticSink(diagnostic, severity) = let tcConfig = TcConfig.Create(tcConfigB, validate = false) - if diagnostic.ReportAsError(tcConfig.diagnosticsOptions, severity) then + match diagnostic.AdjustedSeverity(tcConfig.diagnosticsOptions, severity) with + | FSharpDiagnosticSeverity.Error -> fsiStdinSyphon.PrintDiagnostic(tcConfig, diagnostic) errorCount <- errorCount + 1 @@ -906,20 +907,21 @@ type internal DiagnosticsLoggerThatStopsOnFirstError exit 1 (* non-zero exit code *) // STOP ON FIRST ERROR (AVOIDS PARSER ERROR RECOVERY) raise StopProcessing - elif diagnostic.ReportAsWarning(tcConfig.diagnosticsOptions, severity) then + | FSharpDiagnosticSeverity.Warning -> DoWithDiagnosticColor FSharpDiagnosticSeverity.Warning (fun () -> fsiConsoleOutput.Error.WriteLine() diagnostic.WriteWithContext(fsiConsoleOutput.Error, " ", fsiStdinSyphon.GetLine, tcConfig, severity) fsiConsoleOutput.Error.WriteLine() fsiConsoleOutput.Error.WriteLine() fsiConsoleOutput.Error.Flush()) - elif diagnostic.ReportAsInfo(tcConfig.diagnosticsOptions, severity) then + | FSharpDiagnosticSeverity.Info -> DoWithDiagnosticColor FSharpDiagnosticSeverity.Info (fun () -> fsiConsoleOutput.Error.WriteLine() diagnostic.WriteWithContext(fsiConsoleOutput.Error, " ", fsiStdinSyphon.GetLine, tcConfig, severity) fsiConsoleOutput.Error.WriteLine() fsiConsoleOutput.Error.WriteLine() fsiConsoleOutput.Error.Flush()) + | FSharpDiagnosticSeverity.Hidden -> () override _.ErrorCount = errorCount @@ -1673,7 +1675,7 @@ let internal mkBoundValueTypedImpl tcGlobals m moduleName name ty = let contents = TMDefs([ TMDefs[TMDefRec(false, [], [], [ mbinding ], m)] ]) let qname = QualifiedNameOfFile.QualifiedNameOfFile(Ident(moduleName, m)) - entity, v, CheckedImplFile.CheckedImplFile(qname, [], mty, contents, false, false, StampMap.Empty, Map.empty) + entity, v, CheckedImplFile.CheckedImplFile(qname, mty, contents, false, false, StampMap.Empty, Map.empty) let dynamicCcuName = "FSI-ASSEMBLY" @@ -2483,7 +2485,6 @@ type internal FsiDynamicCompiler true, ComputeQualifiedNameOfFileFromUniquePath(m, prefixPath), [], - [], [ impl ], (isLastCompiland, isExe), { @@ -2838,10 +2839,7 @@ type internal FsiDynamicCompiler ) = WithImplicitHome (tcConfigB, directoryName sourceFile) (fun () -> ProcessMetaCommandsFromInput - ((fun st (m, nm) -> - tcConfigB.TurnWarningOff(m, nm) - st), - (fun st (m, path, directive) -> + ((fun st (m, path, directive) -> let st, _ = fsiDynamicCompiler.PartiallyProcessReferenceOrPackageIncludePathDirective(ctok, st, directive, path, false, m) @@ -2884,10 +2882,6 @@ type internal FsiDynamicCompiler fsiConsoleOutput.uprintfn "]" - for (warnNum, ranges) in closure.NoWarns do - for m in ranges do - tcConfigB.TurnWarningOff(m, warnNum) - // Play errors and warnings from resolution closure.ResolutionDiagnostics |> List.iter diagnosticSink @@ -3695,7 +3689,7 @@ type FsiInteractionProcessor error (Error(FSIstrings.SR.fsiDirectoryDoesNotExist (path), m)) /// Parse one interaction. Called on the parser thread. - let ParseInteraction (tokenizer: LexFilter.LexFilter) = + let ParseInteraction diagnosticOptions (tokenizer: LexFilter.LexFilter) = let mutable lastToken = Parser.ELSE // Any token besides SEMICOLON_SEMICOLON will do for initial value try @@ -3710,6 +3704,8 @@ type FsiInteractionProcessor tok Parser.interaction lexerWhichSavesLastToken tokenizer.LexBuffer) + + WarnScopes.MergeInto diagnosticOptions tokenizer.LexBuffer Some input with e -> @@ -3739,7 +3735,7 @@ type FsiInteractionProcessor let tokenizer = fsiStdinLexerProvider.CreateBufferLexer("hdummy.fsx", lexbuf, diagnosticsLogger) - let parsedInteraction = ParseInteraction tokenizer + let parsedInteraction = ParseInteraction tcConfigB.diagnosticsOptions tokenizer match parsedInteraction with | Some(ParsedScriptInteraction.Definitions([ SynModuleDecl.Expr(e, _) ], _)) -> @@ -3848,9 +3844,9 @@ type FsiInteractionProcessor istate, Completed None - | ParsedHashDirective("nowarn", nowarnArguments, m) -> - let numbers = (parsedHashDirectiveArguments nowarnArguments tcConfigB.langVersion) - List.iter (fun (d: string) -> tcConfigB.TurnWarningOff(m, d)) numbers + | ParsedHashDirective("nowarn", _, _) -> + // let numbers = (parsedHashDirectiveArguments nowarnArguments tcConfigB.langVersion) + // List.iter (fun (d: string) -> tcConfigB.TurnWarningOff(m, d)) numbers istate, Completed None | ParsedHashDirective("terms", [], _) -> @@ -4155,6 +4151,7 @@ type FsiInteractionProcessor runCodeOnMainThread, istate: FsiDynamicCompilerState, tokenizer: LexFilter.LexFilter, + diagnosticOptions, diagnosticsLogger, ?cancellationToken: CancellationToken ) = @@ -4181,8 +4178,8 @@ type FsiInteractionProcessor // Parse the interaction. When FSI.EXE is waiting for input from the console the // parser thread is blocked somewhere deep this call. - let action = ParseInteraction tokenizer - + let action = ParseInteraction diagnosticOptions tokenizer + if progress then fprintfn fsiConsoleOutput.Out "returned from ParseInteraction...calling runCodeOnMainThread..." @@ -4219,7 +4216,7 @@ type FsiInteractionProcessor let rec run istate = let status = - processor.ParseAndExecuteInteractionFromLexbuf((fun f istate -> f ctok istate), istate, tokenizer, diagnosticsLogger) + processor.ParseAndExecuteInteractionFromLexbuf((fun f istate -> f ctok istate), istate, tokenizer, tcConfigB.diagnosticsOptions, diagnosticsLogger) ProcessStepStatus status None (fun _ istate -> run istate) @@ -4299,7 +4296,7 @@ type FsiInteractionProcessor currState |> InteractiveCatch diagnosticsLogger (fun istate -> - let expr = ParseInteraction tokenizer + let expr = ParseInteraction tcConfigB.diagnosticsOptions tokenizer ExecuteParsedInteractionOnMainThread(ctok, diagnosticsLogger, expr, istate, cancellationToken)) |> commitResult @@ -4352,7 +4349,7 @@ type FsiInteractionProcessor // mainForm.Invoke to pipe a message back through the form's main event loop. (The message // is a delegate to execute on the main Thread) // - member processor.StartStdinReadAndProcessThread diagnosticsLogger = + member processor.StartStdinReadAndProcessThread(diagnosticOptions, diagnosticsLogger) = if progress then fprintfn fsiConsoleOutput.Out "creating stdinReaderThread" @@ -4386,6 +4383,7 @@ type FsiInteractionProcessor runCodeOnMainThread, currState, currTokenizer, + diagnosticOptions, diagnosticsLogger ) @@ -4984,7 +4982,7 @@ type FsiEvaluationSession | _ -> ()) fsiInteractionProcessor.LoadInitialFiles(ctokRun, diagnosticsLogger) - fsiInteractionProcessor.StartStdinReadAndProcessThread(diagnosticsLogger) + fsiInteractionProcessor.StartStdinReadAndProcessThread(tcConfigB.diagnosticsOptions, diagnosticsLogger) DriveFsiEventLoop(fsi, fsiInterruptController, fsiConsoleOutput) diff --git a/src/Compiler/Optimize/InnerLambdasToTopLevelFuncs.fs b/src/Compiler/Optimize/InnerLambdasToTopLevelFuncs.fs index f03db8f5e6f..0e2ced16da4 100644 --- a/src/Compiler/Optimize/InnerLambdasToTopLevelFuncs.fs +++ b/src/Compiler/Optimize/InnerLambdasToTopLevelFuncs.fs @@ -1332,9 +1332,9 @@ module Pass4_RewriteAssembly = let rhs, z = TransModuleContents penv z rhs ModuleOrNamespaceBinding.Module(nm, rhs), z - let TransImplFile penv z (CheckedImplFile (fragName, pragmas, signature, contents, hasExplicitEntryPoint, isScript, anonRecdTypes, namedDebugPointsForInlinedCode)) = + let TransImplFile penv z (CheckedImplFile (fragName, signature, contents, hasExplicitEntryPoint, isScript, anonRecdTypes, namedDebugPointsForInlinedCode)) = let contentsR, z = TransModuleContents penv z contents - (CheckedImplFile (fragName, pragmas, signature, contentsR, hasExplicitEntryPoint, isScript, anonRecdTypes, namedDebugPointsForInlinedCode)), z + (CheckedImplFile (fragName, signature, contentsR, hasExplicitEntryPoint, isScript, anonRecdTypes, namedDebugPointsForInlinedCode)), z //------------------------------------------------------------------------- // pass5: copyExpr diff --git a/src/Compiler/Optimize/Optimizer.fs b/src/Compiler/Optimize/Optimizer.fs index 51d889f5691..9a613dd1123 100644 --- a/src/Compiler/Optimize/Optimizer.fs +++ b/src/Compiler/Optimize/Optimizer.fs @@ -4349,7 +4349,7 @@ and OptimizeModuleDefs cenv (env, bindInfosColl) defs = (defs, UnionOptimizationInfos minfos), (env, bindInfosColl) and OptimizeImplFileInternal cenv env isIncrementalFragment hidden implFile = - let (CheckedImplFile (qname, pragmas, signature, contents, hasExplicitEntryPoint, isScript, anonRecdTypes, namedDebugPointsForInlinedCode)) = implFile + let (CheckedImplFile (qname, signature, contents, hasExplicitEntryPoint, isScript, anonRecdTypes, namedDebugPointsForInlinedCode)) = implFile let env, contentsR, minfo, hidden = // FSI compiles interactive fragments as if you're typing incrementally into one module. // @@ -4371,7 +4371,7 @@ and OptimizeImplFileInternal cenv env isIncrementalFragment hidden implFile = let env = BindValsInModuleOrNamespace cenv minfo env env, mexprR, minfoExternal, hidden - let implFileR = CheckedImplFile (qname, pragmas, signature, contentsR, hasExplicitEntryPoint, isScript, anonRecdTypes, namedDebugPointsForInlinedCode) + let implFileR = CheckedImplFile (qname, signature, contentsR, hasExplicitEntryPoint, isScript, anonRecdTypes, namedDebugPointsForInlinedCode) env, implFileR, minfo, hidden diff --git a/src/Compiler/Service/BackgroundCompiler.fs b/src/Compiler/Service/BackgroundCompiler.fs index 1089f5774e8..c618bd9c37e 100644 --- a/src/Compiler/Service/BackgroundCompiler.fs +++ b/src/Compiler/Service/BackgroundCompiler.fs @@ -1375,8 +1375,6 @@ type internal BackgroundCompiler yield! otherFlags for r in loadClosure.References do yield "-r:" + fst r - for code, _ in loadClosure.NoWarns do - yield "--nowarn:" + code |] let options = diff --git a/src/Compiler/Service/FSharpCheckerResults.fs b/src/Compiler/Service/FSharpCheckerResults.fs index 6af2b440cc0..268affd673a 100644 --- a/src/Compiler/Service/FSharpCheckerResults.fs +++ b/src/Compiler/Service/FSharpCheckerResults.fs @@ -3218,10 +3218,6 @@ module internal ParseAndCheckFile = use _unwindBP = UseBuildPhase BuildPhase.TypeCheck - // Apply nowarns to tcConfig (may generate errors, so ensure diagnosticsLogger is installed) - let tcConfig = - ApplyNoWarnsToTcConfig(tcConfig, parsedMainInput, !! Path.GetDirectoryName(mainInputFileName)) - // update the error handler with the modified tcConfig errHandler.DiagnosticOptions <- tcConfig.diagnosticsOptions diff --git a/src/Compiler/Service/IncrementalBuild.fs b/src/Compiler/Service/IncrementalBuild.fs index 29059b4873b..459178e20db 100644 --- a/src/Compiler/Service/IncrementalBuild.fs +++ b/src/Compiler/Service/IncrementalBuild.fs @@ -128,7 +128,6 @@ module IncrementalBuildSyntaxTree = sigName, [], [], - [], isLastCompiland, { ConditionalDirectives = []; CodeComments = [] }, Set.empty @@ -259,7 +258,7 @@ type BoundModel private ( IncrementalBuilderEventTesting.MRU.Add(IncrementalBuilderEventTesting.IBETypechecked fileName) let capturingDiagnosticsLogger = CapturingDiagnosticsLogger("TypeCheck") - let diagnosticsLogger = GetDiagnosticsLoggerFilteringByScopedPragmas(false, input.ScopedPragmas, tcConfig.diagnosticsOptions, capturingDiagnosticsLogger) + let diagnosticsLogger = GetDiagnosticsLoggerFilteringByScopedPragmas(tcConfig.diagnosticsOptions, capturingDiagnosticsLogger) use _ = new CompilationGlobalsScope(diagnosticsLogger, BuildPhase.TypeCheck) beforeFileChecked.Trigger fileName diff --git a/src/Compiler/Service/ServiceLexing.fs b/src/Compiler/Service/ServiceLexing.fs index 37990b026d1..f9a4f256cfd 100644 --- a/src/Compiler/Service/ServiceLexing.fs +++ b/src/Compiler/Service/ServiceLexing.fs @@ -404,6 +404,7 @@ module internal TokenClassifications = | HASH_LIGHT _ | HASH_LINE _ + | WARN_DIRECTIVE _ | HASH_IF _ | HASH_ELSE _ | HASH_ENDIF _ -> (FSharpTokenColorKind.PreprocessorKeyword, FSharpTokenCharKind.WhiteSpace, FSharpTokenTriggerClass.None) @@ -934,6 +935,16 @@ type FSharpLineTokenizer(lexbuf: UnicodeLexing.Lexbuf, maxLength: int option, fi // Process: anywhite* ("//" [^'\n''\r']*)? let offset = beforeIdent + identLength processWhiteAndComment str offset delay cont) + + let processWarnDirective (str: string) leftc rightc cont = + let hashIdx = str.IndexOf("#", StringComparison.Ordinal) + let directive = WARN_DIRECTIVE(str, cont), leftc + hashIdx, rightc + + if (hashIdx <> 0) then + delayToken directive + WHITESPACE cont, leftc, rightc + hashIdx - 1 + else + directive // Set up the initial file position do @@ -1035,6 +1046,7 @@ type FSharpLineTokenizer(lexbuf: UnicodeLexing.Lexbuf, maxLength: int option, fi | HASH_IF(m, lineStr, cont) when lineStr <> "" -> false, processHashIfLine m.StartColumn lineStr cont | HASH_ELSE(m, lineStr, cont) when lineStr <> "" -> false, processHashEndElse m.StartColumn lineStr 4 cont | HASH_ENDIF(m, lineStr, cont) when lineStr <> "" -> false, processHashEndElse m.StartColumn lineStr 5 cont + | WARN_DIRECTIVE(s, cont) -> false, processWarnDirective s leftc rightc cont | HASH_IDENT(ident) -> delayToken (IDENT ident, leftc + 1, rightc) false, (HASH, leftc, leftc) @@ -1173,9 +1185,7 @@ type FSharpLineTokenizer(lexbuf: UnicodeLexing.Lexbuf, maxLength: int option, fi | true, "silentCd" | true, "q" | true, "quit" - | true, "help" - // These are for script and non-script - | _, "nowarn" -> + | true, "help" -> // Merge both tokens into one. let lexcontFinal = if isCached then @@ -1286,6 +1296,7 @@ type FSharpTokenKind = | HashIf | HashElse | HashEndIf + | WarnDirective | CommentTrivia | WhitespaceTrivia | HashLine @@ -1497,6 +1508,7 @@ type FSharpToken = | HASH_IF _ -> FSharpTokenKind.HashIf | HASH_ELSE _ -> FSharpTokenKind.HashElse | HASH_ENDIF _ -> FSharpTokenKind.HashEndIf + | WARN_DIRECTIVE _ -> FSharpTokenKind.WarnDirective | COMMENT _ -> FSharpTokenKind.CommentTrivia | WHITESPACE _ -> FSharpTokenKind.WhitespaceTrivia | HASH_LINE _ -> FSharpTokenKind.HashLine diff --git a/src/Compiler/Service/ServiceLexing.fsi b/src/Compiler/Service/ServiceLexing.fsi index ee2ab7411d5..261c7c6764e 100755 --- a/src/Compiler/Service/ServiceLexing.fsi +++ b/src/Compiler/Service/ServiceLexing.fsi @@ -371,6 +371,7 @@ type public FSharpTokenKind = | HashIf | HashElse | HashEndIf + | WarnDirective | CommentTrivia | WhitespaceTrivia | HashLine diff --git a/src/Compiler/Service/TransparentCompiler.fs b/src/Compiler/Service/TransparentCompiler.fs index 5158ac7f25c..8f2b229310d 100644 --- a/src/Compiler/Service/TransparentCompiler.fs +++ b/src/Compiler/Service/TransparentCompiler.fs @@ -1281,7 +1281,6 @@ type internal TransparentCompiler let mainInputFileName = file.FileName let sourceText = file.SourceText - let parsedMainInput = file.ParsedInput // Initialize the error handler let errHandler = @@ -1294,14 +1293,10 @@ type internal TransparentCompiler tcConfig.flatErrors ) - // Apply nowarns to tcConfig (may generate errors, so ensure diagnosticsLogger is installed) - let tcConfig = - ApplyNoWarnsToTcConfig(tcConfig, parsedMainInput, !! Path.GetDirectoryName(mainInputFileName)) - let diagnosticsLogger = errHandler.DiagnosticsLogger let diagnosticsLogger = - GetDiagnosticsLoggerFilteringByScopedPragmas(false, input.ScopedPragmas, tcConfig.diagnosticsOptions, diagnosticsLogger) + GetDiagnosticsLoggerFilteringByScopedPragmas(tcConfig.diagnosticsOptions, diagnosticsLogger) use _ = new CompilationGlobalsScope(diagnosticsLogger, BuildPhase.TypeCheck) @@ -1564,9 +1559,7 @@ type internal TransparentCompiler let extraLogger = CapturingDiagnosticsLogger("DiagnosticsWhileCreatingDiagnostics") use _ = new CompilationGlobalsScope(extraLogger, BuildPhase.TypeCheck) - // Apply nowarns to tcConfig (may generate errors, so ensure diagnosticsLogger is installed) - let tcConfig = - ApplyNoWarnsToTcConfig(bootstrapInfo.TcConfig, parseResults.ParseTree, Path.GetDirectoryName fileName |> (!!)) + let tcConfig = bootstrapInfo.TcConfig let diagnosticsOptions = tcConfig.diagnosticsOptions @@ -2352,8 +2345,6 @@ type internal TransparentCompiler yield "--noframework" yield "--warn:3" yield! otherFlags - for code, _ in loadClosure.NoWarns do - yield "--nowarn:" + code ] // Once we do have the script closure, we can populate the cache to re-use can later. diff --git a/src/Compiler/Symbols/Exprs.fs b/src/Compiler/Symbols/Exprs.fs index 91480597cc2..c0054e37701 100644 --- a/src/Compiler/Symbols/Exprs.fs +++ b/src/Compiler/Symbols/Exprs.fs @@ -1352,7 +1352,7 @@ and FSharpImplementationFileDeclaration = and FSharpImplementationFileContents(cenv, mimpl) = let g = cenv.g - let (CheckedImplFile (qname, _pragmas, _, contents, hasExplicitEntryPoint, isScript, _anonRecdTypes, _)) = mimpl + let (CheckedImplFile (qname, _, contents, hasExplicitEntryPoint, isScript, _anonRecdTypes, _)) = mimpl let rec getBind (bind: Binding) = let v = bind.Var assert v.IsCompiledAsTopLevel diff --git a/src/Compiler/Symbols/FSharpDiagnostic.fs b/src/Compiler/Symbols/FSharpDiagnostic.fs index 46566d61bbf..d57c5ddabc7 100644 --- a/src/Compiler/Symbols/FSharpDiagnostic.fs +++ b/src/Compiler/Symbols/FSharpDiagnostic.fs @@ -304,13 +304,12 @@ type internal CompilationDiagnosticLogger (debugName: string, options: FSharpDia | Some f -> f diagnostic | None -> diagnostic - if diagnostic.ReportAsError (options, severity) then + match diagnostic.AdjustedSeverity(options, severity) with + | FSharpDiagnosticSeverity.Error -> diagnostics.Add(diagnostic, FSharpDiagnosticSeverity.Error) errorCount <- errorCount + 1 - elif diagnostic.ReportAsWarning (options, severity) then - diagnostics.Add(diagnostic, FSharpDiagnosticSeverity.Warning) - elif diagnostic.ReportAsInfo (options, severity) then - diagnostics.Add(diagnostic, severity) + | FSharpDiagnosticSeverity.Hidden -> () + | s -> diagnostics.Add(diagnostic, s) override _.ErrorCount = errorCount @@ -319,23 +318,18 @@ type internal CompilationDiagnosticLogger (debugName: string, options: FSharpDia module DiagnosticHelpers = let ReportDiagnostic (options: FSharpDiagnosticOptions, allErrors, mainInputFileName, fileInfo, diagnostic: PhasedDiagnostic, severity, suggestNames, flatErrors, symbolEnv) = - [ let severity = - if diagnostic.ReportAsError (options, severity) then - FSharpDiagnosticSeverity.Error - else - severity - - if severity = FSharpDiagnosticSeverity.Error || - diagnostic.ReportAsWarning (options, severity) || - diagnostic.ReportAsInfo (options, severity) then + match diagnostic.AdjustedSeverity(options, severity) with + | FSharpDiagnosticSeverity.Hidden -> [] + | sev -> // We use the first line of the file as a fallbackRange for reporting unexpected errors. // Not ideal, but it's hard to see what else to do. let fallbackRange = rangeN mainInputFileName 1 - let diagnostic = FSharpDiagnostic.CreateFromExceptionAndAdjustEof (diagnostic, severity, fallbackRange, fileInfo, suggestNames, flatErrors, symbolEnv) + let diagnostic = FSharpDiagnostic.CreateFromExceptionAndAdjustEof (diagnostic, sev, fallbackRange, fileInfo, suggestNames, flatErrors, symbolEnv) let fileName = diagnostic.Range.FileName if allErrors || fileName = mainInputFileName || fileName = TcGlobals.DummyFileNameForRangesWithoutASpecificLocation then - yield diagnostic ] + [diagnostic] + else [] let CreateDiagnostics (options, allErrors, mainInputFileName, diagnostics, suggestNames, flatErrors, symbolEnv) = let fileInfo = (Int32.MaxValue, Int32.MaxValue) diff --git a/src/Compiler/SyntaxTree/ParseHelpers.fs b/src/Compiler/SyntaxTree/ParseHelpers.fs index 8d62a724972..3b60428550f 100644 --- a/src/Compiler/SyntaxTree/ParseHelpers.fs +++ b/src/Compiler/SyntaxTree/ParseHelpers.fs @@ -16,6 +16,7 @@ open FSharp.Compiler.Xml open Internal.Utilities.Library open Internal.Utilities.Text.Lexing open Internal.Utilities.Text.Parsing +open System.Text.RegularExpressions //------------------------------------------------------------------------ // Parsing: Error recovery exception for fsyacc @@ -232,6 +233,10 @@ module LexbufIfdefStore = let store = getStore lexbuf Seq.toList store +//------------------------------------------------------------------------ +// Parsing/lexing: capture the ranges of code comments as syntax trivia +//------------------------------------------------------------------------ + /// Used to capture the ranges of code comments as syntax trivia module LexbufCommentStore = // The key into the BufferLocalStore used to hold the compiler directives diff --git a/src/Compiler/SyntaxTree/SyntaxTree.fs b/src/Compiler/SyntaxTree/SyntaxTree.fs index f97fe05234d..895b4e6e4f0 100644 --- a/src/Compiler/SyntaxTree/SyntaxTree.fs +++ b/src/Compiler/SyntaxTree/SyntaxTree.fs @@ -9,6 +9,7 @@ open FSharp.Compiler.Text open FSharp.Compiler.Text.Range open FSharp.Compiler.Xml open FSharp.Compiler.SyntaxTrivia +open FSharp.Compiler.Diagnostics [] type Ident(text: string, range: range) = @@ -1738,9 +1739,6 @@ type ParsedImplFile = ParsedImplFile of hashDirectives: ParsedHashDirective list [] type ParsedSigFile = ParsedSigFile of hashDirectives: ParsedHashDirective list * fragments: ParsedSigFileFragment list -[] -type ScopedPragma = WarningOff of range: range * warningNumber: int - [] type QualifiedNameOfFile = | QualifiedNameOfFile of Ident @@ -1757,7 +1755,6 @@ type ParsedImplFileInput = fileName: string * isScript: bool * qualifiedNameOfFile: QualifiedNameOfFile * - scopedPragmas: ScopedPragma list * hashDirectives: ParsedHashDirective list * contents: SynModuleOrNamespace list * flags: (bool * bool) * @@ -1767,9 +1764,6 @@ type ParsedImplFileInput = member x.QualifiedName = (let (ParsedImplFileInput(qualifiedNameOfFile = qualNameOfFile)) = x in qualNameOfFile) - member x.ScopedPragmas = - (let (ParsedImplFileInput(scopedPragmas = scopedPragmas)) = x in scopedPragmas) - member x.HashDirectives = (let (ParsedImplFileInput(hashDirectives = hashDirectives)) = x in hashDirectives) @@ -1791,7 +1785,6 @@ type ParsedSigFileInput = | ParsedSigFileInput of fileName: string * qualifiedNameOfFile: QualifiedNameOfFile * - scopedPragmas: ScopedPragma list * hashDirectives: ParsedHashDirective list * contents: SynModuleOrNamespaceSig list * trivia: ParsedSigFileInputTrivia * @@ -1800,9 +1793,6 @@ type ParsedSigFileInput = member x.QualifiedName = (let (ParsedSigFileInput(qualifiedNameOfFile = qualNameOfFile)) = x in qualNameOfFile) - member x.ScopedPragmas = - (let (ParsedSigFileInput(scopedPragmas = scopedPragmas)) = x in scopedPragmas) - member x.HashDirectives = (let (ParsedSigFileInput(hashDirectives = hashDirectives)) = x in hashDirectives) @@ -1823,11 +1813,6 @@ type ParsedInput = | ParsedInput.ImplFile file -> file.FileName | ParsedInput.SigFile file -> file.FileName - member inp.ScopedPragmas = - match inp with - | ParsedInput.ImplFile file -> file.ScopedPragmas - | ParsedInput.SigFile file -> file.ScopedPragmas - member inp.QualifiedName = match inp with | ParsedInput.ImplFile file -> file.QualifiedName diff --git a/src/Compiler/SyntaxTree/SyntaxTree.fsi b/src/Compiler/SyntaxTree/SyntaxTree.fsi index 99138631957..88535d582bd 100644 --- a/src/Compiler/SyntaxTree/SyntaxTree.fsi +++ b/src/Compiler/SyntaxTree/SyntaxTree.fsi @@ -7,6 +7,7 @@ open FSharp.Compiler.Syntax open FSharp.Compiler.Text open FSharp.Compiler.Xml open FSharp.Compiler.SyntaxTrivia +open FSharp.Compiler.Diagnostics /// Represents an identifier in F# code [] @@ -1923,12 +1924,6 @@ type ParsedImplFile = [] type ParsedSigFile = ParsedSigFile of hashDirectives: ParsedHashDirective list * fragments: ParsedSigFileFragment list -/// Represents a scoped pragma -[] -type ScopedPragma = - /// A pragma to turn a warning off - | WarningOff of range: range * warningNumber: int - /// Represents a qualifying name for anonymous module specifications and implementations, [] type QualifiedNameOfFile = @@ -1950,7 +1945,6 @@ type ParsedImplFileInput = fileName: string * isScript: bool * qualifiedNameOfFile: QualifiedNameOfFile * - scopedPragmas: ScopedPragma list * hashDirectives: ParsedHashDirective list * contents: SynModuleOrNamespace list * flags: (bool * bool) * @@ -1963,8 +1957,6 @@ type ParsedImplFileInput = member QualifiedName: QualifiedNameOfFile - member ScopedPragmas: ScopedPragma list - member HashDirectives: ParsedHashDirective list member Contents: SynModuleOrNamespace list @@ -1981,7 +1973,6 @@ type ParsedSigFileInput = | ParsedSigFileInput of fileName: string * qualifiedNameOfFile: QualifiedNameOfFile * - scopedPragmas: ScopedPragma list * hashDirectives: ParsedHashDirective list * contents: SynModuleOrNamespaceSig list * trivia: ParsedSigFileInputTrivia * @@ -1991,8 +1982,6 @@ type ParsedSigFileInput = member QualifiedName: QualifiedNameOfFile - member ScopedPragmas: ScopedPragma list - member HashDirectives: ParsedHashDirective list member Contents: SynModuleOrNamespaceSig list @@ -2017,8 +2006,5 @@ type ParsedInput = /// Gets the qualified name used to help match signature and implementation files member QualifiedName: QualifiedNameOfFile - /// Gets the #nowarn and other scoped pragmas - member ScopedPragmas: ScopedPragma list - /// Gets a set of all identifiers used in this parsed input. Only populated if captureIdentifiersWhenParsing option was used. member Identifiers: Set diff --git a/src/Compiler/SyntaxTree/WarnScopes.fs b/src/Compiler/SyntaxTree/WarnScopes.fs new file mode 100644 index 00000000000..15cc031637a --- /dev/null +++ b/src/Compiler/SyntaxTree/WarnScopes.fs @@ -0,0 +1,202 @@ +// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. + +namespace FSharp.Compiler + +open FSharp.Compiler.UnicodeLexing +open FSharp.Compiler.Text +open FSharp.Compiler.Text.Position +open FSharp.Compiler.Text.Range +open FSharp.Compiler.Diagnostics +open System.Text.RegularExpressions + +[] +module internal WarnScopes = + + // The keys into the BufferLocalStore used to hold the warn scopes and related data + let private warnScopeKey = "WarnScopes" + let private lineMapKey = "WarnScopes.LineMaps" + + // ************************************* + // Collect the line directives to correctly interact with them + // ************************************* + + let private getLineMap (lexbuf: Lexbuf) = + if not <| lexbuf.BufferLocalStore.ContainsKey lineMapKey then + lexbuf.BufferLocalStore.Add(lineMapKey, LineMap.Empty) + + lexbuf.BufferLocalStore[lineMapKey] :?> LineMap + + let private setLineMap (lexbuf: Lexbuf) lineMap = + lexbuf.BufferLocalStore[lineMapKey] <- LineMap lineMap + + let RegisterLineDirective (lexbuf, previousFileIndex, fileIndex, line: int) = + let (LineMap lineMap) = getLineMap lexbuf + + if not <| lineMap.ContainsKey fileIndex then + lineMap + |> Map.add fileIndex previousFileIndex + |> Map.add previousFileIndex previousFileIndex // to flag that it contains a line directive + |> setLineMap lexbuf + + ignore line // for now + + // ************************************* + // Collect the warn scopes during lexing + // ************************************* + + let private getWarnScopes (lexbuf: Lexbuf) = + if not <| lexbuf.BufferLocalStore.ContainsKey warnScopeKey then + lexbuf.BufferLocalStore.Add(warnScopeKey, WarnScopeMap Map.empty) + + lexbuf.BufferLocalStore[warnScopeKey] :?> WarnScopeMap + + [] + type private WarnDirective = + | Nowarn of int * range + | Warnon of int * range + + let private getWarningNumber (s: string) = + let s = + if s.StartsWith "\"" && s.EndsWith "\"" then + s.Substring(1, s.Length - 2) + else + s + + let s = if s.StartsWith "FS" then s[2..] else s + + match System.Int32.TryParse s with + | true, i -> Some i + | false, _ -> None + + let private regex = + Regex(" *#(nowarn|warnon)(?: +([^ \r\n/;]+))*(?: *(?:;;|\\/\\/).*)?", RegexOptions.Compiled ||| RegexOptions.CultureInvariant) + + let private getDirectives text m = + let mkDirective (directiveId: string) (m: range) (c: Capture) = + let argRange () = + Range.withEnd (mkPos m.StartLine (c.Index + c.Length - 1)) (Range.shiftStart 0 c.Index m) + + match directiveId, getWarningNumber c.Value with + | "nowarn", Some n -> Some(WarnDirective.Nowarn(n, argRange ())) + | "warnon", Some n -> Some(WarnDirective.Warnon(n, argRange ())) + | _ -> None + + let mGroups = (regex.Match text).Groups + let dIdent = mGroups[1].Value + [ for c in mGroups[2].Captures -> c ] |> List.choose (mkDirective dIdent m) + + let private index (fileIndex, warningNumber) = + (int64 fileIndex <<< 32) + int64 warningNumber + + let private warnNumFromIndex (idx: int64) = idx &&& 0xFFFFFFFFL + + let private getScopes idx warnScopes = + Map.tryFind idx warnScopes |> Option.defaultValue [] + + let private mkScope (m1: range) (m2: range) = + mkFileIndexRange m1.FileIndex m1.Start m2.End + + let private processWarnDirective (WarnScopeMap warnScopes) (wd: WarnDirective) = + match wd with + | WarnDirective.Nowarn(n, m) -> + let idx = index (m.FileIndex, n) + + match getScopes idx warnScopes with + | WarnScope.OpenOn m' :: t -> warnScopes.Add(idx, WarnScope.On(mkScope m' m) :: t) + | WarnScope.OpenOff _ :: _ -> warnScopes + | scopes -> warnScopes.Add(idx, WarnScope.OpenOff(mkScope m m) :: scopes) + | WarnDirective.Warnon(n, m) -> + let idx = index (m.FileIndex, n) + + match getScopes idx warnScopes with + | WarnScope.OpenOff m' :: t -> warnScopes.Add(idx, WarnScope.Off(mkScope m' m) :: t) + | WarnScope.OpenOn _ :: _ -> warnScopes + | scopes -> warnScopes.Add(idx, WarnScope.OpenOn(mkScope m m) :: scopes) + |> WarnScopeMap + + let ParseAndRegisterWarnDirective (lexbuf: Lexbuf) = + let (LineMap lineMap) = getLineMap lexbuf + let convert (p: Internal.Utilities.Text.Lexing.Position) = mkPos p.Line p.Column + let idx = lexbuf.StartPos.FileIndex + let idx = lineMap.TryFind idx |> Option.defaultValue idx + let m = mkFileIndexRange idx (convert lexbuf.StartPos) (convert lexbuf.EndPos) + let text = Lexbuf.LexemeString lexbuf + let directives = getDirectives text m + + let warnScopes = + (getWarnScopes lexbuf, directives) ||> List.fold processWarnDirective + + lexbuf.BufferLocalStore[warnScopeKey] <- warnScopes + + // ************************************* + // Move the warnscope data to diagnosticOptions + // ************************************* + + let MergeInto (diagnosticOptions: FSharpDiagnosticOptions) (lexbuf: Lexbuf) = + let (WarnScopeMap warnScopes) = getWarnScopes lexbuf + let (LineMap lineMap) = getLineMap lexbuf + + lock diagnosticOptions (fun () -> + let (WarnScopeMap current) = diagnosticOptions.WarnScopes + let warnScopes' = Map.fold (fun wss idx ws -> Map.add idx ws wss) current warnScopes + diagnosticOptions.WarnScopes <- WarnScopeMap warnScopes' + let (LineMap clm) = diagnosticOptions.LineMap + let lineMap' = Map.fold (fun lms idx oidx -> Map.add idx oidx lms) clm lineMap + diagnosticOptions.LineMap <- LineMap lineMap') + + lexbuf.BufferLocalStore.Remove warnScopeKey |> ignore + lexbuf.BufferLocalStore.Remove lineMapKey |> ignore + + // ************************************* + // Apply the warn scopes after lexing + // ************************************* + + /// true if m1 contains the start of m2 (#line directives can appear in the middle of an error range) + let private contains (m2: range) (m1: range) = + m2.StartLine > m1.StartLine && m2.StartLine < m1.EndLine + + let private isEnclosingWarnonScope m scope = + match scope with + | WarnScope.On wm when contains m wm -> true + | WarnScope.OpenOn wm when m.StartLine > wm.StartLine -> true + | _ -> false + + let private isEnclosingNowarnScope m scope = + match scope with + | WarnScope.Off wm when contains m wm -> true + | WarnScope.OpenOff wm when m.StartLine > wm.StartLine -> true + | _ -> false + + let private isOffScope scope = + match scope with + | WarnScope.Off _ + | WarnScope.OpenOff _ -> true + | _ -> false + + let IsWarnon (diagnosticOptions: FSharpDiagnosticOptions) warningNumber (mo: range option) = + let (WarnScopeMap warnScopes) = diagnosticOptions.WarnScopes + let (LineMap lineMap) = diagnosticOptions.LineMap + + match mo with + | None -> false + | Some m -> + if lineMap.ContainsKey m.FileIndex then + false + else + let scopes = getScopes (index (m.FileIndex, warningNumber)) warnScopes + List.exists (isEnclosingWarnonScope m) scopes + + let IsNowarn (diagnosticOptions: FSharpDiagnosticOptions) warningNumber (mo: range option) = + let (WarnScopeMap warnScopes) = diagnosticOptions.WarnScopes + let (LineMap lineMap) = diagnosticOptions.LineMap + + match mo, diagnosticOptions.FSharp9CompatibleNowarn with + | Some m, false -> + match lineMap.TryFind m.FileIndex with + | None -> + let scopes = getScopes (index (m.FileIndex, warningNumber)) warnScopes + List.exists (isEnclosingNowarnScope m) scopes + | Some fileIndex -> // file has #line directives + let scopes = getScopes (index (fileIndex, warningNumber)) warnScopes + List.exists isOffScope scopes + | _ -> warnScopes |> Map.exists (fun idx _ -> warnNumFromIndex idx = warningNumber) diff --git a/src/Compiler/SyntaxTree/WarnScopes.fsi b/src/Compiler/SyntaxTree/WarnScopes.fsi new file mode 100644 index 00000000000..2f4a6383b0a --- /dev/null +++ b/src/Compiler/SyntaxTree/WarnScopes.fsi @@ -0,0 +1,24 @@ +// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. + +namespace FSharp.Compiler + +open FSharp.Compiler.Diagnostics +open FSharp.Compiler.Text +open FSharp.Compiler.UnicodeLexing + +module internal WarnScopes = + + /// To be called from lex.fsl to register the line directives for warn scope processing + val RegisterLineDirective: lexbuf: Lexbuf * previousFileIndex: int * fileIndex: int * line: int -> unit + + /// To be called from lex.fsl: #nowarn / #warnon directives are turned into warn scopes and saved + val ParseAndRegisterWarnDirective: lexbuf: Lexbuf -> unit + + /// Add the WarnScopes data of a lexed file into the diagnostics options + val MergeInto: FSharpDiagnosticOptions -> Lexbuf -> unit + + /// Check if the range is inside a WarnScope.On scope + val IsWarnon: FSharpDiagnosticOptions -> warningNumber: int -> mo: range option -> bool + + /// Check if the range is inside a WarnScope.Off scope + val IsNowarn: FSharpDiagnosticOptions -> warningNumber: int -> mo: range option -> bool diff --git a/src/Compiler/TypedTree/TypedTree.fs b/src/Compiler/TypedTree/TypedTree.fs index b948e91fb65..8163cc5a65b 100644 --- a/src/Compiler/TypedTree/TypedTree.fs +++ b/src/Compiler/TypedTree/TypedTree.fs @@ -18,6 +18,7 @@ open FSharp.Compiler open FSharp.Compiler.AbstractIL.IL open FSharp.Compiler.AbstractIL.ILX.Types open FSharp.Compiler.CompilerGlobalState +open FSharp.Compiler.Diagnostics open FSharp.Compiler.DiagnosticsLogger open FSharp.Compiler.Syntax open FSharp.Compiler.Syntax.PrettyNaming @@ -5579,7 +5580,6 @@ type NamedDebugPointKey = type CheckedImplFile = | CheckedImplFile of qualifiedNameOfFile: QualifiedNameOfFile * - pragmas: ScopedPragma list * signature: ModuleOrNamespaceType * contents: ModuleOrNamespaceContents * hasExplicitEntryPoint: bool * @@ -5593,8 +5593,6 @@ type CheckedImplFile = member x.QualifiedNameOfFile = let (CheckedImplFile (qualifiedNameOfFile=res)) = x in res - member x.Pragmas = let (CheckedImplFile (pragmas=res)) = x in res - member x.HasExplicitEntryPoint = let (CheckedImplFile (hasExplicitEntryPoint=res)) = x in res member x.IsScript = let (CheckedImplFile (isScript=res)) = x in res diff --git a/src/Compiler/TypedTree/TypedTree.fsi b/src/Compiler/TypedTree/TypedTree.fsi index d357895728d..7a4efb4918c 100644 --- a/src/Compiler/TypedTree/TypedTree.fsi +++ b/src/Compiler/TypedTree/TypedTree.fsi @@ -10,6 +10,7 @@ open Internal.Utilities.Library open Internal.Utilities.Library.Extras open Internal.Utilities.Rational open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.Diagnostics open FSharp.Compiler.DiagnosticsLogger open FSharp.Compiler.Syntax open FSharp.Compiler.Text @@ -4052,7 +4053,6 @@ type NamedDebugPointKey = type CheckedImplFile = | CheckedImplFile of qualifiedNameOfFile: Syntax.QualifiedNameOfFile * - pragmas: Syntax.ScopedPragma list * signature: ModuleOrNamespaceType * contents: ModuleOrNamespaceContents * hasExplicitEntryPoint: bool * @@ -4071,8 +4071,6 @@ type CheckedImplFile = member IsScript: bool - member Pragmas: Syntax.ScopedPragma list - member QualifiedNameOfFile: Syntax.QualifiedNameOfFile member Signature: ModuleOrNamespaceType diff --git a/src/Compiler/TypedTree/TypedTreeOps.fs b/src/Compiler/TypedTree/TypedTreeOps.fs index 71f26dbf95b..3cb46b81f7f 100644 --- a/src/Compiler/TypedTree/TypedTreeOps.fs +++ b/src/Compiler/TypedTree/TypedTreeOps.fs @@ -6473,10 +6473,10 @@ and remapAndRenameModBind ctxt compgen tmenv x = ModuleOrNamespaceBinding.Module(mspec, def) and remapImplFile ctxt compgen tmenv implFile = - let (CheckedImplFile (fragName, pragmas, signature, contents, hasExplicitEntryPoint, isScript, anonRecdTypes, namedDebugPointsForInlinedCode)) = implFile + let (CheckedImplFile (fragName, signature, contents, hasExplicitEntryPoint, isScript, anonRecdTypes, namedDebugPointsForInlinedCode)) = implFile let contentsR = copyAndRemapModDef ctxt compgen tmenv contents let signatureR, tmenv = copyAndRemapAndBindModTy ctxt compgen tmenv signature - let implFileR = CheckedImplFile (fragName, pragmas, signatureR, contentsR, hasExplicitEntryPoint, isScript, anonRecdTypes, namedDebugPointsForInlinedCode) + let implFileR = CheckedImplFile (fragName, signatureR, contentsR, hasExplicitEntryPoint, isScript, anonRecdTypes, namedDebugPointsForInlinedCode) implFileR, tmenv // Entry points @@ -9778,9 +9778,9 @@ and rewriteModuleOrNamespaceBindings env mbinds = List.map (rewriteModuleOrNamespaceBinding env) mbinds and RewriteImplFile env implFile = - let (CheckedImplFile (fragName, pragmas, signature, contents, hasExplicitEntryPoint, isScript, anonRecdTypes, namedDebugPointsForInlinedCode)) = implFile + let (CheckedImplFile (fragName, signature, contents, hasExplicitEntryPoint, isScript, anonRecdTypes, namedDebugPointsForInlinedCode)) = implFile let contentsR = rewriteModuleOrNamespaceContents env contents - let implFileR = CheckedImplFile (fragName, pragmas, signature, contentsR, hasExplicitEntryPoint, isScript, anonRecdTypes, namedDebugPointsForInlinedCode) + let implFileR = CheckedImplFile (fragName, signature, contentsR, hasExplicitEntryPoint, isScript, anonRecdTypes, namedDebugPointsForInlinedCode) implFileR //-------------------------------------------------------------------------- diff --git a/src/Compiler/lex.fsl b/src/Compiler/lex.fsl index fd95cd3ebce..092f2d51257 100644 --- a/src/Compiler/lex.fsl +++ b/src/Compiler/lex.fsl @@ -816,7 +816,9 @@ rule token (args: LexArgs) (skip: bool) = parse // Construct the new position if args.applyLineDirectives then - lexbuf.EndPos <- pos.ApplyLineDirective((match file with Some f -> FileIndex.fileIndexOfFile f | None -> pos.FileIndex), line) + let fileIndex = match file with Some f -> FileIndex.fileIndexOfFile f | None -> pos.FileIndex + lexbuf.EndPos <- pos.ApplyLineDirective(fileIndex, line) + WarnScopes.RegisterLineDirective(lexbuf, pos.FileIndex, fileIndex, line) else // add a newline when we don't apply a directive since we consumed a newline getting here newline lexbuf @@ -1088,6 +1090,15 @@ rule token (args: LexArgs) (skip: bool) = parse lexbuf.StartPos <- lexbuf.StartPos.ShiftColumnBy(n) HASH_IDENT(lexemeTrimLeft lexbuf (n+1)) } + // We parse and process warn directives here during lexing, including anything that might be an argument. + // But we stop early enough to pass to the parser ";;" (for compatibility) and "//" (for coloring). + | anywhite* ("#nowarn" | "#warnon") anywhite+ [^';''/''\r''\n']+ + { shouldStartLine args lexbuf lexbuf.LexemeRange (FSComp.SR.lexWarnDirectiveMustBeFirst()) () + WarnScopes.ParseAndRegisterWarnDirective lexbuf + let n = (lexeme lexbuf).IndexOf('#') + lexbuf.StartPos <- lexbuf.StartPos.ShiftColumnBy(n) + WARN_DIRECTIVE(lexemeTrimLeft lexbuf (n+1), LexCont.Token (args.ifdefStack, args.stringNest)) } + | surrogateChar surrogateChar | _ diff --git a/src/Compiler/pars.fsy b/src/Compiler/pars.fsy index 656b75c39ff..6f751d21965 100644 --- a/src/Compiler/pars.fsy +++ b/src/Compiler/pars.fsy @@ -151,6 +151,7 @@ let parse_error_rich = Some(fun (ctxt: ParseErrorContext<_>) -> /* These are artificial */ %token LEX_FAILURE %token COMMENT WHITESPACE HASH_LINE HASH_LIGHT INACTIVECODE LINE_COMMENT STRING_TEXT EOF +%token WARN_DIRECTIVE %token HASH_IF HASH_ELSE HASH_ENDIF %start signatureFile implementationFile interaction typedSequentialExprEOF typEOF @@ -473,11 +474,13 @@ interactiveSeparator: | OBLOCKSEP { } /*--------------------------------------------------------------------------*/ -/* #directives - used by both F# Interactive directives and #nowarn etc. */ +/* #directives - used by F# Interactive directives */ /* A #directive in a module, namespace or an interaction */ hashDirective: + | WARN_DIRECTIVE + { ParsedHashDirective("WARN_DIRECTIVE_DUMMY", [], rhs parseState 1) } | HASH IDENT hashDirectiveArgs { let m = match $3 with [] -> rhs2 parseState 1 2 | _ -> rhs2 parseState 1 3 ParsedHashDirective($2, $3, m) } diff --git a/src/Compiler/xlf/FSComp.txt.cs.xlf b/src/Compiler/xlf/FSComp.txt.cs.xlf index 2b1a9483def..2a0e0e2522b 100644 --- a/src/Compiler/xlf/FSComp.txt.cs.xlf +++ b/src/Compiler/xlf/FSComp.txt.cs.xlf @@ -562,6 +562,11 @@ Sdílení podkladových polí v rozlišeném sjednocení [<Struct>] za předpokladu, že mají stejný název a typ + + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + + self type constraints omezení vlastního typu @@ -812,6 +817,11 @@ Interpolovaný řetězec obsahuje nespárované složené závorky. + + #nowarn/#warnon directives must appear as the first non-whitespace characters on a line + #nowarn/#warnon directives must appear as the first non-whitespace characters on a line + + All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n Všechny prvky seznamu musí být implicitně převoditelné na typ prvního prvku, což je řazená kolekce členů o délce {0} typu\n {1} \nTento element je řazená kolekce členů o délce {2} typu\n {3} \n diff --git a/src/Compiler/xlf/FSComp.txt.de.xlf b/src/Compiler/xlf/FSComp.txt.de.xlf index a1b2532e4db..cc083aa2467 100644 --- a/src/Compiler/xlf/FSComp.txt.de.xlf +++ b/src/Compiler/xlf/FSComp.txt.de.xlf @@ -562,6 +562,11 @@ Teilen sie zugrunde liegende Felder in einen [<Struct>]-diskriminierten Union, solange sie denselben Namen und Typ aufweisen. + + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + + self type constraints Selbsttypeinschränkungen @@ -812,6 +817,11 @@ Die interpolierte Zeichenfolge enthält schließende geschweifte Klammern ohne Entsprechung. + + #nowarn/#warnon directives must appear as the first non-whitespace characters on a line + #nowarn/#warnon directives must appear as the first non-whitespace characters on a line + + All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n Alle Elemente einer Liste müssen implizit in den Typ des ersten Elements konvertiert werden. Hierbei handelt es sich um ein Tupel der Länge {0} vom Typ\n {1} \nDieses Element ist ein Tupel der Länge {2} vom Typ\n {3}. \n diff --git a/src/Compiler/xlf/FSComp.txt.es.xlf b/src/Compiler/xlf/FSComp.txt.es.xlf index dd9cbb7fec6..b6bd49889a2 100644 --- a/src/Compiler/xlf/FSComp.txt.es.xlf +++ b/src/Compiler/xlf/FSComp.txt.es.xlf @@ -562,6 +562,11 @@ Compartir campos subyacentes en una unión discriminada [<Struct>] siempre y cuando tengan el mismo nombre y tipo + + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + + self type constraints restricciones de tipo propio @@ -812,6 +817,11 @@ La cadena interpolada contiene llaves de cierre no coincidentes. + + #nowarn/#warnon directives must appear as the first non-whitespace characters on a line + #nowarn/#warnon directives must appear as the first non-whitespace characters on a line + + All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n Todos los elementos de una lista deben convertirse implícitamente en el tipo del primer elemento, que aquí es una tupla de longitud {0} de tipo\n {1} \nEste elemento es una tupla de longitud {2} de tipo\n {3} \n diff --git a/src/Compiler/xlf/FSComp.txt.fr.xlf b/src/Compiler/xlf/FSComp.txt.fr.xlf index 2cc92e5f4d5..9ba4ef18c79 100644 --- a/src/Compiler/xlf/FSComp.txt.fr.xlf +++ b/src/Compiler/xlf/FSComp.txt.fr.xlf @@ -562,6 +562,11 @@ Partager les champs sous-jacents dans une union discriminée [<Struct>] tant qu’ils ont le même nom et le même type + + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + + self type constraints contraintes d’auto-type @@ -812,6 +817,11 @@ La chaîne interpolée contient des accolades fermantes sans correspondance. + + #nowarn/#warnon directives must appear as the first non-whitespace characters on a line + #nowarn/#warnon directives must appear as the first non-whitespace characters on a line + + All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n Tous les éléments d’une liste doivent être implicitement convertibles en type du premier élément, qui est ici un tuple de longueur {0} de type\n {1} \nCet élément est un tuple de longueur {2} de type\n {3} \n diff --git a/src/Compiler/xlf/FSComp.txt.it.xlf b/src/Compiler/xlf/FSComp.txt.it.xlf index 5b5793c4841..2580a67b847 100644 --- a/src/Compiler/xlf/FSComp.txt.it.xlf +++ b/src/Compiler/xlf/FSComp.txt.it.xlf @@ -562,6 +562,11 @@ Condividi i campi sottostanti in un'unione discriminata di [<Struct>] purché abbiano lo stesso nome e tipo + + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + + self type constraints vincoli di tipo automatico @@ -812,6 +817,11 @@ La stringa interpolata contiene parentesi graffe di chiusura non corrispondenti. + + #nowarn/#warnon directives must appear as the first non-whitespace characters on a line + #nowarn/#warnon directives must appear as the first non-whitespace characters on a line + + All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n Tutti gli elementi di un elenco devono essere convertibili in modo implicito nel tipo del primo elemento, che qui è una tupla di lunghezza {0} di tipo\n {1} \nQuesto elemento è una tupla di lunghezza {2} di tipo\n {3} \n diff --git a/src/Compiler/xlf/FSComp.txt.ja.xlf b/src/Compiler/xlf/FSComp.txt.ja.xlf index d30efc74724..154c7ce90f7 100644 --- a/src/Compiler/xlf/FSComp.txt.ja.xlf +++ b/src/Compiler/xlf/FSComp.txt.ja.xlf @@ -562,6 +562,11 @@ 名前と型が同じである限り、[<Struct>] 判別可能な共用体で基になるフィールドを共有する + + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + + self type constraints 自己型制約 @@ -812,6 +817,11 @@ 補間された文字列には、一致しない閉じかっこが含まれています。 + + #nowarn/#warnon directives must appear as the first non-whitespace characters on a line + #nowarn/#warnon directives must appear as the first non-whitespace characters on a line + + All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n リストのすべての要素は、最初の要素の型に暗黙的に変換できる必要があります。これは、型の長さ {0} のタプルです\n {1} \nこの要素は、型の長さ {2} のタプルです\n {3} \n diff --git a/src/Compiler/xlf/FSComp.txt.ko.xlf b/src/Compiler/xlf/FSComp.txt.ko.xlf index c9359c56807..713b3f60a87 100644 --- a/src/Compiler/xlf/FSComp.txt.ko.xlf +++ b/src/Compiler/xlf/FSComp.txt.ko.xlf @@ -562,6 +562,11 @@ 이름과 형식이 같으면 [<Struct>] 구분된 공용 구조체에서 기본 필드 공유 + + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + + self type constraints 자체 형식 제약 조건 @@ -812,6 +817,11 @@ 보간된 문자열에 일치하지 않는 닫는 중괄호가 포함되어 있습니다. + + #nowarn/#warnon directives must appear as the first non-whitespace characters on a line + #nowarn/#warnon directives must appear as the first non-whitespace characters on a line + + All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n 목록의 모든 요소는 첫 번째 요소의 형식으로 암시적으로 변환할 수 있어야 합니다. 여기서는 형식이 \n {1}이고 길이가 {0}인 튜플입니다. \n이 요소는 형식이 \n {3}이고 길이가 {2}인 튜플입니다. \n diff --git a/src/Compiler/xlf/FSComp.txt.pl.xlf b/src/Compiler/xlf/FSComp.txt.pl.xlf index 933379b9f7b..3ae19fb912e 100644 --- a/src/Compiler/xlf/FSComp.txt.pl.xlf +++ b/src/Compiler/xlf/FSComp.txt.pl.xlf @@ -562,6 +562,11 @@ Udostępnij pola źródłowe w unii rozłącznej [<Struct>], o ile mają taką samą nazwę i ten sam typ + + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + + self type constraints ograniczenia typu własnego @@ -812,6 +817,11 @@ Ciąg interpolowany zawiera niedopasowane zamykające nawiasy klamrowe. + + #nowarn/#warnon directives must appear as the first non-whitespace characters on a line + #nowarn/#warnon directives must appear as the first non-whitespace characters on a line + + All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n Wszystkie elementy tablicy muszą być niejawnie konwertowalne na typ pierwszego elementu, który w tym miejscu jest krotką o długości {0} typu\n {1} \nTen element jest krotką o długości {2} typu\n {3} \n diff --git a/src/Compiler/xlf/FSComp.txt.pt-BR.xlf b/src/Compiler/xlf/FSComp.txt.pt-BR.xlf index e6480e13025..a046a75abb5 100644 --- a/src/Compiler/xlf/FSComp.txt.pt-BR.xlf +++ b/src/Compiler/xlf/FSComp.txt.pt-BR.xlf @@ -562,6 +562,11 @@ Compartilhar campos subjacentes em uma união discriminada [<Struct>], desde que tenham o mesmo nome e tipo + + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + + self type constraints restrições de auto-tipo @@ -812,6 +817,11 @@ A cadeia de caracteres interpolada contém chaves de fechamento sem correspondência. + + #nowarn/#warnon directives must appear as the first non-whitespace characters on a line + #nowarn/#warnon directives must appear as the first non-whitespace characters on a line + + All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n Todos os elementos de uma lista devem ser implicitamente conversíveis ao tipo do primeiro elemento, que aqui é uma tupla de comprimento {0} do tipo\n {1} \nEste elemento é uma tupla de comprimento {2} do tipo\n {3} \n diff --git a/src/Compiler/xlf/FSComp.txt.ru.xlf b/src/Compiler/xlf/FSComp.txt.ru.xlf index 61c03885917..7210cb89163 100644 --- a/src/Compiler/xlf/FSComp.txt.ru.xlf +++ b/src/Compiler/xlf/FSComp.txt.ru.xlf @@ -562,6 +562,11 @@ Совместное использование базовых полей в дискриминируемом объединении [<Struct>], если они имеют одинаковое имя и тип. + + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + + self type constraints ограничения самостоятельного типа @@ -812,6 +817,11 @@ Интерполированная строка содержит непарные закрывающие фигурные скобки. + + #nowarn/#warnon directives must appear as the first non-whitespace characters on a line + #nowarn/#warnon directives must appear as the first non-whitespace characters on a line + + All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n Все элементы списка должны поддерживать неявное преобразование в тип первого элемента, который здесь является кортежем длиной {0} типа\n {1} \nЭтот элемент является кортежем длиной {2} типа\n {3} \n diff --git a/src/Compiler/xlf/FSComp.txt.tr.xlf b/src/Compiler/xlf/FSComp.txt.tr.xlf index 09c113ee3f1..375d611bd74 100644 --- a/src/Compiler/xlf/FSComp.txt.tr.xlf +++ b/src/Compiler/xlf/FSComp.txt.tr.xlf @@ -562,6 +562,11 @@ Aynı ada ve türe sahip oldukları sürece temel alınan alanları [<Struct>] ayırt edici birleşim biçiminde paylaşın + + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + + self type constraints kendi kendine tür kısıtlamaları @@ -812,6 +817,11 @@ İlişkilendirilmiş dize, eşleşmeyen kapatma küme ayraçları içeriyor. + + #nowarn/#warnon directives must appear as the first non-whitespace characters on a line + #nowarn/#warnon directives must appear as the first non-whitespace characters on a line + + All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n Bir listenin tüm öğeleri örtük olarak ilk öğenin türüne dönüştürülebilir olmalıdır. Burada ilk öğe {0} uzunluğunda türü\n {1} \nolan bir demet. Bu öğe ise {2} uzunluğunda türü\n {3} \nolan bir demet. diff --git a/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf b/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf index d9573b5bed2..450d05d1ca1 100644 --- a/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf +++ b/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf @@ -562,6 +562,11 @@ 只要它们具有相同的名称和类型，即可在 [<Struct>] 中共享基础字段 + + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + + self type constraints 自类型约束 @@ -812,6 +817,11 @@ 内插字符串包含不匹配的右大括号。 + + #nowarn/#warnon directives must appear as the first non-whitespace characters on a line + #nowarn/#warnon directives must appear as the first non-whitespace characters on a line + + All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n 列表的所有元素必须可隐式转换为第一个元素的类型，这是一个长度为 {0} 的类型的元组\n {1} \n此元素是长度为 {2} 类型的元组\n {3} \n diff --git a/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf b/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf index 1a6c3de6ccf..d2bf1f4745d 100644 --- a/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf +++ b/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf @@ -562,6 +562,11 @@ 只要 [<Struct>] 具有相同名稱和類型，就以強制聯集共用基礎欄位 + + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + + self type constraints 自我類型限制式 @@ -812,6 +817,11 @@ 差補字串包含不成對的右大括弧。 + + #nowarn/#warnon directives must appear as the first non-whitespace characters on a line + #nowarn/#warnon directives must appear as the first non-whitespace characters on a line + + All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n 清單的所有元素必須以隱含方式轉換成第一個元素的類型，這是類型為\n {1} \n的元組長度 {0}此元素是類型為\n {3} \n的元組長度 {2} diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/NonStringArgs.fs b/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/NonStringArgs.fs index 080811bd7c2..f6412f22ef6 100644 --- a/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/NonStringArgs.fs +++ b/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/NonStringArgs.fs @@ -6,133 +6,6 @@ open FSharp.Test.Compiler module NonStringArgs = - [] - [] - [] - let ``#nowarn - errors`` (languageVersion) = - - FSharp """ -#nowarn "988" -#nowarn FS -#nowarn FSBLAH -#nowarn ACME -#nowarn "FS" -#nowarn "FSBLAH" -#nowarn "ACME" - """ - |> withLangVersion languageVersion - |> asExe - |> compile - |> shouldFail - |> withDiagnostics[ - if languageVersion = "8.0" then - (Warning 203, Line 6, Col 1, Line 6, Col 13, "Invalid warning number 'FS'") - (Error 3350, Line 3, Col 9, Line 3, Col 11, "Feature '# directives with non-quoted string arguments' is not available in F# 8.0. Please use language version 9.0 or greater.") - (Error 3350, Line 4, Col 9, Line 4, Col 15, "Feature '# directives with non-quoted string arguments' is not available in F# 8.0. Please use language version 9.0 or greater.") - (Error 3350, Line 5, Col 9, Line 5, Col 13, "Feature '# directives with non-quoted string arguments' is not available in F# 8.0. Please use language version 9.0 or greater.") - else - (Warning 203, Line 3, Col 1, Line 3, Col 11, "Invalid warning number 'FS'") - (Warning 203, Line 6, Col 1, Line 6, Col 13, "Invalid warning number 'FS'") - ] - - - [] - [] - [] - let ``#nowarn - errors - collected`` (languageVersion) = - - FSharp """ -#nowarn - "988" - FS - FSBLAH - ACME - "FS" - "FSBLAH" - "ACME" - """ - |> withLangVersion languageVersion - |> asExe - |> compile - |> shouldFail - |> withDiagnostics[ - if languageVersion = "8.0" then - (Warning 203, Line 2, Col 1, Line 9, Col 11, "Invalid warning number 'FS'") - (Error 3350, Line 4, Col 5, Line 4, Col 7, "Feature '# directives with non-quoted string arguments' is not available in F# 8.0. Please use language version 9.0 or greater.") - (Error 3350, Line 5, Col 5, Line 5, Col 11, "Feature '# directives with non-quoted string arguments' is not available in F# 8.0. Please use language version 9.0 or greater.") - (Error 3350, Line 6, Col 5, Line 6, Col 9, "Feature '# directives with non-quoted string arguments' is not available in F# 8.0. Please use language version 9.0 or greater.") - else - (Warning 203, Line 2, Col 1, Line 9, Col 11, "Invalid warning number 'FS'") - ] - - - [] - [] - [] - let ``#nowarn - errors - inline`` (languageVersion) = - - FSharp """ -#nowarn "988" -#nowarn FS FSBLAH ACME "FS" "FSBLAH" "ACME" - """ - |> withLangVersion languageVersion - |> asExe - |> compile - |> shouldFail - |> withDiagnostics [ - if languageVersion = "8.0" then - (Warning 203, Line 3, Col 1, Line 3, Col 44, "Invalid warning number 'FS'") - (Error 3350, Line 3, Col 9, Line 3, Col 11, "Feature '# directives with non-quoted string arguments' is not available in F# 8.0. Please use language version 9.0 or greater.") - (Error 3350, Line 3, Col 12, Line 3, Col 18, "Feature '# directives with non-quoted string arguments' is not available in F# 8.0. Please use language version 9.0 or greater.") - (Error 3350, Line 3, Col 19, Line 3, Col 23, "Feature '# directives with non-quoted string arguments' is not available in F# 8.0. Please use language version 9.0 or greater.") - else - (Warning 203, Line 3, Col 1, Line 3, Col 44, "Invalid warning number 'FS'") - ] - - - [] - [] - [] - let ``#nowarn - realcode`` (langVersion) = - - let compileResult = - FSharp """ -#nowarn 20 FS1104 "3391" "FS3221" - -module Exception = - exception ``Crazy@name.p`` of string - -module Decimal = - type T1 = { a : decimal } - module M0 = - type T1 = { a : int;} - let x = { a = 10 } // error - 'expecting decimal' (which means we are not seeing M0.T1) - -module MismatchedYields = - let collection () = [ - yield "Hello" - "And this" - ] -module DoBinding = - let square x = x * x - square 32 - """ - |> withLangVersion langVersion - |> asExe - |> compile - - if langVersion = "8.0" then - compileResult - |> shouldFail - |> withDiagnostics [ - (Warning 1104, Line 5, Col 15, Line 5, Col 31, "Identifiers containing '@' are reserved for use in F# code generation") - (Error 3350, Line 2, Col 9, Line 2, Col 11, "Feature '# directives with non-quoted string arguments' is not available in F# 8.0. Please use language version 9.0 or greater.") - (Error 3350, Line 2, Col 12, Line 2, Col 18, "Feature '# directives with non-quoted string arguments' is not available in F# 8.0. Please use language version 9.0 or greater.") - ] - else - compileResult - |> shouldSucceed - [] [] @@ -248,7 +121,7 @@ printfn "Hello, World" |> asExe |> compile |> shouldFail - |> withDiagnostics[ + |> withDiagnostics [ (Error 76, Line 2, Col 9, Line 2, Col 11, "This directive may only be used in F# script files (extensions .fsx or .fsscript). Either remove the directive, move this code to a script file or delimit the directive with '#if INTERACTIVE'/'#endif'.") (Error 76, Line 3, Col 9, Line 3, Col 14, "This directive may only be used in F# script files (extensions .fsx or .fsscript). Either remove the directive, move this code to a script file or delimit the directive with '#if INTERACTIVE'/'#endif'.") (Error 76, Line 4, Col 9, Line 4, Col 17, "This directive may only be used in F# script files (extensions .fsx or .fsscript). Either remove the directive, move this code to a script file or delimit the directive with '#if INTERACTIVE'/'#endif'.") diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Nowarn.fs b/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Nowarn.fs new file mode 100644 index 00000000000..ec3878faee4 --- /dev/null +++ b/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Nowarn.fs @@ -0,0 +1,275 @@ +// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. +namespace CompilerDirectives + +open Xunit +open FSharp.Test.Compiler + +module Nowarn = + + let warning20Text = "The result of this expression has type 'string' and is implicitly ignored. Consider using 'ignore' to discard this value explicitly, e.g. 'expr |> ignore', or 'let' to bind the result to a name, e.g. 'let result = expr'." + let private warning25Text = "Incomplete pattern matches on this expression. For example, the value 'Some (_)' may indicate a case not covered by the pattern(s)." + let private warning44Text = "This construct is deprecated" + + + let consistencySource1a = """ +module A +#nowarn "20" +#line 5 "xyz1a.fs" +"" + """ + + // need different file names here because of global table + let consistencySource1b = """ +module A +#nowarn "20" +#line 5 "xyz1b.fs" +"" + """ + + let consistencySource2a = """ +module A +#nowarn "20" +#line 1 "xyz2a.fs" +"" + """ + + let consistencySource2b = """ +module A +#nowarn "20" +#line 1 "xyz2b.fs" +"" + """ + + let consistencySource2c = """ +module A +#nowarn "20" +#line 1 "xyz2c.fs" +"" + """ + + + [] + let inconsistentInteractionBetweenLineAndNowarn1 () = + + FSharp consistencySource1a + |> withLangVersion90 + |> compile + |> shouldSucceed + + [] + let inconsistentInteractionBetweenLineAndNowarn2 () = + + FSharp consistencySource2a + |> withLangVersion90 + |> compile + |> shouldSucceed + + [] + let consistentInteractionBetweenLineAndNowarn1 () = + + FSharp consistencySource1b + |> withLangVersionPreview + |> compile + |> shouldSucceed + + [] + let consistentInteractionBetweenLineAndNowarn2 () = + + FSharp consistencySource2b + |> withLangVersionPreview + |> compile + |> shouldSucceed + + [] + let consistentInteractionBetweenLineAndNowarn2AsError () = + + FSharp consistencySource2c + |> withLangVersionPreview + |> withOptions ["--warnaserror+"] + |> compile + |> shouldSucceed + + + let doubleSemiSource = """ +module A +#nowarn "20";; +"" +#warnon "20" // comment +"" + """ + + [] + let acceptDoubleSemicolonAfterDirective () = + + FSharp doubleSemiSource + |> withLangVersionPreview + |> compile + |> withDiagnostics [ + Warning 20, Line 6, Col 1, Line 6, Col 3, warning20Text + ] + + let private sourceForNowarnInsideModule = """ +namespace A +module B = + #nowarn "9999" + type C = int +""" + + [] + let nowarnInModule () = + FSharp sourceForNowarnInsideModule + |> withLangVersionPreview + |> compile + |> shouldSucceed + + let private sourceForWarningIsSuppressed = """ +module A +match None with None -> () +#nowarn "25" +match None with None -> () +#warnon "25" +match None with None -> () +#nowarn "25" +match None with None -> () + """ + + [] + let warningIsSuppressedBetweenNowarnAndWarnonDirectives () = + FSharp sourceForWarningIsSuppressed + |> withLangVersionPreview + |> compile + |> withDiagnostics [ + Warning 25, Line 3, Col 7, Line 3, Col 11, warning25Text + Warning 25, Line 7, Col 7, Line 7, Col 11, warning25Text + ] + + let private sigSourceForWarningIsSuppressedInSigFile = """ +namespace A +open System +[] +type T = class end +type T2 = T +#nowarn "44" +type T3 = T +#warnon "44" +type T4 = T +#nowarn "44" +type T5 = T + """ + + let private sourceForWarningIsSuppressedInSigFile = """ +namespace A +#nowarn "44" +open System +[] +type T = class end +type T2 = T +type T3 = T +type T4 = T +type T5 = T + """ + + [] + let warningIsSuppressedBetweenNowarnAndWarnonDirectivesInASignatureFile () = + Fsi sigSourceForWarningIsSuppressedInSigFile + |> withAdditionalSourceFile (FsSource sourceForWarningIsSuppressedInSigFile) + |> withLangVersionPreview + |> compile + |> withDiagnostics [ + Warning 44, Line 6, Col 11, Line 6, Col 12, warning44Text + Warning 44, Line 10, Col 11, Line 10, Col 12, warning44Text + ] + + let private scriptForWarningIsSuppressed = """ + +match None with None -> () +#nowarn "25" +match None with None -> () +#warnon "25" +match None with None -> () +#nowarn "25" +match None with None -> () + """ + + [] + let warningIsSuppressedBetweenNowarnAndWarnonInScript () = + Fsx scriptForWarningIsSuppressed + |> withLangVersionPreview + |> compile + |> withDiagnostics [ + Warning 25, Line 3, Col 7, Line 3, Col 11, warning25Text + Warning 25, Line 7, Col 7, Line 7, Col 11, warning25Text + ] + + [] + [] + [] + let ``#nowarn - errors`` (languageVersion) = + + FSharp """ +#nowarn "988" +#nowarn FS +#nowarn FSBLAH +#nowarn ACME +#nowarn "FS" +#nowarn "FSBLAH" +#nowarn "ACME" + """ + |> withLangVersion languageVersion + |> asExe + |> compile + |> shouldSucceed + + [] + [] + [] + let ``#nowarn - errors - inline`` (languageVersion) = + + FSharp """ +#nowarn "988" +#nowarn FS FSBLAH ACME "FS" "FSBLAH" "ACME" + """ + |> withLangVersion languageVersion + |> asExe + |> compile + |> shouldSucceed + + + [] + [] + [] + let ``#nowarn - realcode`` (langVersion) = + + let compileResult = + FSharp """ +#nowarn 20 FS1104 "3391" "FS3221" + +module Exception = + exception ``Crazy@name.p`` of string + +module Decimal = + type T1 = { a : decimal } + module M0 = + type T1 = { a : int;} + let x = { a = 10 } // error - 'expecting decimal' (which means we are not seeing M0.T1) + +module MismatchedYields = + let collection () = [ + yield "Hello" + "And this" + ] +module DoBinding = + let square x = x * x + square 32 + """ + |> withLangVersion langVersion + |> asExe + |> compile + + if langVersion = "8.0" then + compileResult + |> shouldSucceed + else + compileResult + |> shouldSucceed + diff --git a/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj b/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj index 4b50b28aa12..d73f54e0763 100644 --- a/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj +++ b/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj @@ -33,6 +33,7 @@ + diff --git a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.debug.bsl b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.debug.bsl index da62302304a..0d8aa5b19f6 100644 --- a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.debug.bsl +++ b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.debug.bsl @@ -2236,9 +2236,6 @@ FSharp.Compiler.CodeAnalysis.FSharpParsingOptions: FSharp.Compiler.CodeAnalysis. FSharp.Compiler.CodeAnalysis.FSharpParsingOptions: FSharp.Compiler.CodeAnalysis.FSharpParsingOptions get_Default() FSharp.Compiler.CodeAnalysis.FSharpParsingOptions: FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions DiagnosticOptions FSharp.Compiler.CodeAnalysis.FSharpParsingOptions: FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions get_DiagnosticOptions() -FSharp.Compiler.CodeAnalysis.FSharpParsingOptions: Int32 CompareTo(FSharp.Compiler.CodeAnalysis.FSharpParsingOptions) -FSharp.Compiler.CodeAnalysis.FSharpParsingOptions: Int32 CompareTo(System.Object) -FSharp.Compiler.CodeAnalysis.FSharpParsingOptions: Int32 CompareTo(System.Object, System.Collections.IComparer) FSharp.Compiler.CodeAnalysis.FSharpParsingOptions: Int32 GetHashCode() FSharp.Compiler.CodeAnalysis.FSharpParsingOptions: Int32 GetHashCode(System.Collections.IEqualityComparer) FSharp.Compiler.CodeAnalysis.FSharpParsingOptions: Microsoft.FSharp.Collections.FSharpList`1[System.String] ConditionalDefines @@ -2802,14 +2799,20 @@ FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean Equals(FSharp.Compi FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean Equals(FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions, System.Collections.IEqualityComparer) FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean Equals(System.Object) FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean Equals(System.Object, System.Collections.IEqualityComparer) +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean FSharp9CompatibleNowarn +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean FSharp9CompatibleNowarn@ FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean GlobalWarnAsError FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean get_CheckXmlDocs() +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean get_FSharp9CompatibleNowarn() FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean get_GlobalWarnAsError() FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions Default FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions get_Default() -FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Int32 CompareTo(FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions) -FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Int32 CompareTo(System.Object) -FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Int32 CompareTo(System.Object, System.Collections.IComparer) +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: FSharp.Compiler.Diagnostics.LineMap LineMap +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: FSharp.Compiler.Diagnostics.LineMap LineMap@ +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: FSharp.Compiler.Diagnostics.LineMap get_LineMap() +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: FSharp.Compiler.Diagnostics.WarnScopeMap WarnScopes +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: FSharp.Compiler.Diagnostics.WarnScopeMap WarnScopes@ +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: FSharp.Compiler.Diagnostics.WarnScopeMap get_WarnScopes() FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Int32 GetHashCode() FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Int32 GetHashCode(System.Collections.IEqualityComparer) FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Int32 WarnLevel @@ -2823,7 +2826,10 @@ FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Microsoft.FSharp.Collection FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Microsoft.FSharp.Collections.FSharpList`1[System.Int32] get_WarnOff() FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Microsoft.FSharp.Collections.FSharpList`1[System.Int32] get_WarnOn() FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: System.String ToString() -FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Void .ctor(Int32, Boolean, Microsoft.FSharp.Collections.FSharpList`1[System.Int32], Microsoft.FSharp.Collections.FSharpList`1[System.Int32], Microsoft.FSharp.Collections.FSharpList`1[System.Int32], Microsoft.FSharp.Collections.FSharpList`1[System.Int32]) +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Void .ctor(Int32, Boolean, Microsoft.FSharp.Collections.FSharpList`1[System.Int32], Microsoft.FSharp.Collections.FSharpList`1[System.Int32], Microsoft.FSharp.Collections.FSharpList`1[System.Int32], Microsoft.FSharp.Collections.FSharpList`1[System.Int32], Boolean, FSharp.Compiler.Diagnostics.LineMap, FSharp.Compiler.Diagnostics.WarnScopeMap) +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Void set_FSharp9CompatibleNowarn(Boolean) +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Void set_LineMap(FSharp.Compiler.Diagnostics.LineMap) +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Void set_WarnScopes(FSharp.Compiler.Diagnostics.WarnScopeMap) FSharp.Compiler.Diagnostics.FSharpDiagnosticSeverity+Tags: Int32 Error FSharp.Compiler.Diagnostics.FSharpDiagnosticSeverity+Tags: Int32 Hidden FSharp.Compiler.Diagnostics.FSharpDiagnosticSeverity+Tags: Int32 Info @@ -2857,6 +2863,73 @@ FSharp.Compiler.Diagnostics.FSharpDiagnosticSeverity: Int32 GetHashCode(System.C FSharp.Compiler.Diagnostics.FSharpDiagnosticSeverity: Int32 Tag FSharp.Compiler.Diagnostics.FSharpDiagnosticSeverity: Int32 get_Tag() FSharp.Compiler.Diagnostics.FSharpDiagnosticSeverity: System.String ToString() +FSharp.Compiler.Diagnostics.LineMap: Boolean Equals(FSharp.Compiler.Diagnostics.LineMap) +FSharp.Compiler.Diagnostics.LineMap: Boolean Equals(FSharp.Compiler.Diagnostics.LineMap, System.Collections.IEqualityComparer) +FSharp.Compiler.Diagnostics.LineMap: Boolean Equals(System.Object) +FSharp.Compiler.Diagnostics.LineMap: Boolean Equals(System.Object, System.Collections.IEqualityComparer) +FSharp.Compiler.Diagnostics.LineMap: FSharp.Compiler.Diagnostics.LineMap Empty +FSharp.Compiler.Diagnostics.LineMap: FSharp.Compiler.Diagnostics.LineMap NewLineMap(Microsoft.FSharp.Collections.FSharpMap`2[System.Int32,System.Int32]) +FSharp.Compiler.Diagnostics.LineMap: FSharp.Compiler.Diagnostics.LineMap get_Empty() +FSharp.Compiler.Diagnostics.LineMap: Int32 CompareTo(FSharp.Compiler.Diagnostics.LineMap) +FSharp.Compiler.Diagnostics.LineMap: Int32 CompareTo(System.Object) +FSharp.Compiler.Diagnostics.LineMap: Int32 CompareTo(System.Object, System.Collections.IComparer) +FSharp.Compiler.Diagnostics.LineMap: Int32 GetHashCode() +FSharp.Compiler.Diagnostics.LineMap: Int32 GetHashCode(System.Collections.IEqualityComparer) +FSharp.Compiler.Diagnostics.LineMap: Int32 Tag +FSharp.Compiler.Diagnostics.LineMap: Int32 get_Tag() +FSharp.Compiler.Diagnostics.LineMap: Microsoft.FSharp.Collections.FSharpMap`2[System.Int32,System.Int32] Item +FSharp.Compiler.Diagnostics.LineMap: Microsoft.FSharp.Collections.FSharpMap`2[System.Int32,System.Int32] get_Item() +FSharp.Compiler.Diagnostics.LineMap: System.String ToString() +FSharp.Compiler.Diagnostics.WarnScope+Off: FSharp.Compiler.Text.Range Item +FSharp.Compiler.Diagnostics.WarnScope+Off: FSharp.Compiler.Text.Range get_Item() +FSharp.Compiler.Diagnostics.WarnScope+On: FSharp.Compiler.Text.Range Item +FSharp.Compiler.Diagnostics.WarnScope+On: FSharp.Compiler.Text.Range get_Item() +FSharp.Compiler.Diagnostics.WarnScope+OpenOff: FSharp.Compiler.Text.Range Item +FSharp.Compiler.Diagnostics.WarnScope+OpenOff: FSharp.Compiler.Text.Range get_Item() +FSharp.Compiler.Diagnostics.WarnScope+OpenOn: FSharp.Compiler.Text.Range Item +FSharp.Compiler.Diagnostics.WarnScope+OpenOn: FSharp.Compiler.Text.Range get_Item() +FSharp.Compiler.Diagnostics.WarnScope+Tags: Int32 Off +FSharp.Compiler.Diagnostics.WarnScope+Tags: Int32 On +FSharp.Compiler.Diagnostics.WarnScope+Tags: Int32 OpenOff +FSharp.Compiler.Diagnostics.WarnScope+Tags: Int32 OpenOn +FSharp.Compiler.Diagnostics.WarnScope: Boolean Equals(FSharp.Compiler.Diagnostics.WarnScope) +FSharp.Compiler.Diagnostics.WarnScope: Boolean Equals(FSharp.Compiler.Diagnostics.WarnScope, System.Collections.IEqualityComparer) +FSharp.Compiler.Diagnostics.WarnScope: Boolean Equals(System.Object) +FSharp.Compiler.Diagnostics.WarnScope: Boolean Equals(System.Object, System.Collections.IEqualityComparer) +FSharp.Compiler.Diagnostics.WarnScope: Boolean IsOff +FSharp.Compiler.Diagnostics.WarnScope: Boolean IsOn +FSharp.Compiler.Diagnostics.WarnScope: Boolean IsOpenOff +FSharp.Compiler.Diagnostics.WarnScope: Boolean IsOpenOn +FSharp.Compiler.Diagnostics.WarnScope: Boolean get_IsOff() +FSharp.Compiler.Diagnostics.WarnScope: Boolean get_IsOn() +FSharp.Compiler.Diagnostics.WarnScope: Boolean get_IsOpenOff() +FSharp.Compiler.Diagnostics.WarnScope: Boolean get_IsOpenOn() +FSharp.Compiler.Diagnostics.WarnScope: FSharp.Compiler.Diagnostics.WarnScope NewOff(FSharp.Compiler.Text.Range) +FSharp.Compiler.Diagnostics.WarnScope: FSharp.Compiler.Diagnostics.WarnScope NewOn(FSharp.Compiler.Text.Range) +FSharp.Compiler.Diagnostics.WarnScope: FSharp.Compiler.Diagnostics.WarnScope NewOpenOff(FSharp.Compiler.Text.Range) +FSharp.Compiler.Diagnostics.WarnScope: FSharp.Compiler.Diagnostics.WarnScope NewOpenOn(FSharp.Compiler.Text.Range) +FSharp.Compiler.Diagnostics.WarnScope: FSharp.Compiler.Diagnostics.WarnScope+Off +FSharp.Compiler.Diagnostics.WarnScope: FSharp.Compiler.Diagnostics.WarnScope+On +FSharp.Compiler.Diagnostics.WarnScope: FSharp.Compiler.Diagnostics.WarnScope+OpenOff +FSharp.Compiler.Diagnostics.WarnScope: FSharp.Compiler.Diagnostics.WarnScope+OpenOn +FSharp.Compiler.Diagnostics.WarnScope: FSharp.Compiler.Diagnostics.WarnScope+Tags +FSharp.Compiler.Diagnostics.WarnScope: Int32 GetHashCode() +FSharp.Compiler.Diagnostics.WarnScope: Int32 GetHashCode(System.Collections.IEqualityComparer) +FSharp.Compiler.Diagnostics.WarnScope: Int32 Tag +FSharp.Compiler.Diagnostics.WarnScope: Int32 get_Tag() +FSharp.Compiler.Diagnostics.WarnScope: System.String ToString() +FSharp.Compiler.Diagnostics.WarnScopeMap: Boolean Equals(FSharp.Compiler.Diagnostics.WarnScopeMap) +FSharp.Compiler.Diagnostics.WarnScopeMap: Boolean Equals(FSharp.Compiler.Diagnostics.WarnScopeMap, System.Collections.IEqualityComparer) +FSharp.Compiler.Diagnostics.WarnScopeMap: Boolean Equals(System.Object) +FSharp.Compiler.Diagnostics.WarnScopeMap: Boolean Equals(System.Object, System.Collections.IEqualityComparer) +FSharp.Compiler.Diagnostics.WarnScopeMap: FSharp.Compiler.Diagnostics.WarnScopeMap NewWarnScopeMap(Microsoft.FSharp.Collections.FSharpMap`2[System.Int64,Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Diagnostics.WarnScope]]) +FSharp.Compiler.Diagnostics.WarnScopeMap: Int32 GetHashCode() +FSharp.Compiler.Diagnostics.WarnScopeMap: Int32 GetHashCode(System.Collections.IEqualityComparer) +FSharp.Compiler.Diagnostics.WarnScopeMap: Int32 Tag +FSharp.Compiler.Diagnostics.WarnScopeMap: Int32 get_Tag() +FSharp.Compiler.Diagnostics.WarnScopeMap: Microsoft.FSharp.Collections.FSharpMap`2[System.Int64,Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Diagnostics.WarnScope]] Item +FSharp.Compiler.Diagnostics.WarnScopeMap: Microsoft.FSharp.Collections.FSharpMap`2[System.Int64,Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Diagnostics.WarnScope]] get_Item() +FSharp.Compiler.Diagnostics.WarnScopeMap: System.String ToString() FSharp.Compiler.EditorServices.AssemblyContent: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.EditorServices.AssemblySymbol] GetAssemblyContent(Microsoft.FSharp.Core.FSharpFunc`2[Microsoft.FSharp.Core.FSharpFunc`2[FSharp.Compiler.EditorServices.IAssemblyContentCache,Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.EditorServices.AssemblySymbol]],Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.EditorServices.AssemblySymbol]], FSharp.Compiler.EditorServices.AssemblyContentType, Microsoft.FSharp.Core.FSharpOption`1[System.String], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Symbols.FSharpAssembly]) FSharp.Compiler.EditorServices.AssemblyContent: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.EditorServices.AssemblySymbol] GetAssemblySignatureContent(FSharp.Compiler.EditorServices.AssemblyContentType, FSharp.Compiler.Symbols.FSharpAssemblySignature) FSharp.Compiler.EditorServices.AssemblyContentType+Tags: Int32 Full @@ -6133,7 +6206,7 @@ FSharp.Compiler.Syntax.ParsedImplFileInput: Boolean get_IsLastCompiland() FSharp.Compiler.Syntax.ParsedImplFileInput: Boolean get_IsScript() FSharp.Compiler.Syntax.ParsedImplFileInput: Boolean get_isScript() FSharp.Compiler.Syntax.ParsedImplFileInput: Boolean isScript -FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.Syntax.ParsedImplFileInput NewParsedImplFileInput(System.String, Boolean, FSharp.Compiler.Syntax.QualifiedNameOfFile, Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ScopedPragma], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynModuleOrNamespace], System.Tuple`2[System.Boolean,System.Boolean], FSharp.Compiler.SyntaxTrivia.ParsedImplFileInputTrivia, Microsoft.FSharp.Collections.FSharpSet`1[System.String]) +FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.Syntax.ParsedImplFileInput NewParsedImplFileInput(System.String, Boolean, FSharp.Compiler.Syntax.QualifiedNameOfFile, Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynModuleOrNamespace], System.Tuple`2[System.Boolean,System.Boolean], FSharp.Compiler.SyntaxTrivia.ParsedImplFileInputTrivia, Microsoft.FSharp.Collections.FSharpSet`1[System.String]) FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.Syntax.QualifiedNameOfFile QualifiedName FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.Syntax.QualifiedNameOfFile get_QualifiedName() FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.Syntax.QualifiedNameOfFile get_qualifiedNameOfFile() @@ -6148,10 +6221,6 @@ FSharp.Compiler.Syntax.ParsedImplFileInput: Microsoft.FSharp.Collections.FSharpL FSharp.Compiler.Syntax.ParsedImplFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective] get_HashDirectives() FSharp.Compiler.Syntax.ParsedImplFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective] get_hashDirectives() FSharp.Compiler.Syntax.ParsedImplFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective] hashDirectives -FSharp.Compiler.Syntax.ParsedImplFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ScopedPragma] ScopedPragmas -FSharp.Compiler.Syntax.ParsedImplFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ScopedPragma] get_ScopedPragmas() -FSharp.Compiler.Syntax.ParsedImplFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ScopedPragma] get_scopedPragmas() -FSharp.Compiler.Syntax.ParsedImplFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ScopedPragma] scopedPragmas FSharp.Compiler.Syntax.ParsedImplFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynModuleOrNamespace] Contents FSharp.Compiler.Syntax.ParsedImplFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynModuleOrNamespace] contents FSharp.Compiler.Syntax.ParsedImplFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynModuleOrNamespace] get_Contents() @@ -6186,8 +6255,6 @@ FSharp.Compiler.Syntax.ParsedInput: FSharp.Compiler.Text.Range Range FSharp.Compiler.Syntax.ParsedInput: FSharp.Compiler.Text.Range get_Range() FSharp.Compiler.Syntax.ParsedInput: Int32 Tag FSharp.Compiler.Syntax.ParsedInput: Int32 get_Tag() -FSharp.Compiler.Syntax.ParsedInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ScopedPragma] ScopedPragmas -FSharp.Compiler.Syntax.ParsedInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ScopedPragma] get_ScopedPragmas() FSharp.Compiler.Syntax.ParsedInput: Microsoft.FSharp.Collections.FSharpSet`1[System.String] Identifiers FSharp.Compiler.Syntax.ParsedInput: Microsoft.FSharp.Collections.FSharpSet`1[System.String] get_Identifiers() FSharp.Compiler.Syntax.ParsedInput: System.String FileName @@ -6256,7 +6323,7 @@ FSharp.Compiler.Syntax.ParsedSigFileFragment: FSharp.Compiler.Syntax.ParsedSigFi FSharp.Compiler.Syntax.ParsedSigFileFragment: Int32 Tag FSharp.Compiler.Syntax.ParsedSigFileFragment: Int32 get_Tag() FSharp.Compiler.Syntax.ParsedSigFileFragment: System.String ToString() -FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.Syntax.ParsedSigFileInput NewParsedSigFileInput(System.String, FSharp.Compiler.Syntax.QualifiedNameOfFile, Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ScopedPragma], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynModuleOrNamespaceSig], FSharp.Compiler.SyntaxTrivia.ParsedSigFileInputTrivia, Microsoft.FSharp.Collections.FSharpSet`1[System.String]) +FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.Syntax.ParsedSigFileInput NewParsedSigFileInput(System.String, FSharp.Compiler.Syntax.QualifiedNameOfFile, Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynModuleOrNamespaceSig], FSharp.Compiler.SyntaxTrivia.ParsedSigFileInputTrivia, Microsoft.FSharp.Collections.FSharpSet`1[System.String]) FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.Syntax.QualifiedNameOfFile QualifiedName FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.Syntax.QualifiedNameOfFile get_QualifiedName() FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.Syntax.QualifiedNameOfFile get_qualifiedNameOfFile() @@ -6271,10 +6338,6 @@ FSharp.Compiler.Syntax.ParsedSigFileInput: Microsoft.FSharp.Collections.FSharpLi FSharp.Compiler.Syntax.ParsedSigFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective] get_HashDirectives() FSharp.Compiler.Syntax.ParsedSigFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective] get_hashDirectives() FSharp.Compiler.Syntax.ParsedSigFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective] hashDirectives -FSharp.Compiler.Syntax.ParsedSigFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ScopedPragma] ScopedPragmas -FSharp.Compiler.Syntax.ParsedSigFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ScopedPragma] get_ScopedPragmas() -FSharp.Compiler.Syntax.ParsedSigFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ScopedPragma] get_scopedPragmas() -FSharp.Compiler.Syntax.ParsedSigFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ScopedPragma] scopedPragmas FSharp.Compiler.Syntax.ParsedSigFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynModuleOrNamespaceSig] Contents FSharp.Compiler.Syntax.ParsedSigFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynModuleOrNamespaceSig] contents FSharp.Compiler.Syntax.ParsedSigFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynModuleOrNamespaceSig] get_Contents() @@ -6342,20 +6405,6 @@ FSharp.Compiler.Syntax.QualifiedNameOfFile: Int32 get_Tag() FSharp.Compiler.Syntax.QualifiedNameOfFile: System.String Text FSharp.Compiler.Syntax.QualifiedNameOfFile: System.String ToString() FSharp.Compiler.Syntax.QualifiedNameOfFile: System.String get_Text() -FSharp.Compiler.Syntax.ScopedPragma: Boolean Equals(FSharp.Compiler.Syntax.ScopedPragma) -FSharp.Compiler.Syntax.ScopedPragma: Boolean Equals(FSharp.Compiler.Syntax.ScopedPragma, System.Collections.IEqualityComparer) -FSharp.Compiler.Syntax.ScopedPragma: Boolean Equals(System.Object) -FSharp.Compiler.Syntax.ScopedPragma: Boolean Equals(System.Object, System.Collections.IEqualityComparer) -FSharp.Compiler.Syntax.ScopedPragma: FSharp.Compiler.Syntax.ScopedPragma NewWarningOff(FSharp.Compiler.Text.Range, Int32) -FSharp.Compiler.Syntax.ScopedPragma: FSharp.Compiler.Text.Range get_range() -FSharp.Compiler.Syntax.ScopedPragma: FSharp.Compiler.Text.Range range -FSharp.Compiler.Syntax.ScopedPragma: Int32 GetHashCode() -FSharp.Compiler.Syntax.ScopedPragma: Int32 GetHashCode(System.Collections.IEqualityComparer) -FSharp.Compiler.Syntax.ScopedPragma: Int32 Tag -FSharp.Compiler.Syntax.ScopedPragma: Int32 get_Tag() -FSharp.Compiler.Syntax.ScopedPragma: Int32 get_warningNumber() -FSharp.Compiler.Syntax.ScopedPragma: Int32 warningNumber -FSharp.Compiler.Syntax.ScopedPragma: System.String ToString() FSharp.Compiler.Syntax.SeqExprOnly: Boolean Equals(FSharp.Compiler.Syntax.SeqExprOnly) FSharp.Compiler.Syntax.SeqExprOnly: Boolean Equals(FSharp.Compiler.Syntax.SeqExprOnly, System.Collections.IEqualityComparer) FSharp.Compiler.Syntax.SeqExprOnly: Boolean Equals(System.Object) diff --git a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.release.bsl b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.release.bsl index da62302304a..79b5b9a68ef 100644 --- a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.release.bsl +++ b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.release.bsl @@ -2236,9 +2236,6 @@ FSharp.Compiler.CodeAnalysis.FSharpParsingOptions: FSharp.Compiler.CodeAnalysis. FSharp.Compiler.CodeAnalysis.FSharpParsingOptions: FSharp.Compiler.CodeAnalysis.FSharpParsingOptions get_Default() FSharp.Compiler.CodeAnalysis.FSharpParsingOptions: FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions DiagnosticOptions FSharp.Compiler.CodeAnalysis.FSharpParsingOptions: FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions get_DiagnosticOptions() -FSharp.Compiler.CodeAnalysis.FSharpParsingOptions: Int32 CompareTo(FSharp.Compiler.CodeAnalysis.FSharpParsingOptions) -FSharp.Compiler.CodeAnalysis.FSharpParsingOptions: Int32 CompareTo(System.Object) -FSharp.Compiler.CodeAnalysis.FSharpParsingOptions: Int32 CompareTo(System.Object, System.Collections.IComparer) FSharp.Compiler.CodeAnalysis.FSharpParsingOptions: Int32 GetHashCode() FSharp.Compiler.CodeAnalysis.FSharpParsingOptions: Int32 GetHashCode(System.Collections.IEqualityComparer) FSharp.Compiler.CodeAnalysis.FSharpParsingOptions: Microsoft.FSharp.Collections.FSharpList`1[System.String] ConditionalDefines @@ -2802,14 +2799,20 @@ FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean Equals(FSharp.Compi FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean Equals(FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions, System.Collections.IEqualityComparer) FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean Equals(System.Object) FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean Equals(System.Object, System.Collections.IEqualityComparer) +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean FSharp9CompatibleNowarn +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean FSharp9CompatibleNowarn@ FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean GlobalWarnAsError FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean get_CheckXmlDocs() +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean get_FSharp9CompatibleNowarn() FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean get_GlobalWarnAsError() FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions Default FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions get_Default() -FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Int32 CompareTo(FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions) -FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Int32 CompareTo(System.Object) -FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Int32 CompareTo(System.Object, System.Collections.IComparer) +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: FSharp.Compiler.Diagnostics.LineMap LineMap +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: FSharp.Compiler.Diagnostics.LineMap LineMap@ +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: FSharp.Compiler.Diagnostics.LineMap get_LineMap() +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: FSharp.Compiler.Diagnostics.WarnScopeMap WarnScopes +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: FSharp.Compiler.Diagnostics.WarnScopeMap WarnScopes@ +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: FSharp.Compiler.Diagnostics.WarnScopeMap get_WarnScopes() FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Int32 GetHashCode() FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Int32 GetHashCode(System.Collections.IEqualityComparer) FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Int32 WarnLevel @@ -2823,7 +2826,10 @@ FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Microsoft.FSharp.Collection FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Microsoft.FSharp.Collections.FSharpList`1[System.Int32] get_WarnOff() FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Microsoft.FSharp.Collections.FSharpList`1[System.Int32] get_WarnOn() FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: System.String ToString() -FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Void .ctor(Int32, Boolean, Microsoft.FSharp.Collections.FSharpList`1[System.Int32], Microsoft.FSharp.Collections.FSharpList`1[System.Int32], Microsoft.FSharp.Collections.FSharpList`1[System.Int32], Microsoft.FSharp.Collections.FSharpList`1[System.Int32]) +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Void .ctor(Int32, Boolean, Microsoft.FSharp.Collections.FSharpList`1[System.Int32], Microsoft.FSharp.Collections.FSharpList`1[System.Int32], Microsoft.FSharp.Collections.FSharpList`1[System.Int32], Microsoft.FSharp.Collections.FSharpList`1[System.Int32], Boolean, FSharp.Compiler.Diagnostics.LineMap, FSharp.Compiler.Diagnostics.WarnScopeMap) +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Void set_FSharp9CompatibleNowarn(Boolean) +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Void set_LineMap(FSharp.Compiler.Diagnostics.LineMap) +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Void set_WarnScopes(FSharp.Compiler.Diagnostics.WarnScopeMap) FSharp.Compiler.Diagnostics.FSharpDiagnosticSeverity+Tags: Int32 Error FSharp.Compiler.Diagnostics.FSharpDiagnosticSeverity+Tags: Int32 Hidden FSharp.Compiler.Diagnostics.FSharpDiagnosticSeverity+Tags: Int32 Info @@ -2857,6 +2863,73 @@ FSharp.Compiler.Diagnostics.FSharpDiagnosticSeverity: Int32 GetHashCode(System.C FSharp.Compiler.Diagnostics.FSharpDiagnosticSeverity: Int32 Tag FSharp.Compiler.Diagnostics.FSharpDiagnosticSeverity: Int32 get_Tag() FSharp.Compiler.Diagnostics.FSharpDiagnosticSeverity: System.String ToString() +FSharp.Compiler.Diagnostics.LineMap: Boolean Equals(FSharp.Compiler.Diagnostics.LineMap) +FSharp.Compiler.Diagnostics.LineMap: Boolean Equals(FSharp.Compiler.Diagnostics.LineMap, System.Collections.IEqualityComparer) +FSharp.Compiler.Diagnostics.LineMap: Boolean Equals(System.Object) +FSharp.Compiler.Diagnostics.LineMap: Boolean Equals(System.Object, System.Collections.IEqualityComparer) +FSharp.Compiler.Diagnostics.LineMap: FSharp.Compiler.Diagnostics.LineMap Empty +FSharp.Compiler.Diagnostics.LineMap: FSharp.Compiler.Diagnostics.LineMap NewLineMap(Microsoft.FSharp.Collections.FSharpMap`2[System.Int32,System.Int32]) +FSharp.Compiler.Diagnostics.LineMap: FSharp.Compiler.Diagnostics.LineMap get_Empty() +FSharp.Compiler.Diagnostics.LineMap: Int32 CompareTo(FSharp.Compiler.Diagnostics.LineMap) +FSharp.Compiler.Diagnostics.LineMap: Int32 CompareTo(System.Object) +FSharp.Compiler.Diagnostics.LineMap: Int32 CompareTo(System.Object, System.Collections.IComparer) +FSharp.Compiler.Diagnostics.LineMap: Int32 GetHashCode() +FSharp.Compiler.Diagnostics.LineMap: Int32 GetHashCode(System.Collections.IEqualityComparer) +FSharp.Compiler.Diagnostics.LineMap: Int32 Tag +FSharp.Compiler.Diagnostics.LineMap: Int32 get_Tag() +FSharp.Compiler.Diagnostics.LineMap: Microsoft.FSharp.Collections.FSharpMap`2[System.Int32,System.Int32] Item +FSharp.Compiler.Diagnostics.LineMap: Microsoft.FSharp.Collections.FSharpMap`2[System.Int32,System.Int32] get_Item() +FSharp.Compiler.Diagnostics.LineMap: System.String ToString() +FSharp.Compiler.Diagnostics.WarnScope+Off: FSharp.Compiler.Text.Range Item +FSharp.Compiler.Diagnostics.WarnScope+Off: FSharp.Compiler.Text.Range get_Item() +FSharp.Compiler.Diagnostics.WarnScope+On: FSharp.Compiler.Text.Range Item +FSharp.Compiler.Diagnostics.WarnScope+On: FSharp.Compiler.Text.Range get_Item() +FSharp.Compiler.Diagnostics.WarnScope+OpenOff: FSharp.Compiler.Text.Range Item +FSharp.Compiler.Diagnostics.WarnScope+OpenOff: FSharp.Compiler.Text.Range get_Item() +FSharp.Compiler.Diagnostics.WarnScope+OpenOn: FSharp.Compiler.Text.Range Item +FSharp.Compiler.Diagnostics.WarnScope+OpenOn: FSharp.Compiler.Text.Range get_Item() +FSharp.Compiler.Diagnostics.WarnScope+Tags: Int32 Off +FSharp.Compiler.Diagnostics.WarnScope+Tags: Int32 On +FSharp.Compiler.Diagnostics.WarnScope+Tags: Int32 OpenOff +FSharp.Compiler.Diagnostics.WarnScope+Tags: Int32 OpenOn +FSharp.Compiler.Diagnostics.WarnScope: Boolean Equals(FSharp.Compiler.Diagnostics.WarnScope) +FSharp.Compiler.Diagnostics.WarnScope: Boolean Equals(FSharp.Compiler.Diagnostics.WarnScope, System.Collections.IEqualityComparer) +FSharp.Compiler.Diagnostics.WarnScope: Boolean Equals(System.Object) +FSharp.Compiler.Diagnostics.WarnScope: Boolean Equals(System.Object, System.Collections.IEqualityComparer) +FSharp.Compiler.Diagnostics.WarnScope: Boolean IsOff +FSharp.Compiler.Diagnostics.WarnScope: Boolean IsOn +FSharp.Compiler.Diagnostics.WarnScope: Boolean IsOpenOff +FSharp.Compiler.Diagnostics.WarnScope: Boolean IsOpenOn +FSharp.Compiler.Diagnostics.WarnScope: Boolean get_IsOff() +FSharp.Compiler.Diagnostics.WarnScope: Boolean get_IsOn() +FSharp.Compiler.Diagnostics.WarnScope: Boolean get_IsOpenOff() +FSharp.Compiler.Diagnostics.WarnScope: Boolean get_IsOpenOn() +FSharp.Compiler.Diagnostics.WarnScope: FSharp.Compiler.Diagnostics.WarnScope NewOff(FSharp.Compiler.Text.Range) +FSharp.Compiler.Diagnostics.WarnScope: FSharp.Compiler.Diagnostics.WarnScope NewOn(FSharp.Compiler.Text.Range) +FSharp.Compiler.Diagnostics.WarnScope: FSharp.Compiler.Diagnostics.WarnScope NewOpenOff(FSharp.Compiler.Text.Range) +FSharp.Compiler.Diagnostics.WarnScope: FSharp.Compiler.Diagnostics.WarnScope NewOpenOn(FSharp.Compiler.Text.Range) +FSharp.Compiler.Diagnostics.WarnScope: FSharp.Compiler.Diagnostics.WarnScope+Off +FSharp.Compiler.Diagnostics.WarnScope: FSharp.Compiler.Diagnostics.WarnScope+On +FSharp.Compiler.Diagnostics.WarnScope: FSharp.Compiler.Diagnostics.WarnScope+OpenOff +FSharp.Compiler.Diagnostics.WarnScope: FSharp.Compiler.Diagnostics.WarnScope+OpenOn +FSharp.Compiler.Diagnostics.WarnScope: FSharp.Compiler.Diagnostics.WarnScope+Tags +FSharp.Compiler.Diagnostics.WarnScope: Int32 GetHashCode() +FSharp.Compiler.Diagnostics.WarnScope: Int32 GetHashCode(System.Collections.IEqualityComparer) +FSharp.Compiler.Diagnostics.WarnScope: Int32 Tag +FSharp.Compiler.Diagnostics.WarnScope: Int32 get_Tag() +FSharp.Compiler.Diagnostics.WarnScope: System.String ToString() +FSharp.Compiler.Diagnostics.WarnScopeMap: Boolean Equals(FSharp.Compiler.Diagnostics.WarnScopeMap) +FSharp.Compiler.Diagnostics.WarnScopeMap: Boolean Equals(FSharp.Compiler.Diagnostics.WarnScopeMap, System.Collections.IEqualityComparer) +FSharp.Compiler.Diagnostics.WarnScopeMap: Boolean Equals(System.Object) +FSharp.Compiler.Diagnostics.WarnScopeMap: Boolean Equals(System.Object, System.Collections.IEqualityComparer) +FSharp.Compiler.Diagnostics.WarnScopeMap: FSharp.Compiler.Diagnostics.WarnScopeMap NewWarnScopeMap(Microsoft.FSharp.Collections.FSharpMap`2[System.Int64,Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Diagnostics.WarnScope]]) +FSharp.Compiler.Diagnostics.WarnScopeMap: Int32 GetHashCode() +FSharp.Compiler.Diagnostics.WarnScopeMap: Int32 GetHashCode(System.Collections.IEqualityComparer) +FSharp.Compiler.Diagnostics.WarnScopeMap: Int32 Tag +FSharp.Compiler.Diagnostics.WarnScopeMap: Int32 get_Tag() +FSharp.Compiler.Diagnostics.WarnScopeMap: Microsoft.FSharp.Collections.FSharpMap`2[System.Int64,Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Diagnostics.WarnScope]] Item +FSharp.Compiler.Diagnostics.WarnScopeMap: Microsoft.FSharp.Collections.FSharpMap`2[System.Int64,Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Diagnostics.WarnScope]] get_Item() +FSharp.Compiler.Diagnostics.WarnScopeMap: System.String ToString() FSharp.Compiler.EditorServices.AssemblyContent: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.EditorServices.AssemblySymbol] GetAssemblyContent(Microsoft.FSharp.Core.FSharpFunc`2[Microsoft.FSharp.Core.FSharpFunc`2[FSharp.Compiler.EditorServices.IAssemblyContentCache,Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.EditorServices.AssemblySymbol]],Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.EditorServices.AssemblySymbol]], FSharp.Compiler.EditorServices.AssemblyContentType, Microsoft.FSharp.Core.FSharpOption`1[System.String], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Symbols.FSharpAssembly]) FSharp.Compiler.EditorServices.AssemblyContent: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.EditorServices.AssemblySymbol] GetAssemblySignatureContent(FSharp.Compiler.EditorServices.AssemblyContentType, FSharp.Compiler.Symbols.FSharpAssemblySignature) FSharp.Compiler.EditorServices.AssemblyContentType+Tags: Int32 Full @@ -6133,7 +6206,7 @@ FSharp.Compiler.Syntax.ParsedImplFileInput: Boolean get_IsLastCompiland() FSharp.Compiler.Syntax.ParsedImplFileInput: Boolean get_IsScript() FSharp.Compiler.Syntax.ParsedImplFileInput: Boolean get_isScript() FSharp.Compiler.Syntax.ParsedImplFileInput: Boolean isScript -FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.Syntax.ParsedImplFileInput NewParsedImplFileInput(System.String, Boolean, FSharp.Compiler.Syntax.QualifiedNameOfFile, Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ScopedPragma], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynModuleOrNamespace], System.Tuple`2[System.Boolean,System.Boolean], FSharp.Compiler.SyntaxTrivia.ParsedImplFileInputTrivia, Microsoft.FSharp.Collections.FSharpSet`1[System.String]) +FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.Syntax.ParsedImplFileInput NewParsedImplFileInput(System.String, Boolean, FSharp.Compiler.Syntax.QualifiedNameOfFile, Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynModuleOrNamespace], System.Tuple`2[System.Boolean,System.Boolean], FSharp.Compiler.SyntaxTrivia.ParsedImplFileInputTrivia, Microsoft.FSharp.Collections.FSharpSet`1[System.String]) FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.Syntax.QualifiedNameOfFile QualifiedName FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.Syntax.QualifiedNameOfFile get_QualifiedName() FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.Syntax.QualifiedNameOfFile get_qualifiedNameOfFile() @@ -6148,10 +6221,6 @@ FSharp.Compiler.Syntax.ParsedImplFileInput: Microsoft.FSharp.Collections.FSharpL FSharp.Compiler.Syntax.ParsedImplFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective] get_HashDirectives() FSharp.Compiler.Syntax.ParsedImplFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective] get_hashDirectives() FSharp.Compiler.Syntax.ParsedImplFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective] hashDirectives -FSharp.Compiler.Syntax.ParsedImplFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ScopedPragma] ScopedPragmas -FSharp.Compiler.Syntax.ParsedImplFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ScopedPragma] get_ScopedPragmas() -FSharp.Compiler.Syntax.ParsedImplFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ScopedPragma] get_scopedPragmas() -FSharp.Compiler.Syntax.ParsedImplFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ScopedPragma] scopedPragmas FSharp.Compiler.Syntax.ParsedImplFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynModuleOrNamespace] Contents FSharp.Compiler.Syntax.ParsedImplFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynModuleOrNamespace] contents FSharp.Compiler.Syntax.ParsedImplFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynModuleOrNamespace] get_Contents() @@ -6186,8 +6255,6 @@ FSharp.Compiler.Syntax.ParsedInput: FSharp.Compiler.Text.Range Range FSharp.Compiler.Syntax.ParsedInput: FSharp.Compiler.Text.Range get_Range() FSharp.Compiler.Syntax.ParsedInput: Int32 Tag FSharp.Compiler.Syntax.ParsedInput: Int32 get_Tag() -FSharp.Compiler.Syntax.ParsedInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ScopedPragma] ScopedPragmas -FSharp.Compiler.Syntax.ParsedInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ScopedPragma] get_ScopedPragmas() FSharp.Compiler.Syntax.ParsedInput: Microsoft.FSharp.Collections.FSharpSet`1[System.String] Identifiers FSharp.Compiler.Syntax.ParsedInput: Microsoft.FSharp.Collections.FSharpSet`1[System.String] get_Identifiers() FSharp.Compiler.Syntax.ParsedInput: System.String FileName @@ -6256,7 +6323,7 @@ FSharp.Compiler.Syntax.ParsedSigFileFragment: FSharp.Compiler.Syntax.ParsedSigFi FSharp.Compiler.Syntax.ParsedSigFileFragment: Int32 Tag FSharp.Compiler.Syntax.ParsedSigFileFragment: Int32 get_Tag() FSharp.Compiler.Syntax.ParsedSigFileFragment: System.String ToString() -FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.Syntax.ParsedSigFileInput NewParsedSigFileInput(System.String, FSharp.Compiler.Syntax.QualifiedNameOfFile, Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ScopedPragma], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynModuleOrNamespaceSig], FSharp.Compiler.SyntaxTrivia.ParsedSigFileInputTrivia, Microsoft.FSharp.Collections.FSharpSet`1[System.String]) +FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.Syntax.ParsedSigFileInput NewParsedSigFileInput(System.String, FSharp.Compiler.Syntax.QualifiedNameOfFile, Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynModuleOrNamespaceSig], FSharp.Compiler.SyntaxTrivia.ParsedSigFileInputTrivia, Microsoft.FSharp.Collections.FSharpSet`1[System.String]) FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.Syntax.QualifiedNameOfFile QualifiedName FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.Syntax.QualifiedNameOfFile get_QualifiedName() FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.Syntax.QualifiedNameOfFile get_qualifiedNameOfFile() @@ -6271,10 +6338,6 @@ FSharp.Compiler.Syntax.ParsedSigFileInput: Microsoft.FSharp.Collections.FSharpLi FSharp.Compiler.Syntax.ParsedSigFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective] get_HashDirectives() FSharp.Compiler.Syntax.ParsedSigFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective] get_hashDirectives() FSharp.Compiler.Syntax.ParsedSigFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective] hashDirectives -FSharp.Compiler.Syntax.ParsedSigFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ScopedPragma] ScopedPragmas -FSharp.Compiler.Syntax.ParsedSigFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ScopedPragma] get_ScopedPragmas() -FSharp.Compiler.Syntax.ParsedSigFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ScopedPragma] get_scopedPragmas() -FSharp.Compiler.Syntax.ParsedSigFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ScopedPragma] scopedPragmas FSharp.Compiler.Syntax.ParsedSigFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynModuleOrNamespaceSig] Contents FSharp.Compiler.Syntax.ParsedSigFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynModuleOrNamespaceSig] contents FSharp.Compiler.Syntax.ParsedSigFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynModuleOrNamespaceSig] get_Contents() @@ -6342,20 +6405,6 @@ FSharp.Compiler.Syntax.QualifiedNameOfFile: Int32 get_Tag() FSharp.Compiler.Syntax.QualifiedNameOfFile: System.String Text FSharp.Compiler.Syntax.QualifiedNameOfFile: System.String ToString() FSharp.Compiler.Syntax.QualifiedNameOfFile: System.String get_Text() -FSharp.Compiler.Syntax.ScopedPragma: Boolean Equals(FSharp.Compiler.Syntax.ScopedPragma) -FSharp.Compiler.Syntax.ScopedPragma: Boolean Equals(FSharp.Compiler.Syntax.ScopedPragma, System.Collections.IEqualityComparer) -FSharp.Compiler.Syntax.ScopedPragma: Boolean Equals(System.Object) -FSharp.Compiler.Syntax.ScopedPragma: Boolean Equals(System.Object, System.Collections.IEqualityComparer) -FSharp.Compiler.Syntax.ScopedPragma: FSharp.Compiler.Syntax.ScopedPragma NewWarningOff(FSharp.Compiler.Text.Range, Int32) -FSharp.Compiler.Syntax.ScopedPragma: FSharp.Compiler.Text.Range get_range() -FSharp.Compiler.Syntax.ScopedPragma: FSharp.Compiler.Text.Range range -FSharp.Compiler.Syntax.ScopedPragma: Int32 GetHashCode() -FSharp.Compiler.Syntax.ScopedPragma: Int32 GetHashCode(System.Collections.IEqualityComparer) -FSharp.Compiler.Syntax.ScopedPragma: Int32 Tag -FSharp.Compiler.Syntax.ScopedPragma: Int32 get_Tag() -FSharp.Compiler.Syntax.ScopedPragma: Int32 get_warningNumber() -FSharp.Compiler.Syntax.ScopedPragma: Int32 warningNumber -FSharp.Compiler.Syntax.ScopedPragma: System.String ToString() FSharp.Compiler.Syntax.SeqExprOnly: Boolean Equals(FSharp.Compiler.Syntax.SeqExprOnly) FSharp.Compiler.Syntax.SeqExprOnly: Boolean Equals(FSharp.Compiler.Syntax.SeqExprOnly, System.Collections.IEqualityComparer) FSharp.Compiler.Syntax.SeqExprOnly: Boolean Equals(System.Object) @@ -6896,6 +6945,8 @@ FSharp.Compiler.Syntax.SynExpr+Do: FSharp.Compiler.Text.Range get_range() FSharp.Compiler.Syntax.SynExpr+Do: FSharp.Compiler.Text.Range range FSharp.Compiler.Syntax.SynExpr+DoBang: FSharp.Compiler.Syntax.SynExpr expr FSharp.Compiler.Syntax.SynExpr+DoBang: FSharp.Compiler.Syntax.SynExpr get_expr() +FSharp.Compiler.Syntax.SynExpr+DoBang: FSharp.Compiler.SyntaxTrivia.SynExprDoBangTrivia get_trivia() +FSharp.Compiler.Syntax.SynExpr+DoBang: FSharp.Compiler.SyntaxTrivia.SynExprDoBangTrivia trivia FSharp.Compiler.Syntax.SynExpr+DoBang: FSharp.Compiler.Text.Range get_range() FSharp.Compiler.Syntax.SynExpr+DoBang: FSharp.Compiler.Text.Range range FSharp.Compiler.Syntax.SynExpr+DotGet: FSharp.Compiler.Syntax.SynExpr expr @@ -7606,13 +7657,7 @@ FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewConst(FSharp.C FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewDebugPoint(FSharp.Compiler.Syntax.DebugPointAtLeafExpr, Boolean, FSharp.Compiler.Syntax.SynExpr) FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewDiscardAfterMissingQualificationAfterDot(FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range, FSharp.Compiler.Text.Range) FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewDo(FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range) -FSharp.Compiler.Syntax.SynExpr+DoBang: FSharp.Compiler.SyntaxTrivia.SynExprDoBangTrivia get_trivia() -FSharp.Compiler.Syntax.SynExpr+DoBang: FSharp.Compiler.SyntaxTrivia.SynExprDoBangTrivia trivia FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewDoBang(FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range, FSharp.Compiler.SyntaxTrivia.SynExprDoBangTrivia) -FSharp.Compiler.SyntaxTrivia.SynExprDoBangTrivia: FSharp.Compiler.Text.Range DoBangKeyword -FSharp.Compiler.SyntaxTrivia.SynExprDoBangTrivia: FSharp.Compiler.Text.Range get_DoBangKeyword() -FSharp.Compiler.SyntaxTrivia.SynExprDoBangTrivia: System.String ToString() -FSharp.Compiler.SyntaxTrivia.SynExprDoBangTrivia: Void .ctor(FSharp.Compiler.Text.Range) FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewDotGet(FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range, FSharp.Compiler.Syntax.SynLongIdent, FSharp.Compiler.Text.Range) FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewDotIndexedGet(FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range, FSharp.Compiler.Text.Range) FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewDotIndexedSet(FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range, FSharp.Compiler.Text.Range, FSharp.Compiler.Text.Range) @@ -10180,6 +10225,10 @@ FSharp.Compiler.SyntaxTrivia.SynExprAnonRecdTrivia: FSharp.Compiler.Text.Range O FSharp.Compiler.SyntaxTrivia.SynExprAnonRecdTrivia: FSharp.Compiler.Text.Range get_OpeningBraceRange() FSharp.Compiler.SyntaxTrivia.SynExprAnonRecdTrivia: System.String ToString() FSharp.Compiler.SyntaxTrivia.SynExprAnonRecdTrivia: Void .ctor(FSharp.Compiler.Text.Range) +FSharp.Compiler.SyntaxTrivia.SynExprDoBangTrivia: FSharp.Compiler.Text.Range DoBangKeyword +FSharp.Compiler.SyntaxTrivia.SynExprDoBangTrivia: FSharp.Compiler.Text.Range get_DoBangKeyword() +FSharp.Compiler.SyntaxTrivia.SynExprDoBangTrivia: System.String ToString() +FSharp.Compiler.SyntaxTrivia.SynExprDoBangTrivia: Void .ctor(FSharp.Compiler.Text.Range) FSharp.Compiler.SyntaxTrivia.SynExprDotLambdaTrivia: FSharp.Compiler.Text.Range DotRange FSharp.Compiler.SyntaxTrivia.SynExprDotLambdaTrivia: FSharp.Compiler.Text.Range UnderscoreRange FSharp.Compiler.SyntaxTrivia.SynExprDotLambdaTrivia: FSharp.Compiler.Text.Range get_DotRange() @@ -10206,11 +10255,11 @@ FSharp.Compiler.SyntaxTrivia.SynExprLambdaTrivia: System.String ToString() FSharp.Compiler.SyntaxTrivia.SynExprLambdaTrivia: Void .ctor(Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range]) FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia: FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia Zero FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia: FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia get_Zero() +FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia: FSharp.Compiler.Text.Range LetOrUseBangKeyword +FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia: FSharp.Compiler.Text.Range get_LetOrUseBangKeyword() FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range] EqualsRange FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range] get_EqualsRange() FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia: System.String ToString() -FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia: FSharp.Compiler.Text.Range LetOrUseBangKeyword -FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia: FSharp.Compiler.Text.Range get_LetOrUseBangKeyword() FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia: Void .ctor(FSharp.Compiler.Text.Range, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range]) FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia Zero FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia get_Zero() @@ -11254,6 +11303,7 @@ FSharp.Compiler.Tokenization.FSharpTokenKind+Tags: Int32 Underscore FSharp.Compiler.Tokenization.FSharpTokenKind+Tags: Int32 Upcast FSharp.Compiler.Tokenization.FSharpTokenKind+Tags: Int32 Val FSharp.Compiler.Tokenization.FSharpTokenKind+Tags: Int32 Void +FSharp.Compiler.Tokenization.FSharpTokenKind+Tags: Int32 WarnDirective FSharp.Compiler.Tokenization.FSharpTokenKind+Tags: Int32 When FSharp.Compiler.Tokenization.FSharpTokenKind+Tags: Int32 While FSharp.Compiler.Tokenization.FSharpTokenKind+Tags: Int32 WhileBang @@ -11449,6 +11499,7 @@ FSharp.Compiler.Tokenization.FSharpTokenKind: Boolean IsUnderscore FSharp.Compiler.Tokenization.FSharpTokenKind: Boolean IsUpcast FSharp.Compiler.Tokenization.FSharpTokenKind: Boolean IsVal FSharp.Compiler.Tokenization.FSharpTokenKind: Boolean IsVoid +FSharp.Compiler.Tokenization.FSharpTokenKind: Boolean IsWarnDirective FSharp.Compiler.Tokenization.FSharpTokenKind: Boolean IsWhen FSharp.Compiler.Tokenization.FSharpTokenKind: Boolean IsWhile FSharp.Compiler.Tokenization.FSharpTokenKind: Boolean IsWhileBang @@ -11640,6 +11691,7 @@ FSharp.Compiler.Tokenization.FSharpTokenKind: Boolean get_IsUnderscore() FSharp.Compiler.Tokenization.FSharpTokenKind: Boolean get_IsUpcast() FSharp.Compiler.Tokenization.FSharpTokenKind: Boolean get_IsVal() FSharp.Compiler.Tokenization.FSharpTokenKind: Boolean get_IsVoid() +FSharp.Compiler.Tokenization.FSharpTokenKind: Boolean get_IsWarnDirective() FSharp.Compiler.Tokenization.FSharpTokenKind: Boolean get_IsWhen() FSharp.Compiler.Tokenization.FSharpTokenKind: Boolean get_IsWhile() FSharp.Compiler.Tokenization.FSharpTokenKind: Boolean get_IsWhileBang() @@ -11831,6 +11883,7 @@ FSharp.Compiler.Tokenization.FSharpTokenKind: FSharp.Compiler.Tokenization.FShar FSharp.Compiler.Tokenization.FSharpTokenKind: FSharp.Compiler.Tokenization.FSharpTokenKind Upcast FSharp.Compiler.Tokenization.FSharpTokenKind: FSharp.Compiler.Tokenization.FSharpTokenKind Val FSharp.Compiler.Tokenization.FSharpTokenKind: FSharp.Compiler.Tokenization.FSharpTokenKind Void +FSharp.Compiler.Tokenization.FSharpTokenKind: FSharp.Compiler.Tokenization.FSharpTokenKind WarnDirective FSharp.Compiler.Tokenization.FSharpTokenKind: FSharp.Compiler.Tokenization.FSharpTokenKind When FSharp.Compiler.Tokenization.FSharpTokenKind: FSharp.Compiler.Tokenization.FSharpTokenKind While FSharp.Compiler.Tokenization.FSharpTokenKind: FSharp.Compiler.Tokenization.FSharpTokenKind WhileBang @@ -12022,6 +12075,7 @@ FSharp.Compiler.Tokenization.FSharpTokenKind: FSharp.Compiler.Tokenization.FShar FSharp.Compiler.Tokenization.FSharpTokenKind: FSharp.Compiler.Tokenization.FSharpTokenKind get_Upcast() FSharp.Compiler.Tokenization.FSharpTokenKind: FSharp.Compiler.Tokenization.FSharpTokenKind get_Val() FSharp.Compiler.Tokenization.FSharpTokenKind: FSharp.Compiler.Tokenization.FSharpTokenKind get_Void() +FSharp.Compiler.Tokenization.FSharpTokenKind: FSharp.Compiler.Tokenization.FSharpTokenKind get_WarnDirective() FSharp.Compiler.Tokenization.FSharpTokenKind: FSharp.Compiler.Tokenization.FSharpTokenKind get_When() FSharp.Compiler.Tokenization.FSharpTokenKind: FSharp.Compiler.Tokenization.FSharpTokenKind get_While() FSharp.Compiler.Tokenization.FSharpTokenKind: FSharp.Compiler.Tokenization.FSharpTokenKind get_WhileBang() diff --git a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj index 9f0c7f230b9..dfd70e68e0a 100644 --- a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj +++ b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj @@ -1,6 +1,5 @@  - net472;$(FSharpNetCoreProductTargetFramework) $(FSharpNetCoreProductTargetFramework) @@ -8,12 +7,10 @@ true xunit - $(ArtifactsDir)/bin/$(MSBuildProjectName)/$(Configuration)/ $(ArtifactsDir)obj/$(MSBuildProjectName)/$(Configuration)/ - @@ -28,6 +25,7 @@ + @@ -75,23 +73,20 @@ - - - - SyntaxTreeTestSource\%(RecursiveDir)\%(Extension)\%(Filename)%(Extension) - - - + + + SyntaxTreeTestSource\%(RecursiveDir)\%(Extension)\%(Filename)%(Extension) + + - - - TargetFramework=netstandard2.0 - + + + TargetFramework=netstandard2.0 + - - + \ No newline at end of file diff --git a/tests/FSharp.Compiler.Service.Tests/SyntaxTreeTests.fs b/tests/FSharp.Compiler.Service.Tests/SyntaxTreeTests.fs index 654c01d6cc0..42bf0cf0eb0 100644 --- a/tests/FSharp.Compiler.Service.Tests/SyntaxTreeTests.fs +++ b/tests/FSharp.Compiler.Service.Tests/SyntaxTreeTests.fs @@ -95,7 +95,6 @@ let private sanitizeAST (sourceDirectoryValue: string) (ast: ParsedInput) : Pars | ParsedInput.ImplFile(ParsedImplFileInput(fileName, isScript, qualifiedNameOfFile, - scopedPragmas, hashDirectives, contents, flags, @@ -105,7 +104,6 @@ let private sanitizeAST (sourceDirectoryValue: string) (ast: ParsedInput) : Pars fileName, isScript, qualifiedNameOfFile, - scopedPragmas, List.map mapParsedHashDirective hashDirectives, List.map mapSynModuleOrNamespace contents, flags, @@ -113,11 +111,10 @@ let private sanitizeAST (sourceDirectoryValue: string) (ast: ParsedInput) : Pars identifiers ) |> ParsedInput.ImplFile - | ParsedInput.SigFile(ParsedSigFileInput(fileName, qualifiedNameOfFile, scopedPragmas, hashDirectives, contents, trivia, identifiers)) -> + | ParsedInput.SigFile(ParsedSigFileInput(fileName, qualifiedNameOfFile, hashDirectives, contents, trivia, identifiers)) -> ParsedSigFileInput( fileName, qualifiedNameOfFile, - scopedPragmas, List.map mapParsedHashDirective hashDirectives, List.map mapSynModuleOrNamespaceSig contents, trivia, diff --git a/tests/FSharp.Compiler.Service.Tests/WarnScopeTests.fs b/tests/FSharp.Compiler.Service.Tests/WarnScopeTests.fs new file mode 100644 index 00000000000..0b02e81b1c2 --- /dev/null +++ b/tests/FSharp.Compiler.Service.Tests/WarnScopeTests.fs @@ -0,0 +1,30 @@ +module FSharp.Compiler.Service.Tests.WarnScopeTests + +open Xunit +open FSharp.Compiler.Service.Tests.Common + +let sourceForWarnScopes = + """ +module A +match None with None -> () +#nowarn "25" +match None with None -> () +#warnon "25" +match None with None -> () +#nowarn "25" +match None with None -> () + """ + +[] +let WarnScopesWorkAsExpected () = + let file = "WarnScopesInScript.fs" + let parseResult, typeCheckResults = parseAndCheckScript(file, sourceForWarnScopes) + Assert.Equal(parseResult.Diagnostics.Length, 0) + Assert.Equal(typeCheckResults.Diagnostics.Length, 2) + Assert.Equal(typeCheckResults.Diagnostics[0].ErrorNumber, 25) + Assert.Equal(typeCheckResults.Diagnostics[1].ErrorNumber, 25) + Assert.Equal(typeCheckResults.Diagnostics[0].Range.StartLine, 3) + Assert.Equal(typeCheckResults.Diagnostics[1].Range.StartLine, 7) + + + diff --git a/tests/service/data/SyntaxTree/Attribute/RangeOfAttribute.fs.bsl b/tests/service/data/SyntaxTree/Attribute/RangeOfAttribute.fs.bsl index bde23ff1693..a5b0857974d 100644 --- a/tests/service/data/SyntaxTree/Attribute/RangeOfAttribute.fs.bsl +++ b/tests/service/data/SyntaxTree/Attribute/RangeOfAttribute.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Attribute/RangeOfAttribute.fs", false, - QualifiedNameOfFile RangeOfAttribute, [], [], + QualifiedNameOfFile RangeOfAttribute, [], [SynModuleOrNamespace ([RangeOfAttribute], false, AnonModule, [Attributes diff --git a/tests/service/data/SyntaxTree/Attribute/RangeOfAttributeWithPath.fs.bsl b/tests/service/data/SyntaxTree/Attribute/RangeOfAttributeWithPath.fs.bsl index b8c9c031836..4164c660782 100644 --- a/tests/service/data/SyntaxTree/Attribute/RangeOfAttributeWithPath.fs.bsl +++ b/tests/service/data/SyntaxTree/Attribute/RangeOfAttributeWithPath.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Attribute/RangeOfAttributeWithPath.fs", false, - QualifiedNameOfFile RangeOfAttributeWithPath, [], [], + QualifiedNameOfFile RangeOfAttributeWithPath, [], [SynModuleOrNamespace ([RangeOfAttributeWithPath], false, AnonModule, [Attributes diff --git a/tests/service/data/SyntaxTree/Attribute/RangeOfAttributeWithTarget.fs.bsl b/tests/service/data/SyntaxTree/Attribute/RangeOfAttributeWithTarget.fs.bsl index cdb1fdd30fe..e9d4ec73788 100644 --- a/tests/service/data/SyntaxTree/Attribute/RangeOfAttributeWithTarget.fs.bsl +++ b/tests/service/data/SyntaxTree/Attribute/RangeOfAttributeWithTarget.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Attribute/RangeOfAttributeWithTarget.fs", false, - QualifiedNameOfFile RangeOfAttributeWithTarget, [], [], + QualifiedNameOfFile RangeOfAttributeWithTarget, [], [SynModuleOrNamespace ([RangeOfAttributeWithTarget], false, AnonModule, [Attributes diff --git a/tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTrivia.fs.bsl b/tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTrivia.fs.bsl index 17fea8f0a33..e3997215d38 100644 --- a/tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTrivia.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTrivia.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Binding/ColonBeforeReturnTypeIsPartOfTrivia.fs", false, - QualifiedNameOfFile ColonBeforeReturnTypeIsPartOfTrivia, [], [], + QualifiedNameOfFile ColonBeforeReturnTypeIsPartOfTrivia, [], [SynModuleOrNamespace ([ColonBeforeReturnTypeIsPartOfTrivia], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs.bsl b/tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs.bsl index dd5022f2bc2..22d7d1bcba7 100644 --- a/tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs.bsl @@ -2,7 +2,6 @@ ImplFile (ParsedImplFileInput ("/root/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs", false, QualifiedNameOfFile ColonBeforeReturnTypeIsPartOfTriviaInProperties, [], - [], [SynModuleOrNamespace ([ColonBeforeReturnTypeIsPartOfTriviaInProperties], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Binding/ConditionalDirectiveAroundInlineKeyword.fs.bsl b/tests/service/data/SyntaxTree/Binding/ConditionalDirectiveAroundInlineKeyword.fs.bsl index 115b95c51eb..2e54d3392e1 100644 --- a/tests/service/data/SyntaxTree/Binding/ConditionalDirectiveAroundInlineKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/ConditionalDirectiveAroundInlineKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Binding/ConditionalDirectiveAroundInlineKeyword.fs", false, - QualifiedNameOfFile ConditionalDirectiveAroundInlineKeyword, [], [], + QualifiedNameOfFile ConditionalDirectiveAroundInlineKeyword, [], [SynModuleOrNamespace ([ConditionalDirectiveAroundInlineKeyword], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Binding/InlineKeywordInBinding.fs.bsl b/tests/service/data/SyntaxTree/Binding/InlineKeywordInBinding.fs.bsl index 5a7bf976186..cc2a547ae79 100644 --- a/tests/service/data/SyntaxTree/Binding/InlineKeywordInBinding.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/InlineKeywordInBinding.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Binding/InlineKeywordInBinding.fs", false, - QualifiedNameOfFile InlineKeywordInBinding, [], [], + QualifiedNameOfFile InlineKeywordInBinding, [], [SynModuleOrNamespace ([InlineKeywordInBinding], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs.bsl index 63b8a81ea59..ad64bc458a3 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs.bsl @@ -4,7 +4,7 @@ ImplFile false, QualifiedNameOfFile RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet, - [], [], + [], [SynModuleOrNamespace ([RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs.bsl index db5fe5051fe..1f25d18f4e5 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs", false, QualifiedNameOfFile - RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr, [], [], + RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr, [], [SynModuleOrNamespace ([RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs.bsl index d52e2f085ba..f0a79b00099 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs", false, QualifiedNameOfFile - RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember, [], [], + RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember, [], [SynModuleOrNamespace ([RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs.bsl index 4717531eb39..44f46e6147f 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs.bsl @@ -4,7 +4,7 @@ ImplFile false, QualifiedNameOfFile RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec, - [], [], + [], [SynModuleOrNamespace ([RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs.bsl index fe111972f91..2db2e305465 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs.bsl @@ -4,7 +4,6 @@ ImplFile false, QualifiedNameOfFile RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty, [], - [], [SynModuleOrNamespace ([RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs.bsl index ceff4f8e244..e09ffde7504 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs", false, QualifiedNameOfFile RangeOfAttributeShouldBeIncludedInSecondaryConstructor, - [], [], + [], [SynModuleOrNamespace ([RangeOfAttributeShouldBeIncludedInSecondaryConstructor], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs.bsl index a8e5110eeb4..b94919944c1 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs", false, QualifiedNameOfFile - RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings, [], [], + RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings, [], [SynModuleOrNamespace ([RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs.bsl index 83139fe83ee..2f4cc9ab1ed 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs", false, QualifiedNameOfFile RangeOfAttributeShouldBeIncludedInSynMemberDefnMember, - [], [], + [], [SynModuleOrNamespace ([RangeOfAttributeShouldBeIncludedInSynMemberDefnMember], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs.bsl index 08edc3d2631..b1f8155475b 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs.bsl @@ -3,7 +3,6 @@ ImplFile ("/root/Binding/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs", false, QualifiedNameOfFile RangeOfAttributeShouldBeIncludedInSynModuleDeclLet, [], - [], [SynModuleOrNamespace ([RangeOfAttributeShouldBeIncludedInSynModuleDeclLet], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs.bsl index bf0e8802e32..07444f56d48 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs.bsl @@ -4,7 +4,7 @@ ImplFile false, QualifiedNameOfFile RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty, - [], [], + [], [SynModuleOrNamespace ([RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs.bsl index 844946e66c3..9302de5258a 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs.bsl @@ -2,7 +2,6 @@ ImplFile (ParsedImplFileInput ("/root/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs", false, QualifiedNameOfFile RangeOfEqualSignShouldBePresentInLocalLetBinding, [], - [], [SynModuleOrNamespace ([RangeOfEqualSignShouldBePresentInLocalLetBinding], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs.bsl index b0e567ed3bd..d86d4475a48 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs", false, QualifiedNameOfFile RangeOfEqualSignShouldBePresentInLocalLetBindingTyped, - [], [], + [], [SynModuleOrNamespace ([RangeOfEqualSignShouldBePresentInLocalLetBindingTyped], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs.bsl index 9e0bd27f359..5cbf90929d3 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs", false, - QualifiedNameOfFile RangeOfEqualSignShouldBePresentInMemberBinding, [], [], + QualifiedNameOfFile RangeOfEqualSignShouldBePresentInMemberBinding, [], [SynModuleOrNamespace ([RangeOfEqualSignShouldBePresentInMemberBinding], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs.bsl index 463fcef24ba..dcba7a74c90 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs", false, QualifiedNameOfFile - RangeOfEqualSignShouldBePresentInMemberBindingWithParameters, [], [], + RangeOfEqualSignShouldBePresentInMemberBindingWithParameters, [], [SynModuleOrNamespace ([RangeOfEqualSignShouldBePresentInMemberBindingWithParameters], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs.bsl index 49eeec4d346..3cbc0f8e240 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs", false, QualifiedNameOfFile - RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType, [], [], + RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType, [], [SynModuleOrNamespace ([RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInProperty.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInProperty.fs.bsl index 32f9f50c83a..b37d8459c49 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInProperty.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInProperty.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Binding/RangeOfEqualSignShouldBePresentInProperty.fs", false, - QualifiedNameOfFile RangeOfEqualSignShouldBePresentInProperty, [], [], + QualifiedNameOfFile RangeOfEqualSignShouldBePresentInProperty, [], [SynModuleOrNamespace ([RangeOfEqualSignShouldBePresentInProperty], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs.bsl index eca7f36b6dd..873c7cbe531 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs", false, QualifiedNameOfFile - RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding, [], [], + RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding, [], [SynModuleOrNamespace ([RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped.fs.bsl index 651cdb4f8ce..e81beb1206e 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped.fs", false, QualifiedNameOfFile - RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped, [], [], + RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped, [], [SynModuleOrNamespace ([RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs.bsl index 31febede5b6..2d118d1cd46 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs", false, QualifiedNameOfFile - RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding, [], [], + RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding, [], [SynModuleOrNamespace ([RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs.bsl index 0a175553cad..ff787558f5a 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs", false, QualifiedNameOfFile - RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding, [], [], + RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding, [], [SynModuleOrNamespace ([RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs.bsl index 613931862dd..b62efe5550b 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs.bsl @@ -4,7 +4,7 @@ ImplFile false, QualifiedNameOfFile RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes, - [], [], + [], [SynModuleOrNamespace ([RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Binding/TupleReturnTypeOfBindingShouldContainStars.fs.bsl b/tests/service/data/SyntaxTree/Binding/TupleReturnTypeOfBindingShouldContainStars.fs.bsl index a8dae863d64..6e81296f160 100644 --- a/tests/service/data/SyntaxTree/Binding/TupleReturnTypeOfBindingShouldContainStars.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/TupleReturnTypeOfBindingShouldContainStars.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs", false, - QualifiedNameOfFile TupleReturnTypeOfBindingShouldContainStars, [], [], + QualifiedNameOfFile TupleReturnTypeOfBindingShouldContainStars, [], [SynModuleOrNamespace ([TupleReturnTypeOfBindingShouldContainStars], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/CodeComment/BlockCommentInSourceCode.fs.bsl b/tests/service/data/SyntaxTree/CodeComment/BlockCommentInSourceCode.fs.bsl index 91dffc0ee66..764f33921d1 100644 --- a/tests/service/data/SyntaxTree/CodeComment/BlockCommentInSourceCode.fs.bsl +++ b/tests/service/data/SyntaxTree/CodeComment/BlockCommentInSourceCode.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/CodeComment/BlockCommentInSourceCode.fs", false, - QualifiedNameOfFile BlockCommentInSourceCode, [], [], + QualifiedNameOfFile BlockCommentInSourceCode, [], [SynModuleOrNamespace ([BlockCommentInSourceCode], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/CodeComment/BlockCommentInSourceCodeSignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/CodeComment/BlockCommentInSourceCodeSignatureFile.fsi.bsl index 977d7b388de..53f38927cc9 100644 --- a/tests/service/data/SyntaxTree/CodeComment/BlockCommentInSourceCodeSignatureFile.fsi.bsl +++ b/tests/service/data/SyntaxTree/CodeComment/BlockCommentInSourceCodeSignatureFile.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/CodeComment/BlockCommentInSourceCodeSignatureFile.fsi", - QualifiedNameOfFile BlockCommentInSourceCodeSignatureFile, [], [], + QualifiedNameOfFile BlockCommentInSourceCodeSignatureFile, [], [SynModuleOrNamespaceSig ([Meh], false, DeclaredNamespace, [Val diff --git a/tests/service/data/SyntaxTree/CodeComment/CommentAfterSourceCode.fs.bsl b/tests/service/data/SyntaxTree/CodeComment/CommentAfterSourceCode.fs.bsl index a3bb2470842..226cbf63540 100644 --- a/tests/service/data/SyntaxTree/CodeComment/CommentAfterSourceCode.fs.bsl +++ b/tests/service/data/SyntaxTree/CodeComment/CommentAfterSourceCode.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/CodeComment/CommentAfterSourceCode.fs", false, - QualifiedNameOfFile CommentAfterSourceCode, [], [], + QualifiedNameOfFile CommentAfterSourceCode, [], [SynModuleOrNamespace ([CommentAfterSourceCode], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/CodeComment/CommentAfterSourceCodeSignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/CodeComment/CommentAfterSourceCodeSignatureFile.fsi.bsl index 7b8fc685e00..7cc461ec087 100644 --- a/tests/service/data/SyntaxTree/CodeComment/CommentAfterSourceCodeSignatureFile.fsi.bsl +++ b/tests/service/data/SyntaxTree/CodeComment/CommentAfterSourceCodeSignatureFile.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/CodeComment/CommentAfterSourceCodeSignatureFile.fsi", - QualifiedNameOfFile CommentAfterSourceCodeSignatureFile, [], [], + QualifiedNameOfFile CommentAfterSourceCodeSignatureFile, [], [SynModuleOrNamespaceSig ([Meh], false, DeclaredNamespace, [Val diff --git a/tests/service/data/SyntaxTree/CodeComment/CommentAtEndOfFile.fs.bsl b/tests/service/data/SyntaxTree/CodeComment/CommentAtEndOfFile.fs.bsl index 4c1f24b1384..4e4f6c343cf 100644 --- a/tests/service/data/SyntaxTree/CodeComment/CommentAtEndOfFile.fs.bsl +++ b/tests/service/data/SyntaxTree/CodeComment/CommentAtEndOfFile.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/CodeComment/CommentAtEndOfFile.fs", false, - QualifiedNameOfFile CommentAtEndOfFile, [], [], + QualifiedNameOfFile CommentAtEndOfFile, [], [SynModuleOrNamespace ([CommentAtEndOfFile], false, AnonModule, [Expr (Ident x, (2,0--2,1))], PreXmlDocEmpty, [], None, (2,0--2,1), { LeadingKeyword = None })], diff --git a/tests/service/data/SyntaxTree/CodeComment/CommentOnSingleLine.fs.bsl b/tests/service/data/SyntaxTree/CodeComment/CommentOnSingleLine.fs.bsl index ad5aa017eac..c4e03170068 100644 --- a/tests/service/data/SyntaxTree/CodeComment/CommentOnSingleLine.fs.bsl +++ b/tests/service/data/SyntaxTree/CodeComment/CommentOnSingleLine.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/CodeComment/CommentOnSingleLine.fs", false, - QualifiedNameOfFile CommentOnSingleLine, [], [], + QualifiedNameOfFile CommentOnSingleLine, [], [SynModuleOrNamespace ([CommentOnSingleLine], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/CodeComment/CommentOnSingleLineSignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/CodeComment/CommentOnSingleLineSignatureFile.fsi.bsl index 5dd445b4d00..2591b10a9a8 100644 --- a/tests/service/data/SyntaxTree/CodeComment/CommentOnSingleLineSignatureFile.fsi.bsl +++ b/tests/service/data/SyntaxTree/CodeComment/CommentOnSingleLineSignatureFile.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/CodeComment/CommentOnSingleLineSignatureFile.fsi", - QualifiedNameOfFile CommentOnSingleLineSignatureFile, [], [], + QualifiedNameOfFile CommentOnSingleLineSignatureFile, [], [SynModuleOrNamespaceSig ([Meh], false, DeclaredNamespace, [Val diff --git a/tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs.bsl b/tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs.bsl index b57381ca8e6..f2dc787c81e 100644 --- a/tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs.bsl +++ b/tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs", false, QualifiedNameOfFile - TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation, [], [], + TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation, [], [SynModuleOrNamespace ([TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldNotBeCaptured.fs.bsl b/tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldNotBeCaptured.fs.bsl index fafd932e041..734a1c1b83b 100644 --- a/tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldNotBeCaptured.fs.bsl +++ b/tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldNotBeCaptured.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/CodeComment/TripleSlashCommentShouldNotBeCaptured.fs", false, - QualifiedNameOfFile TripleSlashCommentShouldNotBeCaptured, [], [], + QualifiedNameOfFile TripleSlashCommentShouldNotBeCaptured, [], [SynModuleOrNamespace ([TripleSlashCommentShouldNotBeCaptured], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs.bsl b/tests/service/data/SyntaxTree/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs.bsl index 72f8528c23f..6c740a1a4c9 100644 --- a/tests/service/data/SyntaxTree/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs.bsl +++ b/tests/service/data/SyntaxTree/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs.bsl @@ -4,7 +4,6 @@ ImplFile false, QualifiedNameOfFile MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression, [], - [], [SynModuleOrNamespace ([MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs.bsl b/tests/service/data/SyntaxTree/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs.bsl index d0dd3083e64..97af43342fa 100644 --- a/tests/service/data/SyntaxTree/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs.bsl +++ b/tests/service/data/SyntaxTree/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs", false, QualifiedNameOfFile SynExprAndBangRangeStartsAtAndAndEndsAfterExpression, - [], [], + [], [SynModuleOrNamespace ([SynExprAndBangRangeStartsAtAndAndEndsAfterExpression], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs.bsl index 8a7a55c28a1..94af9836414 100644 --- a/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs.bsl +++ b/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs.bsl @@ -3,7 +3,6 @@ ImplFile ("/root/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs", false, QualifiedNameOfFile DirectivesInMultilineCommentAreNotReportedAsTrivia, [], - [], [SynModuleOrNamespace ([DirectivesInMultilineCommentAreNotReportedAsTrivia], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTriviaSignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTriviaSignatureFile.fsi.bsl index bb8a2a87d75..bfd676a8b83 100644 --- a/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTriviaSignatureFile.fsi.bsl +++ b/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTriviaSignatureFile.fsi.bsl @@ -2,7 +2,7 @@ SigFile (ParsedSigFileInput ("/root/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTriviaSignatureFile.fsi", QualifiedNameOfFile - DirectivesInMultilineCommentAreNotReportedAsTriviaSignatureFile, [], [], + DirectivesInMultilineCommentAreNotReportedAsTriviaSignatureFile, [], [SynModuleOrNamespaceSig ([Foobar], false, DeclaredNamespace, [Val diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTrivia.fs.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTrivia.fs.bsl index 231cfd08d6f..3ef223e31aa 100644 --- a/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTrivia.fs.bsl +++ b/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTrivia.fs.bsl @@ -3,7 +3,6 @@ ImplFile ("/root/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTrivia.fs", false, QualifiedNameOfFile DirectivesInMultilineStringAreNotReportedAsTrivia, [], - [], [SynModuleOrNamespace ([DirectivesInMultilineStringAreNotReportedAsTrivia], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTriviaSignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTriviaSignatureFile.fsi.bsl index 3a151928254..8525f4cb417 100644 --- a/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTriviaSignatureFile.fsi.bsl +++ b/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTriviaSignatureFile.fsi.bsl @@ -2,7 +2,7 @@ SigFile (ParsedSigFileInput ("/root/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTriviaSignatureFile.fsi", QualifiedNameOfFile - DirectivesInMultilineStringAreNotReportedAsTriviaSignatureFile, [], [], + DirectivesInMultilineStringAreNotReportedAsTriviaSignatureFile, [], [SynModuleOrNamespaceSig ([Foobar], false, DeclaredNamespace, [Val diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfElseEndif.fs.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfElseEndif.fs.bsl index 9f409f45808..c579043eab6 100644 --- a/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfElseEndif.fs.bsl +++ b/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfElseEndif.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ConditionalDirective/NestedIfElseEndif.fs", false, - QualifiedNameOfFile NestedIfElseEndif, [], [], + QualifiedNameOfFile NestedIfElseEndif, [], [SynModuleOrNamespace ([NestedIfElseEndif], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfElseEndifSignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfElseEndifSignatureFile.fsi.bsl index c1293f6c9c9..b044cfec4cc 100644 --- a/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfElseEndifSignatureFile.fsi.bsl +++ b/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfElseEndifSignatureFile.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/ConditionalDirective/NestedIfElseEndifSignatureFile.fsi", - QualifiedNameOfFile NestedIfElseEndifSignatureFile, [], [], + QualifiedNameOfFile NestedIfElseEndifSignatureFile, [], [SynModuleOrNamespaceSig ([Foobar], false, DeclaredNamespace, [Val diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfEndifWithComplexExpressions.fs.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfEndifWithComplexExpressions.fs.bsl index 25821646aa0..3aba45cae75 100644 --- a/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfEndifWithComplexExpressions.fs.bsl +++ b/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfEndifWithComplexExpressions.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ConditionalDirective/NestedIfEndifWithComplexExpressions.fs", false, - QualifiedNameOfFile NestedIfEndifWithComplexExpressions, [], [], + QualifiedNameOfFile NestedIfEndifWithComplexExpressions, [], [SynModuleOrNamespace ([NestedIfEndifWithComplexExpressions], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfEndifWithComplexExpressionsSignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfEndifWithComplexExpressionsSignatureFile.fsi.bsl index 9f0375afada..39ac359edef 100644 --- a/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfEndifWithComplexExpressionsSignatureFile.fsi.bsl +++ b/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfEndifWithComplexExpressionsSignatureFile.fsi.bsl @@ -2,7 +2,6 @@ SigFile (ParsedSigFileInput ("/root/ConditionalDirective/NestedIfEndifWithComplexExpressionsSignatureFile.fsi", QualifiedNameOfFile NestedIfEndifWithComplexExpressionsSignatureFile, [], - [], [SynModuleOrNamespaceSig ([Foobar], false, DeclaredNamespace, [Val diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfElseEndif.fs.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfElseEndif.fs.bsl index 72ac590cc94..e9ca1db9743 100644 --- a/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfElseEndif.fs.bsl +++ b/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfElseEndif.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ConditionalDirective/SingleIfElseEndif.fs", false, - QualifiedNameOfFile SingleIfElseEndif, [], [], + QualifiedNameOfFile SingleIfElseEndif, [], [SynModuleOrNamespace ([SingleIfElseEndif], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfElseEndifSignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfElseEndifSignatureFile.fsi.bsl index 4164c59cd03..9ac8d98c7b5 100644 --- a/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfElseEndifSignatureFile.fsi.bsl +++ b/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfElseEndifSignatureFile.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/ConditionalDirective/SingleIfElseEndifSignatureFile.fsi", - QualifiedNameOfFile SingleIfElseEndifSignatureFile, [], [], + QualifiedNameOfFile SingleIfElseEndifSignatureFile, [], [SynModuleOrNamespaceSig ([Foobar], false, DeclaredNamespace, [Val diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfEndif.fs.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfEndif.fs.bsl index cd4a4243c4e..e1cd564ab94 100644 --- a/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfEndif.fs.bsl +++ b/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfEndif.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ConditionalDirective/SingleIfEndif.fs", false, - QualifiedNameOfFile SingleIfEndif, [], [], + QualifiedNameOfFile SingleIfEndif, [], [SynModuleOrNamespace ([SingleIfEndif], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfEndifSignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfEndifSignatureFile.fsi.bsl index ea0a6308762..15b9ae12223 100644 --- a/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfEndifSignatureFile.fsi.bsl +++ b/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfEndifSignatureFile.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/ConditionalDirective/SingleIfEndifSignatureFile.fsi", - QualifiedNameOfFile SingleIfEndifSignatureFile, [], [], + QualifiedNameOfFile SingleIfEndifSignatureFile, [], [SynModuleOrNamespaceSig ([Foobar], false, DeclaredNamespace, [Val diff --git a/tests/service/data/SyntaxTree/EnumCase/MultipleSynEnumCasesHaveBarRange.fs.bsl b/tests/service/data/SyntaxTree/EnumCase/MultipleSynEnumCasesHaveBarRange.fs.bsl index 121139817fc..941eeacd441 100644 --- a/tests/service/data/SyntaxTree/EnumCase/MultipleSynEnumCasesHaveBarRange.fs.bsl +++ b/tests/service/data/SyntaxTree/EnumCase/MultipleSynEnumCasesHaveBarRange.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/EnumCase/MultipleSynEnumCasesHaveBarRange.fs", false, - QualifiedNameOfFile MultipleSynEnumCasesHaveBarRange, [], [], + QualifiedNameOfFile MultipleSynEnumCasesHaveBarRange, [], [SynModuleOrNamespace ([MultipleSynEnumCasesHaveBarRange], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/EnumCase/SingleSynEnumCaseHasBarRange.fs.bsl b/tests/service/data/SyntaxTree/EnumCase/SingleSynEnumCaseHasBarRange.fs.bsl index 7f1b4d84526..de48080c664 100644 --- a/tests/service/data/SyntaxTree/EnumCase/SingleSynEnumCaseHasBarRange.fs.bsl +++ b/tests/service/data/SyntaxTree/EnumCase/SingleSynEnumCaseHasBarRange.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/EnumCase/SingleSynEnumCaseHasBarRange.fs", false, - QualifiedNameOfFile SingleSynEnumCaseHasBarRange, [], [], + QualifiedNameOfFile SingleSynEnumCaseHasBarRange, [], [SynModuleOrNamespace ([SingleSynEnumCaseHasBarRange], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/EnumCase/SingleSynEnumCaseWithoutBar.fs.bsl b/tests/service/data/SyntaxTree/EnumCase/SingleSynEnumCaseWithoutBar.fs.bsl index 2b2f3d90daa..a3f2846f4a5 100644 --- a/tests/service/data/SyntaxTree/EnumCase/SingleSynEnumCaseWithoutBar.fs.bsl +++ b/tests/service/data/SyntaxTree/EnumCase/SingleSynEnumCaseWithoutBar.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/EnumCase/SingleSynEnumCaseWithoutBar.fs", false, - QualifiedNameOfFile SingleSynEnumCaseWithoutBar, [], [], + QualifiedNameOfFile SingleSynEnumCaseWithoutBar, [], [SynModuleOrNamespace ([SingleSynEnumCaseWithoutBar], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Exception/Missing name 01.fs.bsl b/tests/service/data/SyntaxTree/Exception/Missing name 01.fs.bsl index 3bf7aea22b1..dc3b24f91f5 100644 --- a/tests/service/data/SyntaxTree/Exception/Missing name 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Exception/Missing name 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Exception/Missing name 01.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Exception diff --git a/tests/service/data/SyntaxTree/Exception/Missing name 02.fs.bsl b/tests/service/data/SyntaxTree/Exception/Missing name 02.fs.bsl index d71336169b3..3ff8296f894 100644 --- a/tests/service/data/SyntaxTree/Exception/Missing name 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Exception/Missing name 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Exception/Missing name 02.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Exception diff --git a/tests/service/data/SyntaxTree/Exception/Missing name 03.fs.bsl b/tests/service/data/SyntaxTree/Exception/Missing name 03.fs.bsl index 2cb9b84bc5b..f12b08046c4 100644 --- a/tests/service/data/SyntaxTree/Exception/Missing name 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Exception/Missing name 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Exception/Missing name 03.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Exception diff --git a/tests/service/data/SyntaxTree/Exception/Recover Function Type 01.fs.bsl b/tests/service/data/SyntaxTree/Exception/Recover Function Type 01.fs.bsl index 690183a18b6..0d9ca8801bf 100644 --- a/tests/service/data/SyntaxTree/Exception/Recover Function Type 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Exception/Recover Function Type 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Exception/Recover Function Type 01.fs", false, - QualifiedNameOfFile Recover Function Type 01, [], [], + QualifiedNameOfFile Recover Function Type 01, [], [SynModuleOrNamespace ([Foo], false, DeclaredNamespace, [Exception diff --git a/tests/service/data/SyntaxTree/Exception/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Exception/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs.bsl index 8326a320162..5832babbec5 100644 --- a/tests/service/data/SyntaxTree/Exception/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Exception/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Exception/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs", false, QualifiedNameOfFile SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword, - [], [], + [], [SynModuleOrNamespace ([X], false, DeclaredNamespace, [Exception diff --git a/tests/service/data/SyntaxTree/Expression/AnonymousRecords-01.fs.bsl b/tests/service/data/SyntaxTree/Expression/AnonymousRecords-01.fs.bsl index f931eda4280..531e0c9fe10 100644 --- a/tests/service/data/SyntaxTree/Expression/AnonymousRecords-01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/AnonymousRecords-01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/AnonymousRecords-01.fs", false, - QualifiedNameOfFile AnonymousRecords-01, [], [], + QualifiedNameOfFile AnonymousRecords-01, [], [SynModuleOrNamespace ([AnonymousRecords-01], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/AnonymousRecords-02.fs.bsl b/tests/service/data/SyntaxTree/Expression/AnonymousRecords-02.fs.bsl index 4701bc305a6..a8c19867200 100644 --- a/tests/service/data/SyntaxTree/Expression/AnonymousRecords-02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/AnonymousRecords-02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/AnonymousRecords-02.fs", false, - QualifiedNameOfFile AnonymousRecords-02, [], [], + QualifiedNameOfFile AnonymousRecords-02, [], [SynModuleOrNamespace ([AnonymousRecords-02], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/AnonymousRecords-03.fs.bsl b/tests/service/data/SyntaxTree/Expression/AnonymousRecords-03.fs.bsl index 074b9f0b601..be0d1b65f4e 100644 --- a/tests/service/data/SyntaxTree/Expression/AnonymousRecords-03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/AnonymousRecords-03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/AnonymousRecords-03.fs", false, - QualifiedNameOfFile AnonymousRecords-03, [], [], + QualifiedNameOfFile AnonymousRecords-03, [], [SynModuleOrNamespace ([AnonymousRecords-03], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/AnonymousRecords-04.fs.bsl b/tests/service/data/SyntaxTree/Expression/AnonymousRecords-04.fs.bsl index 3314197171d..461498a56c5 100644 --- a/tests/service/data/SyntaxTree/Expression/AnonymousRecords-04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/AnonymousRecords-04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/AnonymousRecords-04.fs", false, - QualifiedNameOfFile AnonymousRecords-04, [], [], + QualifiedNameOfFile AnonymousRecords-04, [], [SynModuleOrNamespace ([AnonymousRecords-04], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/AnonymousRecords-05.fs.bsl b/tests/service/data/SyntaxTree/Expression/AnonymousRecords-05.fs.bsl index fde8214fb91..766380f1f78 100644 --- a/tests/service/data/SyntaxTree/Expression/AnonymousRecords-05.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/AnonymousRecords-05.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/AnonymousRecords-05.fs", false, - QualifiedNameOfFile AnonymousRecords-05, [], [], + QualifiedNameOfFile AnonymousRecords-05, [], [SynModuleOrNamespace ([AnonymousRecords-05], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/AnonymousRecords-06.fs.bsl b/tests/service/data/SyntaxTree/Expression/AnonymousRecords-06.fs.bsl index 90e976cc843..cf9d8d54cee 100644 --- a/tests/service/data/SyntaxTree/Expression/AnonymousRecords-06.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/AnonymousRecords-06.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/AnonymousRecords-06.fs", false, - QualifiedNameOfFile AnonymousRecords-06, [], [], + QualifiedNameOfFile AnonymousRecords-06, [], [SynModuleOrNamespace ([AnonymousRecords-06], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Binary - Eq 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Binary - Eq 01.fs.bsl index 4c3ccc484a3..cc73d09ddf6 100644 --- a/tests/service/data/SyntaxTree/Expression/Binary - Eq 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Binary - Eq 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Binary - Eq 01.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Binary - Eq 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Binary - Eq 02.fs.bsl index e6453f7d365..f45a3bd17c8 100644 --- a/tests/service/data/SyntaxTree/Expression/Binary - Eq 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Binary - Eq 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Binary - Eq 02.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Binary - Eq 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Binary - Eq 03.fs.bsl index 5e7b2edfe2e..9c7732d2527 100644 --- a/tests/service/data/SyntaxTree/Expression/Binary - Eq 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Binary - Eq 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Binary - Eq 03.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Binary - Eq 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/Binary - Eq 04.fs.bsl index 9fabf903f5c..c7da9945b05 100644 --- a/tests/service/data/SyntaxTree/Expression/Binary - Eq 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Binary - Eq 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Binary - Eq 04.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Binary - Eq 05.fs.bsl b/tests/service/data/SyntaxTree/Expression/Binary - Eq 05.fs.bsl index 252070781e5..cf828c1302f 100644 --- a/tests/service/data/SyntaxTree/Expression/Binary - Eq 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Binary - Eq 05.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Binary - Eq 05.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Binary - Eq 06.fs.bsl b/tests/service/data/SyntaxTree/Expression/Binary - Eq 06.fs.bsl index f0fd4f42abb..56ae3843ced 100644 --- a/tests/service/data/SyntaxTree/Expression/Binary - Eq 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Binary - Eq 06.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Binary - Eq 06.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Binary - Eq 07.fs.bsl b/tests/service/data/SyntaxTree/Expression/Binary - Eq 07.fs.bsl index 09316e6513d..fb497cad671 100644 --- a/tests/service/data/SyntaxTree/Expression/Binary - Eq 07.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Binary - Eq 07.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Binary - Eq 07.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Binary - Plus 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Binary - Plus 01.fs.bsl index 748e99e38be..9d1d33e469e 100644 --- a/tests/service/data/SyntaxTree/Expression/Binary - Plus 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Binary - Plus 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Binary - Plus 01.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Binary - Plus 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Binary - Plus 02.fs.bsl index 8233f7b8725..e131cec1260 100644 --- a/tests/service/data/SyntaxTree/Expression/Binary - Plus 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Binary - Plus 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Binary - Plus 02.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Binary - Plus 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Binary - Plus 03.fs.bsl index 95babc117f7..8bdbf299590 100644 --- a/tests/service/data/SyntaxTree/Expression/Binary - Plus 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Binary - Plus 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Binary - Plus 03.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Binary - Plus 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/Binary - Plus 04.fs.bsl index 8f5d5280bb7..5dff24cc42f 100644 --- a/tests/service/data/SyntaxTree/Expression/Binary - Plus 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Binary - Plus 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Binary - Plus 04.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Binary - Plus 05.fs.bsl b/tests/service/data/SyntaxTree/Expression/Binary - Plus 05.fs.bsl index 6717b3e3537..5ad65469fd9 100644 --- a/tests/service/data/SyntaxTree/Expression/Binary - Plus 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Binary - Plus 05.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Binary - Plus 05.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Binary 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Binary 01.fs.bsl index d0679ba06df..b1951671b31 100644 --- a/tests/service/data/SyntaxTree/Expression/Binary 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Binary 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Binary 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Binary 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Binary 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Binary 02.fs.bsl index 0b5419a8632..1c91a47b04f 100644 --- a/tests/service/data/SyntaxTree/Expression/Binary 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Binary 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Binary 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Binary 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl b/tests/service/data/SyntaxTree/Expression/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl index fde625dfdba..22138377be4 100644 --- a/tests/service/data/SyntaxTree/Expression/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl @@ -4,7 +4,6 @@ ImplFile false, QualifiedNameOfFile CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField, [], - [], [SynModuleOrNamespace ([CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Expression/Do 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Do 01.fs.bsl index bbac8331c5c..b63ad8484e3 100644 --- a/tests/service/data/SyntaxTree/Expression/Do 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Do 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Do 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Do 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr (Do (Const (Int32 1, (4,4--4,5)), (3,0--4,5)), (3,0--4,5)); diff --git a/tests/service/data/SyntaxTree/Expression/Do 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Do 02.fs.bsl index b3cfba16181..4dda71baa2d 100644 --- a/tests/service/data/SyntaxTree/Expression/Do 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Do 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Do 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Do 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr (Do (Const (Int32 1, (4,4--4,5)), (3,0--4,5)), (3,0--4,5)); diff --git a/tests/service/data/SyntaxTree/Expression/Do 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Do 03.fs.bsl index 2bf1e3df8cb..42d0c78835d 100644 --- a/tests/service/data/SyntaxTree/Expression/Do 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Do 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Do 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Do 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Do 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/Do 04.fs.bsl index 7edad619273..e34ee16528a 100644 --- a/tests/service/data/SyntaxTree/Expression/Do 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Do 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Do 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Do 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Do 05.fs.bsl b/tests/service/data/SyntaxTree/Expression/Do 05.fs.bsl index 8707692afc7..ce047029a64 100644 --- a/tests/service/data/SyntaxTree/Expression/Do 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Do 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Do 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Do 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/DotLambda - _ Recovery - Casts.fsx.bsl b/tests/service/data/SyntaxTree/Expression/DotLambda - _ Recovery - Casts.fsx.bsl index e0923b67823..7efd387e672 100644 --- a/tests/service/data/SyntaxTree/Expression/DotLambda - _ Recovery - Casts.fsx.bsl +++ b/tests/service/data/SyntaxTree/Expression/DotLambda - _ Recovery - Casts.fsx.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/DotLambda - _ Recovery - Casts.fsx", true, - QualifiedNameOfFile DotLambda - _ Recovery - Casts$fsx, [], [], + QualifiedNameOfFile DotLambda - _ Recovery - Casts$fsx, [], [SynModuleOrNamespace ([DotLambda - _ Recovery - Casts], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/DotLambda - _ Recovery - Eof.fsx.bsl b/tests/service/data/SyntaxTree/Expression/DotLambda - _ Recovery - Eof.fsx.bsl index f481a08bdd5..967b24e04b7 100644 --- a/tests/service/data/SyntaxTree/Expression/DotLambda - _ Recovery - Eof.fsx.bsl +++ b/tests/service/data/SyntaxTree/Expression/DotLambda - _ Recovery - Eof.fsx.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/DotLambda - _ Recovery - Eof.fsx", true, - QualifiedNameOfFile DotLambda - _ Recovery - Eof$fsx, [], [], + QualifiedNameOfFile DotLambda - _ Recovery - Eof$fsx, [], [SynModuleOrNamespace ([DotLambda - _ Recovery - Eof], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/DotLambda - _ Recovery.fsx.bsl b/tests/service/data/SyntaxTree/Expression/DotLambda - _ Recovery.fsx.bsl index 1dfda19d13b..6303f207956 100644 --- a/tests/service/data/SyntaxTree/Expression/DotLambda - _ Recovery.fsx.bsl +++ b/tests/service/data/SyntaxTree/Expression/DotLambda - _ Recovery.fsx.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/DotLambda - _ Recovery.fsx", true, - QualifiedNameOfFile DotLambda - _ Recovery$fsx, [], [], + QualifiedNameOfFile DotLambda - _ Recovery$fsx, [], [SynModuleOrNamespace ([DotLambda - _ Recovery], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/DotLambda - _. Recovery - Eof.fsx.bsl b/tests/service/data/SyntaxTree/Expression/DotLambda - _. Recovery - Eof.fsx.bsl index 878b39bfb7a..41c33797f29 100644 --- a/tests/service/data/SyntaxTree/Expression/DotLambda - _. Recovery - Eof.fsx.bsl +++ b/tests/service/data/SyntaxTree/Expression/DotLambda - _. Recovery - Eof.fsx.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/DotLambda - _. Recovery - Eof.fsx", true, - QualifiedNameOfFile DotLambda - _. Recovery - Eof$fsx, [], [], + QualifiedNameOfFile DotLambda - _. Recovery - Eof$fsx, [], [SynModuleOrNamespace ([DotLambda - _; Recovery - Eof], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/DotLambda - _. Recovery.fsx.bsl b/tests/service/data/SyntaxTree/Expression/DotLambda - _. Recovery.fsx.bsl index 0bc367b4df3..0604348d865 100644 --- a/tests/service/data/SyntaxTree/Expression/DotLambda - _. Recovery.fsx.bsl +++ b/tests/service/data/SyntaxTree/Expression/DotLambda - _. Recovery.fsx.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/DotLambda - _. Recovery.fsx", true, - QualifiedNameOfFile DotLambda - _. Recovery$fsx, [], [], + QualifiedNameOfFile DotLambda - _. Recovery$fsx, [], [SynModuleOrNamespace ([DotLambda - _; Recovery], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/DotLambda_ArgumentExpressionInInnerAppExpression.fs.bsl b/tests/service/data/SyntaxTree/Expression/DotLambda_ArgumentExpressionInInnerAppExpression.fs.bsl index cba7a3d17c6..7692643fca3 100644 --- a/tests/service/data/SyntaxTree/Expression/DotLambda_ArgumentExpressionInInnerAppExpression.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/DotLambda_ArgumentExpressionInInnerAppExpression.fs.bsl @@ -3,7 +3,6 @@ ImplFile ("/root/Expression/DotLambda_ArgumentExpressionInInnerAppExpression.fs", false, QualifiedNameOfFile DotLambda_ArgumentExpressionInInnerAppExpression, [], - [], [SynModuleOrNamespace ([DotLambda_ArgumentExpressionInInnerAppExpression], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/DotLambda_FunctionWithUnderscoreDotLambda.fs.bsl b/tests/service/data/SyntaxTree/Expression/DotLambda_FunctionWithUnderscoreDotLambda.fs.bsl index 378bed8cdf2..1eefee02340 100644 --- a/tests/service/data/SyntaxTree/Expression/DotLambda_FunctionWithUnderscoreDotLambda.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/DotLambda_FunctionWithUnderscoreDotLambda.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/DotLambda_FunctionWithUnderscoreDotLambda.fs", false, - QualifiedNameOfFile DotLambda_FunctionWithUnderscoreDotLambda, [], [], + QualifiedNameOfFile DotLambda_FunctionWithUnderscoreDotLambda, [], [SynModuleOrNamespace ([DotLambda_FunctionWithUnderscoreDotLambda], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/DotLambda_NestedPropertiesAfterUnderscore.fs.bsl b/tests/service/data/SyntaxTree/Expression/DotLambda_NestedPropertiesAfterUnderscore.fs.bsl index ad08dcfcd15..e61cdd58b5f 100644 --- a/tests/service/data/SyntaxTree/Expression/DotLambda_NestedPropertiesAfterUnderscore.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/DotLambda_NestedPropertiesAfterUnderscore.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/DotLambda_NestedPropertiesAfterUnderscore.fs", false, - QualifiedNameOfFile DotLambda_NestedPropertiesAfterUnderscore, [], [], + QualifiedNameOfFile DotLambda_NestedPropertiesAfterUnderscore, [], [SynModuleOrNamespace ([DotLambda_NestedPropertiesAfterUnderscore], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/DotLambda_NotAllowedFunctionExpressionWithArg.fs.bsl b/tests/service/data/SyntaxTree/Expression/DotLambda_NotAllowedFunctionExpressionWithArg.fs.bsl index 561a8c4d1ee..1502e694f12 100644 --- a/tests/service/data/SyntaxTree/Expression/DotLambda_NotAllowedFunctionExpressionWithArg.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/DotLambda_NotAllowedFunctionExpressionWithArg.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/DotLambda_NotAllowedFunctionExpressionWithArg.fs", false, - QualifiedNameOfFile DotLambda_NotAllowedFunctionExpressionWithArg, [], [], + QualifiedNameOfFile DotLambda_NotAllowedFunctionExpressionWithArg, [], [SynModuleOrNamespace ([DotLambda_NotAllowedFunctionExpressionWithArg], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/DotLambda_TopLevelLet.fs.bsl b/tests/service/data/SyntaxTree/Expression/DotLambda_TopLevelLet.fs.bsl index 7b8f9aa8c69..49f33b5941d 100644 --- a/tests/service/data/SyntaxTree/Expression/DotLambda_TopLevelLet.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/DotLambda_TopLevelLet.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/DotLambda_TopLevelLet.fs", false, - QualifiedNameOfFile DotLambda_TopLevelLet, [], [], + QualifiedNameOfFile DotLambda_TopLevelLet, [], [SynModuleOrNamespace ([DotLambda_TopLevelLet], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/DotLambda_TopLevelStandaloneDotLambda.fs.bsl b/tests/service/data/SyntaxTree/Expression/DotLambda_TopLevelStandaloneDotLambda.fs.bsl index 2c57852951a..45b7bcca47c 100644 --- a/tests/service/data/SyntaxTree/Expression/DotLambda_TopLevelStandaloneDotLambda.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/DotLambda_TopLevelStandaloneDotLambda.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/DotLambda_TopLevelStandaloneDotLambda.fs", false, - QualifiedNameOfFile DotLambda_TopLevelStandaloneDotLambda, [], [], + QualifiedNameOfFile DotLambda_TopLevelStandaloneDotLambda, [], [SynModuleOrNamespace ([DotLambda_TopLevelStandaloneDotLambda], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/DotLambda_UnderscoreToFunctionCallWithSpaceAndUnitApplication.fs.bsl b/tests/service/data/SyntaxTree/Expression/DotLambda_UnderscoreToFunctionCallWithSpaceAndUnitApplication.fs.bsl index 5d634a011a2..6a5b07e328d 100644 --- a/tests/service/data/SyntaxTree/Expression/DotLambda_UnderscoreToFunctionCallWithSpaceAndUnitApplication.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/DotLambda_UnderscoreToFunctionCallWithSpaceAndUnitApplication.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Expression/DotLambda_UnderscoreToFunctionCallWithSpaceAndUnitApplication.fs", false, QualifiedNameOfFile - DotLambda_UnderscoreToFunctionCallWithSpaceAndUnitApplication, [], [], + DotLambda_UnderscoreToFunctionCallWithSpaceAndUnitApplication, [], [SynModuleOrNamespace ([DotLambda_UnderscoreToFunctionCallWithSpaceAndUnitApplication], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Expression/DotLambda_UnderscoreToString.fs.bsl b/tests/service/data/SyntaxTree/Expression/DotLambda_UnderscoreToString.fs.bsl index 177818e273f..06ed3e8d5c2 100644 --- a/tests/service/data/SyntaxTree/Expression/DotLambda_UnderscoreToString.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/DotLambda_UnderscoreToString.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/DotLambda_UnderscoreToString.fs", false, - QualifiedNameOfFile DotLambda_UnderscoreToString, [], [], + QualifiedNameOfFile DotLambda_UnderscoreToString, [], [SynModuleOrNamespace ([DotLambda_UnderscoreToString], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/DotLambda_WithNonTupledFunctionCall.fs.bsl b/tests/service/data/SyntaxTree/Expression/DotLambda_WithNonTupledFunctionCall.fs.bsl index 2aaeb2c9bff..001a8ea9b4e 100644 --- a/tests/service/data/SyntaxTree/Expression/DotLambda_WithNonTupledFunctionCall.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/DotLambda_WithNonTupledFunctionCall.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/DotLambda_WithNonTupledFunctionCall.fs", false, - QualifiedNameOfFile DotLambda_WithNonTupledFunctionCall, [], [], + QualifiedNameOfFile DotLambda_WithNonTupledFunctionCall, [], [SynModuleOrNamespace ([DotLambda_WithNonTupledFunctionCall], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/DotLambda_WithoutDot.fs.bsl b/tests/service/data/SyntaxTree/Expression/DotLambda_WithoutDot.fs.bsl index c9e140cb3a0..d3e09de5bc5 100644 --- a/tests/service/data/SyntaxTree/Expression/DotLambda_WithoutDot.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/DotLambda_WithoutDot.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/DotLambda_WithoutDot.fs", false, - QualifiedNameOfFile DotLambda_WithoutDot, [], [], + QualifiedNameOfFile DotLambda_WithoutDot, [], [SynModuleOrNamespace ([DotLambda_WithoutDot], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/DotLambda_WithoutUnderscore.fs.bsl b/tests/service/data/SyntaxTree/Expression/DotLambda_WithoutUnderscore.fs.bsl index 624a15c29e4..d387bdb8b78 100644 --- a/tests/service/data/SyntaxTree/Expression/DotLambda_WithoutUnderscore.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/DotLambda_WithoutUnderscore.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/DotLambda_WithoutUnderscore.fs", false, - QualifiedNameOfFile DotLambda_WithoutUnderscore, [], [], + QualifiedNameOfFile DotLambda_WithoutUnderscore, [], [SynModuleOrNamespace ([DotLambda_WithoutUnderscore], false, AnonModule, [], PreXmlDocEmpty, [], None, (1,0--1,1), { LeadingKeyword = None })], (true, true), diff --git a/tests/service/data/SyntaxTree/Expression/Downcast 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Downcast 01.fs.bsl index 8fde0743e4b..0b88548bd44 100644 --- a/tests/service/data/SyntaxTree/Expression/Downcast 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Downcast 01.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Downcast 01.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Downcast 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Downcast 02.fs.bsl index d9a03af749d..0c088e8fd17 100644 --- a/tests/service/data/SyntaxTree/Expression/Downcast 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Downcast 02.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Downcast 02.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr (Downcast (Ident i, Anon (4,0--4,2), (3,0--4,2)), (3,0--4,2))], diff --git a/tests/service/data/SyntaxTree/Expression/Downcast 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Downcast 03.fs.bsl index fab179734b2..6d2e8d4a038 100644 --- a/tests/service/data/SyntaxTree/Expression/Downcast 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Downcast 03.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Downcast 03.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/For 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/For 01.fs.bsl index 97d7c7cb03e..74e1364eaad 100644 --- a/tests/service/data/SyntaxTree/Expression/For 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/For 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/For 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/For 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/For 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/For 02.fs.bsl index aad044dcf30..deb1ef5e477 100644 --- a/tests/service/data/SyntaxTree/Expression/For 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/For 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/For 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/For 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/For 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/For 03.fs.bsl index 023ec9d79e0..9955d95acbe 100644 --- a/tests/service/data/SyntaxTree/Expression/For 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/For 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/For 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/For 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/For 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/For 04.fs.bsl index 41ed392a753..4d5ca721f0d 100644 --- a/tests/service/data/SyntaxTree/Expression/For 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/For 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/For 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/For 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/For 05.fs.bsl b/tests/service/data/SyntaxTree/Expression/For 05.fs.bsl index 9a71d8f9e4c..4a788c6a421 100644 --- a/tests/service/data/SyntaxTree/Expression/For 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/For 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/For 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/For 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/GlobalKeywordAsSynExpr.fs.bsl b/tests/service/data/SyntaxTree/Expression/GlobalKeywordAsSynExpr.fs.bsl index d76e9fe48b4..78a29949d08 100644 --- a/tests/service/data/SyntaxTree/Expression/GlobalKeywordAsSynExpr.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/GlobalKeywordAsSynExpr.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/GlobalKeywordAsSynExpr.fs", false, - QualifiedNameOfFile GlobalKeywordAsSynExpr, [], [], + QualifiedNameOfFile GlobalKeywordAsSynExpr, [], [SynModuleOrNamespace ([GlobalKeywordAsSynExpr], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Id 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Id 01.fs.bsl index e24dcc6b23b..e2853af7874 100644 --- a/tests/service/data/SyntaxTree/Expression/Id 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Id 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Id 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Id 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr (Ident a, (3,0--3,1))], PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None, diff --git a/tests/service/data/SyntaxTree/Expression/Id 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Id 02.fs.bsl index d46a4254b22..3dc42b9e7b6 100644 --- a/tests/service/data/SyntaxTree/Expression/Id 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Id 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Id 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Id 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr (Ident a, (3,0--3,3)); Expr (Ident b, (4,0--4,1))], diff --git a/tests/service/data/SyntaxTree/Expression/Id 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Id 03.fs.bsl index 26ef9dd71d4..982c8e2bde8 100644 --- a/tests/service/data/SyntaxTree/Expression/Id 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Id 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Id 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Id 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr (FromParseError (Ident , (3,0--3,2)), (3,0--3,2)); diff --git a/tests/service/data/SyntaxTree/Expression/Id 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/Id 04.fs.bsl index c76189328b1..a908b643de4 100644 --- a/tests/service/data/SyntaxTree/Expression/Id 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Id 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Id 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Id 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr (FromParseError (Ident , (3,0--3,1)), (3,0--3,1)); diff --git a/tests/service/data/SyntaxTree/Expression/Id 05.fs.bsl b/tests/service/data/SyntaxTree/Expression/Id 05.fs.bsl index 2e3f9d5568d..5156ef62814 100644 --- a/tests/service/data/SyntaxTree/Expression/Id 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Id 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Id 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Id 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Id 06.fs.bsl b/tests/service/data/SyntaxTree/Expression/Id 06.fs.bsl index bade7e896ea..92b191a467a 100644 --- a/tests/service/data/SyntaxTree/Expression/Id 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Id 06.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Id 06.fs", false, QualifiedNameOfFile Id 06, [], [], + ("/root/Expression/Id 06.fs", false, QualifiedNameOfFile Id 06, [], [SynModuleOrNamespace ([Id 06], false, AnonModule, [Expr (FromParseError (Ident , (1,0--1,2)), (1,0--1,2))], diff --git a/tests/service/data/SyntaxTree/Expression/Id 07.fs.bsl b/tests/service/data/SyntaxTree/Expression/Id 07.fs.bsl index 60d8974e781..e05d53011a5 100644 --- a/tests/service/data/SyntaxTree/Expression/Id 07.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Id 07.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Id 07.fs", false, QualifiedNameOfFile Id 07, [], [], + ("/root/Expression/Id 07.fs", false, QualifiedNameOfFile Id 07, [], [SynModuleOrNamespace ([Id 07], false, AnonModule, [Expr (FromParseError (Ident , (1,0--1,1)), (1,0--1,1))], diff --git a/tests/service/data/SyntaxTree/Expression/If 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/If 01.fs.bsl index 775d6d7764d..3c5d6112613 100644 --- a/tests/service/data/SyntaxTree/Expression/If 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/If 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/If 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/If 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/If 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/If 02.fs.bsl index 8f026aa409e..542bd4580dc 100644 --- a/tests/service/data/SyntaxTree/Expression/If 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/If 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/If 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/If 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/If 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/If 03.fs.bsl index c68682f6f59..00f9e86db62 100644 --- a/tests/service/data/SyntaxTree/Expression/If 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/If 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/If 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/If 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/If 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/If 04.fs.bsl index 99ffbe73e73..b53d9856594 100644 --- a/tests/service/data/SyntaxTree/Expression/If 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/If 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/If 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/If 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/If 05.fs.bsl b/tests/service/data/SyntaxTree/Expression/If 05.fs.bsl index 0197cbcd0d2..14c3141b926 100644 --- a/tests/service/data/SyntaxTree/Expression/If 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/If 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/If 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/If 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/If 06.fs.bsl b/tests/service/data/SyntaxTree/Expression/If 06.fs.bsl index 2c0215d0a8f..eb54aff8e05 100644 --- a/tests/service/data/SyntaxTree/Expression/If 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/If 06.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/If 06.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/If 06.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/If 07.fs.bsl b/tests/service/data/SyntaxTree/Expression/If 07.fs.bsl index d4d53023ff8..a775790478a 100644 --- a/tests/service/data/SyntaxTree/Expression/If 07.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/If 07.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/If 07.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/If 07.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/If 08.fs.bsl b/tests/service/data/SyntaxTree/Expression/If 08.fs.bsl index 016bc4dbfe7..936be0da4f1 100644 --- a/tests/service/data/SyntaxTree/Expression/If 08.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/If 08.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/If 08.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/If 08.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/If 09.fs.bsl b/tests/service/data/SyntaxTree/Expression/If 09.fs.bsl index 6541b409bd9..7057cf36e68 100644 --- a/tests/service/data/SyntaxTree/Expression/If 09.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/If 09.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/If 09.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/If 09.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/If 10.fs.bsl b/tests/service/data/SyntaxTree/Expression/If 10.fs.bsl index ef03391599d..170b8ad0a0c 100644 --- a/tests/service/data/SyntaxTree/Expression/If 10.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/If 10.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/If 10.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/If 10.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl b/tests/service/data/SyntaxTree/Expression/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl index 8c19bf183e8..04d12c94d8b 100644 --- a/tests/service/data/SyntaxTree/Expression/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl @@ -4,7 +4,7 @@ ImplFile false, QualifiedNameOfFile InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField, - [], [], + [], [SynModuleOrNamespace ([InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Expression/Lambda - Missing expr 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Lambda - Missing expr 01.fs.bsl index f67f65c9688..1e754640ce9 100644 --- a/tests/service/data/SyntaxTree/Expression/Lambda - Missing expr 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Lambda - Missing expr 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Lambda - Missing expr 01.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Lambda - Missing expr 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Lambda - Missing expr 02.fs.bsl index 42bbbc58539..b53a3b341cf 100644 --- a/tests/service/data/SyntaxTree/Expression/Lambda - Missing expr 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Lambda - Missing expr 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Lambda - Missing expr 02.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Lambda 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Lambda 01.fs.bsl index 095a5f6834a..fbca7518c2a 100644 --- a/tests/service/data/SyntaxTree/Expression/Lambda 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Lambda 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Lambda 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Lambda 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Lambda 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Lambda 02.fs.bsl index 82cf6a37d3a..af47f5c1031 100644 --- a/tests/service/data/SyntaxTree/Expression/Lambda 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Lambda 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Lambda 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Lambda 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Lazy 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Lazy 01.fs.bsl index 9af75da75fe..fdf0eb903a8 100644 --- a/tests/service/data/SyntaxTree/Expression/Lazy 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Lazy 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Lazy 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Lazy 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Lazy 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Lazy 02.fs.bsl index 32e1522a9e5..cda090c76c0 100644 --- a/tests/service/data/SyntaxTree/Expression/Lazy 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Lazy 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Lazy 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Lazy 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Lazy 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Lazy 03.fs.bsl index 17a4c9785fb..138c07fad45 100644 --- a/tests/service/data/SyntaxTree/Expression/Lazy 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Lazy 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Lazy 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Lazy 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Let 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Let 01.fs.bsl index 8eaabfb3d65..ba682cd6020 100644 --- a/tests/service/data/SyntaxTree/Expression/Let 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Let 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Let 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Let 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Let 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Let 02.fs.bsl index bf9b340b539..454d6a9a4fa 100644 --- a/tests/service/data/SyntaxTree/Expression/Let 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Let 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Let 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Let 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/List - Comprehension 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/List - Comprehension 01.fs.bsl index 7cc9b348848..6cfe5fcabbc 100644 --- a/tests/service/data/SyntaxTree/Expression/List - Comprehension 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/List - Comprehension 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/List - Comprehension 01.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/List - Comprehension 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/List - Comprehension 02.fs.bsl index 1a89da1b0fb..2645ff40cab 100644 --- a/tests/service/data/SyntaxTree/Expression/List - Comprehension 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/List - Comprehension 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/List - Comprehension 02.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl index 132e7030303..dbba6b1816e 100644 --- a/tests/service/data/SyntaxTree/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl @@ -3,7 +3,6 @@ ImplFile ("/root/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs", false, QualifiedNameOfFile NestedSynExprLetOrUseContainsTheRangeOfInKeyword, [], - [], [SynModuleOrNamespace ([NestedSynExprLetOrUseContainsTheRangeOfInKeyword], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 01.fs.bsl index cf716944487..fd16ccd744c 100644 --- a/tests/service/data/SyntaxTree/Expression/Object - Class 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Object - Class 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Object - Class 01.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 02.fs.bsl index 9a06f01ae6e..389f44a541a 100644 --- a/tests/service/data/SyntaxTree/Expression/Object - Class 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Object - Class 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Object - Class 02.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 03.fs.bsl index 92401919062..9c75e1441db 100644 --- a/tests/service/data/SyntaxTree/Expression/Object - Class 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Object - Class 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Object - Class 03.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 04.fs.bsl index 5b7efb7cdf9..95379f2d0a5 100644 --- a/tests/service/data/SyntaxTree/Expression/Object - Class 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Object - Class 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Object - Class 04.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 05.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 05.fs.bsl index d4dbc824d6d..44c71c53d1c 100644 --- a/tests/service/data/SyntaxTree/Expression/Object - Class 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Object - Class 05.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Object - Class 05.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 06.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 06.fs.bsl index 1880c3c044f..b23bb6e5f76 100644 --- a/tests/service/data/SyntaxTree/Expression/Object - Class 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Object - Class 06.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Object - Class 06.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 07.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 07.fs.bsl index eeaef3fd16a..c9eabcdd5a6 100644 --- a/tests/service/data/SyntaxTree/Expression/Object - Class 07.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Object - Class 07.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Object - Class 07.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 08.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 08.fs.bsl index f7c76b0b8fb..2176f273e5d 100644 --- a/tests/service/data/SyntaxTree/Expression/Object - Class 08.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Object - Class 08.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Object - Class 08.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 09.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 09.fs.bsl index 831deffbeac..dd3c049e790 100644 --- a/tests/service/data/SyntaxTree/Expression/Object - Class 09.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Object - Class 09.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Object - Class 09.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 10.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 10.fs.bsl index d7670c74151..270b00d7bf5 100644 --- a/tests/service/data/SyntaxTree/Expression/Object - Class 10.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Object - Class 10.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Object - Class 10.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 11.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 11.fs.bsl index ff41ad2a5d8..6ff48652826 100644 --- a/tests/service/data/SyntaxTree/Expression/Object - Class 11.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Object - Class 11.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Object - Class 11.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 12.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 12.fs.bsl index 53d26ec6e93..c3147b138a7 100644 --- a/tests/service/data/SyntaxTree/Expression/Object - Class 12.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Object - Class 12.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Object - Class 12.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 13.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 13.fs.bsl index 6567abe2e7b..ce8375fa6d2 100644 --- a/tests/service/data/SyntaxTree/Expression/Object - Class 13.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Object - Class 13.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Object - Class 13.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 14.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 14.fs.bsl index 64530949bbc..85b1f160c95 100644 --- a/tests/service/data/SyntaxTree/Expression/Object - Class 14.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Object - Class 14.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Object - Class 14.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 15.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 15.fs.bsl index ec08bebfe92..5b20ec7ef7d 100644 --- a/tests/service/data/SyntaxTree/Expression/Object - Class 15.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Object - Class 15.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Object - Class 15.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Rarrow 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Rarrow 01.fs.bsl index 9d7e7af2125..0e9b8672a91 100644 --- a/tests/service/data/SyntaxTree/Expression/Rarrow 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Rarrow 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Rarrow 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Rarrow 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Rarrow 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Rarrow 02.fs.bsl index 54570b38728..dc5826d4efb 100644 --- a/tests/service/data/SyntaxTree/Expression/Rarrow 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Rarrow 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Rarrow 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Rarrow 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Rarrow 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Rarrow 03.fs.bsl index e0d4104ac0a..8f7af982117 100644 --- a/tests/service/data/SyntaxTree/Expression/Rarrow 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Rarrow 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Rarrow 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Rarrow 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Anon 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Anon 01.fs.bsl index 0e74d6eb486..d72cf32a3f1 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Anon 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Anon 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Anon 01.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Anon 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Anon 02.fs.bsl index 52748529a11..88309d54b5a 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Anon 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Anon 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Anon 02.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Anon 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Anon 03.fs.bsl index dbb9b6e063f..4f76f9e4fa8 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Anon 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Anon 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Anon 03.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Anon 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Anon 04.fs.bsl index 07303e1a146..15e39d2acb6 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Anon 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Anon 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Anon 04.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Anon 05.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Anon 05.fs.bsl index 6c2cefee45d..4b8fa60fac5 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Anon 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Anon 05.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Anon 05.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Anon 06.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Anon 06.fs.bsl index edbeaa194e6..b597846c478 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Anon 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Anon 06.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Anon 06.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Anon 07.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Anon 07.fs.bsl index 1bc1a409d91..135e7002a24 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Anon 07.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Anon 07.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Anon 07.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Anon 08.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Anon 08.fs.bsl index 0cd4a997180..e7d89ffedcd 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Anon 08.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Anon 08.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Anon 08.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Anon 09.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Anon 09.fs.bsl index e851232c521..834aed98c3d 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Anon 09.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Anon 09.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Anon 09.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Anon 10.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Anon 10.fs.bsl index 2e01c7ef8c7..174d2094771 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Anon 10.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Anon 10.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Anon 10.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Anon 11.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Anon 11.fs.bsl index 97ffe8e441d..cc377bc241f 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Anon 11.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Anon 11.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Anon 11.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Anon 12.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Anon 12.fs.bsl index 3371e7a75e6..2756e6b0e25 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Anon 12.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Anon 12.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Anon 12.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Field 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Field 01.fs.bsl index be62dae5864..a80fba14e99 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Field 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Field 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Field 01.fs", false, QualifiedNameOfFile Foo, - [], [], + [], [SynModuleOrNamespace ([Foo], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Field 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Field 02.fs.bsl index 41d98a61173..5a70f2f54f5 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Field 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Field 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Field 02.fs", false, QualifiedNameOfFile Foo, - [], [], + [], [SynModuleOrNamespace ([Foo], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Field 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Field 03.fs.bsl index 7ca89a4c8ed..fca8c8554a2 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Field 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Field 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Field 03.fs", false, QualifiedNameOfFile Foo, - [], [], + [], [SynModuleOrNamespace ([Foo], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Field 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Field 04.fs.bsl index d37f41ae725..e15a6a36567 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Field 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Field 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Field 04.fs", false, QualifiedNameOfFile Foo, - [], [], + [], [SynModuleOrNamespace ([Foo], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Field 05.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Field 05.fs.bsl index f0baef9a8ff..7fbe2f2c3ca 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Field 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Field 05.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Field 05.fs", false, QualifiedNameOfFile Foo, - [], [], + [], [SynModuleOrNamespace ([Foo], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Field 06.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Field 06.fs.bsl index a280f304f7d..b076a81bb2d 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Field 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Field 06.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Field 06.fs", false, QualifiedNameOfFile Foo, - [], [], + [], [SynModuleOrNamespace ([Foo], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Field 07.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Field 07.fs.bsl index 58a717c0121..c76a489f02a 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Field 07.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Field 07.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Field 07.fs", false, QualifiedNameOfFile Foo, - [], [], + [], [SynModuleOrNamespace ([Foo], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Field 08.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Field 08.fs.bsl index a9a2cbc8047..771eac840e6 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Field 08.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Field 08.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Field 08.fs", false, QualifiedNameOfFile Foo, - [], [], + [], [SynModuleOrNamespace ([Foo], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Field 09.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Field 09.fs.bsl index 6132a89bd66..541df44f632 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Field 09.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Field 09.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Field 09.fs", false, QualifiedNameOfFile Foo, - [], [], + [], [SynModuleOrNamespace ([Foo], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Field 10.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Field 10.fs.bsl index 0b0379f5dbf..964495bce86 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Field 10.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Field 10.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Field 10.fs", false, QualifiedNameOfFile Foo, - [], [], + [], [SynModuleOrNamespace ([Foo], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Field 11.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Field 11.fs.bsl index 6b20cddae13..0edaee67e4d 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Field 11.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Field 11.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Field 11.fs", false, QualifiedNameOfFile Foo, - [], [], + [], [SynModuleOrNamespace ([Foo], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Field 12.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Field 12.fs.bsl index f1c61f45015..b41e37f43c3 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Field 12.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Field 12.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Field 12.fs", false, QualifiedNameOfFile Foo, - [], [], + [], [SynModuleOrNamespace ([Foo], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Field 13.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Field 13.fs.bsl index 0012edc2639..ea5bdfffd50 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Field 13.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Field 13.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Field 13.fs", false, QualifiedNameOfFile Foo, - [], [], + [], [SynModuleOrNamespace ([Foo], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Record - Field 14.fs.bsl b/tests/service/data/SyntaxTree/Expression/Record - Field 14.fs.bsl index 1afdd819fb1..d650d481d34 100644 --- a/tests/service/data/SyntaxTree/Expression/Record - Field 14.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Record - Field 14.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Record - Field 14.fs", false, QualifiedNameOfFile Foo, - [], [], + [], [SynModuleOrNamespace ([Foo], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Sequential 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Sequential 01.fs.bsl index c42ed608ed2..a79a2bc5d7c 100644 --- a/tests/service/data/SyntaxTree/Expression/Sequential 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Sequential 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Sequential 01.fs", false, - QualifiedNameOfFile Sequential 01, [], [], + QualifiedNameOfFile Sequential 01, [], [SynModuleOrNamespace ([Sequential 01], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Sequential 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Sequential 02.fs.bsl index 7d58b85ed22..0b8d9ebaa8c 100644 --- a/tests/service/data/SyntaxTree/Expression/Sequential 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Sequential 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Sequential 02.fs", false, - QualifiedNameOfFile Sequential 02, [], [], + QualifiedNameOfFile Sequential 02, [], [SynModuleOrNamespace ([Sequential 02], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Sequential 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Sequential 03.fs.bsl index b04598b79fd..6a2717f4ef4 100644 --- a/tests/service/data/SyntaxTree/Expression/Sequential 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Sequential 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Sequential 03.fs", false, - QualifiedNameOfFile Sequential 03, [], [], + QualifiedNameOfFile Sequential 03, [], [SynModuleOrNamespace ([Sequential 03], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Set 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Set 01.fs.bsl index 68e1f2c85c2..5f2ff3334b8 100644 --- a/tests/service/data/SyntaxTree/Expression/Set 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Set 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Set 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Set 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Set 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Set 02.fs.bsl index da5e8af6a69..70539cca9b6 100644 --- a/tests/service/data/SyntaxTree/Expression/Set 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Set 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Set 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Set 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Set 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Set 03.fs.bsl index fc450c30c94..10f1d76716e 100644 --- a/tests/service/data/SyntaxTree/Expression/Set 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Set 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Set 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Set 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Set 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/Set 04.fs.bsl index ee798381576..d15e64de15f 100644 --- a/tests/service/data/SyntaxTree/Expression/Set 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Set 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Set 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Set 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/SynExprAnonRecdWithStructKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprAnonRecdWithStructKeyword.fs.bsl index 4e6e88c4234..8f25a6132c6 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprAnonRecdWithStructKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprAnonRecdWithStructKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/SynExprAnonRecdWithStructKeyword.fs", false, - QualifiedNameOfFile SynExprAnonRecdWithStructKeyword, [], [], + QualifiedNameOfFile SynExprAnonRecdWithStructKeyword, [], [SynModuleOrNamespace ([SynExprAnonRecdWithStructKeyword], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs.bsl index 534c40ade09..844a6a26490 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Expression/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs", false, QualifiedNameOfFile - SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields, [], [], + SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields, [], [SynModuleOrNamespace ([SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Expression/SynExprDoContainsTheRangeOfTheDoKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprDoContainsTheRangeOfTheDoKeyword.fs.bsl index 4b3437c248d..10a22fdf920 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprDoContainsTheRangeOfTheDoKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprDoContainsTheRangeOfTheDoKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/SynExprDoContainsTheRangeOfTheDoKeyword.fs", false, - QualifiedNameOfFile SynExprDoContainsTheRangeOfTheDoKeyword, [], [], + QualifiedNameOfFile SynExprDoContainsTheRangeOfTheDoKeyword, [], [SynModuleOrNamespace ([SynExprDoContainsTheRangeOfTheDoKeyword], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/SynExprDynamicDoesContainIdent.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprDynamicDoesContainIdent.fs.bsl index fe39cf8a627..770a921000d 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprDynamicDoesContainIdent.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprDynamicDoesContainIdent.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/SynExprDynamicDoesContainIdent.fs", false, - QualifiedNameOfFile SynExprDynamicDoesContainIdent, [], [], + QualifiedNameOfFile SynExprDynamicDoesContainIdent, [], [SynModuleOrNamespace ([SynExprDynamicDoesContainIdent], false, AnonModule, [Expr (Dynamic (Ident x, (2,1--2,2), Ident k, (2,0--2,3)), (2,0--2,3))], diff --git a/tests/service/data/SyntaxTree/Expression/SynExprDynamicDoesContainParentheses.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprDynamicDoesContainParentheses.fs.bsl index 46eee1bf1b6..76f83e002fe 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprDynamicDoesContainParentheses.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprDynamicDoesContainParentheses.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/SynExprDynamicDoesContainParentheses.fs", false, - QualifiedNameOfFile SynExprDynamicDoesContainParentheses, [], [], + QualifiedNameOfFile SynExprDynamicDoesContainParentheses, [], [SynModuleOrNamespace ([SynExprDynamicDoesContainParentheses], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/SynExprForContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprForContainsTheRangeOfTheEqualsSign.fs.bsl index e62b4dc35d8..31c484389e1 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprForContainsTheRangeOfTheEqualsSign.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprForContainsTheRangeOfTheEqualsSign.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/SynExprForContainsTheRangeOfTheEqualsSign.fs", false, - QualifiedNameOfFile SynExprForContainsTheRangeOfTheEqualsSign, [], [], + QualifiedNameOfFile SynExprForContainsTheRangeOfTheEqualsSign, [], [SynModuleOrNamespace ([SynExprForContainsTheRangeOfTheEqualsSign], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs.bsl index a0f54029820..71fb22235eb 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs.bsl @@ -3,7 +3,6 @@ ImplFile ("/root/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs", false, QualifiedNameOfFile SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign, [], - [], [SynModuleOrNamespace ([SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl index f9ce333429a..01902bfb572 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs", false, - QualifiedNameOfFile SynExprLetOrUseContainsTheRangeOfInKeyword, [], [], + QualifiedNameOfFile SynExprLetOrUseContainsTheRangeOfInKeyword, [], [SynModuleOrNamespace ([SynExprLetOrUseContainsTheRangeOfInKeyword], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs.bsl index 54c3f8180e4..35abd078400 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs.bsl @@ -3,7 +3,6 @@ ImplFile ("/root/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs", false, QualifiedNameOfFile SynExprLetOrUseDoesNotContainTheRangeOfInKeyword, [], - [], [SynModuleOrNamespace ([SynExprLetOrUseDoesNotContainTheRangeOfInKeyword], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs.bsl index a5d102356f1..c6a4f878c3c 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs.bsl @@ -4,7 +4,7 @@ ImplFile false, QualifiedNameOfFile SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword, - [], [], + [], [SynModuleOrNamespace ([SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs.bsl index 72352706810..daf50fb841a 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs", false, QualifiedNameOfFile - SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword, [], [], + SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword, [], [SynModuleOrNamespace ([SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Expression/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl index e70d8c752eb..8827eb89356 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Expression/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs", false, QualifiedNameOfFile - SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword, [], [], + SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword, [], [SynModuleOrNamespace ([SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Expression/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl index acbf05115af..9396e35bbfd 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Expression/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs", false, QualifiedNameOfFile SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword, - [], [], + [], [SynModuleOrNamespace ([SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs.bsl index c84d9fb3d27..ac255e6b303 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs", false, - QualifiedNameOfFile SynExprObjExprContainsTheRangeOfWithKeyword, [], [], + QualifiedNameOfFile SynExprObjExprContainsTheRangeOfWithKeyword, [], [SynModuleOrNamespace ([SynExprObjExprContainsTheRangeOfWithKeyword], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/SynExprObjWithSetter.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprObjWithSetter.fs.bsl index 405f967b350..38f4424a25d 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprObjWithSetter.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprObjWithSetter.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/SynExprObjWithSetter.fs", false, - QualifiedNameOfFile SynExprObjWithSetter, [], [], + QualifiedNameOfFile SynExprObjWithSetter, [], [SynModuleOrNamespace ([SynExprObjWithSetter], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Expression/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl index bbd85336307..4d85bb76e81 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Expression/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs", false, QualifiedNameOfFile - SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField, [], [], + SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField, [], [SynModuleOrNamespace ([SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Expression/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs.bsl index 109d053a41d..f05f5b21f95 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs.bsl @@ -2,7 +2,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs", false, QualifiedNameOfFile SynExprRecordFieldsContainCorrectAmountOfTrivia, - [], [], + [], [SynModuleOrNamespace ([SynExprRecordFieldsContainCorrectAmountOfTrivia], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/SynExprSetWithSynExprDynamic.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprSetWithSynExprDynamic.fs.bsl index 4cd0b5776e6..46b7bf2473e 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprSetWithSynExprDynamic.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprSetWithSynExprDynamic.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/SynExprSetWithSynExprDynamic.fs", false, - QualifiedNameOfFile SynExprSetWithSynExprDynamic, [], [], + QualifiedNameOfFile SynExprSetWithSynExprDynamic, [], [SynModuleOrNamespace ([SynExprSetWithSynExprDynamic], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs.bsl index 4e1d438bfe7..89099c61bb8 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Expression/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs", false, QualifiedNameOfFile - SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword, [], [], + SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword, [], [SynModuleOrNamespace ([SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Expression/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs.bsl index 7900862979d..037ee8844ca 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Expression/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs", false, QualifiedNameOfFile SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword, - [], [], + [], [SynModuleOrNamespace ([SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Expression/Try - Finally 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try - Finally 01.fs.bsl index d2437e5ebfc..b5b1f18ac13 100644 --- a/tests/service/data/SyntaxTree/Expression/Try - Finally 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try - Finally 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Try - Finally 01.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Try - Finally 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try - Finally 02.fs.bsl index 4d463ef1077..485ce3440c4 100644 --- a/tests/service/data/SyntaxTree/Expression/Try - Finally 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try - Finally 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Try - Finally 02.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Try - Finally 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try - Finally 03.fs.bsl index 2ad046c6c6a..888a858a0f0 100644 --- a/tests/service/data/SyntaxTree/Expression/Try - Finally 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try - Finally 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Try - Finally 03.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Try - Finally 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try - Finally 04.fs.bsl index 58c6e87e550..b2f136869b9 100644 --- a/tests/service/data/SyntaxTree/Expression/Try - Finally 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try - Finally 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Try - Finally 04.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Try - With 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try - With 01.fs.bsl index beb30aedfe4..08875b8f3a7 100644 --- a/tests/service/data/SyntaxTree/Expression/Try - With 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try - With 01.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Try - With 01.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Try - With 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try - With 02.fs.bsl index 0fa71a2d560..204fd741e18 100644 --- a/tests/service/data/SyntaxTree/Expression/Try - With 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try - With 02.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Try - With 02.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Try - With 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try - With 03.fs.bsl index f357989f6d7..fe5f94352e8 100644 --- a/tests/service/data/SyntaxTree/Expression/Try - With 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try - With 03.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Try - With 03.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Try - With 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try - With 04.fs.bsl index b3ed1e9fdf0..f439d855df0 100644 --- a/tests/service/data/SyntaxTree/Expression/Try - With 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try - With 04.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Try - With 04.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Try - With 05.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try - With 05.fs.bsl index cce7a7716ca..7823ce6089c 100644 --- a/tests/service/data/SyntaxTree/Expression/Try - With 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try - With 05.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Try - With 05.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Try - With 06.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try - With 06.fs.bsl index 2f37ac458b1..603a3901a5e 100644 --- a/tests/service/data/SyntaxTree/Expression/Try - With 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try - With 06.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Try - With 06.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Try - With 07.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try - With 07.fs.bsl index 394af4cbd7c..12b11fc07ee 100644 --- a/tests/service/data/SyntaxTree/Expression/Try - With 07.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try - With 07.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Try - With 07.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Try - With 08.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try - With 08.fs.bsl index bcad7831beb..9c426b9d4fa 100644 --- a/tests/service/data/SyntaxTree/Expression/Try - With 08.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try - With 08.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Try - With 08.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Try - With 09.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try - With 09.fs.bsl index d3557177c85..bcd0d539de1 100644 --- a/tests/service/data/SyntaxTree/Expression/Try - With 09.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try - With 09.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Try - With 09.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Try 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try 01.fs.bsl index 94e5c9c690d..04b9f27838f 100644 --- a/tests/service/data/SyntaxTree/Expression/Try 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Try 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Try 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Try 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try 02.fs.bsl index b1330bbff79..6358f0552af 100644 --- a/tests/service/data/SyntaxTree/Expression/Try 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Try 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Try 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 01.fs.bsl index 8a17abd5fe8..12ae1ac3d16 100644 --- a/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Try with - Missing expr 01.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 02.fs.bsl index 4d6eeb04f62..e31ae30853d 100644 --- a/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Try with - Missing expr 02.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 03.fs.bsl index 74ec0b40076..d5a4c9de2cf 100644 --- a/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Try with - Missing expr 03.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 04.fs.bsl index 94ee31ce8d1..322b6cdcfaf 100644 --- a/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Try with - Missing expr 04.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 05.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 05.fs.bsl index e55f5f0b2ef..54b649fddd2 100644 --- a/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 05.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Try with - Missing expr 05.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Try with 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try with 01.fs.bsl index 3435a66a380..af5551daa63 100644 --- a/tests/service/data/SyntaxTree/Expression/Try with 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try with 01.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Try with 01.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 01.fs.bsl index 6df06c17cc4..53317050cc3 100644 --- a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Tuple - Missing item 01.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 02.fs.bsl index 8478b3cd009..d4aceb87dca 100644 --- a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Tuple - Missing item 02.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 03.fs.bsl index 8690087c0b8..bb8f51816ab 100644 --- a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Tuple - Missing item 03.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 04.fs.bsl index 142fb6f4d4d..9a66f322800 100644 --- a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Tuple - Missing item 04.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 05.fs.bsl b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 05.fs.bsl index 9ff45a09481..489f15001ef 100644 --- a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 05.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Tuple - Missing item 05.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 06.fs.bsl b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 06.fs.bsl index f1ac3a85d0a..05d5e0dc840 100644 --- a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 06.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Tuple - Missing item 06.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 07.fs.bsl b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 07.fs.bsl index 28b3b9ebffd..dc92dd51431 100644 --- a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 07.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 07.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Tuple - Missing item 07.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 08.fs.bsl b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 08.fs.bsl index 750a36647f4..95aec5d71da 100644 --- a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 08.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 08.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Tuple - Missing item 08.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 09.fs.bsl b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 09.fs.bsl index ee4a18e88a0..e5a9e4d42c6 100644 --- a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 09.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 09.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Tuple - Missing item 09.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 10.fs.bsl b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 10.fs.bsl index d44279250a4..189f47b0d4a 100644 --- a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 10.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 10.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Tuple - Missing item 10.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 11.fs.bsl b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 11.fs.bsl index df9f4900d70..122e7abe64d 100644 --- a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 11.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 11.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Tuple - Missing item 11.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/Tuple 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Tuple 01.fs.bsl index 5310605d97b..8046ca1a591 100644 --- a/tests/service/data/SyntaxTree/Expression/Tuple 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Tuple 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Tuple 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Tuple 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Tuple 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Tuple 02.fs.bsl index d8ef94b69a8..a62c6c8bf70 100644 --- a/tests/service/data/SyntaxTree/Expression/Tuple 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Tuple 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Tuple 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Tuple 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Type test 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Type test 01.fs.bsl index 7e404d712a8..be4f18af46f 100644 --- a/tests/service/data/SyntaxTree/Expression/Type test 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Type test 01.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Type test 01.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Type test 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Type test 02.fs.bsl index a0c458e845c..d0dfd00f953 100644 --- a/tests/service/data/SyntaxTree/Expression/Type test 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Type test 02.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Type test 02.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Type test 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Type test 03.fs.bsl index 4189996253d..1c19b97ab3a 100644 --- a/tests/service/data/SyntaxTree/Expression/Type test 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Type test 03.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Type test 03.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Type test 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/Type test 04.fs.bsl index ab70a127c9c..5ac7702ccc5 100644 --- a/tests/service/data/SyntaxTree/Expression/Type test 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Type test 04.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Type test 04.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Typed 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Typed 01.fs.bsl index 126033bd3a0..afc885f780b 100644 --- a/tests/service/data/SyntaxTree/Expression/Typed 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Typed 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Typed 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Typed 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr (Ident i, (3,0--3,1))], PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None, diff --git a/tests/service/data/SyntaxTree/Expression/Typed 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Typed 02.fs.bsl index cfca2392376..9649921172f 100644 --- a/tests/service/data/SyntaxTree/Expression/Typed 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Typed 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Typed 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Typed 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr (Ident i, (3,0--3,1))], PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None, diff --git a/tests/service/data/SyntaxTree/Expression/Typed 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Typed 03.fs.bsl index ea133deba4a..152e9469ec8 100644 --- a/tests/service/data/SyntaxTree/Expression/Typed 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Typed 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Typed 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Typed 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Typed 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/Typed 04.fs.bsl index 2bef6b3b004..e66721b9e9d 100644 --- a/tests/service/data/SyntaxTree/Expression/Typed 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Typed 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Typed 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Typed 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Unary - Reserved 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Unary - Reserved 01.fs.bsl index 0ef183357aa..59175a52b46 100644 --- a/tests/service/data/SyntaxTree/Expression/Unary - Reserved 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Unary - Reserved 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Unary - Reserved 01.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Unary - Reserved 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Unary - Reserved 02.fs.bsl index d246acbd5b9..3233fdcb50c 100644 --- a/tests/service/data/SyntaxTree/Expression/Unary - Reserved 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Unary - Reserved 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Unary - Reserved 02.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Unfinished escaped ident 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Unfinished escaped ident 01.fs.bsl index 7e4b6c613c6..b7f2a9d6a32 100644 --- a/tests/service/data/SyntaxTree/Expression/Unfinished escaped ident 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Unfinished escaped ident 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Unfinished escaped ident 01.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Unfinished escaped ident 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Unfinished escaped ident 02.fs.bsl index d85ff5016bd..c2c79d3a93b 100644 --- a/tests/service/data/SyntaxTree/Expression/Unfinished escaped ident 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Unfinished escaped ident 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Unfinished escaped ident 02.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Expression/Unfinished escaped ident 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Unfinished escaped ident 03.fs.bsl index 683dccae609..aa0013699c5 100644 --- a/tests/service/data/SyntaxTree/Expression/Unfinished escaped ident 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Unfinished escaped ident 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Expression/Unfinished escaped ident 03.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Upcast 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Upcast 01.fs.bsl index cd9537573ea..e035a107f97 100644 --- a/tests/service/data/SyntaxTree/Expression/Upcast 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Upcast 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Upcast 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Upcast 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Upcast 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Upcast 02.fs.bsl index 3b979512571..6b05aea94d8 100644 --- a/tests/service/data/SyntaxTree/Expression/Upcast 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Upcast 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Upcast 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Upcast 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr (Upcast (Ident i, Anon (4,0--4,2), (3,0--4,2)), (3,0--4,2))], diff --git a/tests/service/data/SyntaxTree/Expression/Upcast 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Upcast 03.fs.bsl index 174f880184b..b9a936a12b9 100644 --- a/tests/service/data/SyntaxTree/Expression/Upcast 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Upcast 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Upcast 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Upcast 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Upcast 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/Upcast 04.fs.bsl index adf29275cb5..f1ecbd819c0 100644 --- a/tests/service/data/SyntaxTree/Expression/Upcast 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Upcast 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Upcast 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Upcast 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/Upcast 05.fs.bsl b/tests/service/data/SyntaxTree/Expression/Upcast 05.fs.bsl index 62339dd016f..48d9573f6f0 100644 --- a/tests/service/data/SyntaxTree/Expression/Upcast 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Upcast 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/Upcast 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/Upcast 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/While 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/While 01.fs.bsl index e8039cbe2cf..3049058555b 100644 --- a/tests/service/data/SyntaxTree/Expression/While 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/While 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/While 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/While 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/While 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/While 02.fs.bsl index 99e63d5e069..3493bdcf886 100644 --- a/tests/service/data/SyntaxTree/Expression/While 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/While 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/While 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/While 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/While 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/While 03.fs.bsl index f8e8df6f239..e374d2e0c35 100644 --- a/tests/service/data/SyntaxTree/Expression/While 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/While 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/While 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/While 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/While 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/While 04.fs.bsl index 525fd0e42a5..4ebc6f63841 100644 --- a/tests/service/data/SyntaxTree/Expression/While 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/While 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/While 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/While 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/While 05.fs.bsl b/tests/service/data/SyntaxTree/Expression/While 05.fs.bsl index b6d3daf4f51..f08e61160f5 100644 --- a/tests/service/data/SyntaxTree/Expression/While 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/While 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/While 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/While 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/While 06.fs.bsl b/tests/service/data/SyntaxTree/Expression/While 06.fs.bsl index e106a73365d..acfb4b1e7b8 100644 --- a/tests/service/data/SyntaxTree/Expression/While 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/While 06.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Expression/While 06.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Expression/While 06.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/WhileBang 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/WhileBang 01.fs.bsl index 936525524f3..21848845316 100644 --- a/tests/service/data/SyntaxTree/Expression/WhileBang 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/WhileBang 01.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/WhileBang 01.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/WhileBang 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/WhileBang 02.fs.bsl index b12f9b0df18..e99b3701f0f 100644 --- a/tests/service/data/SyntaxTree/Expression/WhileBang 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/WhileBang 02.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/WhileBang 02.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Expression/WhileBang 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/WhileBang 03.fs.bsl index a5793465b34..4abd391541a 100644 --- a/tests/service/data/SyntaxTree/Expression/WhileBang 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/WhileBang 03.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/WhileBang 03.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/WhileBang 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/WhileBang 04.fs.bsl index 863c8aaabfe..964f4237a8a 100644 --- a/tests/service/data/SyntaxTree/Expression/WhileBang 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/WhileBang 04.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/WhileBang 04.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/WhileBang 05.fs.bsl b/tests/service/data/SyntaxTree/Expression/WhileBang 05.fs.bsl index e2f5875ef4b..c76eafad3e9 100644 --- a/tests/service/data/SyntaxTree/Expression/WhileBang 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/WhileBang 05.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/WhileBang 05.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Expression/WhileBang 06.fs.bsl b/tests/service/data/SyntaxTree/Expression/WhileBang 06.fs.bsl index 3c8ef1cbebf..86e0325ecf1 100644 --- a/tests/service/data/SyntaxTree/Expression/WhileBang 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/WhileBang 06.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Expression/WhileBang 06.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Extern/Extern 01.fs.bsl b/tests/service/data/SyntaxTree/Extern/Extern 01.fs.bsl index efb3580fda3..4f87de78b2c 100644 --- a/tests/service/data/SyntaxTree/Extern/Extern 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Extern/Extern 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Extern/Extern 01.fs", false, QualifiedNameOfFile Extern 01, [], [], + ("/root/Extern/Extern 01.fs", false, QualifiedNameOfFile Extern 01, [], [SynModuleOrNamespace ([Extern 01], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Extern/ExternKeywordIsPresentInTrivia.fs.bsl b/tests/service/data/SyntaxTree/Extern/ExternKeywordIsPresentInTrivia.fs.bsl index 8b6a9a601fc..28d52f58274 100644 --- a/tests/service/data/SyntaxTree/Extern/ExternKeywordIsPresentInTrivia.fs.bsl +++ b/tests/service/data/SyntaxTree/Extern/ExternKeywordIsPresentInTrivia.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Extern/ExternKeywordIsPresentInTrivia.fs", false, - QualifiedNameOfFile ExternKeywordIsPresentInTrivia, [], [], + QualifiedNameOfFile ExternKeywordIsPresentInTrivia, [], [SynModuleOrNamespace ([ExternKeywordIsPresentInTrivia], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/IfThenElse/Comment after else 01.fs.bsl b/tests/service/data/SyntaxTree/IfThenElse/Comment after else 01.fs.bsl index 6800642d8f9..d7290eedaed 100644 --- a/tests/service/data/SyntaxTree/IfThenElse/Comment after else 01.fs.bsl +++ b/tests/service/data/SyntaxTree/IfThenElse/Comment after else 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/IfThenElse/Comment after else 01.fs", false, - QualifiedNameOfFile Comment after else 01, [], [], + QualifiedNameOfFile Comment after else 01, [], [SynModuleOrNamespace ([Comment after else 01], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/IfThenElse/Comment after else 02.fs.bsl b/tests/service/data/SyntaxTree/IfThenElse/Comment after else 02.fs.bsl index 6fcbf474c2f..ec3583a93f6 100644 --- a/tests/service/data/SyntaxTree/IfThenElse/Comment after else 02.fs.bsl +++ b/tests/service/data/SyntaxTree/IfThenElse/Comment after else 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/IfThenElse/Comment after else 02.fs", false, - QualifiedNameOfFile Comment after else 02, [], [], + QualifiedNameOfFile Comment after else 02, [], [SynModuleOrNamespace ([Comment after else 02], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/IfThenElse/DeeplyNestedIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/IfThenElse/DeeplyNestedIfThenElse.fs.bsl index a94aa49c2f8..b13a3a890d1 100644 --- a/tests/service/data/SyntaxTree/IfThenElse/DeeplyNestedIfThenElse.fs.bsl +++ b/tests/service/data/SyntaxTree/IfThenElse/DeeplyNestedIfThenElse.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/IfThenElse/DeeplyNestedIfThenElse.fs", false, - QualifiedNameOfFile DeeplyNestedIfThenElse, [], [], + QualifiedNameOfFile DeeplyNestedIfThenElse, [], [SynModuleOrNamespace ([DeeplyNestedIfThenElse], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/IfThenElse/ElseKeywordInSimpleIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/IfThenElse/ElseKeywordInSimpleIfThenElse.fs.bsl index 4ee21824e57..4954134e7f3 100644 --- a/tests/service/data/SyntaxTree/IfThenElse/ElseKeywordInSimpleIfThenElse.fs.bsl +++ b/tests/service/data/SyntaxTree/IfThenElse/ElseKeywordInSimpleIfThenElse.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/IfThenElse/ElseKeywordInSimpleIfThenElse.fs", false, - QualifiedNameOfFile ElseKeywordInSimpleIfThenElse, [], [], + QualifiedNameOfFile ElseKeywordInSimpleIfThenElse, [], [SynModuleOrNamespace ([ElseKeywordInSimpleIfThenElse], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/IfThenElse/IfKeywordInIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/IfThenElse/IfKeywordInIfThenElse.fs.bsl index afb0f0222c3..2fbc822ee69 100644 --- a/tests/service/data/SyntaxTree/IfThenElse/IfKeywordInIfThenElse.fs.bsl +++ b/tests/service/data/SyntaxTree/IfThenElse/IfKeywordInIfThenElse.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/IfThenElse/IfKeywordInIfThenElse.fs", false, - QualifiedNameOfFile IfKeywordInIfThenElse, [], [], + QualifiedNameOfFile IfKeywordInIfThenElse, [], [SynModuleOrNamespace ([IfKeywordInIfThenElse], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/IfThenElse/IfThenAndElseKeywordOnSeparateLines.fs.bsl b/tests/service/data/SyntaxTree/IfThenElse/IfThenAndElseKeywordOnSeparateLines.fs.bsl index f1421e566ab..f5c3f698695 100644 --- a/tests/service/data/SyntaxTree/IfThenElse/IfThenAndElseKeywordOnSeparateLines.fs.bsl +++ b/tests/service/data/SyntaxTree/IfThenElse/IfThenAndElseKeywordOnSeparateLines.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/IfThenElse/IfThenAndElseKeywordOnSeparateLines.fs", false, - QualifiedNameOfFile IfThenAndElseKeywordOnSeparateLines, [], [], + QualifiedNameOfFile IfThenAndElseKeywordOnSeparateLines, [], [SynModuleOrNamespace ([IfThenAndElseKeywordOnSeparateLines], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/IfThenElse/NestedElifInIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/IfThenElse/NestedElifInIfThenElse.fs.bsl index 08b9a76501c..2ea8eec9f42 100644 --- a/tests/service/data/SyntaxTree/IfThenElse/NestedElifInIfThenElse.fs.bsl +++ b/tests/service/data/SyntaxTree/IfThenElse/NestedElifInIfThenElse.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/IfThenElse/NestedElifInIfThenElse.fs", false, - QualifiedNameOfFile NestedElifInIfThenElse, [], [], + QualifiedNameOfFile NestedElifInIfThenElse, [], [SynModuleOrNamespace ([NestedElifInIfThenElse], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/IfThenElse/NestedElseIfInIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/IfThenElse/NestedElseIfInIfThenElse.fs.bsl index 07bafab126e..7dc8e1fa8ea 100644 --- a/tests/service/data/SyntaxTree/IfThenElse/NestedElseIfInIfThenElse.fs.bsl +++ b/tests/service/data/SyntaxTree/IfThenElse/NestedElseIfInIfThenElse.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/IfThenElse/NestedElseIfInIfThenElse.fs", false, - QualifiedNameOfFile NestedElseIfInIfThenElse, [], [], + QualifiedNameOfFile NestedElseIfInIfThenElse, [], [SynModuleOrNamespace ([NestedElseIfInIfThenElse], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/IfThenElse/NestedElseIfOnTheSameLineInIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/IfThenElse/NestedElseIfOnTheSameLineInIfThenElse.fs.bsl index da6f78fb889..c6875396818 100644 --- a/tests/service/data/SyntaxTree/IfThenElse/NestedElseIfOnTheSameLineInIfThenElse.fs.bsl +++ b/tests/service/data/SyntaxTree/IfThenElse/NestedElseIfOnTheSameLineInIfThenElse.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/IfThenElse/NestedElseIfOnTheSameLineInIfThenElse.fs", false, - QualifiedNameOfFile NestedElseIfOnTheSameLineInIfThenElse, [], [], + QualifiedNameOfFile NestedElseIfOnTheSameLineInIfThenElse, [], [SynModuleOrNamespace ([NestedElseIfOnTheSameLineInIfThenElse], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Lambda/ComplexArgumentsLambdaHasArrowRange.fs.bsl b/tests/service/data/SyntaxTree/Lambda/ComplexArgumentsLambdaHasArrowRange.fs.bsl index b7334e423de..12c3f53464b 100644 --- a/tests/service/data/SyntaxTree/Lambda/ComplexArgumentsLambdaHasArrowRange.fs.bsl +++ b/tests/service/data/SyntaxTree/Lambda/ComplexArgumentsLambdaHasArrowRange.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs", false, - QualifiedNameOfFile ComplexArgumentsLambdaHasArrowRange, [], [], + QualifiedNameOfFile ComplexArgumentsLambdaHasArrowRange, [], [SynModuleOrNamespace ([ComplexArgumentsLambdaHasArrowRange], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Lambda/DestructedLambdaHasArrowRange.fs.bsl b/tests/service/data/SyntaxTree/Lambda/DestructedLambdaHasArrowRange.fs.bsl index 442d815a3dd..b4d356e54a3 100644 --- a/tests/service/data/SyntaxTree/Lambda/DestructedLambdaHasArrowRange.fs.bsl +++ b/tests/service/data/SyntaxTree/Lambda/DestructedLambdaHasArrowRange.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Lambda/DestructedLambdaHasArrowRange.fs", false, - QualifiedNameOfFile DestructedLambdaHasArrowRange, [], [], + QualifiedNameOfFile DestructedLambdaHasArrowRange, [], [SynModuleOrNamespace ([DestructedLambdaHasArrowRange], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs.bsl b/tests/service/data/SyntaxTree/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs.bsl index af455533914..9379103e026 100644 --- a/tests/service/data/SyntaxTree/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs.bsl +++ b/tests/service/data/SyntaxTree/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs", false, QualifiedNameOfFile LambdaWithTupleParameterWithWildCardGivesCorrectBody, - [], [], + [], [SynModuleOrNamespace ([LambdaWithTupleParameterWithWildCardGivesCorrectBody], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Lambda/LambdaWithTwoParametersGivesCorrectBody.fs.bsl b/tests/service/data/SyntaxTree/Lambda/LambdaWithTwoParametersGivesCorrectBody.fs.bsl index c014aa3236c..c3c75fd45ff 100644 --- a/tests/service/data/SyntaxTree/Lambda/LambdaWithTwoParametersGivesCorrectBody.fs.bsl +++ b/tests/service/data/SyntaxTree/Lambda/LambdaWithTwoParametersGivesCorrectBody.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Lambda/LambdaWithTwoParametersGivesCorrectBody.fs", false, - QualifiedNameOfFile LambdaWithTwoParametersGivesCorrectBody, [], [], + QualifiedNameOfFile LambdaWithTwoParametersGivesCorrectBody, [], [SynModuleOrNamespace ([LambdaWithTwoParametersGivesCorrectBody], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Lambda/LambdaWithWildCardParameterGivesCorrectBody.fs.bsl b/tests/service/data/SyntaxTree/Lambda/LambdaWithWildCardParameterGivesCorrectBody.fs.bsl index 9e2a1e33385..8e83682cda5 100644 --- a/tests/service/data/SyntaxTree/Lambda/LambdaWithWildCardParameterGivesCorrectBody.fs.bsl +++ b/tests/service/data/SyntaxTree/Lambda/LambdaWithWildCardParameterGivesCorrectBody.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Lambda/LambdaWithWildCardParameterGivesCorrectBody.fs", false, - QualifiedNameOfFile LambdaWithWildCardParameterGivesCorrectBody, [], [], + QualifiedNameOfFile LambdaWithWildCardParameterGivesCorrectBody, [], [SynModuleOrNamespace ([LambdaWithWildCardParameterGivesCorrectBody], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Lambda/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs.bsl b/tests/service/data/SyntaxTree/Lambda/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs.bsl index 83435aa48a5..ef6c14bf7e3 100644 --- a/tests/service/data/SyntaxTree/Lambda/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs.bsl +++ b/tests/service/data/SyntaxTree/Lambda/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Lambda/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs", false, QualifiedNameOfFile LambdaWithWildCardThatReturnsALambdaGivesCorrectBody, - [], [], + [], [SynModuleOrNamespace ([LambdaWithWildCardThatReturnsALambdaGivesCorrectBody], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Lambda/MultilineLambdaHasArrowRange.fs.bsl b/tests/service/data/SyntaxTree/Lambda/MultilineLambdaHasArrowRange.fs.bsl index 6d3ea6eea4a..dbd3126d5ac 100644 --- a/tests/service/data/SyntaxTree/Lambda/MultilineLambdaHasArrowRange.fs.bsl +++ b/tests/service/data/SyntaxTree/Lambda/MultilineLambdaHasArrowRange.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Lambda/MultilineLambdaHasArrowRange.fs", false, - QualifiedNameOfFile MultilineLambdaHasArrowRange, [], [], + QualifiedNameOfFile MultilineLambdaHasArrowRange, [], [SynModuleOrNamespace ([MultilineLambdaHasArrowRange], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Lambda/Param - Missing type 01.fs.bsl b/tests/service/data/SyntaxTree/Lambda/Param - Missing type 01.fs.bsl index cf6edce993f..af8ef7d643d 100644 --- a/tests/service/data/SyntaxTree/Lambda/Param - Missing type 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Lambda/Param - Missing type 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Lambda/Param - Missing type 01.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Lambda/Param - Missing type 02.fs.bsl b/tests/service/data/SyntaxTree/Lambda/Param - Missing type 02.fs.bsl index faf86a319e0..51172de35b4 100644 --- a/tests/service/data/SyntaxTree/Lambda/Param - Missing type 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Lambda/Param - Missing type 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Lambda/Param - Missing type 02.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Lambda/Param - Missing type 03.fs.bsl b/tests/service/data/SyntaxTree/Lambda/Param - Missing type 03.fs.bsl index 490a20dd75f..85ec1537c6a 100644 --- a/tests/service/data/SyntaxTree/Lambda/Param - Missing type 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Lambda/Param - Missing type 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Lambda/Param - Missing type 03.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Lambda/Param - Missing type 04.fs.bsl b/tests/service/data/SyntaxTree/Lambda/Param - Missing type 04.fs.bsl index 6c522c46bab..667c05c7ad7 100644 --- a/tests/service/data/SyntaxTree/Lambda/Param - Missing type 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Lambda/Param - Missing type 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Lambda/Param - Missing type 04.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Lambda/SimpleLambdaHasArrowRange.fs.bsl b/tests/service/data/SyntaxTree/Lambda/SimpleLambdaHasArrowRange.fs.bsl index 818107806bf..8bf8ad63cdc 100644 --- a/tests/service/data/SyntaxTree/Lambda/SimpleLambdaHasArrowRange.fs.bsl +++ b/tests/service/data/SyntaxTree/Lambda/SimpleLambdaHasArrowRange.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Lambda/SimpleLambdaHasArrowRange.fs", false, - QualifiedNameOfFile SimpleLambdaHasArrowRange, [], [], + QualifiedNameOfFile SimpleLambdaHasArrowRange, [], [SynModuleOrNamespace ([SimpleLambdaHasArrowRange], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Lambda/TupleInLambdaHasArrowRange.fs.bsl b/tests/service/data/SyntaxTree/Lambda/TupleInLambdaHasArrowRange.fs.bsl index 30442a303f0..6925a9c551d 100644 --- a/tests/service/data/SyntaxTree/Lambda/TupleInLambdaHasArrowRange.fs.bsl +++ b/tests/service/data/SyntaxTree/Lambda/TupleInLambdaHasArrowRange.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Lambda/TupleInLambdaHasArrowRange.fs", false, - QualifiedNameOfFile TupleInLambdaHasArrowRange, [], [], + QualifiedNameOfFile TupleInLambdaHasArrowRange, [], [SynModuleOrNamespace ([TupleInLambdaHasArrowRange], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/AbstractKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/AbstractKeyword.fs.bsl index 9c4b593e133..78e31e502e0 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/AbstractKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/AbstractKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/AbstractKeyword.fs", false, - QualifiedNameOfFile AbstractKeyword, [], [], + QualifiedNameOfFile AbstractKeyword, [], [SynModuleOrNamespace ([AbstractKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/AbstractMemberKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/AbstractMemberKeyword.fs.bsl index 0cbd9b3a434..be486c576bc 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/AbstractMemberKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/AbstractMemberKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/AbstractMemberKeyword.fs", false, - QualifiedNameOfFile AbstractMemberKeyword, [], [], + QualifiedNameOfFile AbstractMemberKeyword, [], [SynModuleOrNamespace ([AbstractMemberKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/AndKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/AndKeyword.fs.bsl index 7376e64e8e4..ba096898c56 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/AndKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/AndKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/AndKeyword.fs", false, - QualifiedNameOfFile AndKeyword, [], [], + QualifiedNameOfFile AndKeyword, [], [SynModuleOrNamespace ([AndKeyword], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/DefaultKeyword.fsi.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/DefaultKeyword.fsi.bsl index ba9b7296835..e77e558de93 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/DefaultKeyword.fsi.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/DefaultKeyword.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/LeadingKeyword/DefaultKeyword.fsi", - QualifiedNameOfFile DefaultKeyword, [], [], + QualifiedNameOfFile DefaultKeyword, [], [SynModuleOrNamespaceSig ([X], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/DefaultValKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/DefaultValKeyword.fs.bsl index 2c243f2ca9d..a7ab9cb90ca 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/DefaultValKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/DefaultValKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/DefaultValKeyword.fs", false, - QualifiedNameOfFile DefaultValKeyword, [], [], + QualifiedNameOfFile DefaultValKeyword, [], [SynModuleOrNamespace ([DefaultValKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/DoKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/DoKeyword.fs.bsl index 41ed25792f7..52f3642b5f4 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/DoKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/DoKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/DoKeyword.fs", false, QualifiedNameOfFile DoKeyword, - [], [], + [], [SynModuleOrNamespace ([DoKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/DoStaticKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/DoStaticKeyword.fs.bsl index 1c7e811ab69..d934ca16c1b 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/DoStaticKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/DoStaticKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/DoStaticKeyword.fs", false, - QualifiedNameOfFile DoStaticKeyword, [], [], + QualifiedNameOfFile DoStaticKeyword, [], [SynModuleOrNamespace ([DoStaticKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/ExternKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/ExternKeyword.fs.bsl index ae6df6a8091..7fa9ead546a 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/ExternKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/ExternKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/ExternKeyword.fs", false, - QualifiedNameOfFile ExternKeyword, [], [], + QualifiedNameOfFile ExternKeyword, [], [SynModuleOrNamespace ([ExternKeyword], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/LetKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/LetKeyword.fs.bsl index c783b4b4354..4bd1292b0fd 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/LetKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/LetKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/LetKeyword.fs", false, - QualifiedNameOfFile LetKeyword, [], [], + QualifiedNameOfFile LetKeyword, [], [SynModuleOrNamespace ([LetKeyword], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/LetRecKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/LetRecKeyword.fs.bsl index a5ecb2a98b5..79aa4994ee9 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/LetRecKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/LetRecKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/LetRecKeyword.fs", false, - QualifiedNameOfFile LetRecKeyword, [], [], + QualifiedNameOfFile LetRecKeyword, [], [SynModuleOrNamespace ([LetRecKeyword], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/MemberKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/MemberKeyword.fs.bsl index d9497db0bfe..44f0903d342 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/MemberKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/MemberKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/MemberKeyword.fs", false, - QualifiedNameOfFile MemberKeyword, [], [], + QualifiedNameOfFile MemberKeyword, [], [SynModuleOrNamespace ([MemberKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/MemberValKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/MemberValKeyword.fs.bsl index 63618be45b7..453116efb30 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/MemberValKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/MemberValKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/MemberValKeyword.fs", false, - QualifiedNameOfFile MemberValKeyword, [], [], + QualifiedNameOfFile MemberValKeyword, [], [SynModuleOrNamespace ([MemberValKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/NewKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/NewKeyword.fs.bsl index 1e408d27f4b..e8f6bedf730 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/NewKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/NewKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/NewKeyword.fs", false, - QualifiedNameOfFile NewKeyword, [], [], + QualifiedNameOfFile NewKeyword, [], [SynModuleOrNamespace ([NewKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/OverrideKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/OverrideKeyword.fs.bsl index 896ea64e69b..388ba7e5607 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/OverrideKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/OverrideKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/OverrideKeyword.fs", false, - QualifiedNameOfFile OverrideKeyword, [], [], + QualifiedNameOfFile OverrideKeyword, [], [SynModuleOrNamespace ([OverrideKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/OverrideValKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/OverrideValKeyword.fs.bsl index 3fff6cb5b0d..0fb8aada856 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/OverrideValKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/OverrideValKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/OverrideValKeyword.fs", false, - QualifiedNameOfFile OverrideValKeyword, [], [], + QualifiedNameOfFile OverrideValKeyword, [], [SynModuleOrNamespace ([OverrideValKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/StaticAbstractKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/StaticAbstractKeyword.fs.bsl index 92d3182daea..32f2dfa026b 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/StaticAbstractKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/StaticAbstractKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/StaticAbstractKeyword.fs", false, - QualifiedNameOfFile StaticAbstractKeyword, [], [], + QualifiedNameOfFile StaticAbstractKeyword, [], [SynModuleOrNamespace ([StaticAbstractKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/StaticAbstractMemberKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/StaticAbstractMemberKeyword.fs.bsl index 8b2dc3b5c8f..e1c0e6a68e4 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/StaticAbstractMemberKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/StaticAbstractMemberKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/StaticAbstractMemberKeyword.fs", false, - QualifiedNameOfFile StaticAbstractMemberKeyword, [], [], + QualifiedNameOfFile StaticAbstractMemberKeyword, [], [SynModuleOrNamespace ([StaticAbstractMemberKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/StaticLetKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/StaticLetKeyword.fs.bsl index 25ad616ec0f..00f1cf9feff 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/StaticLetKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/StaticLetKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/StaticLetKeyword.fs", false, - QualifiedNameOfFile StaticLetKeyword, [], [], + QualifiedNameOfFile StaticLetKeyword, [], [SynModuleOrNamespace ([StaticLetKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/StaticLetRecKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/StaticLetRecKeyword.fs.bsl index a0851241351..dec21949167 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/StaticLetRecKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/StaticLetRecKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/StaticLetRecKeyword.fs", false, - QualifiedNameOfFile StaticLetRecKeyword, [], [], + QualifiedNameOfFile StaticLetRecKeyword, [], [SynModuleOrNamespace ([StaticLetRecKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/StaticMemberKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/StaticMemberKeyword.fs.bsl index 70b40e7ccd2..ea9e474eacb 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/StaticMemberKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/StaticMemberKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/StaticMemberKeyword.fs", false, - QualifiedNameOfFile StaticMemberKeyword, [], [], + QualifiedNameOfFile StaticMemberKeyword, [], [SynModuleOrNamespace ([StaticMemberKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/StaticMemberValKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/StaticMemberValKeyword.fs.bsl index 1ce7e21fea2..7594f065fdb 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/StaticMemberValKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/StaticMemberValKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/StaticMemberValKeyword.fs", false, - QualifiedNameOfFile StaticMemberValKeyword, [], [], + QualifiedNameOfFile StaticMemberValKeyword, [], [SynModuleOrNamespace ([StaticMemberValKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/StaticValKeyword.fsi.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/StaticValKeyword.fsi.bsl index a30354d3b41..3515d71f264 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/StaticValKeyword.fsi.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/StaticValKeyword.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/LeadingKeyword/StaticValKeyword.fsi", - QualifiedNameOfFile StaticValKeyword, [], [], + QualifiedNameOfFile StaticValKeyword, [], [SynModuleOrNamespaceSig ([Meh], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/SyntheticKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/SyntheticKeyword.fs.bsl index b833f40ae10..608501eb6db 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/SyntheticKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/SyntheticKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/SyntheticKeyword.fs", false, - QualifiedNameOfFile SyntheticKeyword, [], [], + QualifiedNameOfFile SyntheticKeyword, [], [SynModuleOrNamespace ([SyntheticKeyword], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/UseKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/UseKeyword.fs.bsl index b2b3420c806..734d01d3539 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/UseKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/UseKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/UseKeyword.fs", false, - QualifiedNameOfFile UseKeyword, [], [], + QualifiedNameOfFile UseKeyword, [], [SynModuleOrNamespace ([UseKeyword], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/UseRecKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/UseRecKeyword.fs.bsl index 7dbbc35edd7..071d34cad2f 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/UseRecKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/UseRecKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/LeadingKeyword/UseRecKeyword.fs", false, - QualifiedNameOfFile UseRecKeyword, [], [], + QualifiedNameOfFile UseRecKeyword, [], [SynModuleOrNamespace ([UseRecKeyword], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/ValKeyword.fsi.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/ValKeyword.fsi.bsl index 1c940b8d6fd..d4db8d69210 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/ValKeyword.fsi.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/ValKeyword.fsi.bsl @@ -1,7 +1,6 @@ SigFile (ParsedSigFileInput ("/root/LeadingKeyword/ValKeyword.fsi", QualifiedNameOfFile ValKeyword, [], - [], [SynModuleOrNamespaceSig ([X], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/MatchClause/Missing expr 01.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/Missing expr 01.fs.bsl index 6f92c909aa0..cfac5d6711e 100644 --- a/tests/service/data/SyntaxTree/MatchClause/Missing expr 01.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/Missing expr 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/MatchClause/Missing expr 01.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/MatchClause/Missing expr 02.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/Missing expr 02.fs.bsl index a38e67668d2..a1d80d4909f 100644 --- a/tests/service/data/SyntaxTree/MatchClause/Missing expr 02.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/Missing expr 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/MatchClause/Missing expr 02.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/MatchClause/Missing expr 03.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/Missing expr 03.fs.bsl index 36e8ecc9e9b..26257f35a14 100644 --- a/tests/service/data/SyntaxTree/MatchClause/Missing expr 03.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/Missing expr 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/MatchClause/Missing expr 03.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/MatchClause/Missing expr 04.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/Missing expr 04.fs.bsl index eae47c2aa83..f330f9319b3 100644 --- a/tests/service/data/SyntaxTree/MatchClause/Missing expr 04.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/Missing expr 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/MatchClause/Missing expr 04.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/MatchClause/Missing expr 05.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/Missing expr 05.fs.bsl index 787b09b31dc..683382cc888 100644 --- a/tests/service/data/SyntaxTree/MatchClause/Missing expr 05.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/Missing expr 05.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/MatchClause/Missing expr 05.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/MatchClause/Missing pat 01.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/Missing pat 01.fs.bsl index 3e5974d65be..cd0f4bf48b8 100644 --- a/tests/service/data/SyntaxTree/MatchClause/Missing pat 01.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/Missing pat 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/MatchClause/Missing pat 01.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/MatchClause/Missing pat 02.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/Missing pat 02.fs.bsl index 0812581e1ff..c71769f1e3f 100644 --- a/tests/service/data/SyntaxTree/MatchClause/Missing pat 02.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/Missing pat 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/MatchClause/Missing pat 02.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/MatchClause/Missing pat 03.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/Missing pat 03.fs.bsl index 8fb3f4b8142..ded83f5f12e 100644 --- a/tests/service/data/SyntaxTree/MatchClause/Missing pat 03.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/Missing pat 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/MatchClause/Missing pat 03.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/MatchClause/Missing pat 04.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/Missing pat 04.fs.bsl index 8fde4f353ee..3e00098d245 100644 --- a/tests/service/data/SyntaxTree/MatchClause/Missing pat 04.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/Missing pat 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/MatchClause/Missing pat 04.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/MatchClause/Missing pat 05.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/Missing pat 05.fs.bsl index e9693065f21..54dbf18b339 100644 --- a/tests/service/data/SyntaxTree/MatchClause/Missing pat 05.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/Missing pat 05.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/MatchClause/Missing pat 05.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/MatchClause/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl index 79e765d0135..f07cb960713 100644 --- a/tests/service/data/SyntaxTree/MatchClause/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/MatchClause/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs", false, QualifiedNameOfFile NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith, - [], [], + [], [SynModuleOrNamespace ([NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfArrowInSynMatchClause.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfArrowInSynMatchClause.fs.bsl index 850422e1df8..17f4aee9ac6 100644 --- a/tests/service/data/SyntaxTree/MatchClause/RangeOfArrowInSynMatchClause.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfArrowInSynMatchClause.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/MatchClause/RangeOfArrowInSynMatchClause.fs", false, - QualifiedNameOfFile RangeOfArrowInSynMatchClause, [], [], + QualifiedNameOfFile RangeOfArrowInSynMatchClause, [], [SynModuleOrNamespace ([RangeOfArrowInSynMatchClause], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfArrowInSynMatchClauseWithWhenClause.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfArrowInSynMatchClauseWithWhenClause.fs.bsl index 3ec91a6aab5..78e5fcbe803 100644 --- a/tests/service/data/SyntaxTree/MatchClause/RangeOfArrowInSynMatchClauseWithWhenClause.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfArrowInSynMatchClauseWithWhenClause.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/MatchClause/RangeOfArrowInSynMatchClauseWithWhenClause.fs", false, - QualifiedNameOfFile RangeOfArrowInSynMatchClauseWithWhenClause, [], [], + QualifiedNameOfFile RangeOfArrowInSynMatchClauseWithWhenClause, [], [SynModuleOrNamespace ([RangeOfArrowInSynMatchClauseWithWhenClause], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs.bsl index 00fd4e2de7b..798697b854c 100644 --- a/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs", false, QualifiedNameOfFile RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith, - [], [], + [], [SynModuleOrNamespace ([RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs.bsl index 744fc813f3c..c8fe46a507a 100644 --- a/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs.bsl @@ -2,7 +2,7 @@ ImplFile (ParsedImplFileInput ("/root/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs", false, QualifiedNameOfFile RangeOfBarInASingleSynMatchClauseInSynExprMatch, - [], [], + [], [SynModuleOrNamespace ([RangeOfBarInASingleSynMatchClauseInSynExprMatch], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl index 8306431f657..55f4d62599f 100644 --- a/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl @@ -3,7 +3,6 @@ ImplFile ("/root/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs", false, QualifiedNameOfFile RangeOfBarInASingleSynMatchClauseInSynExprTryWith, [], - [], [SynModuleOrNamespace ([RangeOfBarInASingleSynMatchClauseInSynExprTryWith], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs.bsl index 02122fba61d..01c34274a54 100644 --- a/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs.bsl @@ -3,7 +3,6 @@ ImplFile ("/root/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs", false, QualifiedNameOfFile RangeOfBarInMultipleSynMatchClausesInSynExprMatch, [], - [], [SynModuleOrNamespace ([RangeOfBarInMultipleSynMatchClausesInSynExprMatch], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfMultipleSynMatchClause.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfMultipleSynMatchClause.fs.bsl index 84ce5019498..0dea35e32dd 100644 --- a/tests/service/data/SyntaxTree/MatchClause/RangeOfMultipleSynMatchClause.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfMultipleSynMatchClause.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/MatchClause/RangeOfMultipleSynMatchClause.fs", false, - QualifiedNameOfFile RangeOfMultipleSynMatchClause, [], [], + QualifiedNameOfFile RangeOfMultipleSynMatchClause, [], [SynModuleOrNamespace ([RangeOfMultipleSynMatchClause], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClause.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClause.fs.bsl index dfa2ad58587..81dc7bcb3b8 100644 --- a/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClause.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClause.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/MatchClause/RangeOfSingleSynMatchClause.fs", false, - QualifiedNameOfFile RangeOfSingleSynMatchClause, [], [], + QualifiedNameOfFile RangeOfSingleSynMatchClause, [], [SynModuleOrNamespace ([RangeOfSingleSynMatchClause], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl index ea10cf70558..e2f461a46e9 100644 --- a/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs", false, - QualifiedNameOfFile RangeOfSingleSynMatchClauseFollowedByBar, [], [], + QualifiedNameOfFile RangeOfSingleSynMatchClauseFollowedByBar, [], [SynModuleOrNamespace ([RangeOfSingleSynMatchClauseFollowedByBar], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Measure/Constant - 01.fs.bsl b/tests/service/data/SyntaxTree/Measure/Constant - 01.fs.bsl index a9bc46a831a..be033366ce9 100644 --- a/tests/service/data/SyntaxTree/Measure/Constant - 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Measure/Constant - 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Measure/Constant - 01.fs", false, QualifiedNameOfFile M, [], [], + ("/root/Measure/Constant - 01.fs", false, QualifiedNameOfFile M, [], [SynModuleOrNamespace ([M], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Measure/Constant - 02.fs.bsl b/tests/service/data/SyntaxTree/Measure/Constant - 02.fs.bsl index 9cc97f47504..92cf6fe29a5 100644 --- a/tests/service/data/SyntaxTree/Measure/Constant - 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Measure/Constant - 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Measure/Constant - 02.fs", false, QualifiedNameOfFile M, [], [], + ("/root/Measure/Constant - 02.fs", false, QualifiedNameOfFile M, [], [SynModuleOrNamespace ([M], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Measure/Constant - 03.fs.bsl b/tests/service/data/SyntaxTree/Measure/Constant - 03.fs.bsl index a28e62906de..e85e2aa0fe8 100644 --- a/tests/service/data/SyntaxTree/Measure/Constant - 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Measure/Constant - 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Measure/Constant - 03.fs", false, QualifiedNameOfFile M, [], [], + ("/root/Measure/Constant - 03.fs", false, QualifiedNameOfFile M, [], [SynModuleOrNamespace ([M], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Measure/Constant - 04.fs.bsl b/tests/service/data/SyntaxTree/Measure/Constant - 04.fs.bsl index bf2ab0c3bd3..99f417c0bdc 100644 --- a/tests/service/data/SyntaxTree/Measure/Constant - 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Measure/Constant - 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Measure/Constant - 04.fs", false, QualifiedNameOfFile M, [], [], + ("/root/Measure/Constant - 04.fs", false, QualifiedNameOfFile M, [], [SynModuleOrNamespace ([M], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Measure/Constant - 05.fs.bsl b/tests/service/data/SyntaxTree/Measure/Constant - 05.fs.bsl index b18f6f4a22f..8d3a97520e0 100644 --- a/tests/service/data/SyntaxTree/Measure/Constant - 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Measure/Constant - 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Measure/Constant - 05.fs", false, QualifiedNameOfFile M, [], [], + ("/root/Measure/Constant - 05.fs", false, QualifiedNameOfFile M, [], [SynModuleOrNamespace ([M], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Measure/Constant - 06.fs.bsl b/tests/service/data/SyntaxTree/Measure/Constant - 06.fs.bsl index 7d5bac5d2e4..44ce7c44e29 100644 --- a/tests/service/data/SyntaxTree/Measure/Constant - 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Measure/Constant - 06.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Measure/Constant - 06.fs", false, QualifiedNameOfFile M, [], [], + ("/root/Measure/Constant - 06.fs", false, QualifiedNameOfFile M, [], [SynModuleOrNamespace ([M], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Measure/Constant - 07.fs.bsl b/tests/service/data/SyntaxTree/Measure/Constant - 07.fs.bsl index db9e83c0fb8..9b522c0b0f1 100644 --- a/tests/service/data/SyntaxTree/Measure/Constant - 07.fs.bsl +++ b/tests/service/data/SyntaxTree/Measure/Constant - 07.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Measure/Constant - 07.fs", false, QualifiedNameOfFile M, [], [], + ("/root/Measure/Constant - 07.fs", false, QualifiedNameOfFile M, [], [SynModuleOrNamespace ([M], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Measure/Constant - 08.fs.bsl b/tests/service/data/SyntaxTree/Measure/Constant - 08.fs.bsl index b4a8f0b48c2..6618ecbaa60 100644 --- a/tests/service/data/SyntaxTree/Measure/Constant - 08.fs.bsl +++ b/tests/service/data/SyntaxTree/Measure/Constant - 08.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Measure/Constant - 08.fs", false, QualifiedNameOfFile M, [], [], + ("/root/Measure/Constant - 08.fs", false, QualifiedNameOfFile M, [], [SynModuleOrNamespace ([M], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Measure/Constant - 09.fs.bsl b/tests/service/data/SyntaxTree/Measure/Constant - 09.fs.bsl index 2eeee44a379..bff140cca4e 100644 --- a/tests/service/data/SyntaxTree/Measure/Constant - 09.fs.bsl +++ b/tests/service/data/SyntaxTree/Measure/Constant - 09.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Measure/Constant - 09.fs", false, QualifiedNameOfFile M, [], [], + ("/root/Measure/Constant - 09.fs", false, QualifiedNameOfFile M, [], [SynModuleOrNamespace ([M], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Measure/Constant - 10.fs.bsl b/tests/service/data/SyntaxTree/Measure/Constant - 10.fs.bsl index f6e6b3d7fee..9b4a689fcba 100644 --- a/tests/service/data/SyntaxTree/Measure/Constant - 10.fs.bsl +++ b/tests/service/data/SyntaxTree/Measure/Constant - 10.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Measure/Constant - 10.fs", false, QualifiedNameOfFile M, [], [], + ("/root/Measure/Constant - 10.fs", false, QualifiedNameOfFile M, [], [SynModuleOrNamespace ([M], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Measure/MeasureContainsTheRangeOfTheConstant.fs.bsl b/tests/service/data/SyntaxTree/Measure/MeasureContainsTheRangeOfTheConstant.fs.bsl index b0150fbdc0b..c9ba8332c0b 100644 --- a/tests/service/data/SyntaxTree/Measure/MeasureContainsTheRangeOfTheConstant.fs.bsl +++ b/tests/service/data/SyntaxTree/Measure/MeasureContainsTheRangeOfTheConstant.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Measure/MeasureContainsTheRangeOfTheConstant.fs", false, - QualifiedNameOfFile MeasureContainsTheRangeOfTheConstant, [], [], + QualifiedNameOfFile MeasureContainsTheRangeOfTheConstant, [], [SynModuleOrNamespace ([MeasureContainsTheRangeOfTheConstant], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Measure/SynMeasureParenHasCorrectRange.fs.bsl b/tests/service/data/SyntaxTree/Measure/SynMeasureParenHasCorrectRange.fs.bsl index 84f544b9146..989fe9b1b6e 100644 --- a/tests/service/data/SyntaxTree/Measure/SynMeasureParenHasCorrectRange.fs.bsl +++ b/tests/service/data/SyntaxTree/Measure/SynMeasureParenHasCorrectRange.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Measure/SynMeasureParenHasCorrectRange.fs", false, - QualifiedNameOfFile SynMeasureParenHasCorrectRange, [], [], + QualifiedNameOfFile SynMeasureParenHasCorrectRange, [], [SynModuleOrNamespace ([SynMeasureParenHasCorrectRange], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithLeadingSlash.fs.bsl b/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithLeadingSlash.fs.bsl index 65535c03d20..23fe857a2c0 100644 --- a/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithLeadingSlash.fs.bsl +++ b/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithLeadingSlash.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Measure/SynTypeTupleInMeasureTypeWithLeadingSlash.fs", false, - QualifiedNameOfFile SynTypeTupleInMeasureTypeWithLeadingSlash, [], [], + QualifiedNameOfFile SynTypeTupleInMeasureTypeWithLeadingSlash, [], [SynModuleOrNamespace ([SynTypeTupleInMeasureTypeWithLeadingSlash], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithNoSlashes.fs.bsl b/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithNoSlashes.fs.bsl index dca088b13db..fb57de4ffa2 100644 --- a/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithNoSlashes.fs.bsl +++ b/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithNoSlashes.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Measure/SynTypeTupleInMeasureTypeWithNoSlashes.fs", false, - QualifiedNameOfFile SynTypeTupleInMeasureTypeWithNoSlashes, [], [], + QualifiedNameOfFile SynTypeTupleInMeasureTypeWithNoSlashes, [], [SynModuleOrNamespace ([SynTypeTupleInMeasureTypeWithNoSlashes], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithStartAndSlash.fs.bsl b/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithStartAndSlash.fs.bsl index f47273a687c..e199893f482 100644 --- a/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithStartAndSlash.fs.bsl +++ b/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithStartAndSlash.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Measure/SynTypeTupleInMeasureTypeWithStartAndSlash.fs", false, - QualifiedNameOfFile SynTypeTupleInMeasureTypeWithStartAndSlash, [], [], + QualifiedNameOfFile SynTypeTupleInMeasureTypeWithStartAndSlash, [], [SynModuleOrNamespace ([SynTypeTupleInMeasureTypeWithStartAndSlash], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Abstract - Property 01.fs.bsl b/tests/service/data/SyntaxTree/Member/Abstract - Property 01.fs.bsl index 9ec3b5452d7..62d6dcb128d 100644 --- a/tests/service/data/SyntaxTree/Member/Abstract - Property 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Abstract - Property 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Abstract - Property 01.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Abstract - Property 02.fs.bsl b/tests/service/data/SyntaxTree/Member/Abstract - Property 02.fs.bsl index 95ced08879b..6aeb84faf96 100644 --- a/tests/service/data/SyntaxTree/Member/Abstract - Property 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Abstract - Property 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Abstract - Property 02.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Abstract - Property 03.fs.bsl b/tests/service/data/SyntaxTree/Member/Abstract - Property 03.fs.bsl index d9393dc8da0..4ca2a6dc24a 100644 --- a/tests/service/data/SyntaxTree/Member/Abstract - Property 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Abstract - Property 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Abstract - Property 03.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Abstract - Property 04.fs.bsl b/tests/service/data/SyntaxTree/Member/Abstract - Property 04.fs.bsl index f315032ac6c..1018995483e 100644 --- a/tests/service/data/SyntaxTree/Member/Abstract - Property 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Abstract - Property 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Abstract - Property 04.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Abstract - Property 05.fs.bsl b/tests/service/data/SyntaxTree/Member/Abstract - Property 05.fs.bsl index e8092cae4f6..1e064665081 100644 --- a/tests/service/data/SyntaxTree/Member/Abstract - Property 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Abstract - Property 05.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Abstract - Property 05.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Auto property 01.fs.bsl b/tests/service/data/SyntaxTree/Member/Auto property 01.fs.bsl index 211a0fed943..60ef1663b5d 100644 --- a/tests/service/data/SyntaxTree/Member/Auto property 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Auto property 01.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Member/Auto property 01.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Auto property 02.fs.bsl b/tests/service/data/SyntaxTree/Member/Auto property 02.fs.bsl index 31f825ba1af..51398f18bbf 100644 --- a/tests/service/data/SyntaxTree/Member/Auto property 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Auto property 02.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Member/Auto property 02.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Auto property 03.fs.bsl b/tests/service/data/SyntaxTree/Member/Auto property 03.fs.bsl index fced13abaa4..3d9347395c7 100644 --- a/tests/service/data/SyntaxTree/Member/Auto property 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Auto property 03.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Member/Auto property 03.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Auto property 04.fs.bsl b/tests/service/data/SyntaxTree/Member/Auto property 04.fs.bsl index 19e8d589688..0328439cf1b 100644 --- a/tests/service/data/SyntaxTree/Member/Auto property 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Auto property 04.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Member/Auto property 04.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Auto property 05.fs.bsl b/tests/service/data/SyntaxTree/Member/Auto property 05.fs.bsl index ca97d03b523..96621f4e06c 100644 --- a/tests/service/data/SyntaxTree/Member/Auto property 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Auto property 05.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Member/Auto property 05.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Auto property 06.fs.bsl b/tests/service/data/SyntaxTree/Member/Auto property 06.fs.bsl index 6a60db20a73..555b6714c71 100644 --- a/tests/service/data/SyntaxTree/Member/Auto property 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Auto property 06.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Member/Auto property 06.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Auto property 07.fs.bsl b/tests/service/data/SyntaxTree/Member/Auto property 07.fs.bsl index 8e6436d4eb4..d16172f698d 100644 --- a/tests/service/data/SyntaxTree/Member/Auto property 07.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Auto property 07.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Auto property 07.fs", false, QualifiedNameOfFile A, [], [], + ("/root/Member/Auto property 07.fs", false, QualifiedNameOfFile A, [], [SynModuleOrNamespace ([A], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Auto property 08.fs.bsl b/tests/service/data/SyntaxTree/Member/Auto property 08.fs.bsl index b4d9c9da2c4..bcaa846ea85 100644 --- a/tests/service/data/SyntaxTree/Member/Auto property 08.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Auto property 08.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Member/Auto property 08.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Auto property 09.fs.bsl b/tests/service/data/SyntaxTree/Member/Auto property 09.fs.bsl index 5599ff4faa3..d0b7368ab15 100644 --- a/tests/service/data/SyntaxTree/Member/Auto property 09.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Auto property 09.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Member/Auto property 09.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Auto property 10.fs.bsl b/tests/service/data/SyntaxTree/Member/Auto property 10.fs.bsl index 0a94591f95a..b5971dd68ef 100644 --- a/tests/service/data/SyntaxTree/Member/Auto property 10.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Auto property 10.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Member/Auto property 10.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Auto property 11.fs.bsl b/tests/service/data/SyntaxTree/Member/Auto property 11.fs.bsl index f6f1fb9e52b..0f1b1a6f59a 100644 --- a/tests/service/data/SyntaxTree/Member/Auto property 11.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Auto property 11.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Member/Auto property 11.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Auto property 12.fs.bsl b/tests/service/data/SyntaxTree/Member/Auto property 12.fs.bsl index da5a5eb7b72..210188e5c48 100644 --- a/tests/service/data/SyntaxTree/Member/Auto property 12.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Auto property 12.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Member/Auto property 12.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Auto property 13.fs.bsl b/tests/service/data/SyntaxTree/Member/Auto property 13.fs.bsl index b28a6d273bb..6b504d3eac1 100644 --- a/tests/service/data/SyntaxTree/Member/Auto property 13.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Auto property 13.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Member/Auto property 13.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Auto property 14.fs.bsl b/tests/service/data/SyntaxTree/Member/Auto property 14.fs.bsl index d9725daa923..61921f11306 100644 --- a/tests/service/data/SyntaxTree/Member/Auto property 14.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Auto property 14.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Auto property 14.fs", false, QualifiedNameOfFile A, [], [], + ("/root/Member/Auto property 14.fs", false, QualifiedNameOfFile A, [], [SynModuleOrNamespace ([A], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Auto property 15.fs.bsl b/tests/service/data/SyntaxTree/Member/Auto property 15.fs.bsl index 417da42ef8a..780a8d2b45d 100644 --- a/tests/service/data/SyntaxTree/Member/Auto property 15.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Auto property 15.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Auto property 15.fs", false, QualifiedNameOfFile A, [], [], + ("/root/Member/Auto property 15.fs", false, QualifiedNameOfFile A, [], [SynModuleOrNamespace ([A], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Do 01.fs.bsl b/tests/service/data/SyntaxTree/Member/Do 01.fs.bsl index 5f63d7bdc38..7c4535a5e7a 100644 --- a/tests/service/data/SyntaxTree/Member/Do 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Do 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Do 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Do 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Do 02.fs.bsl b/tests/service/data/SyntaxTree/Member/Do 02.fs.bsl index 1585d6135ee..959c849d866 100644 --- a/tests/service/data/SyntaxTree/Member/Do 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Do 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Do 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Do 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Do 03.fs.bsl b/tests/service/data/SyntaxTree/Member/Do 03.fs.bsl index b255897d0e8..631d336cb7c 100644 --- a/tests/service/data/SyntaxTree/Member/Do 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Do 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Do 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Do 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Do 04.fs.bsl b/tests/service/data/SyntaxTree/Member/Do 04.fs.bsl index 637426c98df..037cceb93bb 100644 --- a/tests/service/data/SyntaxTree/Member/Do 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Do 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Do 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Do 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Field 01.fs.bsl b/tests/service/data/SyntaxTree/Member/Field 01.fs.bsl index add8ac4adbe..be888b8d1cd 100644 --- a/tests/service/data/SyntaxTree/Member/Field 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Field 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Field 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Field 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Field 02.fs.bsl b/tests/service/data/SyntaxTree/Member/Field 02.fs.bsl index 33eba0a9f87..326fac0c868 100644 --- a/tests/service/data/SyntaxTree/Member/Field 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Field 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Field 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Field 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Field 03.fs.bsl b/tests/service/data/SyntaxTree/Member/Field 03.fs.bsl index 4308cbcfebb..2775859c003 100644 --- a/tests/service/data/SyntaxTree/Member/Field 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Field 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Field 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Field 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Field 04.fs.bsl b/tests/service/data/SyntaxTree/Member/Field 04.fs.bsl index e481768ccb4..70c40c10aaa 100644 --- a/tests/service/data/SyntaxTree/Member/Field 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Field 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Field 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Field 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Field 05.fs.bsl b/tests/service/data/SyntaxTree/Member/Field 05.fs.bsl index 46cf2e29c7f..1b1b74ebb2f 100644 --- a/tests/service/data/SyntaxTree/Member/Field 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Field 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Field 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Field 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Field 06.fs.bsl b/tests/service/data/SyntaxTree/Member/Field 06.fs.bsl index 723a8c44f25..5f843495fff 100644 --- a/tests/service/data/SyntaxTree/Member/Field 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Field 06.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Field 06.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Field 06.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Field 07.fs.bsl b/tests/service/data/SyntaxTree/Member/Field 07.fs.bsl index e62126034db..cdce2dc24d4 100644 --- a/tests/service/data/SyntaxTree/Member/Field 07.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Field 07.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Field 07.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Field 07.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Field 08.fs.bsl b/tests/service/data/SyntaxTree/Member/Field 08.fs.bsl index c74f09be72c..b1827032bea 100644 --- a/tests/service/data/SyntaxTree/Member/Field 08.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Field 08.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Field 08.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Field 08.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Field 09.fs.bsl b/tests/service/data/SyntaxTree/Member/Field 09.fs.bsl index 8b4d8d1fa48..18cb28b4b33 100644 --- a/tests/service/data/SyntaxTree/Member/Field 09.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Field 09.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Field 09.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Field 09.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Field 10.fs.bsl b/tests/service/data/SyntaxTree/Member/Field 10.fs.bsl index 77016903ad5..9f1d0e80091 100644 --- a/tests/service/data/SyntaxTree/Member/Field 10.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Field 10.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Field 10.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Field 10.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Field 11.fs.bsl b/tests/service/data/SyntaxTree/Member/Field 11.fs.bsl index 4f3cfe4b8b4..8eb1bdb43af 100644 --- a/tests/service/data/SyntaxTree/Member/Field 11.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Field 11.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Field 11.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Field 11.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Field 12.fs.bsl b/tests/service/data/SyntaxTree/Member/Field 12.fs.bsl index d29045ba0e7..c6241ae8e53 100644 --- a/tests/service/data/SyntaxTree/Member/Field 12.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Field 12.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Field 12.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Field 12.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Field 13.fs.bsl b/tests/service/data/SyntaxTree/Member/Field 13.fs.bsl index 3b42126b6db..ec73e1f93ad 100644 --- a/tests/service/data/SyntaxTree/Member/Field 13.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Field 13.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Field 13.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Field 13.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Field 14.fs.bsl b/tests/service/data/SyntaxTree/Member/Field 14.fs.bsl index b9ae59996cf..2607772504f 100644 --- a/tests/service/data/SyntaxTree/Member/Field 14.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Field 14.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Field 14.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Field 14.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Field 15.fs.bsl b/tests/service/data/SyntaxTree/Member/Field 15.fs.bsl index 472d5e0c2f9..9b157845ece 100644 --- a/tests/service/data/SyntaxTree/Member/Field 15.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Field 15.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Field 15.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Field 15.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/GetSetMember 01.fs.bsl b/tests/service/data/SyntaxTree/Member/GetSetMember 01.fs.bsl index 55fb27c87bd..2e4c1f12327 100644 --- a/tests/service/data/SyntaxTree/Member/GetSetMember 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/GetSetMember 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/GetSetMember 01.fs", false, QualifiedNameOfFile Foo, [], [], + ("/root/Member/GetSetMember 01.fs", false, QualifiedNameOfFile Foo, [], [SynModuleOrNamespace ([Foo], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/GetSetMemberWithInlineKeyword.fs.bsl b/tests/service/data/SyntaxTree/Member/GetSetMemberWithInlineKeyword.fs.bsl index 3768075ef94..31857360101 100644 --- a/tests/service/data/SyntaxTree/Member/GetSetMemberWithInlineKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/GetSetMemberWithInlineKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/GetSetMemberWithInlineKeyword.fs", false, - QualifiedNameOfFile GetSetMemberWithInlineKeyword, [], [], + QualifiedNameOfFile GetSetMemberWithInlineKeyword, [], [SynModuleOrNamespace ([GetSetMemberWithInlineKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Implicit ctor - Missing type 01.fs.bsl b/tests/service/data/SyntaxTree/Member/Implicit ctor - Missing type 01.fs.bsl index d603121ea71..2de703a9046 100644 --- a/tests/service/data/SyntaxTree/Member/Implicit ctor - Missing type 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Implicit ctor - Missing type 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Implicit ctor - Missing type 01.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Implicit ctor - Missing type 02.fs.bsl b/tests/service/data/SyntaxTree/Member/Implicit ctor - Missing type 02.fs.bsl index d963c4115e8..97aed02699b 100644 --- a/tests/service/data/SyntaxTree/Member/Implicit ctor - Missing type 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Implicit ctor - Missing type 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Implicit ctor - Missing type 02.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Implicit ctor - Pat - Tuple 01.fs.bsl b/tests/service/data/SyntaxTree/Member/Implicit ctor - Pat - Tuple 01.fs.bsl index 2bc4b5f488f..74ce95ad59a 100644 --- a/tests/service/data/SyntaxTree/Member/Implicit ctor - Pat - Tuple 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Implicit ctor - Pat - Tuple 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Implicit ctor - Pat - Tuple 01.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Implicit ctor - Pat - Tuple 02.fs.bsl b/tests/service/data/SyntaxTree/Member/Implicit ctor - Pat - Tuple 02.fs.bsl index 35502745762..d685d70cc14 100644 --- a/tests/service/data/SyntaxTree/Member/Implicit ctor - Pat - Tuple 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Implicit ctor - Pat - Tuple 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Implicit ctor - Pat - Tuple 02.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 01.fs.bsl b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 01.fs.bsl index 424a3619305..b13f07e8d00 100644 --- a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Implicit ctor - Type - Fun 01.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 02.fs.bsl b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 02.fs.bsl index 0146ad5a153..f9b9daf5c24 100644 --- a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Implicit ctor - Type - Fun 02.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 03.fs.bsl b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 03.fs.bsl index 61b3b7f3776..76acdf90cf1 100644 --- a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Implicit ctor - Type - Fun 03.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 04.fs.bsl b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 04.fs.bsl index ca30a8c2327..e223fed4354 100644 --- a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Implicit ctor - Type - Fun 04.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 05.fs.bsl b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 05.fs.bsl index bd89bbaf94e..3e659881def 100644 --- a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 05.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Implicit ctor - Type - Fun 05.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 06.fs.bsl b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 06.fs.bsl index ac58a094acb..64fb82d0e7e 100644 --- a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Fun 06.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Implicit ctor - Type - Fun 06.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Tuple 01.fs.bsl b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Tuple 01.fs.bsl index 473bd768b3c..1fec29a3069 100644 --- a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Tuple 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Tuple 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Implicit ctor - Type - Tuple 01.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Tuple 02.fs.bsl b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Tuple 02.fs.bsl index 57b5279161a..f08eb8a36b8 100644 --- a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Tuple 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Tuple 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Implicit ctor - Type - Tuple 02.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Tuple 03.fs.bsl b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Tuple 03.fs.bsl index 92b69f0c2b2..ce53c83362c 100644 --- a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Tuple 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Tuple 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Implicit ctor - Type - Tuple 03.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Tuple 04.fs.bsl b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Tuple 04.fs.bsl index 5ff10cae81b..3c008d94ffe 100644 --- a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Tuple 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Tuple 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Implicit ctor - Type - Tuple 04.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Tuple 05.fs.bsl b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Tuple 05.fs.bsl index a39da9cc29e..ed91cce2068 100644 --- a/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Tuple 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Implicit ctor - Type - Tuple 05.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Implicit ctor - Type - Tuple 05.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/ImplicitCtorWithAsKeyword.fs.bsl b/tests/service/data/SyntaxTree/Member/ImplicitCtorWithAsKeyword.fs.bsl index 61f182611f8..7a2162f049a 100644 --- a/tests/service/data/SyntaxTree/Member/ImplicitCtorWithAsKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/ImplicitCtorWithAsKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/ImplicitCtorWithAsKeyword.fs", false, - QualifiedNameOfFile ImplicitCtorWithAsKeyword, [], [], + QualifiedNameOfFile ImplicitCtorWithAsKeyword, [], [SynModuleOrNamespace ([ImplicitCtorWithAsKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Inherit 01.fs.bsl b/tests/service/data/SyntaxTree/Member/Inherit 01.fs.bsl index e138535c113..463e5fae508 100644 --- a/tests/service/data/SyntaxTree/Member/Inherit 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Inherit 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Inherit 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Inherit 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Inherit 02.fs.bsl b/tests/service/data/SyntaxTree/Member/Inherit 02.fs.bsl index 51185750c32..3e382c3b622 100644 --- a/tests/service/data/SyntaxTree/Member/Inherit 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Inherit 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Inherit 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Inherit 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Inherit 03.fs.bsl b/tests/service/data/SyntaxTree/Member/Inherit 03.fs.bsl index eeab1704856..97ca5055419 100644 --- a/tests/service/data/SyntaxTree/Member/Inherit 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Inherit 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Inherit 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Inherit 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Inherit 04.fs.bsl b/tests/service/data/SyntaxTree/Member/Inherit 04.fs.bsl index 9c03baf2b56..b2f8c3a069d 100644 --- a/tests/service/data/SyntaxTree/Member/Inherit 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Inherit 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Inherit 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Inherit 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Inherit 05.fs.bsl b/tests/service/data/SyntaxTree/Member/Inherit 05.fs.bsl index ddb47eb7ecc..1cd03dfcbf5 100644 --- a/tests/service/data/SyntaxTree/Member/Inherit 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Inherit 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Inherit 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Inherit 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Inherit 06.fsi.bsl b/tests/service/data/SyntaxTree/Member/Inherit 06.fsi.bsl index 3ac7c9adc29..039e89eb31a 100644 --- a/tests/service/data/SyntaxTree/Member/Inherit 06.fsi.bsl +++ b/tests/service/data/SyntaxTree/Member/Inherit 06.fsi.bsl @@ -1,6 +1,6 @@ SigFile (ParsedSigFileInput - ("/root/Member/Inherit 06.fsi", QualifiedNameOfFile Module, [], [], + ("/root/Member/Inherit 06.fsi", QualifiedNameOfFile Module, [], [SynModuleOrNamespaceSig ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Inherit 07.fsi.bsl b/tests/service/data/SyntaxTree/Member/Inherit 07.fsi.bsl index 7dc4657766f..4ff79f9a937 100644 --- a/tests/service/data/SyntaxTree/Member/Inherit 07.fsi.bsl +++ b/tests/service/data/SyntaxTree/Member/Inherit 07.fsi.bsl @@ -1,6 +1,6 @@ SigFile (ParsedSigFileInput - ("/root/Member/Inherit 07.fsi", QualifiedNameOfFile Module, [], [], + ("/root/Member/Inherit 07.fsi", QualifiedNameOfFile Module, [], [SynModuleOrNamespaceSig ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Inherit 08.fs.bsl b/tests/service/data/SyntaxTree/Member/Inherit 08.fs.bsl index fa0211259a4..748d1fd87e8 100644 --- a/tests/service/data/SyntaxTree/Member/Inherit 08.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Inherit 08.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Inherit 08.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Inherit 08.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Interface 01.fs.bsl b/tests/service/data/SyntaxTree/Member/Interface 01.fs.bsl index 332508f43f8..5019eb05803 100644 --- a/tests/service/data/SyntaxTree/Member/Interface 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Interface 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Interface 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Interface 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Interface 02.fs.bsl b/tests/service/data/SyntaxTree/Member/Interface 02.fs.bsl index 2d699762c27..f1cc9973a6d 100644 --- a/tests/service/data/SyntaxTree/Member/Interface 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Interface 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Interface 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Interface 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Interface 03.fs.bsl b/tests/service/data/SyntaxTree/Member/Interface 03.fs.bsl index 8f563d2c61a..be75c8cda7b 100644 --- a/tests/service/data/SyntaxTree/Member/Interface 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Interface 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Interface 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Interface 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Interface 04.fs.bsl b/tests/service/data/SyntaxTree/Member/Interface 04.fs.bsl index 20db259a02e..73106fcb6a7 100644 --- a/tests/service/data/SyntaxTree/Member/Interface 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Interface 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Interface 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Interface 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Interface 05.fs.bsl b/tests/service/data/SyntaxTree/Member/Interface 05.fs.bsl index 1394c744330..3dc378a8900 100644 --- a/tests/service/data/SyntaxTree/Member/Interface 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Interface 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Interface 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Interface 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Interface 06.fs.bsl b/tests/service/data/SyntaxTree/Member/Interface 06.fs.bsl index b92b4abc202..9e4e6a7a0c9 100644 --- a/tests/service/data/SyntaxTree/Member/Interface 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Interface 06.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Interface 06.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Interface 06.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Interface 07.fs.bsl b/tests/service/data/SyntaxTree/Member/Interface 07.fs.bsl index 66c618d8e44..b48a8d45a4a 100644 --- a/tests/service/data/SyntaxTree/Member/Interface 07.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Interface 07.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Interface 07.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Interface 07.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Interface 08.fs.bsl b/tests/service/data/SyntaxTree/Member/Interface 08.fs.bsl index 301dc4c9570..76815165eea 100644 --- a/tests/service/data/SyntaxTree/Member/Interface 08.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Interface 08.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Interface 08.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Interface 08.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Interface 09.fs.bsl b/tests/service/data/SyntaxTree/Member/Interface 09.fs.bsl index 9260f21ff5b..7cf1a1b7d7e 100644 --- a/tests/service/data/SyntaxTree/Member/Interface 09.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Interface 09.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Interface 09.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Interface 09.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Interface 10.fs.bsl b/tests/service/data/SyntaxTree/Member/Interface 10.fs.bsl index 9ddc6fb80bb..cfa21037a50 100644 --- a/tests/service/data/SyntaxTree/Member/Interface 10.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Interface 10.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Interface 10.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Interface 10.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Let 01.fs.bsl b/tests/service/data/SyntaxTree/Member/Let 01.fs.bsl index c4071e92b4f..aa338b590ff 100644 --- a/tests/service/data/SyntaxTree/Member/Let 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Let 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Let 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Let 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Let 02.fs.bsl b/tests/service/data/SyntaxTree/Member/Let 02.fs.bsl index e8e2862dcc6..6d27f97edd0 100644 --- a/tests/service/data/SyntaxTree/Member/Let 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Let 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Let 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Let 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Let 03.fs.bsl b/tests/service/data/SyntaxTree/Member/Let 03.fs.bsl index 01cb91bbe95..c7c1463fb53 100644 --- a/tests/service/data/SyntaxTree/Member/Let 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Let 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Let 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Let 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Let 04.fs.bsl b/tests/service/data/SyntaxTree/Member/Let 04.fs.bsl index 439bf0d6cb7..730e70f95b6 100644 --- a/tests/service/data/SyntaxTree/Member/Let 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Let 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Let 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Let 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Member - Attributes 01.fs.bsl b/tests/service/data/SyntaxTree/Member/Member - Attributes 01.fs.bsl index 168769ff761..056bc209b4b 100644 --- a/tests/service/data/SyntaxTree/Member/Member - Attributes 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Member - Attributes 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Member - Attributes 01.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Member - Param - Missing type 01.fs.bsl b/tests/service/data/SyntaxTree/Member/Member - Param - Missing type 01.fs.bsl index 432229da76f..dfdd59c9aec 100644 --- a/tests/service/data/SyntaxTree/Member/Member - Param - Missing type 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Member - Param - Missing type 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/Member - Param - Missing type 01.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Member 01.fs.bsl b/tests/service/data/SyntaxTree/Member/Member 01.fs.bsl index e5ce844b09e..db4e44904aa 100644 --- a/tests/service/data/SyntaxTree/Member/Member 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Member 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Member 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Member 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Member 02.fs.bsl b/tests/service/data/SyntaxTree/Member/Member 02.fs.bsl index dc24f73a058..68cb2e7a8c2 100644 --- a/tests/service/data/SyntaxTree/Member/Member 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Member 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Member 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Member 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Member 03.fs.bsl b/tests/service/data/SyntaxTree/Member/Member 03.fs.bsl index cb85a85bfc7..42e89101916 100644 --- a/tests/service/data/SyntaxTree/Member/Member 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Member 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Member 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Member 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Member 04.fs.bsl b/tests/service/data/SyntaxTree/Member/Member 04.fs.bsl index c4bfa610f42..d9d33f94bae 100644 --- a/tests/service/data/SyntaxTree/Member/Member 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Member 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Member 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Member 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Member 05.fs.bsl b/tests/service/data/SyntaxTree/Member/Member 05.fs.bsl index 7fdadfeebbc..227a332bb55 100644 --- a/tests/service/data/SyntaxTree/Member/Member 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Member 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Member 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Member 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Member 06.fs.bsl b/tests/service/data/SyntaxTree/Member/Member 06.fs.bsl index d249dd2cc26..9c51e6704a3 100644 --- a/tests/service/data/SyntaxTree/Member/Member 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Member 06.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Member 06.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Member 06.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Member 07.fs.bsl b/tests/service/data/SyntaxTree/Member/Member 07.fs.bsl index 5e5c51e0f2b..d317d097f70 100644 --- a/tests/service/data/SyntaxTree/Member/Member 07.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Member 07.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Member 07.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Member 07.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Member 08.fs.bsl b/tests/service/data/SyntaxTree/Member/Member 08.fs.bsl index b2e10558c6a..712b32837cb 100644 --- a/tests/service/data/SyntaxTree/Member/Member 08.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Member 08.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Member 08.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Member 08.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Member 09.fs.bsl b/tests/service/data/SyntaxTree/Member/Member 09.fs.bsl index e101bf1b6da..eeb22f06461 100644 --- a/tests/service/data/SyntaxTree/Member/Member 09.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Member 09.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Member 09.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Member 09.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Member 10.fs.bsl b/tests/service/data/SyntaxTree/Member/Member 10.fs.bsl index e0e6936d612..1e978a7b66e 100644 --- a/tests/service/data/SyntaxTree/Member/Member 10.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Member 10.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Member 10.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Member 10.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Member 11.fs.bsl b/tests/service/data/SyntaxTree/Member/Member 11.fs.bsl index a4d4b985c40..182de669d22 100644 --- a/tests/service/data/SyntaxTree/Member/Member 11.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Member 11.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Member 11.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Member 11.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Member 12.fs.bsl b/tests/service/data/SyntaxTree/Member/Member 12.fs.bsl index 44e361be813..10a3b6e5fd7 100644 --- a/tests/service/data/SyntaxTree/Member/Member 12.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Member 12.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Member 12.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Member 12.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Member 13.fs.bsl b/tests/service/data/SyntaxTree/Member/Member 13.fs.bsl index 129c9f529ce..c0420341bef 100644 --- a/tests/service/data/SyntaxTree/Member/Member 13.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Member 13.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Member 13.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Member 13.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/MemberMispelledToMeme.fs.bsl b/tests/service/data/SyntaxTree/Member/MemberMispelledToMeme.fs.bsl index 13e0c26b915..3b5ddd957a3 100644 --- a/tests/service/data/SyntaxTree/Member/MemberMispelledToMeme.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/MemberMispelledToMeme.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/MemberMispelledToMeme.fs", false, - QualifiedNameOfFile MemberMispelledToMeme, [], [], + QualifiedNameOfFile MemberMispelledToMeme, [], [SynModuleOrNamespace ([MemberMispelledToMeme], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/MemberWithInlineKeyword.fs.bsl b/tests/service/data/SyntaxTree/Member/MemberWithInlineKeyword.fs.bsl index 7db3831e689..8e1c91c74a2 100644 --- a/tests/service/data/SyntaxTree/Member/MemberWithInlineKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/MemberWithInlineKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/MemberWithInlineKeyword.fs", false, - QualifiedNameOfFile MemberWithInlineKeyword, [], [], + QualifiedNameOfFile MemberWithInlineKeyword, [], [SynModuleOrNamespace ([MemberWithInlineKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl index 6692c520246..42a853180a1 100644 --- a/tests/service/data/SyntaxTree/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl @@ -4,7 +4,7 @@ ImplFile false, QualifiedNameOfFile Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword, - [], [], + [], [SynModuleOrNamespace ([Foo], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl index 8319d790680..ec2dae78b91 100644 --- a/tests/service/data/SyntaxTree/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl @@ -4,7 +4,7 @@ ImplFile false, QualifiedNameOfFile ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword, - [], [], + [], [SynModuleOrNamespace ([ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Member/SignatureMemberWithGet.fsi.bsl b/tests/service/data/SyntaxTree/Member/SignatureMemberWithGet.fsi.bsl index a516a7766cf..f85f36ec7ad 100644 --- a/tests/service/data/SyntaxTree/Member/SignatureMemberWithGet.fsi.bsl +++ b/tests/service/data/SyntaxTree/Member/SignatureMemberWithGet.fsi.bsl @@ -1,6 +1,6 @@ SigFile (ParsedSigFileInput - ("/root/Member/SignatureMemberWithGet.fsi", QualifiedNameOfFile Meh, [], [], + ("/root/Member/SignatureMemberWithGet.fsi", QualifiedNameOfFile Meh, [], [SynModuleOrNamespaceSig ([Meh], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/SignatureMemberWithSet.fsi.bsl b/tests/service/data/SyntaxTree/Member/SignatureMemberWithSet.fsi.bsl index 038b502e256..a6826dedf93 100644 --- a/tests/service/data/SyntaxTree/Member/SignatureMemberWithSet.fsi.bsl +++ b/tests/service/data/SyntaxTree/Member/SignatureMemberWithSet.fsi.bsl @@ -1,6 +1,6 @@ SigFile (ParsedSigFileInput - ("/root/Member/SignatureMemberWithSet.fsi", QualifiedNameOfFile Meh, [], [], + ("/root/Member/SignatureMemberWithSet.fsi", QualifiedNameOfFile Meh, [], [SynModuleOrNamespaceSig ([Meh], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/SignatureMemberWithSetget.fsi.bsl b/tests/service/data/SyntaxTree/Member/SignatureMemberWithSetget.fsi.bsl index acb516b9113..87a96d09948 100644 --- a/tests/service/data/SyntaxTree/Member/SignatureMemberWithSetget.fsi.bsl +++ b/tests/service/data/SyntaxTree/Member/SignatureMemberWithSetget.fsi.bsl @@ -1,7 +1,6 @@ SigFile (ParsedSigFileInput ("/root/Member/SignatureMemberWithSetget.fsi", QualifiedNameOfFile Meh, [], - [], [SynModuleOrNamespaceSig ([Meh], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Static 01.fs.bsl b/tests/service/data/SyntaxTree/Member/Static 01.fs.bsl index 7c47ccf95ec..8a6d7b212a6 100644 --- a/tests/service/data/SyntaxTree/Member/Static 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Static 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Static 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Static 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Static 02.fs.bsl b/tests/service/data/SyntaxTree/Member/Static 02.fs.bsl index ecf86c4e1f6..0f2a2cf7f74 100644 --- a/tests/service/data/SyntaxTree/Member/Static 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Static 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Static 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Static 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Static 03.fs.bsl b/tests/service/data/SyntaxTree/Member/Static 03.fs.bsl index 70d5eb3aba9..ae718beefec 100644 --- a/tests/service/data/SyntaxTree/Member/Static 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Static 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Member/Static 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Member/Static 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs.bsl index 4158e55ca3f..d0a50103d31 100644 --- a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Member/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs", false, QualifiedNameOfFile - SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword, [], [], + SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword, [], [SynModuleOrNamespace ([SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs.bsl index 06e0765a03b..e9705317fea 100644 --- a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs", false, QualifiedNameOfFile - SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign, [], [], + SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign, [], [SynModuleOrNamespace ([SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs.bsl index 95b26eac8a3..3cac28e9078 100644 --- a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs", false, QualifiedNameOfFile - SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword, [], [], + SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword, [], [SynModuleOrNamespace ([SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs.bsl b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs.bsl index b09a60eed84..4151638914d 100644 --- a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs", false, - QualifiedNameOfFile SynTypeDefnWithMemberWithGetHasXmlComment, [], [], + QualifiedNameOfFile SynTypeDefnWithMemberWithGetHasXmlComment, [], [SynModuleOrNamespace ([SynTypeDefnWithMemberWithGetHasXmlComment], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithSetget.fs.bsl b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithSetget.fs.bsl index e3fe9618a23..de611f26400 100644 --- a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithSetget.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithSetget.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/SynTypeDefnWithMemberWithSetget.fs", false, - QualifiedNameOfFile SynTypeDefnWithMemberWithSetget, [], [], + QualifiedNameOfFile SynTypeDefnWithMemberWithSetget, [], [SynModuleOrNamespace ([SynTypeDefnWithMemberWithSetget], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithStaticMemberWithGetset.fs.bsl b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithStaticMemberWithGetset.fs.bsl index 33c1348b561..b16fc3d7187 100644 --- a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithStaticMemberWithGetset.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithStaticMemberWithGetset.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Member/SynTypeDefnWithStaticMemberWithGetset.fs", false, - QualifiedNameOfFile SynTypeDefnWithStaticMemberWithGetset, [], [], + QualifiedNameOfFile SynTypeDefnWithStaticMemberWithGetset, [], [SynModuleOrNamespace ([SynTypeDefnWithStaticMemberWithGetset], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl index 79a865c5eed..ef4617c60e6 100644 --- a/tests/service/data/SyntaxTree/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl @@ -4,7 +4,7 @@ ImplFile false, QualifiedNameOfFile Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword, - [], [], + [], [SynModuleOrNamespace ([Foo], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs.bsl b/tests/service/data/SyntaxTree/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs.bsl index cb73ae7b1dd..9bf4d3b0575 100644 --- a/tests/service/data/SyntaxTree/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs.bsl +++ b/tests/service/data/SyntaxTree/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs", false, - QualifiedNameOfFile SynExprObjMembersHaveCorrectKeywords, [], [], + QualifiedNameOfFile SynExprObjMembersHaveCorrectKeywords, [], [SynModuleOrNamespace ([SynExprObjMembersHaveCorrectKeywords], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnAbstractSlotHasCorrectKeyword.fs.bsl b/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnAbstractSlotHasCorrectKeyword.fs.bsl index 23d12756c3e..2c56802ac48 100644 --- a/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnAbstractSlotHasCorrectKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnAbstractSlotHasCorrectKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/MemberFlag/SynMemberDefnAbstractSlotHasCorrectKeyword.fs", false, - QualifiedNameOfFile SynMemberDefnAbstractSlotHasCorrectKeyword, [], [], + QualifiedNameOfFile SynMemberDefnAbstractSlotHasCorrectKeyword, [], [SynModuleOrNamespace ([SynMemberDefnAbstractSlotHasCorrectKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs.bsl b/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs.bsl index 76d6b9ac1b5..fcdee7b56f4 100644 --- a/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs", false, - QualifiedNameOfFile SynMemberDefnAutoPropertyHasCorrectKeyword, [], [], + QualifiedNameOfFile SynMemberDefnAutoPropertyHasCorrectKeyword, [], [SynModuleOrNamespace ([SynMemberDefnAutoPropertyHasCorrectKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs.bsl b/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs.bsl index ae8cfbaa083..603baeec5c9 100644 --- a/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs.bsl @@ -2,7 +2,7 @@ ImplFile (ParsedImplFileInput ("/root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs", false, QualifiedNameOfFile SynMemberDefnMemberSynValDataHasCorrectKeyword, - [], [], + [], [SynModuleOrNamespace ([SynMemberDefnMemberSynValDataHasCorrectKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi.bsl b/tests/service/data/SyntaxTree/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi.bsl index 878187410bc..dff27e04746 100644 --- a/tests/service/data/SyntaxTree/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi.bsl +++ b/tests/service/data/SyntaxTree/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi", - QualifiedNameOfFile SynMemberSigMemberHasCorrectKeywords, [], [], + QualifiedNameOfFile SynMemberSigMemberHasCorrectKeywords, [], [SynModuleOrNamespaceSig ([X], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/ModuleMember/Do 01.fs.bsl b/tests/service/data/SyntaxTree/ModuleMember/Do 01.fs.bsl index 0db6971e934..c85c24e00b5 100644 --- a/tests/service/data/SyntaxTree/ModuleMember/Do 01.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleMember/Do 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/ModuleMember/Do 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/ModuleMember/Do 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/ModuleMember/Do 02.fs.bsl b/tests/service/data/SyntaxTree/ModuleMember/Do 02.fs.bsl index 581e4ff62c0..496e552fa1f 100644 --- a/tests/service/data/SyntaxTree/ModuleMember/Do 02.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleMember/Do 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/ModuleMember/Do 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/ModuleMember/Do 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/ModuleMember/Let 01.fs.bsl b/tests/service/data/SyntaxTree/ModuleMember/Let 01.fs.bsl index 92101cded07..1c8c4dccedb 100644 --- a/tests/service/data/SyntaxTree/ModuleMember/Let 01.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleMember/Let 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/ModuleMember/Let 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/ModuleMember/Let 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/ModuleMember/Let 02.fs.bsl b/tests/service/data/SyntaxTree/ModuleMember/Let 02.fs.bsl index cfa14a90cd0..e530a40f54e 100644 --- a/tests/service/data/SyntaxTree/ModuleMember/Let 02.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleMember/Let 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/ModuleMember/Let 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/ModuleMember/Let 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/ModuleMember/Let 03.fs.bsl b/tests/service/data/SyntaxTree/ModuleMember/Let 03.fs.bsl index 374a64bda0e..f941ff3a07d 100644 --- a/tests/service/data/SyntaxTree/ModuleMember/Let 03.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleMember/Let 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/ModuleMember/Let 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/ModuleMember/Let 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/ModuleMember/Let 04.fs.bsl b/tests/service/data/SyntaxTree/ModuleMember/Let 04.fs.bsl index 7d2f30db848..62051453f04 100644 --- a/tests/service/data/SyntaxTree/ModuleMember/Let 04.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleMember/Let 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/ModuleMember/Let 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/ModuleMember/Let 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let (false, [], (3,0--3,3)); diff --git a/tests/service/data/SyntaxTree/ModuleMember/Let 05.fs.bsl b/tests/service/data/SyntaxTree/ModuleMember/Let 05.fs.bsl index 684cfa3cfb0..9148d9593fb 100644 --- a/tests/service/data/SyntaxTree/ModuleMember/Let 05.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleMember/Let 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/ModuleMember/Let 05.fs", false, QualifiedNameOfFile Let 05, [], [], + ("/root/ModuleMember/Let 05.fs", false, QualifiedNameOfFile Let 05, [], [SynModuleOrNamespace ([Let 05], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/ModuleMember/Open 01.fs.bsl b/tests/service/data/SyntaxTree/ModuleMember/Open 01.fs.bsl index 9ba9b81eb53..54a69cef5f9 100644 --- a/tests/service/data/SyntaxTree/ModuleMember/Open 01.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleMember/Open 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/ModuleMember/Open 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/ModuleMember/Open 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Open diff --git a/tests/service/data/SyntaxTree/ModuleMember/Open 02.fs.bsl b/tests/service/data/SyntaxTree/ModuleMember/Open 02.fs.bsl index 2a17ef664a5..3a79d8a40d3 100644 --- a/tests/service/data/SyntaxTree/ModuleMember/Open 02.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleMember/Open 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/ModuleMember/Open 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/ModuleMember/Open 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Open diff --git a/tests/service/data/SyntaxTree/ModuleMember/Open 03.fs.bsl b/tests/service/data/SyntaxTree/ModuleMember/Open 03.fs.bsl index 549a2c50a79..baf94d09558 100644 --- a/tests/service/data/SyntaxTree/ModuleMember/Open 03.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleMember/Open 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/ModuleMember/Open 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/ModuleMember/Open 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Open diff --git a/tests/service/data/SyntaxTree/ModuleMember/Open 04.fs.bsl b/tests/service/data/SyntaxTree/ModuleMember/Open 04.fs.bsl index 26532b885c0..211ce9f819e 100644 --- a/tests/service/data/SyntaxTree/ModuleMember/Open 04.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleMember/Open 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/ModuleMember/Open 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/ModuleMember/Open 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Open diff --git a/tests/service/data/SyntaxTree/ModuleMember/Open 05.fs.bsl b/tests/service/data/SyntaxTree/ModuleMember/Open 05.fs.bsl index d6339de665b..51b91aeb60b 100644 --- a/tests/service/data/SyntaxTree/ModuleMember/Open 05.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleMember/Open 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/ModuleMember/Open 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/ModuleMember/Open 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Open diff --git a/tests/service/data/SyntaxTree/ModuleMember/Open 06.fs.bsl b/tests/service/data/SyntaxTree/ModuleMember/Open 06.fs.bsl index 44453c403fa..49a280c5294 100644 --- a/tests/service/data/SyntaxTree/ModuleMember/Open 06.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleMember/Open 06.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/ModuleMember/Open 06.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/ModuleMember/Open 06.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Open diff --git a/tests/service/data/SyntaxTree/ModuleMember/Open 07.fs.bsl b/tests/service/data/SyntaxTree/ModuleMember/Open 07.fs.bsl index 38af89635b8..3780e042264 100644 --- a/tests/service/data/SyntaxTree/ModuleMember/Open 07.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleMember/Open 07.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/ModuleMember/Open 07.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/ModuleMember/Open 07.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Open diff --git a/tests/service/data/SyntaxTree/ModuleMember/Open 08.fs.bsl b/tests/service/data/SyntaxTree/ModuleMember/Open 08.fs.bsl index 5968d7456b1..6e12aa9e0f1 100644 --- a/tests/service/data/SyntaxTree/ModuleMember/Open 08.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleMember/Open 08.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/ModuleMember/Open 08.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/ModuleMember/Open 08.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Open diff --git a/tests/service/data/SyntaxTree/ModuleMember/Val 01.fsi.bsl b/tests/service/data/SyntaxTree/ModuleMember/Val 01.fsi.bsl index 33a28bec72c..e7b920cf3bb 100644 --- a/tests/service/data/SyntaxTree/ModuleMember/Val 01.fsi.bsl +++ b/tests/service/data/SyntaxTree/ModuleMember/Val 01.fsi.bsl @@ -1,6 +1,6 @@ SigFile (ParsedSigFileInput - ("/root/ModuleMember/Val 01.fsi", QualifiedNameOfFile Module, [], [], + ("/root/ModuleMember/Val 01.fsi", QualifiedNameOfFile Module, [], [SynModuleOrNamespaceSig ([Module], false, NamedModule, [Val diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Anon module 01.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Anon module 01.fs.bsl index 11fc84ec748..299a86738ac 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Anon module 01.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Anon module 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Anon module 01.fs", false, - QualifiedNameOfFile Anon module 01, [], [], + QualifiedNameOfFile Anon module 01, [], [SynModuleOrNamespace ([Anon module 01], false, AnonModule, [Expr (Const (Unit, (1,0--1,2)), (1,0--1,2))], PreXmlDocEmpty, [], diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Anon module 02.fsx.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Anon module 02.fsx.bsl index 448d9bae968..3bfef6b4af3 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Anon module 02.fsx.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Anon module 02.fsx.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Anon module 02.fsx", true, - QualifiedNameOfFile Anon module 02$fsx, [], [], + QualifiedNameOfFile Anon module 02$fsx, [], [SynModuleOrNamespace ([Anon module 02], false, AnonModule, [Expr (Const (Unit, (1,0--1,2)), (1,0--1,2))], PreXmlDocEmpty, [], diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs.bsl index e45507b4a0d..8c83319357d 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/ModuleOrNamespace/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs", false, QualifiedNameOfFile DeclaredNamespaceRangeShouldStartAtNamespaceKeyword, - [], [], + [], [SynModuleOrNamespace ([TypeEquality], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/GlobalInOpenPathShouldContainTrivia.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/GlobalInOpenPathShouldContainTrivia.fs.bsl index 0d822c247fb..4350831d9f7 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/GlobalInOpenPathShouldContainTrivia.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/GlobalInOpenPathShouldContainTrivia.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/GlobalInOpenPathShouldContainTrivia.fs", false, - QualifiedNameOfFile GlobalInOpenPathShouldContainTrivia, [], [], + QualifiedNameOfFile GlobalInOpenPathShouldContainTrivia, [], [SynModuleOrNamespace ([Ionide; VSCode; FSharp], false, DeclaredNamespace, [Open diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/GlobalNamespaceShouldStartAtNamespaceKeyword.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/GlobalNamespaceShouldStartAtNamespaceKeyword.fs.bsl index ab4611ba1fc..92846d05a78 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/GlobalNamespaceShouldStartAtNamespaceKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/GlobalNamespaceShouldStartAtNamespaceKeyword.fs.bsl @@ -2,7 +2,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/GlobalNamespaceShouldStartAtNamespaceKeyword.fs", false, QualifiedNameOfFile GlobalNamespaceShouldStartAtNamespaceKeyword, - [], [], + [], [SynModuleOrNamespace ([], false, GlobalNamespace, [Types diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Module - Attribute 01.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Module - Attribute 01.fs.bsl index 70ca7f64fdb..51e98e1f023 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Module - Attribute 01.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Module - Attribute 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Module - Attribute 01.fs", false, - QualifiedNameOfFile Bar, [], [], + QualifiedNameOfFile Bar, [], [SynModuleOrNamespace ([Bar], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 01.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 01.fs.bsl index 253b83115a7..ae107b348ff 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 01.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Module 01.fs", false, QualifiedNameOfFile A.B.C, - [], [], + [], [SynModuleOrNamespace ([A; B; C], false, NamedModule, [], PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None, diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 02.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 02.fs.bsl index 1ca7710dfcb..22c3612ec3b 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 02.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Module 02.fs", false, QualifiedNameOfFile A.B.C, - [], [], + [], [SynModuleOrNamespace ([A; B; C], false, NamedModule, [Expr (Const (Unit, (3,0--3,2)), (3,0--3,2))], diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 03.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 03.fs.bsl index f71a5daa644..fdb556ac83b 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 03.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Module 03.fs", false, QualifiedNameOfFile A.B.C, - [], [], + [], [SynModuleOrNamespace ([A; B; C], false, NamedModule, [Expr (Const (Unit, (3,2--3,4)), (3,2--3,4))], diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 04.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 04.fs.bsl index 226e6492957..9eeea926035 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 04.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Module 04.fs", false, QualifiedNameOfFile A.B.C, - [], [], + [], [SynModuleOrNamespace ([A; B; C], false, NamedModule, [Expr (Const (Unit, (3,0--3,2)), (3,0--3,2))], diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 05.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 05.fs.bsl index 6f4c8c701d5..fddc1377f63 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 05.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 05.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Module 05.fs", false, QualifiedNameOfFile A, [], - [], [SynModuleOrNamespace ([A], false, NamedModule, [Expr (Const (Unit, (3,0--3,2)), (3,0--3,2))], PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None, diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 06.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 06.fs.bsl index ec0cd02e4ce..7768d80248f 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 06.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 06.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Module 06.fs", false, QualifiedNameOfFile , [], - [], [SynModuleOrNamespace ([], false, NamedModule, [Expr (Const (Unit, (3,0--3,2)), (3,0--3,2))], PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None, diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 07.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 07.fs.bsl index b52a7bcdbf4..49ddcfcd603 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 07.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 07.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Module 07.fs", false, QualifiedNameOfFile , [], - [], [SynModuleOrNamespace ([], true, NamedModule, [Expr (Const (Unit, (3,0--3,2)), (3,0--3,2))], PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None, diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs.bsl index 7e55d2eb57d..e9d1f920f5a 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs", false, - QualifiedNameOfFile FsAutoComplete.FCSPatches, [], [], + QualifiedNameOfFile FsAutoComplete.FCSPatches, [], [SynModuleOrNamespace ([FsAutoComplete; FCSPatches], false, NamedModule, [Open diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs.bsl index 09880fab704..55f704823db 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs.bsl @@ -4,7 +4,7 @@ ImplFile false, QualifiedNameOfFile MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword, - [], [], + [], [SynModuleOrNamespace ([TypeEquality], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 01.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 01.fs.bsl index d4bb61b979b..3909b882997 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 01.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Namespace 01.fs", false, - QualifiedNameOfFile Namespace 01, [], [], + QualifiedNameOfFile Namespace 01, [], [SynModuleOrNamespace ([Ns1], false, DeclaredNamespace, [Expr (Const (Unit, (3,0--3,2)), (3,0--3,2))], PreXmlDocEmpty, [], diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 02.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 02.fs.bsl index 1e5985485f2..e67784b655f 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 02.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Namespace 02.fs", false, - QualifiedNameOfFile Namespace 02, [], [], + QualifiedNameOfFile Namespace 02, [], [SynModuleOrNamespace ([Ns1], false, DeclaredNamespace, [Expr (Const (Unit, (3,0--3,2)), (3,0--3,2))], PreXmlDocEmpty, [], diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 03.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 03.fs.bsl index c822d41e48f..cd9f6e26581 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 03.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Namespace 03.fs", false, - QualifiedNameOfFile Namespace 03, [], [], + QualifiedNameOfFile Namespace 03, [], [SynModuleOrNamespace ([Ns1], false, DeclaredNamespace, [Expr (Const (Unit, (3,0--3,2)), (3,0--3,2))], PreXmlDocEmpty, [], diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 04.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 04.fs.bsl index e012c095c25..171a69cc184 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 04.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Namespace 04.fs", false, - QualifiedNameOfFile Namespace 04, [], [], + QualifiedNameOfFile Namespace 04, [], [SynModuleOrNamespace ([Ns1], false, DeclaredNamespace, [Expr (Const (Unit, (3,0--3,2)), (3,0--3,2))], PreXmlDocEmpty, [], diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 05.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 05.fs.bsl index a41e32b6583..4b06b212184 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 05.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 05.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Namespace 05.fs", false, - QualifiedNameOfFile Namespace 05, [], [], + QualifiedNameOfFile Namespace 05, [], [SynModuleOrNamespace ([], false, DeclaredNamespace, [], PreXmlDocEmpty, [], None, (1,0--2,0), { LeadingKeyword = Namespace (1,0--1,9) })], (true, true), diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 06.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 06.fs.bsl index 06fd6804862..d633d78da5d 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 06.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 06.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Namespace 06.fs", false, - QualifiedNameOfFile Namespace 06, [], [], + QualifiedNameOfFile Namespace 06, [], [SynModuleOrNamespace ([], false, DeclaredNamespace, [Expr (Const (Unit, (3,0--3,2)), (3,0--3,2))], PreXmlDocEmpty, [], diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 07.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 07.fs.bsl index 904371c96d7..2001e63d579 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 07.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 07.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Namespace 07.fs", false, - QualifiedNameOfFile Namespace 07, [], [], + QualifiedNameOfFile Namespace 07, [], [SynModuleOrNamespace ([], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 08.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 08.fs.bsl index 35984038851..99774bdfb2d 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 08.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 08.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Namespace 08.fs", false, - QualifiedNameOfFile Namespace 08, [], [], + QualifiedNameOfFile Namespace 08, [], [SynModuleOrNamespace ([], true, DeclaredNamespace, [], PreXmlDocEmpty, [], None, (1,0--2,0), { LeadingKeyword = Namespace (1,0--1,9) })], (true, true), diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 09.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 09.fs.bsl index c6f1e667ff6..d92df6a3bad 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 09.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Namespace 09.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Namespace 09.fs", false, - QualifiedNameOfFile Namespace 09, [], [], + QualifiedNameOfFile Namespace 09, [], [SynModuleOrNamespace ([], false, DeclaredNamespace, [Expr (Const (Unit, (3,0--3,2)), (3,0--3,2))], PreXmlDocEmpty, [], diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/NamespaceShouldContainNamespaceKeyword.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/NamespaceShouldContainNamespaceKeyword.fs.bsl index fddeeca8a03..4770bd12c28 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/NamespaceShouldContainNamespaceKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/NamespaceShouldContainNamespaceKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/NamespaceShouldContainNamespaceKeyword.fs", false, - QualifiedNameOfFile NamespaceShouldContainNamespaceKeyword, [], [], + QualifiedNameOfFile NamespaceShouldContainNamespaceKeyword, [], [SynModuleOrNamespace ([Foo], false, DeclaredNamespace, [NestedModule diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 01.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 01.fs.bsl index 8b74425f9b6..f096330f153 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 01.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Nested module 01.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [NestedModule diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 02.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 02.fs.bsl index e7761029d97..64e42143c82 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 02.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Nested module 02.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [NestedModule diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 03.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 03.fs.bsl index 44ab73f81ad..85c740b97cd 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 03.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Nested module 03.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [NestedModule diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 04.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 04.fs.bsl index 4208cc94225..cc6ea82a8d9 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 04.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Nested module 04.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [NestedModule diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 05.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 05.fs.bsl index 53b4a1f12df..7d668de43d5 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 05.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 05.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Nested module 05.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [NestedModule diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 06.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 06.fs.bsl index d6875779d2f..27f741f4153 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 06.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 06.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Nested module 06.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [NestedModule diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 07.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 07.fs.bsl index 569bdfe5811..32f9e5749c1 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 07.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 07.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Nested module 07.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [NestedModule diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 08.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 08.fs.bsl index 1b6fcc1a41c..9ad6d285ef3 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 08.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 08.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Nested module 08.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [NestedModule diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 09.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 09.fs.bsl index 175f01fc0e0..08e0e408e98 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 09.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 09.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Nested module 09.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [NestedModule diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 10.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 10.fs.bsl index 4605fc9a35d..28b6fdc833d 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 10.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 10.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Nested module 10.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [NestedModule diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 11.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 11.fs.bsl index 181836a8b7f..c3f3f3c2e40 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 11.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 11.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Nested module 11.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [NestedModule diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 12.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 12.fs.bsl index eb79389bb5c..019a46d4811 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 12.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 12.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Nested module 12.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [NestedModule diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 13.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 13.fs.bsl index c57a57743cb..dc6136a18bd 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 13.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 13.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Nested module 13.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [NestedModule diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 14.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 14.fs.bsl index 708fae6dee0..28273f45569 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 14.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 14.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Nested module 14.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [NestedModule diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 15.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 15.fs.bsl index e7aaa7fbdbc..3d649cef854 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 15.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 15.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Nested module 15.fs", false, - QualifiedNameOfFile Nested module 15, [], [], + QualifiedNameOfFile Nested module 15, [], [SynModuleOrNamespace ([Ns], false, DeclaredNamespace, [NestedModule diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 16.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 16.fs.bsl index 2ce127eef5d..5cc142e8798 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 16.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 16.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Nested module 16.fs", false, - QualifiedNameOfFile Nested module 16, [], [], + QualifiedNameOfFile Nested module 16, [], [SynModuleOrNamespace ([Ns], false, DeclaredNamespace, [NestedModule diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 17.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 17.fs.bsl index 4e5dd1a1914..2f93776f291 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 17.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 17.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/ModuleOrNamespace/Nested module 17.fs", false, - QualifiedNameOfFile Nested module 17, [], [], + QualifiedNameOfFile Nested module 17, [], [SynModuleOrNamespace ([Ns], false, DeclaredNamespace, [NestedModule diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi.bsl index 13f845e312a..72959c8147a 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/ModuleOrNamespaceSig/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi", - QualifiedNameOfFile GlobalNamespaceShouldStartAtNamespaceKeyword, [], [], + QualifiedNameOfFile GlobalNamespaceShouldStartAtNamespaceKeyword, [], [SynModuleOrNamespaceSig ([], false, GlobalNamespace, [Types diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleAbbreviation.fsi.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleAbbreviation.fsi.bsl index 045e4931a62..4c68ef8caf6 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleAbbreviation.fsi.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleAbbreviation.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/ModuleOrNamespaceSig/ModuleAbbreviation.fsi", - QualifiedNameOfFile Foo, [], [], + QualifiedNameOfFile Foo, [], [SynModuleOrNamespaceSig ([Foo], false, NamedModule, [Open diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleRangeShouldStartAtFirstAttribute.fsi.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleRangeShouldStartAtFirstAttribute.fsi.bsl index 833995c7304..6e11069d964 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleRangeShouldStartAtFirstAttribute.fsi.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleRangeShouldStartAtFirstAttribute.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/ModuleOrNamespaceSig/ModuleRangeShouldStartAtFirstAttribute.fsi", - QualifiedNameOfFile Bar, [], [], + QualifiedNameOfFile Bar, [], [SynModuleOrNamespaceSig ([Bar], false, NamedModule, [Val diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleShouldContainModuleKeyword.fsi.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleShouldContainModuleKeyword.fsi.bsl index 9c4dbafc6cd..e816eae1175 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleShouldContainModuleKeyword.fsi.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleShouldContainModuleKeyword.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/ModuleOrNamespaceSig/ModuleShouldContainModuleKeyword.fsi", - QualifiedNameOfFile Bar, [], [], + QualifiedNameOfFile Bar, [], [SynModuleOrNamespaceSig ([Bar], false, NamedModule, [Val diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/Namespace - Keyword 01.fsi.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/Namespace - Keyword 01.fsi.bsl index a2d8deea5fe..8ca9b252eff 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/Namespace - Keyword 01.fsi.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/Namespace - Keyword 01.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/ModuleOrNamespaceSig/Namespace - Keyword 01.fsi", - QualifiedNameOfFile Namespace - Keyword 01, [], [], + QualifiedNameOfFile Namespace - Keyword 01, [], [SynModuleOrNamespaceSig ([Foo], false, DeclaredNamespace, [NestedModule diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/Nested module 01.fsi.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/Nested module 01.fsi.bsl index 2ca7d9b108a..688224fe4ea 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/Nested module 01.fsi.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/Nested module 01.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/ModuleOrNamespaceSig/Nested module 01.fsi", - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespaceSig ([Module], false, NamedModule, [NestedModule diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi.bsl index 8a0f981091f..3cb6f1282c4 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi.bsl @@ -2,7 +2,6 @@ SigFile (ParsedSigFileInput ("/root/ModuleOrNamespaceSig/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi", QualifiedNameOfFile RangeMemberReturnsRangeOfSynModuleOrNamespaceSig, [], - [], [SynModuleOrNamespaceSig ([Foobar], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/NestedModule/IncompleteNestedModuleSigShouldBePresent.fsi.bsl b/tests/service/data/SyntaxTree/NestedModule/IncompleteNestedModuleSigShouldBePresent.fsi.bsl index d9d1e49ae74..63aa45d782f 100644 --- a/tests/service/data/SyntaxTree/NestedModule/IncompleteNestedModuleSigShouldBePresent.fsi.bsl +++ b/tests/service/data/SyntaxTree/NestedModule/IncompleteNestedModuleSigShouldBePresent.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/NestedModule/IncompleteNestedModuleSigShouldBePresent.fsi", - QualifiedNameOfFile A.B, [], [], + QualifiedNameOfFile A.B, [], [SynModuleOrNamespaceSig ([A; B], false, NamedModule, [NestedModule diff --git a/tests/service/data/SyntaxTree/NestedModule/NestedModuleWithBeginEndAndDecls.fs.bsl b/tests/service/data/SyntaxTree/NestedModule/NestedModuleWithBeginEndAndDecls.fs.bsl index 24837f66d09..a42d49b79bd 100644 --- a/tests/service/data/SyntaxTree/NestedModule/NestedModuleWithBeginEndAndDecls.fs.bsl +++ b/tests/service/data/SyntaxTree/NestedModule/NestedModuleWithBeginEndAndDecls.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/NestedModule/NestedModuleWithBeginEndAndDecls.fs", false, - QualifiedNameOfFile NestedModuleWithBeginEndAndDecls, [], [], + QualifiedNameOfFile NestedModuleWithBeginEndAndDecls, [], [SynModuleOrNamespace ([X], false, DeclaredNamespace, [NestedModule diff --git a/tests/service/data/SyntaxTree/NestedModule/NestedModuleWithBeginEndAndDecls.fsi.bsl b/tests/service/data/SyntaxTree/NestedModule/NestedModuleWithBeginEndAndDecls.fsi.bsl index 878125cde66..aff271ecfe3 100644 --- a/tests/service/data/SyntaxTree/NestedModule/NestedModuleWithBeginEndAndDecls.fsi.bsl +++ b/tests/service/data/SyntaxTree/NestedModule/NestedModuleWithBeginEndAndDecls.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/NestedModule/NestedModuleWithBeginEndAndDecls.fsi", - QualifiedNameOfFile NestedModuleWithBeginEndAndDecls, [], [], + QualifiedNameOfFile NestedModuleWithBeginEndAndDecls, [], [SynModuleOrNamespaceSig ([X], false, DeclaredNamespace, [NestedModule diff --git a/tests/service/data/SyntaxTree/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs.bsl b/tests/service/data/SyntaxTree/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs.bsl index 0160f4068bf..6aba4e114e8 100644 --- a/tests/service/data/SyntaxTree/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs.bsl +++ b/tests/service/data/SyntaxTree/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs", - false, QualifiedNameOfFile TopLevel, [], [], + false, QualifiedNameOfFile TopLevel, [], [SynModuleOrNamespace ([TopLevel], false, NamedModule, [NestedModule diff --git a/tests/service/data/SyntaxTree/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi.bsl b/tests/service/data/SyntaxTree/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi.bsl index 2d2eb425be6..da4768cef87 100644 --- a/tests/service/data/SyntaxTree/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi.bsl +++ b/tests/service/data/SyntaxTree/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi.bsl @@ -2,7 +2,7 @@ SigFile (ParsedSigFileInput ("/root/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi", QualifiedNameOfFile - RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule, [], [], + RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule, [], [SynModuleOrNamespaceSig ([SomeNamespace], false, DeclaredNamespace, [NestedModule diff --git a/tests/service/data/SyntaxTree/NestedModule/RangeOfBeginEnd.fs.bsl b/tests/service/data/SyntaxTree/NestedModule/RangeOfBeginEnd.fs.bsl index 45d8f088c57..2833d4ffd98 100644 --- a/tests/service/data/SyntaxTree/NestedModule/RangeOfBeginEnd.fs.bsl +++ b/tests/service/data/SyntaxTree/NestedModule/RangeOfBeginEnd.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/NestedModule/RangeOfBeginEnd.fs", false, - QualifiedNameOfFile RangeOfBeginEnd, [], [], + QualifiedNameOfFile RangeOfBeginEnd, [], [SynModuleOrNamespace ([X], false, DeclaredNamespace, [NestedModule diff --git a/tests/service/data/SyntaxTree/NestedModule/RangeOfBeginEnd.fsi.bsl b/tests/service/data/SyntaxTree/NestedModule/RangeOfBeginEnd.fsi.bsl index 33815671eb9..b1b30b523cd 100644 --- a/tests/service/data/SyntaxTree/NestedModule/RangeOfBeginEnd.fsi.bsl +++ b/tests/service/data/SyntaxTree/NestedModule/RangeOfBeginEnd.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/NestedModule/RangeOfBeginEnd.fsi", - QualifiedNameOfFile RangeOfBeginEnd, [], [], + QualifiedNameOfFile RangeOfBeginEnd, [], [SynModuleOrNamespaceSig ([X], false, DeclaredNamespace, [NestedModule diff --git a/tests/service/data/SyntaxTree/NestedModule/RangeOfEqualSignShouldBePresent.fs.bsl b/tests/service/data/SyntaxTree/NestedModule/RangeOfEqualSignShouldBePresent.fs.bsl index da9c0e154f4..610571d60c5 100644 --- a/tests/service/data/SyntaxTree/NestedModule/RangeOfEqualSignShouldBePresent.fs.bsl +++ b/tests/service/data/SyntaxTree/NestedModule/RangeOfEqualSignShouldBePresent.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/NestedModule/RangeOfEqualSignShouldBePresent.fs", false, - QualifiedNameOfFile RangeOfEqualSignShouldBePresent, [], [], + QualifiedNameOfFile RangeOfEqualSignShouldBePresent, [], [SynModuleOrNamespace ([RangeOfEqualSignShouldBePresent], false, AnonModule, [NestedModule diff --git a/tests/service/data/SyntaxTree/NestedModule/RangeOfEqualSignShouldBePresentSignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/NestedModule/RangeOfEqualSignShouldBePresentSignatureFile.fsi.bsl index d9575b21a86..cb57ecdd9ed 100644 --- a/tests/service/data/SyntaxTree/NestedModule/RangeOfEqualSignShouldBePresentSignatureFile.fsi.bsl +++ b/tests/service/data/SyntaxTree/NestedModule/RangeOfEqualSignShouldBePresentSignatureFile.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/NestedModule/RangeOfEqualSignShouldBePresentSignatureFile.fsi", - QualifiedNameOfFile RangeOfEqualSignShouldBePresentSignatureFile, [], [], + QualifiedNameOfFile RangeOfEqualSignShouldBePresentSignatureFile, [], [SynModuleOrNamespaceSig ([Foo], false, DeclaredNamespace, [NestedModule diff --git a/tests/service/data/SyntaxTree/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi.bsl b/tests/service/data/SyntaxTree/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi.bsl index d1d8882f2a0..a7c40ad9209 100644 --- a/tests/service/data/SyntaxTree/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi.bsl +++ b/tests/service/data/SyntaxTree/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi.bsl @@ -3,7 +3,6 @@ SigFile ("/root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi", QualifiedNameOfFile RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl, [], - [], [SynModuleOrNamespaceSig ([Microsoft; FSharp; Core], false, DeclaredNamespace, [Open diff --git a/tests/service/data/SyntaxTree/Nullness/AbstractClassProperty.fs.bsl b/tests/service/data/SyntaxTree/Nullness/AbstractClassProperty.fs.bsl index fa15e544c36..3661fdb9a96 100644 --- a/tests/service/data/SyntaxTree/Nullness/AbstractClassProperty.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/AbstractClassProperty.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/AbstractClassProperty.fs", false, - QualifiedNameOfFile AbstractClassProperty, [], [], + QualifiedNameOfFile AbstractClassProperty, [], [SynModuleOrNamespace ([AbstractClassProperty], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Nullness/DuCaseStringOrNull.fs.bsl b/tests/service/data/SyntaxTree/Nullness/DuCaseStringOrNull.fs.bsl index e60a05e853d..42e8d6b842f 100644 --- a/tests/service/data/SyntaxTree/Nullness/DuCaseStringOrNull.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/DuCaseStringOrNull.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/DuCaseStringOrNull.fs", false, - QualifiedNameOfFile DuCaseStringOrNull, [], [], + QualifiedNameOfFile DuCaseStringOrNull, [], [SynModuleOrNamespace ([DuCaseStringOrNull], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Nullness/DuCaseTuplePrecedence.fs.bsl b/tests/service/data/SyntaxTree/Nullness/DuCaseTuplePrecedence.fs.bsl index 1ae968787e3..3adaaad24fc 100644 --- a/tests/service/data/SyntaxTree/Nullness/DuCaseTuplePrecedence.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/DuCaseTuplePrecedence.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/DuCaseTuplePrecedence.fs", false, - QualifiedNameOfFile DuCaseTuplePrecedence, [], [], + QualifiedNameOfFile DuCaseTuplePrecedence, [], [SynModuleOrNamespace ([DuCaseTuplePrecedence], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Nullness/ExplicitField.fs.bsl b/tests/service/data/SyntaxTree/Nullness/ExplicitField.fs.bsl index b590e85bce5..301776765e5 100644 --- a/tests/service/data/SyntaxTree/Nullness/ExplicitField.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/ExplicitField.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/ExplicitField.fs", false, - QualifiedNameOfFile ExplicitField, [], [], + QualifiedNameOfFile ExplicitField, [], [SynModuleOrNamespace ([ExplicitField], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Nullness/FunctionArgAsPatternWithNullCase.fs.bsl b/tests/service/data/SyntaxTree/Nullness/FunctionArgAsPatternWithNullCase.fs.bsl index 1d72ceec00a..f0d46ce9461 100644 --- a/tests/service/data/SyntaxTree/Nullness/FunctionArgAsPatternWithNullCase.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/FunctionArgAsPatternWithNullCase.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/FunctionArgAsPatternWithNullCase.fs", false, - QualifiedNameOfFile FunctionArgAsPatternWithNullCase, [], [], + QualifiedNameOfFile FunctionArgAsPatternWithNullCase, [], [SynModuleOrNamespace ([FunctionArgAsPatternWithNullCase], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Nullness/GenericFunctionReturnTypeNotStructNull.fs.bsl b/tests/service/data/SyntaxTree/Nullness/GenericFunctionReturnTypeNotStructNull.fs.bsl index d155f74abba..dea9102a521 100644 --- a/tests/service/data/SyntaxTree/Nullness/GenericFunctionReturnTypeNotStructNull.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/GenericFunctionReturnTypeNotStructNull.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/GenericFunctionReturnTypeNotStructNull.fs", false, - QualifiedNameOfFile GenericFunctionReturnTypeNotStructNull, [], [], + QualifiedNameOfFile GenericFunctionReturnTypeNotStructNull, [], [SynModuleOrNamespace ([GenericFunctionReturnTypeNotStructNull], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Nullness/GenericFunctionTyparNotNull.fs.bsl b/tests/service/data/SyntaxTree/Nullness/GenericFunctionTyparNotNull.fs.bsl index f03151197dd..6a96a915afb 100644 --- a/tests/service/data/SyntaxTree/Nullness/GenericFunctionTyparNotNull.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/GenericFunctionTyparNotNull.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/GenericFunctionTyparNotNull.fs", false, - QualifiedNameOfFile GenericFunctionTyparNotNull, [], [], + QualifiedNameOfFile GenericFunctionTyparNotNull, [], [SynModuleOrNamespace ([GenericFunctionTyparNotNull], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Nullness/GenericFunctionTyparNull.fs.bsl b/tests/service/data/SyntaxTree/Nullness/GenericFunctionTyparNull.fs.bsl index db83d1ddcbf..c7d1be5131d 100644 --- a/tests/service/data/SyntaxTree/Nullness/GenericFunctionTyparNull.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/GenericFunctionTyparNull.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/GenericFunctionTyparNull.fs", false, - QualifiedNameOfFile GenericFunctionTyparNull, [], [], + QualifiedNameOfFile GenericFunctionTyparNull, [], [SynModuleOrNamespace ([GenericFunctionTyparNull], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Nullness/GenericTypeNotNull.fs.bsl b/tests/service/data/SyntaxTree/Nullness/GenericTypeNotNull.fs.bsl index 92d0d1a136c..c4356b6f53b 100644 --- a/tests/service/data/SyntaxTree/Nullness/GenericTypeNotNull.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/GenericTypeNotNull.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/GenericTypeNotNull.fs", false, - QualifiedNameOfFile GenericTypeNotNull, [], [], + QualifiedNameOfFile GenericTypeNotNull, [], [SynModuleOrNamespace ([GenericTypeNotNull], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Nullness/GenericTypeNotNullAndOtherConstraint.fs.bsl b/tests/service/data/SyntaxTree/Nullness/GenericTypeNotNullAndOtherConstraint.fs.bsl index 0906d86df22..4fe24f7379b 100644 --- a/tests/service/data/SyntaxTree/Nullness/GenericTypeNotNullAndOtherConstraint.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/GenericTypeNotNullAndOtherConstraint.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/GenericTypeNotNullAndOtherConstraint.fs", false, - QualifiedNameOfFile GenericTypeNotNullAndOtherConstraint, [], [], + QualifiedNameOfFile GenericTypeNotNullAndOtherConstraint, [], [SynModuleOrNamespace ([GenericTypeNotNullAndOtherConstraint], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Nullness/GenericTypeNotStructAndOtherConstraint-I_am_Still_Sane.fs.bsl b/tests/service/data/SyntaxTree/Nullness/GenericTypeNotStructAndOtherConstraint-I_am_Still_Sane.fs.bsl index 6ebe197154b..6bfc279f6f3 100644 --- a/tests/service/data/SyntaxTree/Nullness/GenericTypeNotStructAndOtherConstraint-I_am_Still_Sane.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/GenericTypeNotStructAndOtherConstraint-I_am_Still_Sane.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Nullness/GenericTypeNotStructAndOtherConstraint-I_am_Still_Sane.fs", false, QualifiedNameOfFile GenericTypeNotStructAndOtherConstraint-I_am_Still_Sane, - [], [], + [], [SynModuleOrNamespace ([GenericTypeNotStructAndOtherConstraint-I_am_Still_Sane], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Nullness/GenericTypeNull.fs.bsl b/tests/service/data/SyntaxTree/Nullness/GenericTypeNull.fs.bsl index 184b29d69d3..d1c295fd484 100644 --- a/tests/service/data/SyntaxTree/Nullness/GenericTypeNull.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/GenericTypeNull.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/GenericTypeNull.fs", false, - QualifiedNameOfFile GenericTypeNull, [], [], + QualifiedNameOfFile GenericTypeNull, [], [SynModuleOrNamespace ([GenericTypeNull], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Nullness/GenericTypeOtherConstraintAndThenNotNull.fs.bsl b/tests/service/data/SyntaxTree/Nullness/GenericTypeOtherConstraintAndThenNotNull.fs.bsl index c6f6f52d871..027c30db9da 100644 --- a/tests/service/data/SyntaxTree/Nullness/GenericTypeOtherConstraintAndThenNotNull.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/GenericTypeOtherConstraintAndThenNotNull.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/GenericTypeOtherConstraintAndThenNotNull.fs", false, - QualifiedNameOfFile GenericTypeOtherConstraintAndThenNotNull, [], [], + QualifiedNameOfFile GenericTypeOtherConstraintAndThenNotNull, [], [SynModuleOrNamespace ([GenericTypeOtherConstraintAndThenNotNull], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Nullness/IntListOrNull.fs.bsl b/tests/service/data/SyntaxTree/Nullness/IntListOrNull.fs.bsl index c678aa83577..ab336ed3594 100644 --- a/tests/service/data/SyntaxTree/Nullness/IntListOrNull.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/IntListOrNull.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/IntListOrNull.fs", false, - QualifiedNameOfFile IntListOrNull, [], [], + QualifiedNameOfFile IntListOrNull, [], [SynModuleOrNamespace ([IntListOrNull], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Nullness/IntListOrNullOrNullOrNull.fs.bsl b/tests/service/data/SyntaxTree/Nullness/IntListOrNullOrNullOrNull.fs.bsl index 2ba94607f41..ff5a413899b 100644 --- a/tests/service/data/SyntaxTree/Nullness/IntListOrNullOrNullOrNull.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/IntListOrNullOrNullOrNull.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/IntListOrNullOrNullOrNull.fs", false, - QualifiedNameOfFile IntListOrNullOrNullOrNull, [], [], + QualifiedNameOfFile IntListOrNullOrNullOrNull, [], [SynModuleOrNamespace ([IntListOrNullOrNullOrNull], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Nullness/MatchWithTypeCast.fs.bsl b/tests/service/data/SyntaxTree/Nullness/MatchWithTypeCast.fs.bsl index 86094715714..594d54a0f80 100644 --- a/tests/service/data/SyntaxTree/Nullness/MatchWithTypeCast.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/MatchWithTypeCast.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/MatchWithTypeCast.fs", false, - QualifiedNameOfFile MatchWithTypeCast, [], [], + QualifiedNameOfFile MatchWithTypeCast, [], [SynModuleOrNamespace ([MatchWithTypeCast], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Nullness/MatchWithTypeCastParens.fs.bsl b/tests/service/data/SyntaxTree/Nullness/MatchWithTypeCastParens.fs.bsl index 2c465e58091..89075b825ff 100644 --- a/tests/service/data/SyntaxTree/Nullness/MatchWithTypeCastParens.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/MatchWithTypeCastParens.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/MatchWithTypeCastParens.fs", false, - QualifiedNameOfFile MatchWithTypeCastParens, [], [], + QualifiedNameOfFile MatchWithTypeCastParens, [], [SynModuleOrNamespace ([MatchWithTypeCastParens], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Nullness/MatchWithTypeCastParensAndSeparateNullCase.fs.bsl b/tests/service/data/SyntaxTree/Nullness/MatchWithTypeCastParensAndSeparateNullCase.fs.bsl index aa2e5f0787c..5a490553bb0 100644 --- a/tests/service/data/SyntaxTree/Nullness/MatchWithTypeCastParensAndSeparateNullCase.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/MatchWithTypeCastParensAndSeparateNullCase.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/MatchWithTypeCastParensAndSeparateNullCase.fs", false, - QualifiedNameOfFile MatchWithTypeCastParensAndSeparateNullCase, [], [], + QualifiedNameOfFile MatchWithTypeCastParensAndSeparateNullCase, [], [SynModuleOrNamespace ([MatchWithTypeCastParensAndSeparateNullCase], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Nullness/NullAnnotatedExpression.fs.bsl b/tests/service/data/SyntaxTree/Nullness/NullAnnotatedExpression.fs.bsl index 207a76250e4..a739143e2b4 100644 --- a/tests/service/data/SyntaxTree/Nullness/NullAnnotatedExpression.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/NullAnnotatedExpression.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/NullAnnotatedExpression.fs", false, - QualifiedNameOfFile NullAnnotatedExpression, [], [], + QualifiedNameOfFile NullAnnotatedExpression, [], [SynModuleOrNamespace ([NullAnnotatedExpression], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Nullness/RegressionAnnotatedInlinePatternMatch.fs.bsl b/tests/service/data/SyntaxTree/Nullness/RegressionAnnotatedInlinePatternMatch.fs.bsl index aaa2b2bafc3..f9a2416f122 100644 --- a/tests/service/data/SyntaxTree/Nullness/RegressionAnnotatedInlinePatternMatch.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/RegressionAnnotatedInlinePatternMatch.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/RegressionAnnotatedInlinePatternMatch.fs", false, - QualifiedNameOfFile RegressionAnnotatedInlinePatternMatch, [], [], + QualifiedNameOfFile RegressionAnnotatedInlinePatternMatch, [], [SynModuleOrNamespace ([RegressionAnnotatedInlinePatternMatch], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Nullness/RegressionChoiceType.fs.bsl b/tests/service/data/SyntaxTree/Nullness/RegressionChoiceType.fs.bsl index aa2b6752d76..2394eab8d93 100644 --- a/tests/service/data/SyntaxTree/Nullness/RegressionChoiceType.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/RegressionChoiceType.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/RegressionChoiceType.fs", false, - QualifiedNameOfFile RegressionChoiceType, [], [], + QualifiedNameOfFile RegressionChoiceType, [], [SynModuleOrNamespace ([RegressionChoiceType], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Nullness/RegressionListType.fs.bsl b/tests/service/data/SyntaxTree/Nullness/RegressionListType.fs.bsl index 5b1a914a438..39fcbd0a2cc 100644 --- a/tests/service/data/SyntaxTree/Nullness/RegressionListType.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/RegressionListType.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/RegressionListType.fs", false, - QualifiedNameOfFile RegressionListType, [], [], + QualifiedNameOfFile RegressionListType, [], [SynModuleOrNamespace ([RegressionListType], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Nullness/RegressionOneLinerOptionType.fs.bsl b/tests/service/data/SyntaxTree/Nullness/RegressionOneLinerOptionType.fs.bsl index 7a062070cb7..356e5f7b676 100644 --- a/tests/service/data/SyntaxTree/Nullness/RegressionOneLinerOptionType.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/RegressionOneLinerOptionType.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/RegressionOneLinerOptionType.fs", false, - QualifiedNameOfFile RegressionOneLinerOptionType, [], [], + QualifiedNameOfFile RegressionOneLinerOptionType, [], [SynModuleOrNamespace ([RegressionOneLinerOptionType], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Nullness/RegressionOptionType.fs.bsl b/tests/service/data/SyntaxTree/Nullness/RegressionOptionType.fs.bsl index 5491684ccaa..3ca156ee1d9 100644 --- a/tests/service/data/SyntaxTree/Nullness/RegressionOptionType.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/RegressionOptionType.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/RegressionOptionType.fs", false, - QualifiedNameOfFile RegressionOptionType, [], [], + QualifiedNameOfFile RegressionOptionType, [], [SynModuleOrNamespace ([RegressionOptionType], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Nullness/RegressionOrPattern.fs.bsl b/tests/service/data/SyntaxTree/Nullness/RegressionOrPattern.fs.bsl index 82fe5cb33d5..62d3701a2af 100644 --- a/tests/service/data/SyntaxTree/Nullness/RegressionOrPattern.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/RegressionOrPattern.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/RegressionOrPattern.fs", false, - QualifiedNameOfFile RegressionOrPattern, [], [], + QualifiedNameOfFile RegressionOrPattern, [], [SynModuleOrNamespace ([RegressionOrPattern], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Nullness/RegressionResultType.fs.bsl b/tests/service/data/SyntaxTree/Nullness/RegressionResultType.fs.bsl index c36213899e7..caa6326fb1b 100644 --- a/tests/service/data/SyntaxTree/Nullness/RegressionResultType.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/RegressionResultType.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/RegressionResultType.fs", false, - QualifiedNameOfFile RegressionResultType, [], [], + QualifiedNameOfFile RegressionResultType, [], [SynModuleOrNamespace ([RegressionResultType], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Nullness/SignatureInAbstractMember.fs.bsl b/tests/service/data/SyntaxTree/Nullness/SignatureInAbstractMember.fs.bsl index f1ba6080294..dd5c9ddbed8 100644 --- a/tests/service/data/SyntaxTree/Nullness/SignatureInAbstractMember.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/SignatureInAbstractMember.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/SignatureInAbstractMember.fs", false, - QualifiedNameOfFile SignatureInAbstractMember, [], [], + QualifiedNameOfFile SignatureInAbstractMember, [], [SynModuleOrNamespace ([SignatureInAbstractMember], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Nullness/StringOrNull.fs.bsl b/tests/service/data/SyntaxTree/Nullness/StringOrNull.fs.bsl index 4e8240dd5fb..2c13aae4b70 100644 --- a/tests/service/data/SyntaxTree/Nullness/StringOrNull.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/StringOrNull.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/StringOrNull.fs", false, QualifiedNameOfFile StringOrNull, - [], [], + [], [SynModuleOrNamespace ([StringOrNull], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Nullness/StringOrNullInFunctionArg.fs.bsl b/tests/service/data/SyntaxTree/Nullness/StringOrNullInFunctionArg.fs.bsl index 864e6e38365..80872046550 100644 --- a/tests/service/data/SyntaxTree/Nullness/StringOrNullInFunctionArg.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/StringOrNullInFunctionArg.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/StringOrNullInFunctionArg.fs", false, - QualifiedNameOfFile StringOrNullInFunctionArg, [], [], + QualifiedNameOfFile StringOrNullInFunctionArg, [], [SynModuleOrNamespace ([StringOrNullInFunctionArg], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Nullness/TypeAbbreviationAddingWithNull.fs.bsl b/tests/service/data/SyntaxTree/Nullness/TypeAbbreviationAddingWithNull.fs.bsl index 61d17ea291a..c81b5f343cc 100644 --- a/tests/service/data/SyntaxTree/Nullness/TypeAbbreviationAddingWithNull.fs.bsl +++ b/tests/service/data/SyntaxTree/Nullness/TypeAbbreviationAddingWithNull.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Nullness/TypeAbbreviationAddingWithNull.fs", false, - QualifiedNameOfFile TypeAbbreviationAddingWithNull, [], [], + QualifiedNameOfFile TypeAbbreviationAddingWithNull, [], [SynModuleOrNamespace ([TypeAbbreviationAddingWithNull], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 01.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 01.fs.bsl index 43d64f45a98..cbc11003bb7 100644 --- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 01.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/ActivePatternAnd 01.fs", false, - QualifiedNameOfFile ActivePatternAnd 01, [], [], + QualifiedNameOfFile ActivePatternAnd 01, [], [SynModuleOrNamespace ([ActivePatternAnd 01], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 02.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 02.fs.bsl index 23ebdc7c8da..26c363d69bf 100644 --- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 02.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/ActivePatternAnd 02.fs", false, - QualifiedNameOfFile ActivePatternAnd 02, [], [], + QualifiedNameOfFile ActivePatternAnd 02, [], [SynModuleOrNamespace ([ActivePatternAnd 02], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 03.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 03.fs.bsl index f59e50d9403..90680cc0b71 100644 --- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 03.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/ActivePatternAnd 03.fs", false, - QualifiedNameOfFile ActivePatternAnd 03, [], [], + QualifiedNameOfFile ActivePatternAnd 03, [], [SynModuleOrNamespace ([ActivePatternAnd 03], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 04.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 04.fs.bsl index 37b343fad98..2b18069688a 100644 --- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 04.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/ActivePatternAnd 04.fs", false, - QualifiedNameOfFile ActivePatternAnd 04, [], [], + QualifiedNameOfFile ActivePatternAnd 04, [], [SynModuleOrNamespace ([ActivePatternAnd 04], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 05.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 05.fs.bsl index 062a413ccde..6fff959e01b 100644 --- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 05.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 05.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/ActivePatternAnd 05.fs", false, - QualifiedNameOfFile ActivePatternAnd 05, [], [], + QualifiedNameOfFile ActivePatternAnd 05, [], [SynModuleOrNamespace ([ActivePatternAnd 05], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 06.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 06.fs.bsl index 7c8649824d5..1a811b779e8 100644 --- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 06.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 06.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/ActivePatternAnd 06.fs", false, - QualifiedNameOfFile ActivePatternAnd 06, [], [], + QualifiedNameOfFile ActivePatternAnd 06, [], [SynModuleOrNamespace ([ActivePatternAnd 06], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 07.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 07.fs.bsl index 71db7cf842c..592c465c453 100644 --- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 07.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 07.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/ActivePatternAnd 07.fs", false, - QualifiedNameOfFile ActivePatternAnd 07, [], [], + QualifiedNameOfFile ActivePatternAnd 07, [], [SynModuleOrNamespace ([ActivePatternAnd 07], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 08.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 08.fs.bsl index c2c958503a8..2117ecaae3e 100644 --- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 08.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternAnd 08.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/ActivePatternAnd 08.fs", false, - QualifiedNameOfFile ActivePatternAnd 08, [], [], + QualifiedNameOfFile ActivePatternAnd 08, [], [SynModuleOrNamespace ([ActivePatternAnd 08], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternAsFunction.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternAsFunction.fs.bsl index 83e6005fd33..df31775ed4e 100644 --- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternAsFunction.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternAsFunction.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/ActivePatternAsFunction.fs", false, - QualifiedNameOfFile ActivePatternAsFunction, [], [], + QualifiedNameOfFile ActivePatternAsFunction, [], [SynModuleOrNamespace ([ActivePatternAsFunction], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternDefinition.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternDefinition.fs.bsl index 9741e505625..012655dcbe0 100644 --- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternDefinition.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternDefinition.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/ActivePatternDefinition.fs", false, - QualifiedNameOfFile ActivePatternDefinition, [], [], + QualifiedNameOfFile ActivePatternDefinition, [], [SynModuleOrNamespace ([ActivePatternDefinition], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 01.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 01.fs.bsl index f90393a139b..c97100e78ef 100644 --- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 01.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/ActivePatternExceptionAnd 01.fs", false, - QualifiedNameOfFile ActivePatternExceptionAnd 01, [], [], + QualifiedNameOfFile ActivePatternExceptionAnd 01, [], [SynModuleOrNamespace ([ActivePatternExceptionAnd 01], false, AnonModule, [Exception diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 02.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 02.fs.bsl index ad1420869f1..a6702952344 100644 --- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 02.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/ActivePatternExceptionAnd 02.fs", false, - QualifiedNameOfFile ActivePatternExceptionAnd 02, [], [], + QualifiedNameOfFile ActivePatternExceptionAnd 02, [], [SynModuleOrNamespace ([ActivePatternExceptionAnd 02], false, AnonModule, [Exception diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 03.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 03.fs.bsl index 1b4bdf7dfd9..74d522e8553 100644 --- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 03.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/ActivePatternExceptionAnd 03.fs", false, - QualifiedNameOfFile ActivePatternExceptionAnd 03, [], [], + QualifiedNameOfFile ActivePatternExceptionAnd 03, [], [SynModuleOrNamespace ([ActivePatternExceptionAnd 03], false, AnonModule, [Exception diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 04.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 04.fs.bsl index ea96f1966b4..54b831828ff 100644 --- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 04.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/ActivePatternExceptionAnd 04.fs", false, - QualifiedNameOfFile ActivePatternExceptionAnd 04, [], [], + QualifiedNameOfFile ActivePatternExceptionAnd 04, [], [SynModuleOrNamespace ([ActivePatternExceptionAnd 04], false, AnonModule, [Exception diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 05.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 05.fs.bsl index 2517eb3918d..4155388cf8d 100644 --- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 05.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 05.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/ActivePatternExceptionAnd 05.fs", false, - QualifiedNameOfFile ActivePatternExceptionAnd 05, [], [], + QualifiedNameOfFile ActivePatternExceptionAnd 05, [], [SynModuleOrNamespace ([ActivePatternExceptionAnd 05], false, AnonModule, [Exception diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 06.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 06.fs.bsl index 91e95536c83..5bdf4c59fb8 100644 --- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 06.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 06.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/ActivePatternExceptionAnd 06.fs", false, - QualifiedNameOfFile ActivePatternExceptionAnd 06, [], [], + QualifiedNameOfFile ActivePatternExceptionAnd 06, [], [SynModuleOrNamespace ([ActivePatternExceptionAnd 06], false, AnonModule, [Exception diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 07.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 07.fs.bsl index 35c7d986cf3..2341e1a1b7e 100644 --- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 07.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 07.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/ActivePatternExceptionAnd 07.fs", false, - QualifiedNameOfFile ActivePatternExceptionAnd 07, [], [], + QualifiedNameOfFile ActivePatternExceptionAnd 07, [], [SynModuleOrNamespace ([ActivePatternExceptionAnd 07], false, AnonModule, [Exception diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 08.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 08.fs.bsl index d61d4fa3ef0..0a32a6a2b80 100644 --- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 08.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternExceptionAnd 08.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/ActivePatternExceptionAnd 08.fs", false, - QualifiedNameOfFile ActivePatternExceptionAnd 08, [], [], + QualifiedNameOfFile ActivePatternExceptionAnd 08, [], [SynModuleOrNamespace ([ActivePatternExceptionAnd 08], false, AnonModule, [Exception diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternIdentifierInPrivateMember.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternIdentifierInPrivateMember.fs.bsl index a91a973e4e5..360bb27a52f 100644 --- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternIdentifierInPrivateMember.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternIdentifierInPrivateMember.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/ActivePatternIdentifierInPrivateMember.fs", false, - QualifiedNameOfFile ActivePatternIdentifierInPrivateMember, [], [], + QualifiedNameOfFile ActivePatternIdentifierInPrivateMember, [], [SynModuleOrNamespace ([ActivePatternIdentifierInPrivateMember], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/OperatorName/CustomOperatorDefinition.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/CustomOperatorDefinition.fs.bsl index 33ebeafb08c..88ecf1de842 100644 --- a/tests/service/data/SyntaxTree/OperatorName/CustomOperatorDefinition.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/CustomOperatorDefinition.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/CustomOperatorDefinition.fs", false, - QualifiedNameOfFile CustomOperatorDefinition, [], [], + QualifiedNameOfFile CustomOperatorDefinition, [], [SynModuleOrNamespace ([CustomOperatorDefinition], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/OperatorName/DetectDifferenceBetweenCompiledOperators.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/DetectDifferenceBetweenCompiledOperators.fs.bsl index 51389ae62c8..e44d429bd80 100644 --- a/tests/service/data/SyntaxTree/OperatorName/DetectDifferenceBetweenCompiledOperators.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/DetectDifferenceBetweenCompiledOperators.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/DetectDifferenceBetweenCompiledOperators.fs", false, - QualifiedNameOfFile DetectDifferenceBetweenCompiledOperators, [], [], + QualifiedNameOfFile DetectDifferenceBetweenCompiledOperators, [], [SynModuleOrNamespace ([DetectDifferenceBetweenCompiledOperators], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/OperatorName/InfixOperation.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/InfixOperation.fs.bsl index 20572a95193..19ec78e77a5 100644 --- a/tests/service/data/SyntaxTree/OperatorName/InfixOperation.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/InfixOperation.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/InfixOperation.fs", false, - QualifiedNameOfFile InfixOperation, [], [], + QualifiedNameOfFile InfixOperation, [], [SynModuleOrNamespace ([InfixOperation], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/OperatorName/NamedParameter.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/NamedParameter.fs.bsl index bc0bf9748b4..421436b43bb 100644 --- a/tests/service/data/SyntaxTree/OperatorName/NamedParameter.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/NamedParameter.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/NamedParameter.fs", false, - QualifiedNameOfFile NamedParameter, [], [], + QualifiedNameOfFile NamedParameter, [], [SynModuleOrNamespace ([NamedParameter], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/OperatorName/NameofOperator.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/NameofOperator.fs.bsl index 49f2b8a4332..a76f41f16cc 100644 --- a/tests/service/data/SyntaxTree/OperatorName/NameofOperator.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/NameofOperator.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/NameofOperator.fs", false, - QualifiedNameOfFile NameofOperator, [], [], + QualifiedNameOfFile NameofOperator, [], [SynModuleOrNamespace ([NameofOperator], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/OperatorName/ObjectModelWithTwoMembers.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ObjectModelWithTwoMembers.fs.bsl index 760c3f64ca3..5f7548cb360 100644 --- a/tests/service/data/SyntaxTree/OperatorName/ObjectModelWithTwoMembers.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/ObjectModelWithTwoMembers.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/ObjectModelWithTwoMembers.fs", false, - QualifiedNameOfFile ObjectModelWithTwoMembers, [], [], + QualifiedNameOfFile ObjectModelWithTwoMembers, [], [SynModuleOrNamespace ([ObjectModelWithTwoMembers], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/OperatorName/OperatorAsFunction.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/OperatorAsFunction.fs.bsl index a18485248e6..81238865b85 100644 --- a/tests/service/data/SyntaxTree/OperatorName/OperatorAsFunction.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/OperatorAsFunction.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/OperatorAsFunction.fs", false, - QualifiedNameOfFile OperatorAsFunction, [], [], + QualifiedNameOfFile OperatorAsFunction, [], [SynModuleOrNamespace ([OperatorAsFunction], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/OperatorName/OperatorInMemberDefinition.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/OperatorInMemberDefinition.fs.bsl index 4e05d9cbd83..d1e04d886b8 100644 --- a/tests/service/data/SyntaxTree/OperatorName/OperatorInMemberDefinition.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/OperatorInMemberDefinition.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/OperatorInMemberDefinition.fs", false, - QualifiedNameOfFile OperatorInMemberDefinition, [], [], + QualifiedNameOfFile OperatorInMemberDefinition, [], [SynModuleOrNamespace ([OperatorInMemberDefinition], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/OperatorName/OperatorNameInSynValSig.fsi.bsl b/tests/service/data/SyntaxTree/OperatorName/OperatorNameInSynValSig.fsi.bsl index b90adbf927e..259f60816de 100644 --- a/tests/service/data/SyntaxTree/OperatorName/OperatorNameInSynValSig.fsi.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/OperatorNameInSynValSig.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/OperatorName/OperatorNameInSynValSig.fsi", - QualifiedNameOfFile IntrinsicOperators, [], [], + QualifiedNameOfFile IntrinsicOperators, [], [SynModuleOrNamespaceSig ([IntrinsicOperators], false, NamedModule, [Val diff --git a/tests/service/data/SyntaxTree/OperatorName/OperatorNameInValConstraint.fsi.bsl b/tests/service/data/SyntaxTree/OperatorName/OperatorNameInValConstraint.fsi.bsl index d31043ea99c..c2af4e7f89b 100644 --- a/tests/service/data/SyntaxTree/OperatorName/OperatorNameInValConstraint.fsi.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/OperatorNameInValConstraint.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/OperatorName/OperatorNameInValConstraint.fsi", - QualifiedNameOfFile Operators, [], [], + QualifiedNameOfFile Operators, [], [SynModuleOrNamespaceSig ([Operators], false, NamedModule, [Val diff --git a/tests/service/data/SyntaxTree/OperatorName/OptionalExpression.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/OptionalExpression.fs.bsl index 2db0610b10d..0fb3fe398bd 100644 --- a/tests/service/data/SyntaxTree/OperatorName/OptionalExpression.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/OptionalExpression.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/OptionalExpression.fs", false, - QualifiedNameOfFile OptionalExpression, [], [], + QualifiedNameOfFile OptionalExpression, [], [SynModuleOrNamespace ([OptionalExpression], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternAsFunction.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternAsFunction.fs.bsl index 81d08cb1074..6ff91c33e3a 100644 --- a/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternAsFunction.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternAsFunction.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/PartialActivePatternAsFunction.fs", false, - QualifiedNameOfFile PartialActivePatternAsFunction, [], [], + QualifiedNameOfFile PartialActivePatternAsFunction, [], [SynModuleOrNamespace ([PartialActivePatternAsFunction], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinition.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinition.fs.bsl index 6b6c5b59524..c9c9acd625f 100644 --- a/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinition.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinition.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/PartialActivePatternDefinition.fs", false, - QualifiedNameOfFile PartialActivePatternDefinition, [], [], + QualifiedNameOfFile PartialActivePatternDefinition, [], [SynModuleOrNamespace ([PartialActivePatternDefinition], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinitionWithoutParameters.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinitionWithoutParameters.fs.bsl index be0b81e8577..7b269ec6cf6 100644 --- a/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinitionWithoutParameters.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinitionWithoutParameters.fs.bsl @@ -2,7 +2,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/PartialActivePatternDefinitionWithoutParameters.fs", false, QualifiedNameOfFile PartialActivePatternDefinitionWithoutParameters, - [], [], + [], [SynModuleOrNamespace ([PartialActivePatternDefinitionWithoutParameters], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/OperatorName/PrefixOperation.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/PrefixOperation.fs.bsl index 15193e63278..c07f18855fd 100644 --- a/tests/service/data/SyntaxTree/OperatorName/PrefixOperation.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/PrefixOperation.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/PrefixOperation.fs", false, - QualifiedNameOfFile PrefixOperation, [], [], + QualifiedNameOfFile PrefixOperation, [], [SynModuleOrNamespace ([PrefixOperation], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/OperatorName/PrefixOperationWithTwoCharacters.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/PrefixOperationWithTwoCharacters.fs.bsl index f73ff914587..d25ce9b329a 100644 --- a/tests/service/data/SyntaxTree/OperatorName/PrefixOperationWithTwoCharacters.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/PrefixOperationWithTwoCharacters.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/PrefixOperationWithTwoCharacters.fs", false, - QualifiedNameOfFile PrefixOperationWithTwoCharacters, [], [], + QualifiedNameOfFile PrefixOperationWithTwoCharacters, [], [SynModuleOrNamespace ([PrefixOperationWithTwoCharacters], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/OperatorName/QualifiedOperatorExpression.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/QualifiedOperatorExpression.fs.bsl index b83fc4ecf68..9925af284c5 100644 --- a/tests/service/data/SyntaxTree/OperatorName/QualifiedOperatorExpression.fs.bsl +++ b/tests/service/data/SyntaxTree/OperatorName/QualifiedOperatorExpression.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/OperatorName/QualifiedOperatorExpression.fs", false, - QualifiedNameOfFile QualifiedOperatorExpression, [], [], + QualifiedNameOfFile QualifiedOperatorExpression, [], [SynModuleOrNamespace ([QualifiedOperatorExpression], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/ParsedHashDirective/RegularStringAsParsedHashDirectiveArgument.fs.bsl b/tests/service/data/SyntaxTree/ParsedHashDirective/RegularStringAsParsedHashDirectiveArgument.fs.bsl index 360f4117e4b..8bac0d35794 100644 --- a/tests/service/data/SyntaxTree/ParsedHashDirective/RegularStringAsParsedHashDirectiveArgument.fs.bsl +++ b/tests/service/data/SyntaxTree/ParsedHashDirective/RegularStringAsParsedHashDirectiveArgument.fs.bsl @@ -2,7 +2,6 @@ ImplFile (ParsedImplFileInput ("/root/ParsedHashDirective/RegularStringAsParsedHashDirectiveArgument.fs", false, QualifiedNameOfFile RegularStringAsParsedHashDirectiveArgument, [], - [], [SynModuleOrNamespace ([RegularStringAsParsedHashDirectiveArgument], false, AnonModule, [HashDirective diff --git a/tests/service/data/SyntaxTree/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs.bsl b/tests/service/data/SyntaxTree/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs.bsl index 8434a2be591..ef095020b9a 100644 --- a/tests/service/data/SyntaxTree/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs.bsl +++ b/tests/service/data/SyntaxTree/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs.bsl @@ -2,7 +2,7 @@ ImplFile (ParsedImplFileInput ("/root/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs", false, QualifiedNameOfFile SourceIdentifierAsParsedHashDirectiveArgument, - [], [], + [], [SynModuleOrNamespace ([SourceIdentifierAsParsedHashDirectiveArgument], false, AnonModule, [HashDirective diff --git a/tests/service/data/SyntaxTree/ParsedHashDirective/TripleQuoteStringAsParsedHashDirectiveArgument.fs.bsl b/tests/service/data/SyntaxTree/ParsedHashDirective/TripleQuoteStringAsParsedHashDirectiveArgument.fs.bsl index 391a462d0b8..511d5bb167f 100644 --- a/tests/service/data/SyntaxTree/ParsedHashDirective/TripleQuoteStringAsParsedHashDirectiveArgument.fs.bsl +++ b/tests/service/data/SyntaxTree/ParsedHashDirective/TripleQuoteStringAsParsedHashDirectiveArgument.fs.bsl @@ -2,13 +2,12 @@ ImplFile (ParsedImplFileInput ("/root/ParsedHashDirective/TripleQuoteStringAsParsedHashDirectiveArgument.fs", false, QualifiedNameOfFile TripleQuoteStringAsParsedHashDirectiveArgument, - [WarningOff ((2,0--2,16), 40)], [], + [], [SynModuleOrNamespace ([TripleQuoteStringAsParsedHashDirectiveArgument], false, AnonModule, [HashDirective - (ParsedHashDirective - ("nowarn", [String ("40", TripleQuote, (2,8--2,16))], - (2,0--2,16)), (2,0--2,16))], PreXmlDocEmpty, [], None, - (2,0--2,16), { LeadingKeyword = None })], (true, true), + (ParsedHashDirective ("WARN_DIRECTIVE_DUMMY", [], (2,0--2,16)), + (2,0--2,16))], PreXmlDocEmpty, [], None, (2,0--2,16), + { LeadingKeyword = None })], (true, true), { ConditionalDirectives = [] CodeComments = [] }, set [])) diff --git a/tests/service/data/SyntaxTree/ParsedHashDirective/VerbatimStringAsParsedHashDirectiveArgument.fs.bsl b/tests/service/data/SyntaxTree/ParsedHashDirective/VerbatimStringAsParsedHashDirectiveArgument.fs.bsl index 2dbceeacd80..e80cc800e59 100644 --- a/tests/service/data/SyntaxTree/ParsedHashDirective/VerbatimStringAsParsedHashDirectiveArgument.fs.bsl +++ b/tests/service/data/SyntaxTree/ParsedHashDirective/VerbatimStringAsParsedHashDirectiveArgument.fs.bsl @@ -2,7 +2,6 @@ ImplFile (ParsedImplFileInput ("/root/ParsedHashDirective/VerbatimStringAsParsedHashDirectiveArgument.fs", false, QualifiedNameOfFile VerbatimStringAsParsedHashDirectiveArgument, [], - [], [SynModuleOrNamespace ([VerbatimStringAsParsedHashDirectiveArgument], false, AnonModule, [HashDirective diff --git a/tests/service/data/SyntaxTree/Pattern/And 01.fs.bsl b/tests/service/data/SyntaxTree/Pattern/And 01.fs.bsl index 679d264dfcc..1a6fd9254e9 100644 --- a/tests/service/data/SyntaxTree/Pattern/And 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/And 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/And 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/And 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/And 02.fs.bsl b/tests/service/data/SyntaxTree/Pattern/And 02.fs.bsl index f533ba83b0a..d07733cd127 100644 --- a/tests/service/data/SyntaxTree/Pattern/And 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/And 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/And 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/And 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/And 03.fs.bsl b/tests/service/data/SyntaxTree/Pattern/And 03.fs.bsl index b75921e2808..0204ba0921c 100644 --- a/tests/service/data/SyntaxTree/Pattern/And 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/And 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/And 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/And 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/And 04.fs.bsl b/tests/service/data/SyntaxTree/Pattern/And 04.fs.bsl index 7a0fa1f4c89..864712ff84b 100644 --- a/tests/service/data/SyntaxTree/Pattern/And 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/And 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/And 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/And 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/As 01.fs.bsl b/tests/service/data/SyntaxTree/Pattern/As 01.fs.bsl index f0277e7a075..fe2af8673fb 100644 --- a/tests/service/data/SyntaxTree/Pattern/As 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/As 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/As 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/As 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/As 02.fs.bsl b/tests/service/data/SyntaxTree/Pattern/As 02.fs.bsl index dc9ff5caae9..e4ebd19812a 100644 --- a/tests/service/data/SyntaxTree/Pattern/As 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/As 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/As 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/As 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/As 03.fs.bsl b/tests/service/data/SyntaxTree/Pattern/As 03.fs.bsl index 87eeb9e821a..8e8fe561927 100644 --- a/tests/service/data/SyntaxTree/Pattern/As 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/As 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/As 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/As 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/As 04.fs.bsl b/tests/service/data/SyntaxTree/Pattern/As 04.fs.bsl index dbbdbdd9f3e..6497c92f1ad 100644 --- a/tests/service/data/SyntaxTree/Pattern/As 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/As 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/As 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/As 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/As 05.fs.bsl b/tests/service/data/SyntaxTree/Pattern/As 05.fs.bsl index 07a1aac463e..2f77f51b6e2 100644 --- a/tests/service/data/SyntaxTree/Pattern/As 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/As 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/As 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/As 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/As 06.fs.bsl b/tests/service/data/SyntaxTree/Pattern/As 06.fs.bsl index 5ce6e55db4d..dad977042ab 100644 --- a/tests/service/data/SyntaxTree/Pattern/As 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/As 06.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/As 06.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/As 06.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/As 07.fs.bsl b/tests/service/data/SyntaxTree/Pattern/As 07.fs.bsl index b462b81d90b..7dd91055a37 100644 --- a/tests/service/data/SyntaxTree/Pattern/As 07.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/As 07.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/As 07.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/As 07.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/As 08.fs.bsl b/tests/service/data/SyntaxTree/Pattern/As 08.fs.bsl index bfe069db512..547bce231b7 100644 --- a/tests/service/data/SyntaxTree/Pattern/As 08.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/As 08.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/As 08.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/As 08.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/As 09.fs.bsl b/tests/service/data/SyntaxTree/Pattern/As 09.fs.bsl index ad9aa2247c1..35407e85c8d 100644 --- a/tests/service/data/SyntaxTree/Pattern/As 09.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/As 09.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/As 09.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/As 09.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/As 10.fs.bsl b/tests/service/data/SyntaxTree/Pattern/As 10.fs.bsl index 384bd2c6d06..f5dfb760f5e 100644 --- a/tests/service/data/SyntaxTree/Pattern/As 10.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/As 10.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/As 10.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/As 10.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/As 11.fs.bsl b/tests/service/data/SyntaxTree/Pattern/As 11.fs.bsl index 84773ba8ee6..5b2d5f457b5 100644 --- a/tests/service/data/SyntaxTree/Pattern/As 11.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/As 11.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/As 11.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/As 11.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/As 12.fs.bsl b/tests/service/data/SyntaxTree/Pattern/As 12.fs.bsl index f77b92aba46..bfef9de7176 100644 --- a/tests/service/data/SyntaxTree/Pattern/As 12.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/As 12.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/As 12.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/As 12.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Cons 01.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Cons 01.fs.bsl index c48f71c8ab2..ee3ab440e79 100644 --- a/tests/service/data/SyntaxTree/Pattern/Cons 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Cons 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/Cons 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/Cons 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Cons 02.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Cons 02.fs.bsl index a88741e666c..a47e7dac324 100644 --- a/tests/service/data/SyntaxTree/Pattern/Cons 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Cons 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/Cons 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/Cons 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Cons 03.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Cons 03.fs.bsl index fda13199e97..e269339f89e 100644 --- a/tests/service/data/SyntaxTree/Pattern/Cons 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Cons 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/Cons 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/Cons 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Cons 04.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Cons 04.fs.bsl index 90d727b5f30..7edb3d119ae 100644 --- a/tests/service/data/SyntaxTree/Pattern/Cons 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Cons 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/Cons 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/Cons 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/InHeadPattern.fs.bsl b/tests/service/data/SyntaxTree/Pattern/InHeadPattern.fs.bsl index 13a1e99ea00..8189cb8f290 100644 --- a/tests/service/data/SyntaxTree/Pattern/InHeadPattern.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/InHeadPattern.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/InHeadPattern.fs", false, QualifiedNameOfFile InHeadPattern, - [], [], + [], [SynModuleOrNamespace ([InHeadPattern], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/IsInst 01.fs.bsl b/tests/service/data/SyntaxTree/Pattern/IsInst 01.fs.bsl index 3b690e54512..deb80c5f4d8 100644 --- a/tests/service/data/SyntaxTree/Pattern/IsInst 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/IsInst 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/IsInst 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/IsInst 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/IsInst 02.fs.bsl b/tests/service/data/SyntaxTree/Pattern/IsInst 02.fs.bsl index dd1e86fabe4..18b4bd7f75d 100644 --- a/tests/service/data/SyntaxTree/Pattern/IsInst 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/IsInst 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/IsInst 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/IsInst 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/IsInst 03.fs.bsl b/tests/service/data/SyntaxTree/Pattern/IsInst 03.fs.bsl index 320a8c97f75..3772fa64f68 100644 --- a/tests/service/data/SyntaxTree/Pattern/IsInst 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/IsInst 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/IsInst 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/IsInst 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/IsInst 04.fs.bsl b/tests/service/data/SyntaxTree/Pattern/IsInst 04.fs.bsl index 1cf58c17dbc..1035177f690 100644 --- a/tests/service/data/SyntaxTree/Pattern/IsInst 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/IsInst 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/IsInst 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/IsInst 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/IsInst 05.fs.bsl b/tests/service/data/SyntaxTree/Pattern/IsInst 05.fs.bsl index 136e844c2ef..65f3afa33b8 100644 --- a/tests/service/data/SyntaxTree/Pattern/IsInst 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/IsInst 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/IsInst 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/IsInst 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Named field 01.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Named field 01.fs.bsl index 4a3050eb9f9..041d7aab3d3 100644 --- a/tests/service/data/SyntaxTree/Pattern/Named field 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Named field 01.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Named field 01.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Named field 02.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Named field 02.fs.bsl index b7bfc84c6d6..cd398f6c9b2 100644 --- a/tests/service/data/SyntaxTree/Pattern/Named field 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Named field 02.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Named field 02.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Named field 03.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Named field 03.fs.bsl index 0740dee26d8..7ae43154a9c 100644 --- a/tests/service/data/SyntaxTree/Pattern/Named field 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Named field 03.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Named field 03.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Named field 04.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Named field 04.fs.bsl index 33a958c138e..d0412f69e42 100644 --- a/tests/service/data/SyntaxTree/Pattern/Named field 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Named field 04.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Named field 04.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Named field 05.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Named field 05.fs.bsl index 969fb6c2b32..6969994de57 100644 --- a/tests/service/data/SyntaxTree/Pattern/Named field 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Named field 05.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Named field 05.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/OperatorInMatchPattern.fs.bsl b/tests/service/data/SyntaxTree/Pattern/OperatorInMatchPattern.fs.bsl index d9f4fc99fd0..4c6ba4479ce 100644 --- a/tests/service/data/SyntaxTree/Pattern/OperatorInMatchPattern.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/OperatorInMatchPattern.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/OperatorInMatchPattern.fs", false, - QualifiedNameOfFile OperatorInMatchPattern, [], [], + QualifiedNameOfFile OperatorInMatchPattern, [], [SynModuleOrNamespace ([OperatorInMatchPattern], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/OperatorInSynPatLongIdent.fs.bsl b/tests/service/data/SyntaxTree/Pattern/OperatorInSynPatLongIdent.fs.bsl index 90a60008ec8..b9c2a518bf3 100644 --- a/tests/service/data/SyntaxTree/Pattern/OperatorInSynPatLongIdent.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/OperatorInSynPatLongIdent.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/OperatorInSynPatLongIdent.fs", false, - QualifiedNameOfFile OperatorInSynPatLongIdent, [], [], + QualifiedNameOfFile OperatorInSynPatLongIdent, [], [SynModuleOrNamespace ([OperatorInSynPatLongIdent], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs.bsl b/tests/service/data/SyntaxTree/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs.bsl index e260f077c31..44ecd079413 100644 --- a/tests/service/data/SyntaxTree/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs", false, - QualifiedNameOfFile ParenthesesOfSynArgPatsNamePatPairs, [], [], + QualifiedNameOfFile ParenthesesOfSynArgPatsNamePatPairs, [], [SynModuleOrNamespace ([ParenthesesOfSynArgPatsNamePatPairs], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Record 01.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Record 01.fs.bsl index 9feca15fc45..0e25143cd03 100644 --- a/tests/service/data/SyntaxTree/Pattern/Record 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Record 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/Record 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/Record 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Record 02.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Record 02.fs.bsl index 57d597dab55..74b2d16784a 100644 --- a/tests/service/data/SyntaxTree/Pattern/Record 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Record 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/Record 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/Record 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Record 03.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Record 03.fs.bsl index 6ce17ab990c..f3901c89570 100644 --- a/tests/service/data/SyntaxTree/Pattern/Record 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Record 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/Record 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/Record 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Record 04.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Record 04.fs.bsl index e96ed95a57c..9fd5fc5ddbd 100644 --- a/tests/service/data/SyntaxTree/Pattern/Record 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Record 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/Record 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/Record 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Record 05.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Record 05.fs.bsl index ef0a9a11727..7b5cdc38484 100644 --- a/tests/service/data/SyntaxTree/Pattern/Record 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Record 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/Record 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/Record 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Record 06.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Record 06.fs.bsl index 7781aa39c9b..5d326421074 100644 --- a/tests/service/data/SyntaxTree/Pattern/Record 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Record 06.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Pattern/Record 06.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Pattern/Record 06.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/Pattern/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs.bsl index 61afba6c7a8..ae47f650909 100644 --- a/tests/service/data/SyntaxTree/Pattern/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Pattern/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs", false, QualifiedNameOfFile SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign, - [], [], + [], [SynModuleOrNamespace ([SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Pattern/SynPatOrContainsTheRangeOfTheBar.fs.bsl b/tests/service/data/SyntaxTree/Pattern/SynPatOrContainsTheRangeOfTheBar.fs.bsl index 61046ffea4e..8085e22a55b 100644 --- a/tests/service/data/SyntaxTree/Pattern/SynPatOrContainsTheRangeOfTheBar.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/SynPatOrContainsTheRangeOfTheBar.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/SynPatOrContainsTheRangeOfTheBar.fs", false, - QualifiedNameOfFile SynPatOrContainsTheRangeOfTheBar, [], [], + QualifiedNameOfFile SynPatOrContainsTheRangeOfTheBar, [], [SynModuleOrNamespace ([SynPatOrContainsTheRangeOfTheBar], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Tuple - HeadPat 01.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Tuple - HeadPat 01.fs.bsl index a81579964af..1873238bf24 100644 --- a/tests/service/data/SyntaxTree/Pattern/Tuple - HeadPat 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Tuple - HeadPat 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Tuple - HeadPat 01.fs", false, QualifiedNameOfFile Tuple, - [], [], + [], [SynModuleOrNamespace ([Tuple], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/Tuple - HeadPat 02.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Tuple - HeadPat 02.fs.bsl index 61bc7ef99b7..3b6f36dae28 100644 --- a/tests/service/data/SyntaxTree/Pattern/Tuple - HeadPat 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Tuple - HeadPat 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Tuple - HeadPat 02.fs", false, QualifiedNameOfFile Tuple, - [], [], + [], [SynModuleOrNamespace ([Tuple], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 01.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 01.fs.bsl index ed30e1a4690..7ec5d9c8b32 100644 --- a/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Tuple - Recover 01.fs", false, QualifiedNameOfFile Tuple, - [], [], + [], [SynModuleOrNamespace ([Tuple], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 02.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 02.fs.bsl index 5a07aa0debc..a9bd2fdef0a 100644 --- a/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Tuple - Recover 02.fs", false, QualifiedNameOfFile Tuple, - [], [], + [], [SynModuleOrNamespace ([Tuple], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 03.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 03.fs.bsl index ada6c9b8de0..eb7da283a86 100644 --- a/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Tuple - Recover 03.fs", false, QualifiedNameOfFile Tuple, - [], [], + [], [SynModuleOrNamespace ([Tuple], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 04.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 04.fs.bsl index 98ed45e9cfd..6b98966b6bf 100644 --- a/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Tuple - Recover 04.fs", false, QualifiedNameOfFile Tuple, - [], [], + [], [SynModuleOrNamespace ([Tuple], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/Tuple - Struct 01.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Tuple - Struct 01.fs.bsl index 0b605142320..3d79c343825 100644 --- a/tests/service/data/SyntaxTree/Pattern/Tuple - Struct 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Tuple - Struct 01.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Tuple - Struct 01.fs", false, QualifiedNameOfFile Tuple, [], - [], [SynModuleOrNamespace ([Tuple], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 01.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 01.fs.bsl index 39999d8f69c..0bc93fdd063 100644 --- a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Typed - Missing type 01.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 02.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 02.fs.bsl index b5b4b6e28e2..207de5569ea 100644 --- a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Typed - Missing type 02.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 03.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 03.fs.bsl index 609bc09a6fe..a18c86356f0 100644 --- a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Typed - Missing type 03.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 04.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 04.fs.bsl index 6ac283f7a93..0252822b055 100644 --- a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Typed - Missing type 04.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 05.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 05.fs.bsl index 54749497087..7816c5b5ced 100644 --- a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 05.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Typed - Missing type 05.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 06.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 06.fs.bsl index 55a07b60288..00fa285df54 100644 --- a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 06.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Typed - Missing type 06.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 07.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 07.fs.bsl index c96b5fc8d5e..e8d8865d65d 100644 --- a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 07.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 07.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Typed - Missing type 07.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 08.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 08.fs.bsl index 394f1e21eac..5c351f3dd30 100644 --- a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 08.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 08.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Typed - Missing type 08.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 09.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 09.fs.bsl index 89a4af5ce5c..0192145c5d1 100644 --- a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 09.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 09.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Typed - Missing type 09.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 10.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 10.fs.bsl index f3fa83db96a..77af407dfcc 100644 --- a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 10.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 10.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Typed - Missing type 10.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 11.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 11.fs.bsl index e89431a48e0..2fad3aceb3e 100644 --- a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 11.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 11.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Typed - Missing type 11.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 12.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 12.fs.bsl index 97ad7191e25..f016150d2de 100644 --- a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 12.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 12.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Pattern/Typed - Missing type 12.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SignatureType/EqualsTokenIsPresentInSynValSigMember.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/EqualsTokenIsPresentInSynValSigMember.fsi.bsl index ab9078c270c..797a3c95b65 100644 --- a/tests/service/data/SyntaxTree/SignatureType/EqualsTokenIsPresentInSynValSigMember.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/EqualsTokenIsPresentInSynValSigMember.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/SignatureType/EqualsTokenIsPresentInSynValSigMember.fsi", - QualifiedNameOfFile Meh, [], [], + QualifiedNameOfFile Meh, [], [SynModuleOrNamespaceSig ([Meh], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/SignatureType/EqualsTokenIsPresentInSynValSigValue.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/EqualsTokenIsPresentInSynValSigValue.fsi.bsl index c63121096fa..805a083f8a4 100644 --- a/tests/service/data/SyntaxTree/SignatureType/EqualsTokenIsPresentInSynValSigValue.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/EqualsTokenIsPresentInSynValSigValue.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/SignatureType/EqualsTokenIsPresentInSynValSigValue.fsi", - QualifiedNameOfFile Meh, [], [], + QualifiedNameOfFile Meh, [], [SynModuleOrNamespaceSig ([Meh], false, NamedModule, [Val diff --git a/tests/service/data/SyntaxTree/SignatureType/LeadingKeywordInRecursiveTypes.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/LeadingKeywordInRecursiveTypes.fsi.bsl index 8a2cf2cb845..15ca7c4fd96 100644 --- a/tests/service/data/SyntaxTree/SignatureType/LeadingKeywordInRecursiveTypes.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/LeadingKeywordInRecursiveTypes.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/SignatureType/LeadingKeywordInRecursiveTypes.fsi", - QualifiedNameOfFile LeadingKeywordInRecursiveTypes, [], [], + QualifiedNameOfFile LeadingKeywordInRecursiveTypes, [], [SynModuleOrNamespaceSig ([LeadingKeywordInRecursiveTypes], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/SignatureType/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi.bsl index 493d3b104ad..898d6e3fc36 100644 --- a/tests/service/data/SyntaxTree/SignatureType/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi.bsl @@ -3,7 +3,6 @@ SigFile ("/root/SignatureType/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi", QualifiedNameOfFile MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword, [], - [], [SynModuleOrNamespaceSig ([X], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/SignatureType/NestedTypeHasStaticTypeAsLeadingKeyword.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/NestedTypeHasStaticTypeAsLeadingKeyword.fsi.bsl index 1c3c8bc8d23..13ccfe80ac8 100644 --- a/tests/service/data/SyntaxTree/SignatureType/NestedTypeHasStaticTypeAsLeadingKeyword.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/NestedTypeHasStaticTypeAsLeadingKeyword.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/SignatureType/NestedTypeHasStaticTypeAsLeadingKeyword.fsi", - QualifiedNameOfFile NestedTypeHasStaticTypeAsLeadingKeyword, [], [], + QualifiedNameOfFile NestedTypeHasStaticTypeAsLeadingKeyword, [], [SynModuleOrNamespaceSig ([NestedTypeHasStaticTypeAsLeadingKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi.bsl index e92edcc8113..bc2173a5ce1 100644 --- a/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/SignatureType/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi", - QualifiedNameOfFile FSharp.Compiler.ParseHelpers, [], [], + QualifiedNameOfFile FSharp.Compiler.ParseHelpers, [], [SynModuleOrNamespaceSig ([FSharp; Compiler; ParseHelpers], false, NamedModule, [Exception diff --git a/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi.bsl index 0e7eac31934..5c0b55e4196 100644 --- a/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi.bsl @@ -2,7 +2,6 @@ SigFile (ParsedSigFileInput ("/root/SignatureType/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi", QualifiedNameOfFile RangeOfAttributeShouldBeIncludedInSynTypeDefnSig, [], - [], [SynModuleOrNamespaceSig ([SomeNamespace], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi.bsl index 920c9e5a472..a92285dbf01 100644 --- a/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi.bsl @@ -2,7 +2,7 @@ SigFile (ParsedSigFileInput ("/root/SignatureType/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi", QualifiedNameOfFile RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember, - [], [], + [], [SynModuleOrNamespaceSig ([SomeNamespace], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi.bsl index 9788067cd7c..68801c9da9f 100644 --- a/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi.bsl @@ -2,7 +2,6 @@ SigFile (ParsedSigFileInput ("/root/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi", QualifiedNameOfFile RangeOfAttributesShouldBeIncludedInRecursiveTypes, [], - [], [SynModuleOrNamespaceSig ([SomeNamespace], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/SignatureType/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi.bsl index 7025f3aadc2..7e605fe4b2b 100644 --- a/tests/service/data/SyntaxTree/SignatureType/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/SignatureType/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi", - QualifiedNameOfFile FSharp.Compiler.ParseHelpers, [], [], + QualifiedNameOfFile FSharp.Compiler.ParseHelpers, [], [SynModuleOrNamespaceSig ([FSharp; Compiler; ParseHelpers], false, NamedModule, [Exception diff --git a/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi.bsl index 0dcb3eb2e73..2e5b28ee770 100644 --- a/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi.bsl @@ -2,7 +2,6 @@ SigFile (ParsedSigFileInput ("/root/SignatureType/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi", QualifiedNameOfFile RangeOfSynTypeDefnSigDelegateOfShouldStartFromName, [], - [], [SynModuleOrNamespaceSig ([Y], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi.bsl index 4ed17f26304..9e922714079 100644 --- a/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi.bsl @@ -2,7 +2,7 @@ SigFile (ParsedSigFileInput ("/root/SignatureType/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi", QualifiedNameOfFile RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember, - [], [], + [], [SynModuleOrNamespaceSig ([X], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi.bsl index 553c900522d..7fff1b42d63 100644 --- a/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi.bsl @@ -2,7 +2,6 @@ SigFile (ParsedSigFileInput ("/root/SignatureType/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi", QualifiedNameOfFile RangeOfSynTypeDefnSigRecordShouldEndAtLastMember, [], - [], [SynModuleOrNamespaceSig ([X], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi.bsl index 7829833143a..b46577c1a7d 100644 --- a/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/SignatureType/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi", - QualifiedNameOfFile RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal, [], [], + QualifiedNameOfFile RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal, [], [SynModuleOrNamespaceSig ([Z], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/SignatureType/RangeOfTypeShouldEndAtEndKeyword.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/RangeOfTypeShouldEndAtEndKeyword.fsi.bsl index ebb3921ac38..00725a41983 100644 --- a/tests/service/data/SyntaxTree/SignatureType/RangeOfTypeShouldEndAtEndKeyword.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/RangeOfTypeShouldEndAtEndKeyword.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/SignatureType/RangeOfTypeShouldEndAtEndKeyword.fsi", - QualifiedNameOfFile RangeOfTypeShouldEndAtEndKeyword, [], [], + QualifiedNameOfFile RangeOfTypeShouldEndAtEndKeyword, [], [SynModuleOrNamespaceSig ([GreatProjectThing], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/SignatureType/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl index ef541678686..96a8f67c5cb 100644 --- a/tests/service/data/SyntaxTree/SignatureType/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl @@ -2,7 +2,7 @@ SigFile (ParsedSigFileInput ("/root/SignatureType/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi", QualifiedNameOfFile SynExceptionSigShouldContainsTheRangeOfTheWithKeyword, - [], [], + [], [SynModuleOrNamespaceSig ([X], false, DeclaredNamespace, [Exception diff --git a/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi.bsl index ab21d9a361f..097b01263fd 100644 --- a/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi.bsl @@ -2,7 +2,7 @@ SigFile (ParsedSigFileInput ("/root/SignatureType/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi", QualifiedNameOfFile SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign, - [], [], + [], [SynModuleOrNamespaceSig ([SomeNamespace], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi.bsl index d512ca1ef68..dd52d87a9be 100644 --- a/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi.bsl @@ -3,7 +3,6 @@ SigFile ("/root/SignatureType/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi", QualifiedNameOfFile SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign, [], - [], [SynModuleOrNamespaceSig ([SomeNamespace], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi.bsl index 25b5feb9ae6..75cb679757f 100644 --- a/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi.bsl @@ -3,7 +3,6 @@ SigFile ("/root/SignatureType/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi", QualifiedNameOfFile SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign, [], - [], [SynModuleOrNamespaceSig ([Foo], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi.bsl index bfc76db57f5..f6e53376828 100644 --- a/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi.bsl @@ -2,7 +2,7 @@ SigFile (ParsedSigFileInput ("/root/SignatureType/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi", QualifiedNameOfFile SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign, - [], [], + [], [SynModuleOrNamespaceSig ([SomeNamespace], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/SignatureType/SynValSigContainsParameterNames.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/SynValSigContainsParameterNames.fsi.bsl index edb06fea795..32972c86082 100644 --- a/tests/service/data/SyntaxTree/SignatureType/SynValSigContainsParameterNames.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/SynValSigContainsParameterNames.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/SignatureType/SynValSigContainsParameterNames.fsi", - QualifiedNameOfFile Meh, [], [], + QualifiedNameOfFile Meh, [], [SynModuleOrNamespaceSig ([Meh], false, NamedModule, [Val diff --git a/tests/service/data/SyntaxTree/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi.bsl index 53962cae2b9..021232ddd47 100644 --- a/tests/service/data/SyntaxTree/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi", - QualifiedNameOfFile Meh, [], [], + QualifiedNameOfFile Meh, [], [SynModuleOrNamespaceSig ([Meh], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/SignatureType/ValKeywordIsPresentInSynValSig.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/ValKeywordIsPresentInSynValSig.fsi.bsl index 599315bef28..679fdc5c241 100644 --- a/tests/service/data/SyntaxTree/SignatureType/ValKeywordIsPresentInSynValSig.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/ValKeywordIsPresentInSynValSig.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/SignatureType/ValKeywordIsPresentInSynValSig.fsi", - QualifiedNameOfFile Meh, [], [], + QualifiedNameOfFile Meh, [], [SynModuleOrNamespaceSig ([Meh], false, NamedModule, [Val diff --git a/tests/service/data/SyntaxTree/SignatureType/With 01.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/With 01.fsi.bsl index f6ef4571fd9..dda970bf730 100644 --- a/tests/service/data/SyntaxTree/SignatureType/With 01.fsi.bsl +++ b/tests/service/data/SyntaxTree/SignatureType/With 01.fsi.bsl @@ -1,6 +1,6 @@ SigFile (ParsedSigFileInput - ("/root/SignatureType/With 01.fsi", QualifiedNameOfFile With 01, [], [], + ("/root/SignatureType/With 01.fsi", QualifiedNameOfFile With 01, [], [SynModuleOrNamespaceSig ([X], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/SimplePats/SimplePats - Recover 01.fs.bsl b/tests/service/data/SyntaxTree/SimplePats/SimplePats - Recover 01.fs.bsl index 9f74ed36236..33db66f5639 100644 --- a/tests/service/data/SyntaxTree/SimplePats/SimplePats - Recover 01.fs.bsl +++ b/tests/service/data/SyntaxTree/SimplePats/SimplePats - Recover 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SimplePats/SimplePats - Recover 01.fs", false, - QualifiedNameOfFile SimplePats, [], [], + QualifiedNameOfFile SimplePats, [], [SynModuleOrNamespace ([SimplePats], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/SimplePats/SimplePats 01.fs.bsl b/tests/service/data/SyntaxTree/SimplePats/SimplePats 01.fs.bsl index 512fa280b98..4cb7a28362c 100644 --- a/tests/service/data/SyntaxTree/SimplePats/SimplePats 01.fs.bsl +++ b/tests/service/data/SyntaxTree/SimplePats/SimplePats 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SimplePats/SimplePats 01.fs", false, QualifiedNameOfFile SimplePats, - [], [], + [], [SynModuleOrNamespace ([SimplePats], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/SimplePats/SimplePats 02.fs.bsl b/tests/service/data/SyntaxTree/SimplePats/SimplePats 02.fs.bsl index fc92f2e4767..259efdf7dff 100644 --- a/tests/service/data/SyntaxTree/SimplePats/SimplePats 02.fs.bsl +++ b/tests/service/data/SyntaxTree/SimplePats/SimplePats 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SimplePats/SimplePats 02.fs", false, QualifiedNameOfFile SimplePats, - [], [], + [], [SynModuleOrNamespace ([SimplePats], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/SourceIdentifier/_LINE_.fs.bsl b/tests/service/data/SyntaxTree/SourceIdentifier/_LINE_.fs.bsl index 2ac2c71f433..e6e7cc7b985 100644 --- a/tests/service/data/SyntaxTree/SourceIdentifier/_LINE_.fs.bsl +++ b/tests/service/data/SyntaxTree/SourceIdentifier/_LINE_.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/SourceIdentifier/_LINE_.fs", false, QualifiedNameOfFile _LINE_, [], - [], [SynModuleOrNamespace ([_LINE_], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEDIRECTORY_.fs.bsl b/tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEDIRECTORY_.fs.bsl index cc7fb97f4fa..953660aaeb7 100644 --- a/tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEDIRECTORY_.fs.bsl +++ b/tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEDIRECTORY_.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SourceIdentifier/_SOURCEDIRECTORY_.fs", false, - QualifiedNameOfFile _SOURCEDIRECTORY_, [], [], + QualifiedNameOfFile _SOURCEDIRECTORY_, [], [SynModuleOrNamespace ([_SOURCEDIRECTORY_], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEFILE_.fs.bsl b/tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEFILE_.fs.bsl index abf6b7aca84..3badb607f3c 100644 --- a/tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEFILE_.fs.bsl +++ b/tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEFILE_.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SourceIdentifier/_SOURCEFILE_.fs", false, - QualifiedNameOfFile _SOURCEFILE_, [], [], + QualifiedNameOfFile _SOURCEFILE_, [], [SynModuleOrNamespace ([_SOURCEFILE_], false, AnonModule, [Expr diff --git a/tests/service/data/SyntaxTree/String/InterpolatedStringOffsideInModule.fs.bsl b/tests/service/data/SyntaxTree/String/InterpolatedStringOffsideInModule.fs.bsl index 7e6563219a6..cd5f88470cc 100644 --- a/tests/service/data/SyntaxTree/String/InterpolatedStringOffsideInModule.fs.bsl +++ b/tests/service/data/SyntaxTree/String/InterpolatedStringOffsideInModule.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/String/InterpolatedStringOffsideInModule.fs", false, - QualifiedNameOfFile InterpolatedStringOffsideInModule, [], [], + QualifiedNameOfFile InterpolatedStringOffsideInModule, [], [SynModuleOrNamespace ([InterpolatedStringOffsideInModule], false, AnonModule, [NestedModule diff --git a/tests/service/data/SyntaxTree/String/InterpolatedStringOffsideInNestedLet.fs.bsl b/tests/service/data/SyntaxTree/String/InterpolatedStringOffsideInNestedLet.fs.bsl index d91bffd331d..9515e542eab 100644 --- a/tests/service/data/SyntaxTree/String/InterpolatedStringOffsideInNestedLet.fs.bsl +++ b/tests/service/data/SyntaxTree/String/InterpolatedStringOffsideInNestedLet.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/String/InterpolatedStringOffsideInNestedLet.fs", false, - QualifiedNameOfFile InterpolatedStringOffsideInNestedLet, [], [], + QualifiedNameOfFile InterpolatedStringOffsideInNestedLet, [], [SynModuleOrNamespace ([InterpolatedStringOffsideInNestedLet], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindRegular.fs.bsl b/tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindRegular.fs.bsl index be0c3ae5c30..4aafaa808a3 100644 --- a/tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindRegular.fs.bsl +++ b/tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindRegular.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/String/SynConstBytesWithSynByteStringKindRegular.fs", false, - QualifiedNameOfFile SynConstBytesWithSynByteStringKindRegular, [], [], + QualifiedNameOfFile SynConstBytesWithSynByteStringKindRegular, [], [SynModuleOrNamespace ([SynConstBytesWithSynByteStringKindRegular], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindVerbatim.fs.bsl b/tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindVerbatim.fs.bsl index 178873fb61e..4ba09c64d64 100644 --- a/tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindVerbatim.fs.bsl +++ b/tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindVerbatim.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/String/SynConstBytesWithSynByteStringKindVerbatim.fs", false, - QualifiedNameOfFile SynConstBytesWithSynByteStringKindVerbatim, [], [], + QualifiedNameOfFile SynConstBytesWithSynByteStringKindVerbatim, [], [SynModuleOrNamespace ([SynConstBytesWithSynByteStringKindVerbatim], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindRegular.fs.bsl b/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindRegular.fs.bsl index aaba1c57606..675897813ca 100644 --- a/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindRegular.fs.bsl +++ b/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindRegular.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/String/SynConstStringWithSynStringKindRegular.fs", false, - QualifiedNameOfFile SynConstStringWithSynStringKindRegular, [], [], + QualifiedNameOfFile SynConstStringWithSynStringKindRegular, [], [SynModuleOrNamespace ([SynConstStringWithSynStringKindRegular], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindTripleQuote.fs.bsl b/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindTripleQuote.fs.bsl index 2ad18580156..5ef5d9d5095 100644 --- a/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindTripleQuote.fs.bsl +++ b/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindTripleQuote.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/String/SynConstStringWithSynStringKindTripleQuote.fs", false, - QualifiedNameOfFile SynConstStringWithSynStringKindTripleQuote, [], [], + QualifiedNameOfFile SynConstStringWithSynStringKindTripleQuote, [], [SynModuleOrNamespace ([SynConstStringWithSynStringKindTripleQuote], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindVerbatim.fs.bsl b/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindVerbatim.fs.bsl index 2bbac831810..4eb69eb760b 100644 --- a/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindVerbatim.fs.bsl +++ b/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindVerbatim.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/String/SynConstStringWithSynStringKindVerbatim.fs", false, - QualifiedNameOfFile SynConstStringWithSynStringKindVerbatim, [], [], + QualifiedNameOfFile SynConstStringWithSynStringKindVerbatim, [], [SynModuleOrNamespace ([SynConstStringWithSynStringKindVerbatim], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindRegular.fs.bsl b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindRegular.fs.bsl index 601a0e5e9da..bba81224765 100644 --- a/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindRegular.fs.bsl +++ b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindRegular.fs.bsl @@ -2,7 +2,6 @@ ImplFile (ParsedImplFileInput ("/root/String/SynExprInterpolatedStringWithSynStringKindRegular.fs", false, QualifiedNameOfFile SynExprInterpolatedStringWithSynStringKindRegular, [], - [], [SynModuleOrNamespace ([SynExprInterpolatedStringWithSynStringKindRegular], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs.bsl b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs.bsl index 8eafe3c8745..ae0b204b07b 100644 --- a/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs.bsl +++ b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/String/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs", false, QualifiedNameOfFile SynExprInterpolatedStringWithSynStringKindTripleQuote, - [], [], + [], [SynModuleOrNamespace ([SynExprInterpolatedStringWithSynStringKindTripleQuote], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindVerbatim.fs.bsl b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindVerbatim.fs.bsl index 486b527607a..7e01e53f5ed 100644 --- a/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindVerbatim.fs.bsl +++ b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindVerbatim.fs.bsl @@ -3,7 +3,6 @@ ImplFile ("/root/String/SynExprInterpolatedStringWithSynStringKindVerbatim.fs", false, QualifiedNameOfFile SynExprInterpolatedStringWithSynStringKindVerbatim, [], - [], [SynModuleOrNamespace ([SynExprInterpolatedStringWithSynStringKindVerbatim], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithTripleQuoteMultipleDollars.fs.bsl b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithTripleQuoteMultipleDollars.fs.bsl index db6d4bcdc96..65ee95b04cb 100644 --- a/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithTripleQuoteMultipleDollars.fs.bsl +++ b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithTripleQuoteMultipleDollars.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/String/SynExprInterpolatedStringWithTripleQuoteMultipleDollars.fs", false, QualifiedNameOfFile - SynExprInterpolatedStringWithTripleQuoteMultipleDollars, [], [], + SynExprInterpolatedStringWithTripleQuoteMultipleDollars, [], [SynModuleOrNamespace ([SynExprInterpolatedStringWithTripleQuoteMultipleDollars], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithTripleQuoteMultipleDollars2.fs.bsl b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithTripleQuoteMultipleDollars2.fs.bsl index 152cb27e9b3..c7f6052468b 100644 --- a/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithTripleQuoteMultipleDollars2.fs.bsl +++ b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithTripleQuoteMultipleDollars2.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/String/SynExprInterpolatedStringWithTripleQuoteMultipleDollars2.fs", false, QualifiedNameOfFile - SynExprInterpolatedStringWithTripleQuoteMultipleDollars2, [], [], + SynExprInterpolatedStringWithTripleQuoteMultipleDollars2, [], [SynModuleOrNamespace ([SynExprInterpolatedStringWithTripleQuoteMultipleDollars2], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/SynIdent/IncompleteLongIdent 01.fs.bsl b/tests/service/data/SyntaxTree/SynIdent/IncompleteLongIdent 01.fs.bsl index 493efcfa2b7..a663aa978e9 100644 --- a/tests/service/data/SyntaxTree/SynIdent/IncompleteLongIdent 01.fs.bsl +++ b/tests/service/data/SyntaxTree/SynIdent/IncompleteLongIdent 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SynIdent/IncompleteLongIdent 01.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynIdent/IncompleteLongIdent 02.fs.bsl b/tests/service/data/SyntaxTree/SynIdent/IncompleteLongIdent 02.fs.bsl index 9df8951773d..4dba0e6c85d 100644 --- a/tests/service/data/SyntaxTree/SynIdent/IncompleteLongIdent 02.fs.bsl +++ b/tests/service/data/SyntaxTree/SynIdent/IncompleteLongIdent 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SynIdent/IncompleteLongIdent 02.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynTyparDecl/Constraint intersection 01.fs.bsl b/tests/service/data/SyntaxTree/SynTyparDecl/Constraint intersection 01.fs.bsl index 96d2a16e16c..3d11337f385 100644 --- a/tests/service/data/SyntaxTree/SynTyparDecl/Constraint intersection 01.fs.bsl +++ b/tests/service/data/SyntaxTree/SynTyparDecl/Constraint intersection 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SynTyparDecl/Constraint intersection 01.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/SynType/Constraint intersection 01.fs.bsl b/tests/service/data/SyntaxTree/SynType/Constraint intersection 01.fs.bsl index 64e8fd7c7a8..c033ffceb3b 100644 --- a/tests/service/data/SyntaxTree/SynType/Constraint intersection 01.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Constraint intersection 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SynType/Constraint intersection 01.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/SynType/Constraint intersection 02.fs.bsl b/tests/service/data/SyntaxTree/SynType/Constraint intersection 02.fs.bsl index 039915cb522..dffe2d6d94f 100644 --- a/tests/service/data/SyntaxTree/SynType/Constraint intersection 02.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Constraint intersection 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SynType/Constraint intersection 02.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/SynType/Constraint intersection 03.fs.bsl b/tests/service/data/SyntaxTree/SynType/Constraint intersection 03.fs.bsl index f28ed328e25..b2aa3a108b3 100644 --- a/tests/service/data/SyntaxTree/SynType/Constraint intersection 03.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Constraint intersection 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SynType/Constraint intersection 03.fs", false, - QualifiedNameOfFile Module, [], [], + QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/SynType/Div 01.fs.bsl b/tests/service/data/SyntaxTree/SynType/Div 01.fs.bsl index ea6b5ee5e6d..2430f96bbe4 100644 --- a/tests/service/data/SyntaxTree/SynType/Div 01.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Div 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Div 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Div 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Div 02.fs.bsl b/tests/service/data/SyntaxTree/SynType/Div 02.fs.bsl index 2ed151d5ecf..0af9e624823 100644 --- a/tests/service/data/SyntaxTree/SynType/Div 02.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Div 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Div 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Div 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Div 03.fs.bsl b/tests/service/data/SyntaxTree/SynType/Div 03.fs.bsl index 411cff73657..e05310e22b5 100644 --- a/tests/service/data/SyntaxTree/SynType/Div 03.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Div 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Div 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Div 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Div 04.fs.bsl b/tests/service/data/SyntaxTree/SynType/Div 04.fs.bsl index 9b036b95e12..8a30b9a038b 100644 --- a/tests/service/data/SyntaxTree/SynType/Div 04.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Div 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Div 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Div 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Div 05.fs.bsl b/tests/service/data/SyntaxTree/SynType/Div 05.fs.bsl index 56f07e3876e..7443b2ccc21 100644 --- a/tests/service/data/SyntaxTree/SynType/Div 05.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Div 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Div 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Div 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Div 06.fs.bsl b/tests/service/data/SyntaxTree/SynType/Div 06.fs.bsl index 354ee8e4e9b..3b7c2589d6e 100644 --- a/tests/service/data/SyntaxTree/SynType/Div 06.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Div 06.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Div 06.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Div 06.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Fun 01.fs.bsl b/tests/service/data/SyntaxTree/SynType/Fun 01.fs.bsl index d723fe968b4..521263ec54f 100644 --- a/tests/service/data/SyntaxTree/SynType/Fun 01.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Fun 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Fun 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Fun 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Fun 02.fs.bsl b/tests/service/data/SyntaxTree/SynType/Fun 02.fs.bsl index 4413b33b2c2..bb1bb168c93 100644 --- a/tests/service/data/SyntaxTree/SynType/Fun 02.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Fun 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Fun 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Fun 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Fun 03.fs.bsl b/tests/service/data/SyntaxTree/SynType/Fun 03.fs.bsl index c92a2eaa29a..fa9371d9a43 100644 --- a/tests/service/data/SyntaxTree/SynType/Fun 03.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Fun 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Fun 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Fun 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Fun 04.fs.bsl b/tests/service/data/SyntaxTree/SynType/Fun 04.fs.bsl index 90cb7ec281f..bfc0d51c350 100644 --- a/tests/service/data/SyntaxTree/SynType/Fun 04.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Fun 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Fun 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Fun 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Fun 05.fs.bsl b/tests/service/data/SyntaxTree/SynType/Fun 05.fs.bsl index 51bd3d1f6c3..8effc77fd9b 100644 --- a/tests/service/data/SyntaxTree/SynType/Fun 05.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Fun 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Fun 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Fun 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Fun 06.fs.bsl b/tests/service/data/SyntaxTree/SynType/Fun 06.fs.bsl index 79fba7f21d4..a96e7c69146 100644 --- a/tests/service/data/SyntaxTree/SynType/Fun 06.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Fun 06.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Fun 06.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Fun 06.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/SynType/Fun 07.fs.bsl b/tests/service/data/SyntaxTree/SynType/Fun 07.fs.bsl index fc09b3f737f..c59294bd019 100644 --- a/tests/service/data/SyntaxTree/SynType/Fun 07.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Fun 07.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Fun 07.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Fun 07.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/SynType/Fun 08.fs.bsl b/tests/service/data/SyntaxTree/SynType/Fun 08.fs.bsl index 914be23e3c5..1ab6a488969 100644 --- a/tests/service/data/SyntaxTree/SynType/Fun 08.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Fun 08.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Fun 08.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Fun 08.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/SynType/Fun 09.fs.bsl b/tests/service/data/SyntaxTree/SynType/Fun 09.fs.bsl index 3a7ecdba3cf..3329b78b608 100644 --- a/tests/service/data/SyntaxTree/SynType/Fun 09.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Fun 09.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Fun 09.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Fun 09.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/SynType/Fun 10.fs.bsl b/tests/service/data/SyntaxTree/SynType/Fun 10.fs.bsl index 061982252ad..f0a17a8257a 100644 --- a/tests/service/data/SyntaxTree/SynType/Fun 10.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Fun 10.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Fun 10.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Fun 10.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs.bsl b/tests/service/data/SyntaxTree/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs.bsl index 1c58087b0d8..4411a8d9af2 100644 --- a/tests/service/data/SyntaxTree/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs", false, - QualifiedNameOfFile NestedSynTypeOrInsideSynExprTraitCall, [], [], + QualifiedNameOfFile NestedSynTypeOrInsideSynExprTraitCall, [], [SynModuleOrNamespace ([NestedSynTypeOrInsideSynExprTraitCall], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/SynType/SingleSynTypeInsideSynExprTraitCall.fs.bsl b/tests/service/data/SyntaxTree/SynType/SingleSynTypeInsideSynExprTraitCall.fs.bsl index 5c1cd55a5bf..992544278eb 100644 --- a/tests/service/data/SyntaxTree/SynType/SingleSynTypeInsideSynExprTraitCall.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/SingleSynTypeInsideSynExprTraitCall.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SynType/SingleSynTypeInsideSynExprTraitCall.fs", false, - QualifiedNameOfFile SingleSynTypeInsideSynExprTraitCall, [], [], + QualifiedNameOfFile SingleSynTypeInsideSynExprTraitCall, [], [SynModuleOrNamespace ([SingleSynTypeInsideSynExprTraitCall], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynExprTraitCall.fs.bsl b/tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynExprTraitCall.fs.bsl index 24fb731523f..19672ed336d 100644 --- a/tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynExprTraitCall.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynExprTraitCall.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SynType/SynTypeOrInsideSynExprTraitCall.fs", false, - QualifiedNameOfFile SynTypeOrInsideSynExprTraitCall, [], [], + QualifiedNameOfFile SynTypeOrInsideSynExprTraitCall, [], [SynModuleOrNamespace ([SynTypeOrInsideSynExprTraitCall], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs.bsl b/tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs.bsl index c2de9ccff5c..77cc622836a 100644 --- a/tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs", false, QualifiedNameOfFile - SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember, [], [], + SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember, [], [SynModuleOrNamespace ([SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs.bsl b/tests/service/data/SyntaxTree/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs.bsl index f509494f211..748356200ee 100644 --- a/tests/service/data/SyntaxTree/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs", false, - QualifiedNameOfFile SynTypeOrWithAppTypeOnTheRightHandSide, [], [], + QualifiedNameOfFile SynTypeOrWithAppTypeOnTheRightHandSide, [], [SynModuleOrNamespace ([SynTypeOrWithAppTypeOnTheRightHandSide], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi.bsl b/tests/service/data/SyntaxTree/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi.bsl index 6d0202252ea..3b1fa906abb 100644 --- a/tests/service/data/SyntaxTree/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi.bsl +++ b/tests/service/data/SyntaxTree/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi.bsl @@ -2,7 +2,6 @@ SigFile (ParsedSigFileInput ("/root/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi", QualifiedNameOfFile SynTypeTupleDoesIncludeLeadingParameterAttributes, [], - [], [SynModuleOrNamespaceSig ([SynTypeTupleDoesIncludeLeadingParameterAttributes], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/SynType/SynTypeTupleDoesIncludeLeadingParameterName.fsi.bsl b/tests/service/data/SyntaxTree/SynType/SynTypeTupleDoesIncludeLeadingParameterName.fsi.bsl index 662002f0c87..49ba491f2c3 100644 --- a/tests/service/data/SyntaxTree/SynType/SynTypeTupleDoesIncludeLeadingParameterName.fsi.bsl +++ b/tests/service/data/SyntaxTree/SynType/SynTypeTupleDoesIncludeLeadingParameterName.fsi.bsl @@ -1,7 +1,7 @@ SigFile (ParsedSigFileInput ("/root/SynType/SynTypeTupleDoesIncludeLeadingParameterName.fsi", - QualifiedNameOfFile SynTypeTupleDoesIncludeLeadingParameterName, [], [], + QualifiedNameOfFile SynTypeTupleDoesIncludeLeadingParameterName, [], [SynModuleOrNamespaceSig ([SynTypeTupleDoesIncludeLeadingParameterName], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/SynType/Tuple - Nested 01.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple - Nested 01.fs.bsl index cb47bf69176..6a5eb6c4a60 100644 --- a/tests/service/data/SyntaxTree/SynType/Tuple - Nested 01.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Tuple - Nested 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SynType/Tuple - Nested 01.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Tuple - Nested 02.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple - Nested 02.fs.bsl index 31c6f32e32e..867c71b8e50 100644 --- a/tests/service/data/SyntaxTree/SynType/Tuple - Nested 02.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Tuple - Nested 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SynType/Tuple - Nested 02.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Tuple - Nested 03.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple - Nested 03.fs.bsl index d2a8a234b88..e8bbb944fbf 100644 --- a/tests/service/data/SyntaxTree/SynType/Tuple - Nested 03.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Tuple - Nested 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SynType/Tuple - Nested 03.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Tuple - Nested 04.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple - Nested 04.fs.bsl index 5ceab06a988..f9bc1043c34 100644 --- a/tests/service/data/SyntaxTree/SynType/Tuple - Nested 04.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Tuple - Nested 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SynType/Tuple - Nested 04.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Tuple - Nested 05.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple - Nested 05.fs.bsl index e72167dde44..4f2b8d91ce3 100644 --- a/tests/service/data/SyntaxTree/SynType/Tuple - Nested 05.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Tuple - Nested 05.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SynType/Tuple - Nested 05.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Tuple - Nested 06.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple - Nested 06.fs.bsl index f90be5ac2f2..3a423cda4ca 100644 --- a/tests/service/data/SyntaxTree/SynType/Tuple - Nested 06.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Tuple - Nested 06.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/SynType/Tuple - Nested 06.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Tuple 01.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple 01.fs.bsl index 85497901333..fb75335cb94 100644 --- a/tests/service/data/SyntaxTree/SynType/Tuple 01.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Tuple 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Tuple 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Tuple 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Tuple 02.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple 02.fs.bsl index b35e5fb5bda..4457b838e0a 100644 --- a/tests/service/data/SyntaxTree/SynType/Tuple 02.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Tuple 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Tuple 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Tuple 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Tuple 03.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple 03.fs.bsl index c83be44e69b..ec5dfc24377 100644 --- a/tests/service/data/SyntaxTree/SynType/Tuple 03.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Tuple 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Tuple 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Tuple 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Tuple 04.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple 04.fs.bsl index de61cb515a6..e59aa270e41 100644 --- a/tests/service/data/SyntaxTree/SynType/Tuple 04.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Tuple 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Tuple 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Tuple 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Tuple 05.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple 05.fs.bsl index 7d02d692052..8939f6566e3 100644 --- a/tests/service/data/SyntaxTree/SynType/Tuple 05.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Tuple 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Tuple 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Tuple 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Tuple 06.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple 06.fs.bsl index aa3c77a6051..b78f34afec7 100644 --- a/tests/service/data/SyntaxTree/SynType/Tuple 06.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Tuple 06.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Tuple 06.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Tuple 06.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Tuple 07.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple 07.fs.bsl index af8c1af77d0..4ca1d2f2ad1 100644 --- a/tests/service/data/SyntaxTree/SynType/Tuple 07.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Tuple 07.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Tuple 07.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Tuple 07.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Tuple 08.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple 08.fs.bsl index 658dd4661e2..19049fc4cd4 100644 --- a/tests/service/data/SyntaxTree/SynType/Tuple 08.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Tuple 08.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Tuple 08.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Tuple 08.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Expr diff --git a/tests/service/data/SyntaxTree/SynType/Tuple 09.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple 09.fs.bsl index c0d052bcc9f..7a7d8b70bd4 100644 --- a/tests/service/data/SyntaxTree/SynType/Tuple 09.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Tuple 09.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Tuple 09.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Tuple 09.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/SynType/Tuple 10.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple 10.fs.bsl index dc553f72214..51ccddda4ca 100644 --- a/tests/service/data/SyntaxTree/SynType/Tuple 10.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Tuple 10.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Tuple 10.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Tuple 10.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/SynType/Tuple 11.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple 11.fs.bsl index 31ca0e7d595..e9335f05032 100644 --- a/tests/service/data/SyntaxTree/SynType/Tuple 11.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Tuple 11.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Tuple 11.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Tuple 11.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/SynType/Tuple 12.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple 12.fs.bsl index 48dd1654f53..10016228daa 100644 --- a/tests/service/data/SyntaxTree/SynType/Tuple 12.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Tuple 12.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Tuple 12.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Tuple 12.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/SynType/Tuple 13.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple 13.fs.bsl index 1c4baa1ad5b..dabd1ab1736 100644 --- a/tests/service/data/SyntaxTree/SynType/Tuple 13.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Tuple 13.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Tuple 13.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Tuple 13.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/SynType/Tuple 14.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple 14.fs.bsl index 8f40539042b..99e47aab3f4 100644 --- a/tests/service/data/SyntaxTree/SynType/Tuple 14.fs.bsl +++ b/tests/service/data/SyntaxTree/SynType/Tuple 14.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/SynType/Tuple 14.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/SynType/Tuple 14.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/Type/Abbreviation 01.fs.bsl b/tests/service/data/SyntaxTree/Type/Abbreviation 01.fs.bsl index f5ca6da29e6..bd094b2a457 100644 --- a/tests/service/data/SyntaxTree/Type/Abbreviation 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Abbreviation 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Abbreviation 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Abbreviation 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Abbreviation 02.fs.bsl b/tests/service/data/SyntaxTree/Type/Abbreviation 02.fs.bsl index 6d0a7728993..05836b227fd 100644 --- a/tests/service/data/SyntaxTree/Type/Abbreviation 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Abbreviation 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Abbreviation 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Abbreviation 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Abbreviation 03.fs.bsl b/tests/service/data/SyntaxTree/Type/Abbreviation 03.fs.bsl index d2fb3a0cb2b..0c8ec15eee9 100644 --- a/tests/service/data/SyntaxTree/Type/Abbreviation 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Abbreviation 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Abbreviation 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Abbreviation 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Abbreviation 04.fs.bsl b/tests/service/data/SyntaxTree/Type/Abbreviation 04.fs.bsl index 53dd6bbce50..be0d67013e9 100644 --- a/tests/service/data/SyntaxTree/Type/Abbreviation 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Abbreviation 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Abbreviation 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Abbreviation 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/And 01.fs.bsl b/tests/service/data/SyntaxTree/Type/And 01.fs.bsl index a9d16c93758..7d99711c88a 100644 --- a/tests/service/data/SyntaxTree/Type/And 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/And 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/And 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/And 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/And 02.fs.bsl b/tests/service/data/SyntaxTree/Type/And 02.fs.bsl index 9c68fa0b125..2f0d4d0b82f 100644 --- a/tests/service/data/SyntaxTree/Type/And 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/And 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/And 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/And 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/And 03.fs.bsl b/tests/service/data/SyntaxTree/Type/And 03.fs.bsl index 0334d8da564..c93ff3ad48f 100644 --- a/tests/service/data/SyntaxTree/Type/And 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/And 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/And 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/And 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/And 04.fs.bsl b/tests/service/data/SyntaxTree/Type/And 04.fs.bsl index 05c052ddda5..cb407b52bc9 100644 --- a/tests/service/data/SyntaxTree/Type/And 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/And 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/And 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/And 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/And 05.fs.bsl b/tests/service/data/SyntaxTree/Type/And 05.fs.bsl index 60a23a89c19..a92c4236e43 100644 --- a/tests/service/data/SyntaxTree/Type/And 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/And 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/And 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/And 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/And 06.fs.bsl b/tests/service/data/SyntaxTree/Type/And 06.fs.bsl index cb3337443f1..343730bccea 100644 --- a/tests/service/data/SyntaxTree/Type/And 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/And 06.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/And 06.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/And 06.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/As 01.fs.bsl b/tests/service/data/SyntaxTree/Type/As 01.fs.bsl index bec2d3a7121..de85e4e3118 100644 --- a/tests/service/data/SyntaxTree/Type/As 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/As 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/As 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/As 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/As 02.fs.bsl b/tests/service/data/SyntaxTree/Type/As 02.fs.bsl index f40ff1a13d0..6ff2e6c63db 100644 --- a/tests/service/data/SyntaxTree/Type/As 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/As 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/As 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/As 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/As 03.fs.bsl b/tests/service/data/SyntaxTree/Type/As 03.fs.bsl index 42c054e0dbf..9d3eea9b4b4 100644 --- a/tests/service/data/SyntaxTree/Type/As 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/As 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/As 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/As 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/As 04.fs.bsl b/tests/service/data/SyntaxTree/Type/As 04.fs.bsl index 82bef8fffce..e51d6cda798 100644 --- a/tests/service/data/SyntaxTree/Type/As 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/As 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/As 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/As 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/As 05.fs.bsl b/tests/service/data/SyntaxTree/Type/As 05.fs.bsl index 52ea9524fef..622e07959a5 100644 --- a/tests/service/data/SyntaxTree/Type/As 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/As 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/As 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/As 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/As 06.fs.bsl b/tests/service/data/SyntaxTree/Type/As 06.fs.bsl index ed933552272..a9974e85664 100644 --- a/tests/service/data/SyntaxTree/Type/As 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/As 06.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/As 06.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/As 06.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/As 07.fs.bsl b/tests/service/data/SyntaxTree/Type/As 07.fs.bsl index a491491159b..62a9366bad8 100644 --- a/tests/service/data/SyntaxTree/Type/As 07.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/As 07.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/As 07.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/As 07.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/As 08.fs.bsl b/tests/service/data/SyntaxTree/Type/As 08.fs.bsl index 24254ea6064..6001010a369 100644 --- a/tests/service/data/SyntaxTree/Type/As 08.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/As 08.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/As 08.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/As 08.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/AttributesInOptionalNamedMemberParameter.fs.bsl b/tests/service/data/SyntaxTree/Type/AttributesInOptionalNamedMemberParameter.fs.bsl index 6ed7fe97af5..51e4ee662ba 100644 --- a/tests/service/data/SyntaxTree/Type/AttributesInOptionalNamedMemberParameter.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/AttributesInOptionalNamedMemberParameter.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Type/AttributesInOptionalNamedMemberParameter.fs", false, - QualifiedNameOfFile AttributesInOptionalNamedMemberParameter, [], [], + QualifiedNameOfFile AttributesInOptionalNamedMemberParameter, [], [SynModuleOrNamespace ([AttributesInOptionalNamedMemberParameter], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Class 01.fs.bsl b/tests/service/data/SyntaxTree/Type/Class 01.fs.bsl index fe8be852708..39e6fa5a399 100644 --- a/tests/service/data/SyntaxTree/Type/Class 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Class 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Class 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Class 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Class 02.fs.bsl b/tests/service/data/SyntaxTree/Type/Class 02.fs.bsl index f7e959d10a0..491bc809083 100644 --- a/tests/service/data/SyntaxTree/Type/Class 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Class 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Class 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Class 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Class 03.fs.bsl b/tests/service/data/SyntaxTree/Type/Class 03.fs.bsl index 77f8ca8cea0..bfa960ed91b 100644 --- a/tests/service/data/SyntaxTree/Type/Class 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Class 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Class 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Class 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Class 04.fs.bsl b/tests/service/data/SyntaxTree/Type/Class 04.fs.bsl index 80c75b7d5da..aefc9202636 100644 --- a/tests/service/data/SyntaxTree/Type/Class 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Class 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Class 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Class 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Class 05.fs.bsl b/tests/service/data/SyntaxTree/Type/Class 05.fs.bsl index 6516bdc8320..14915f1e1a2 100644 --- a/tests/service/data/SyntaxTree/Type/Class 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Class 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Class 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Class 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Enum 01.fs.bsl b/tests/service/data/SyntaxTree/Type/Enum 01.fs.bsl index e10f9194831..9eff05a3ff3 100644 --- a/tests/service/data/SyntaxTree/Type/Enum 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Enum 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Enum 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Enum 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Enum 02.fs.bsl b/tests/service/data/SyntaxTree/Type/Enum 02.fs.bsl index e586e137997..211598e3612 100644 --- a/tests/service/data/SyntaxTree/Type/Enum 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Enum 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Enum 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Enum 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Enum 03.fs.bsl b/tests/service/data/SyntaxTree/Type/Enum 03.fs.bsl index 17ed2baa172..8350322ebaa 100644 --- a/tests/service/data/SyntaxTree/Type/Enum 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Enum 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Enum 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Enum 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Enum 04.fs.bsl b/tests/service/data/SyntaxTree/Type/Enum 04.fs.bsl index faed14098e3..c230d0e45f0 100644 --- a/tests/service/data/SyntaxTree/Type/Enum 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Enum 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Enum 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Enum 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Enum 05.fs.bsl b/tests/service/data/SyntaxTree/Type/Enum 05.fs.bsl index fd808927027..b9e9a0c70eb 100644 --- a/tests/service/data/SyntaxTree/Type/Enum 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Enum 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Enum 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Enum 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Enum 06.fs.bsl b/tests/service/data/SyntaxTree/Type/Enum 06.fs.bsl index b7fd06cbbd2..f890ba16437 100644 --- a/tests/service/data/SyntaxTree/Type/Enum 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Enum 06.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Enum 06.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Enum 06.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Enum 07 - Eof.fs.bsl b/tests/service/data/SyntaxTree/Type/Enum 07 - Eof.fs.bsl index 5278e60ecd8..f7f2d4b8525 100644 --- a/tests/service/data/SyntaxTree/Type/Enum 07 - Eof.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Enum 07 - Eof.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Enum 07 - Eof.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Enum 07 - Eof.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Enum 08 - Eof.fs.bsl b/tests/service/data/SyntaxTree/Type/Enum 08 - Eof.fs.bsl index b715aa57067..34918ee2e0e 100644 --- a/tests/service/data/SyntaxTree/Type/Enum 08 - Eof.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Enum 08 - Eof.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Enum 08 - Eof.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Enum 08 - Eof.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Enum 09 - Eof.fs.bsl b/tests/service/data/SyntaxTree/Type/Enum 09 - Eof.fs.bsl index c1756aeb77a..010ae7603c5 100644 --- a/tests/service/data/SyntaxTree/Type/Enum 09 - Eof.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Enum 09 - Eof.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Enum 09 - Eof.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Enum 09 - Eof.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Enum 10 - Eof.fs.bsl b/tests/service/data/SyntaxTree/Type/Enum 10 - Eof.fs.bsl index 6a6bf175b1d..718d600211b 100644 --- a/tests/service/data/SyntaxTree/Type/Enum 10 - Eof.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Enum 10 - Eof.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Enum 10 - Eof.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Enum 10 - Eof.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Interface 01.fs.bsl b/tests/service/data/SyntaxTree/Type/Interface 01.fs.bsl index 27d0bc70287..14907cf22c9 100644 --- a/tests/service/data/SyntaxTree/Type/Interface 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Interface 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Interface 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Interface 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Interface 02.fs.bsl b/tests/service/data/SyntaxTree/Type/Interface 02.fs.bsl index 9a516b1a4a4..b438bf9ea14 100644 --- a/tests/service/data/SyntaxTree/Type/Interface 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Interface 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Interface 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Interface 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Interface 03.fs.bsl b/tests/service/data/SyntaxTree/Type/Interface 03.fs.bsl index beaa9fae234..e23921df237 100644 --- a/tests/service/data/SyntaxTree/Type/Interface 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Interface 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Interface 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Interface 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Interface 04.fs.bsl b/tests/service/data/SyntaxTree/Type/Interface 04.fs.bsl index 3c5776cc025..7d4d0cafe06 100644 --- a/tests/service/data/SyntaxTree/Type/Interface 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Interface 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Interface 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Interface 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Interface 05.fs.bsl b/tests/service/data/SyntaxTree/Type/Interface 05.fs.bsl index 25c830d341d..b91181ec396 100644 --- a/tests/service/data/SyntaxTree/Type/Interface 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Interface 05.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Type/Interface 05.fs", false, QualifiedNameOfFile Interface 05, [], - [], [SynModuleOrNamespace ([Interface 05], false, AnonModule, [], PreXmlDocEmpty, [], None, (8,0--8,0), { LeadingKeyword = None })], (true, true), diff --git a/tests/service/data/SyntaxTree/Type/Interface 06.fs.bsl b/tests/service/data/SyntaxTree/Type/Interface 06.fs.bsl index b8201474aa2..2868b31d486 100644 --- a/tests/service/data/SyntaxTree/Type/Interface 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Interface 06.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Type/Interface 06.fs", false, QualifiedNameOfFile Interface 06, [], - [], [SynModuleOrNamespace ([Interface 06], false, AnonModule, [], PreXmlDocEmpty, [], None, (7,0--7,0), { LeadingKeyword = None })], (true, true), diff --git a/tests/service/data/SyntaxTree/Type/Interface 07.fs.bsl b/tests/service/data/SyntaxTree/Type/Interface 07.fs.bsl index 7776c39507b..e06d5ff762e 100644 --- a/tests/service/data/SyntaxTree/Type/Interface 07.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Interface 07.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Interface 07.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Interface 07.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/MultipleSynEnumCaseContainsRangeOfConstant.fs.bsl b/tests/service/data/SyntaxTree/Type/MultipleSynEnumCaseContainsRangeOfConstant.fs.bsl index 85c646eae41..46a27b7a712 100644 --- a/tests/service/data/SyntaxTree/Type/MultipleSynEnumCaseContainsRangeOfConstant.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/MultipleSynEnumCaseContainsRangeOfConstant.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Type/MultipleSynEnumCaseContainsRangeOfConstant.fs", false, - QualifiedNameOfFile MultipleSynEnumCaseContainsRangeOfConstant, [], [], + QualifiedNameOfFile MultipleSynEnumCaseContainsRangeOfConstant, [], [SynModuleOrNamespace ([MultipleSynEnumCaseContainsRangeOfConstant], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/NamedParametersInDelegateType.fs.bsl b/tests/service/data/SyntaxTree/Type/NamedParametersInDelegateType.fs.bsl index daea0ab5026..3d70d6898e7 100644 --- a/tests/service/data/SyntaxTree/Type/NamedParametersInDelegateType.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/NamedParametersInDelegateType.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Type/NamedParametersInDelegateType.fs", false, - QualifiedNameOfFile NamedParametersInDelegateType, [], [], + QualifiedNameOfFile NamedParametersInDelegateType, [], [SynModuleOrNamespace ([NamedParametersInDelegateType], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/NestedTypeHasStaticTypeAsLeadingKeyword.fs.bsl b/tests/service/data/SyntaxTree/Type/NestedTypeHasStaticTypeAsLeadingKeyword.fs.bsl index ae482a08271..c463b269478 100644 --- a/tests/service/data/SyntaxTree/Type/NestedTypeHasStaticTypeAsLeadingKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/NestedTypeHasStaticTypeAsLeadingKeyword.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Type/NestedTypeHasStaticTypeAsLeadingKeyword.fs", false, - QualifiedNameOfFile NestedTypeHasStaticTypeAsLeadingKeyword, [], [], + QualifiedNameOfFile NestedTypeHasStaticTypeAsLeadingKeyword, [], [SynModuleOrNamespace ([NestedTypeHasStaticTypeAsLeadingKeyword], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Primary ctor 01.fs.bsl b/tests/service/data/SyntaxTree/Type/Primary ctor 01.fs.bsl index 6717cb55b41..0a52551eeff 100644 --- a/tests/service/data/SyntaxTree/Type/Primary ctor 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Primary ctor 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Primary ctor 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Primary ctor 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Primary ctor 02.fs.bsl b/tests/service/data/SyntaxTree/Type/Primary ctor 02.fs.bsl index fbb48e2fd0a..aec0ec81fbd 100644 --- a/tests/service/data/SyntaxTree/Type/Primary ctor 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Primary ctor 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Primary ctor 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Primary ctor 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Primary ctor 03.fs.bsl b/tests/service/data/SyntaxTree/Type/Primary ctor 03.fs.bsl index 7bf4dedee58..57aec3cf52f 100644 --- a/tests/service/data/SyntaxTree/Type/Primary ctor 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Primary ctor 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Primary ctor 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Primary ctor 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Primary ctor 04.fs.bsl b/tests/service/data/SyntaxTree/Type/Primary ctor 04.fs.bsl index a46c198cdfe..fd12e152398 100644 --- a/tests/service/data/SyntaxTree/Type/Primary ctor 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Primary ctor 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Primary ctor 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Primary ctor 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Primary ctor 05.fs.bsl b/tests/service/data/SyntaxTree/Type/Primary ctor 05.fs.bsl index 17215f552fc..434fc7d1cc2 100644 --- a/tests/service/data/SyntaxTree/Type/Primary ctor 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Primary ctor 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Primary ctor 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Primary ctor 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs.bsl b/tests/service/data/SyntaxTree/Type/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs.bsl index 3d954e3c37d..4253f983bad 100644 --- a/tests/service/data/SyntaxTree/Type/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Type/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs", false, - QualifiedNameOfFile RangeOfAttributeShouldBeIncludedInSynTypeDefn, [], [], + QualifiedNameOfFile RangeOfAttributeShouldBeIncludedInSynTypeDefn, [], [SynModuleOrNamespace ([RangeOfAttributeShouldBeIncludedInSynTypeDefn], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs.bsl b/tests/service/data/SyntaxTree/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs.bsl index 0b685986fc4..7bc7b8dbb94 100644 --- a/tests/service/data/SyntaxTree/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs.bsl @@ -2,7 +2,6 @@ ImplFile (ParsedImplFileInput ("/root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs", false, QualifiedNameOfFile RangeOfAttributesShouldBeIncludedInRecursiveTypes, [], - [], [SynModuleOrNamespace ([RangeOfAttributesShouldBeIncludedInRecursiveTypes], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Record - Access 01.fs.bsl b/tests/service/data/SyntaxTree/Type/Record - Access 01.fs.bsl index 95895538080..3aefae6e4cd 100644 --- a/tests/service/data/SyntaxTree/Type/Record - Access 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Record - Access 01.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Type/Record - Access 01.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Record - Access 02.fs.bsl b/tests/service/data/SyntaxTree/Type/Record - Access 02.fs.bsl index dac1c3f6255..735a202cf0e 100644 --- a/tests/service/data/SyntaxTree/Type/Record - Access 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Record - Access 02.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Type/Record - Access 02.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Record - Access 03.fs.bsl b/tests/service/data/SyntaxTree/Type/Record - Access 03.fs.bsl index f819d61d7c4..f5d6d66387f 100644 --- a/tests/service/data/SyntaxTree/Type/Record - Access 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Record - Access 03.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Type/Record - Access 03.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Record - Access 04.fs.bsl b/tests/service/data/SyntaxTree/Type/Record - Access 04.fs.bsl index 1bcbe107b49..5a624b823c8 100644 --- a/tests/service/data/SyntaxTree/Type/Record - Access 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Record - Access 04.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Type/Record - Access 04.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Record - Mutable 01.fs.bsl b/tests/service/data/SyntaxTree/Type/Record - Mutable 01.fs.bsl index 1b629ceaf6f..2889181e162 100644 --- a/tests/service/data/SyntaxTree/Type/Record - Mutable 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Record - Mutable 01.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Type/Record - Mutable 01.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Record - Mutable 02.fs.bsl b/tests/service/data/SyntaxTree/Type/Record - Mutable 02.fs.bsl index 6d7a08f3caa..e32f56c275c 100644 --- a/tests/service/data/SyntaxTree/Type/Record - Mutable 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Record - Mutable 02.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Type/Record - Mutable 02.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Record - Mutable 03.fs.bsl b/tests/service/data/SyntaxTree/Type/Record - Mutable 03.fs.bsl index 34b8bfe0d51..0bd0fd37b90 100644 --- a/tests/service/data/SyntaxTree/Type/Record - Mutable 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Record - Mutable 03.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Type/Record - Mutable 03.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Record - Mutable 04.fs.bsl b/tests/service/data/SyntaxTree/Type/Record - Mutable 04.fs.bsl index e8067343cd8..34a3d73a0c5 100644 --- a/tests/service/data/SyntaxTree/Type/Record - Mutable 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Record - Mutable 04.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Type/Record - Mutable 04.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Record - Mutable 05.fs.bsl b/tests/service/data/SyntaxTree/Type/Record - Mutable 05.fs.bsl index 3679671665f..6ae97678dd5 100644 --- a/tests/service/data/SyntaxTree/Type/Record - Mutable 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Record - Mutable 05.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Type/Record - Mutable 05.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Record 01.fs.bsl b/tests/service/data/SyntaxTree/Type/Record 01.fs.bsl index 1eabb2b2f62..c7b7b1de73b 100644 --- a/tests/service/data/SyntaxTree/Type/Record 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Record 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Record 01.fs", false, QualifiedNameOfFile Foo, [], [], + ("/root/Type/Record 01.fs", false, QualifiedNameOfFile Foo, [], [SynModuleOrNamespace ([Foo], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Record 02.fs.bsl b/tests/service/data/SyntaxTree/Type/Record 02.fs.bsl index 11cabe541de..6e34c49dee7 100644 --- a/tests/service/data/SyntaxTree/Type/Record 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Record 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Record 02.fs", false, QualifiedNameOfFile Foo, [], [], + ("/root/Type/Record 02.fs", false, QualifiedNameOfFile Foo, [], [SynModuleOrNamespace ([Foo], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Record 03.fs.bsl b/tests/service/data/SyntaxTree/Type/Record 03.fs.bsl index 8777aa1b200..7f5fd12edec 100644 --- a/tests/service/data/SyntaxTree/Type/Record 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Record 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Record 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Record 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Record 04.fs.bsl b/tests/service/data/SyntaxTree/Type/Record 04.fs.bsl index db457dd8de3..56f3272248b 100644 --- a/tests/service/data/SyntaxTree/Type/Record 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Record 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Record 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Record 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Record 05.fs.bsl b/tests/service/data/SyntaxTree/Type/Record 05.fs.bsl index 19883a9e8c9..bcbd0edf540 100644 --- a/tests/service/data/SyntaxTree/Type/Record 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Record 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Record 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Record 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/SingleSynEnumCaseContainsRangeOfConstant.fs.bsl b/tests/service/data/SyntaxTree/Type/SingleSynEnumCaseContainsRangeOfConstant.fs.bsl index e901d3eac2f..9730753b60a 100644 --- a/tests/service/data/SyntaxTree/Type/SingleSynEnumCaseContainsRangeOfConstant.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/SingleSynEnumCaseContainsRangeOfConstant.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Type/SingleSynEnumCaseContainsRangeOfConstant.fs", false, - QualifiedNameOfFile SingleSynEnumCaseContainsRangeOfConstant, [], [], + QualifiedNameOfFile SingleSynEnumCaseContainsRangeOfConstant, [], [SynModuleOrNamespace ([SingleSynEnumCaseContainsRangeOfConstant], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Struct 01.fs.bsl b/tests/service/data/SyntaxTree/Type/Struct 01.fs.bsl index 9996befe9da..2ab68391a02 100644 --- a/tests/service/data/SyntaxTree/Type/Struct 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Struct 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Struct 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Struct 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Struct 02.fs.bsl b/tests/service/data/SyntaxTree/Type/Struct 02.fs.bsl index 3ca9cf08ae3..f13c18f4987 100644 --- a/tests/service/data/SyntaxTree/Type/Struct 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Struct 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Struct 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Struct 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs.bsl index cc2e1a3997f..83c681128e3 100644 --- a/tests/service/data/SyntaxTree/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs", false, QualifiedNameOfFile SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword, - [], [], + [], [SynModuleOrNamespace ([SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs.bsl index 6b465047993..4576fce11a3 100644 --- a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Type/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs", false, QualifiedNameOfFile - SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword, [], [], + SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword, [], [SynModuleOrNamespace ([SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs.bsl index 285ecf0975e..37e30d480b8 100644 --- a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Type/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs", false, QualifiedNameOfFile - SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword, [], [], + SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword, [], [SynModuleOrNamespace ([SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs.bsl index f4a425b596d..583bc63a082 100644 --- a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs.bsl @@ -2,7 +2,6 @@ ImplFile (ParsedImplFileInput ("/root/Type/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs", false, QualifiedNameOfFile SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign, [], - [], [SynModuleOrNamespace ([SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs.bsl index 3809962658a..80c2c66f000 100644 --- a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs.bsl @@ -4,7 +4,6 @@ ImplFile false, QualifiedNameOfFile SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign, [], - [], [SynModuleOrNamespace ([SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs.bsl index 35e334478f0..d60b0697fc7 100644 --- a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs", false, QualifiedNameOfFile SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword, - [], [], + [], [SynModuleOrNamespace ([SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs.bsl index 5e5b3b7fc3b..3ab19de13c9 100644 --- a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs.bsl @@ -2,7 +2,7 @@ ImplFile (ParsedImplFileInput ("/root/Type/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs", false, QualifiedNameOfFile SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign, - [], [], + [], [SynModuleOrNamespace ([SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs.bsl index 06a95ae7aa5..cda809b09f5 100644 --- a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs.bsl @@ -3,7 +3,7 @@ ImplFile ("/root/Type/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs", false, QualifiedNameOfFile SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword, - [], [], + [], [SynModuleOrNamespace ([SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword], false, AnonModule, diff --git a/tests/service/data/SyntaxTree/Type/SynTypeFunHasRangeOfArrow.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeFunHasRangeOfArrow.fs.bsl index 21eb149bb10..0bb997cc4ec 100644 --- a/tests/service/data/SyntaxTree/Type/SynTypeFunHasRangeOfArrow.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/SynTypeFunHasRangeOfArrow.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Type/SynTypeFunHasRangeOfArrow.fs", false, - QualifiedNameOfFile SynTypeFunHasRangeOfArrow, [], [], + QualifiedNameOfFile SynTypeFunHasRangeOfArrow, [], [SynModuleOrNamespace ([SynTypeFunHasRangeOfArrow], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/SynTypeTupleWithStruct.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeTupleWithStruct.fs.bsl index e0f51c6ee46..bd0c3ae61d3 100644 --- a/tests/service/data/SyntaxTree/Type/SynTypeTupleWithStruct.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/SynTypeTupleWithStruct.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Type/SynTypeTupleWithStruct.fs", false, - QualifiedNameOfFile SynTypeTupleWithStruct, [], [], + QualifiedNameOfFile SynTypeTupleWithStruct, [], [SynModuleOrNamespace ([SynTypeTupleWithStruct], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Type/SynTypeTupleWithStructRecovery.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeTupleWithStructRecovery.fs.bsl index c69d94938c8..adc62beb271 100644 --- a/tests/service/data/SyntaxTree/Type/SynTypeTupleWithStructRecovery.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/SynTypeTupleWithStructRecovery.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/Type/SynTypeTupleWithStructRecovery.fs", false, - QualifiedNameOfFile SynTypeTupleWithStructRecovery, [], [], + QualifiedNameOfFile SynTypeTupleWithStructRecovery, [], [SynModuleOrNamespace ([SynTypeTupleWithStructRecovery], false, AnonModule, [Let diff --git a/tests/service/data/SyntaxTree/Type/Type 01.fs.bsl b/tests/service/data/SyntaxTree/Type/Type 01.fs.bsl index f34d5eb126b..9677804b583 100644 --- a/tests/service/data/SyntaxTree/Type/Type 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Type 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Type 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Type 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Type 02.fs.bsl b/tests/service/data/SyntaxTree/Type/Type 02.fs.bsl index a670186b978..d12ecd1c004 100644 --- a/tests/service/data/SyntaxTree/Type/Type 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Type 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Type 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Type 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Type 03.fs.bsl b/tests/service/data/SyntaxTree/Type/Type 03.fs.bsl index 9cb15932e4c..09a6f352831 100644 --- a/tests/service/data/SyntaxTree/Type/Type 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Type 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Type 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Type 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Type 04.fs.bsl b/tests/service/data/SyntaxTree/Type/Type 04.fs.bsl index 83a744a8417..ae3109e9ca6 100644 --- a/tests/service/data/SyntaxTree/Type/Type 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Type 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Type 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Type 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Type 05.fs.bsl b/tests/service/data/SyntaxTree/Type/Type 05.fs.bsl index ab92f140113..b04274172f2 100644 --- a/tests/service/data/SyntaxTree/Type/Type 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Type 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Type 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Type 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Type 06.fs.bsl b/tests/service/data/SyntaxTree/Type/Type 06.fs.bsl index c987c0d38f5..e7464b29027 100644 --- a/tests/service/data/SyntaxTree/Type/Type 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Type 06.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Type 06.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Type 06.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Type 07.fs.bsl b/tests/service/data/SyntaxTree/Type/Type 07.fs.bsl index 0eb812102a6..8f409b661c8 100644 --- a/tests/service/data/SyntaxTree/Type/Type 07.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Type 07.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Type 07.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Type 07.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Type 08.fs.bsl b/tests/service/data/SyntaxTree/Type/Type 08.fs.bsl index fea4942c9fa..4aba8af8616 100644 --- a/tests/service/data/SyntaxTree/Type/Type 08.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Type 08.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Type 08.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Type 08.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Type 09.fs.bsl b/tests/service/data/SyntaxTree/Type/Type 09.fs.bsl index c4361033429..c19788af60f 100644 --- a/tests/service/data/SyntaxTree/Type/Type 09.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Type 09.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Type 09.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Type 09.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Type 10.fs.bsl b/tests/service/data/SyntaxTree/Type/Type 10.fs.bsl index 979759d4dbf..5a37de6356d 100644 --- a/tests/service/data/SyntaxTree/Type/Type 10.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Type 10.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Type 10.fs", false, QualifiedNameOfFile Type 10, [], [], + ("/root/Type/Type 10.fs", false, QualifiedNameOfFile Type 10, [], [SynModuleOrNamespace ([N], false, DeclaredNamespace, [NestedModule diff --git a/tests/service/data/SyntaxTree/Type/Type 11.fs.bsl b/tests/service/data/SyntaxTree/Type/Type 11.fs.bsl index 074cead59e8..068eef07152 100644 --- a/tests/service/data/SyntaxTree/Type/Type 11.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Type 11.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Type 11.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Type 11.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Type 12.fs.bsl b/tests/service/data/SyntaxTree/Type/Type 12.fs.bsl index 9bacae3a626..b5d3c290ca9 100644 --- a/tests/service/data/SyntaxTree/Type/Type 12.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Type 12.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Type 12.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Type 12.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Union - Field 01.fs.bsl b/tests/service/data/SyntaxTree/Type/Union - Field 01.fs.bsl index bb78f6b332f..dac7a485157 100644 --- a/tests/service/data/SyntaxTree/Type/Union - Field 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Union - Field 01.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Type/Union - Field 01.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Union - Field 02.fs.bsl b/tests/service/data/SyntaxTree/Type/Union - Field 02.fs.bsl index 4d3b58b4440..e262f48a772 100644 --- a/tests/service/data/SyntaxTree/Type/Union - Field 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Union - Field 02.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Type/Union - Field 02.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Union - Field 03.fs.bsl b/tests/service/data/SyntaxTree/Type/Union - Field 03.fs.bsl index 378ecc0220d..ab664437a53 100644 --- a/tests/service/data/SyntaxTree/Type/Union - Field 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Union - Field 03.fs.bsl @@ -1,7 +1,6 @@ ImplFile (ParsedImplFileInput ("/root/Type/Union - Field 03.fs", false, QualifiedNameOfFile Module, [], - [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Union 01.fs.bsl b/tests/service/data/SyntaxTree/Type/Union 01.fs.bsl index d652bfba1e6..9525bcf2e2c 100644 --- a/tests/service/data/SyntaxTree/Type/Union 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Union 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Union 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Union 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Union 02.fs.bsl b/tests/service/data/SyntaxTree/Type/Union 02.fs.bsl index 55d2c0c07e6..8a6381bb535 100644 --- a/tests/service/data/SyntaxTree/Type/Union 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Union 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Union 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Union 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Union 03.fs.bsl b/tests/service/data/SyntaxTree/Type/Union 03.fs.bsl index 2906039ff99..69d408d0697 100644 --- a/tests/service/data/SyntaxTree/Type/Union 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Union 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Union 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Union 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Union 04.fs.bsl b/tests/service/data/SyntaxTree/Type/Union 04.fs.bsl index 65be844f376..7a3cb76f5fd 100644 --- a/tests/service/data/SyntaxTree/Type/Union 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Union 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Union 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Union 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Union 05.fs.bsl b/tests/service/data/SyntaxTree/Type/Union 05.fs.bsl index 36eb5dae412..b59546acdf5 100644 --- a/tests/service/data/SyntaxTree/Type/Union 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Union 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Union 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Union 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Union 06.fs.bsl b/tests/service/data/SyntaxTree/Type/Union 06.fs.bsl index 90b09522783..57d18768349 100644 --- a/tests/service/data/SyntaxTree/Type/Union 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Union 06.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Union 06.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Union 06.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/Union 07.fs.bsl b/tests/service/data/SyntaxTree/Type/Union 07.fs.bsl index 2f0f76e6131..5be3edddfab 100644 --- a/tests/service/data/SyntaxTree/Type/Union 07.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Union 07.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/Union 07.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/Union 07.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/With 01.fs.bsl b/tests/service/data/SyntaxTree/Type/With 01.fs.bsl index 7fd1e7479f6..a57b78983c2 100644 --- a/tests/service/data/SyntaxTree/Type/With 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/With 01.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/With 01.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/With 01.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/With 02.fs.bsl b/tests/service/data/SyntaxTree/Type/With 02.fs.bsl index afef8b79973..b0b5a5d5568 100644 --- a/tests/service/data/SyntaxTree/Type/With 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/With 02.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/With 02.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/With 02.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/With 03.fs.bsl b/tests/service/data/SyntaxTree/Type/With 03.fs.bsl index 690a827af17..30170838157 100644 --- a/tests/service/data/SyntaxTree/Type/With 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/With 03.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/With 03.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/With 03.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/With 04.fs.bsl b/tests/service/data/SyntaxTree/Type/With 04.fs.bsl index 99ddf674425..cee74baae73 100644 --- a/tests/service/data/SyntaxTree/Type/With 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/With 04.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/With 04.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/With 04.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/Type/With 05.fs.bsl b/tests/service/data/SyntaxTree/Type/With 05.fs.bsl index af2e4a0317a..4e323f3b2af 100644 --- a/tests/service/data/SyntaxTree/Type/With 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/With 05.fs.bsl @@ -1,6 +1,6 @@ ImplFile (ParsedImplFileInput - ("/root/Type/With 05.fs", false, QualifiedNameOfFile Module, [], [], + ("/root/Type/With 05.fs", false, QualifiedNameOfFile Module, [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/UnionCase/Missing keyword of.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/Missing keyword of.fs.bsl index 2bac019ca23..7e20b1c0a9c 100644 --- a/tests/service/data/SyntaxTree/UnionCase/Missing keyword of.fs.bsl +++ b/tests/service/data/SyntaxTree/UnionCase/Missing keyword of.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/UnionCase/Missing keyword of.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Let diff --git a/tests/service/data/SyntaxTree/UnionCase/Missing name 01.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/Missing name 01.fs.bsl index a67e4eb8783..3f11d875232 100644 --- a/tests/service/data/SyntaxTree/UnionCase/Missing name 01.fs.bsl +++ b/tests/service/data/SyntaxTree/UnionCase/Missing name 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/UnionCase/Missing name 01.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/UnionCase/Missing name 02.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/Missing name 02.fs.bsl index 02c674e6a1f..199a903bf66 100644 --- a/tests/service/data/SyntaxTree/UnionCase/Missing name 02.fs.bsl +++ b/tests/service/data/SyntaxTree/UnionCase/Missing name 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/UnionCase/Missing name 02.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/UnionCase/Missing name 03.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/Missing name 03.fs.bsl index 4a272764df0..78bfdfb9248 100644 --- a/tests/service/data/SyntaxTree/UnionCase/Missing name 03.fs.bsl +++ b/tests/service/data/SyntaxTree/UnionCase/Missing name 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/UnionCase/Missing name 03.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/UnionCase/Missing name 04.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/Missing name 04.fs.bsl index 8913b904cea..9187f29d234 100644 --- a/tests/service/data/SyntaxTree/UnionCase/Missing name 04.fs.bsl +++ b/tests/service/data/SyntaxTree/UnionCase/Missing name 04.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/UnionCase/Missing name 04.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/UnionCase/Missing name 05.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/Missing name 05.fs.bsl index 9d7a69011ef..19ebcf9b59a 100644 --- a/tests/service/data/SyntaxTree/UnionCase/Missing name 05.fs.bsl +++ b/tests/service/data/SyntaxTree/UnionCase/Missing name 05.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/UnionCase/Missing name 05.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/UnionCase/Missing name 06.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/Missing name 06.fs.bsl index 27516955a99..48d435cfe63 100644 --- a/tests/service/data/SyntaxTree/UnionCase/Missing name 06.fs.bsl +++ b/tests/service/data/SyntaxTree/UnionCase/Missing name 06.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/UnionCase/Missing name 06.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/UnionCase/Missing name 07.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/Missing name 07.fs.bsl index c4d3efa237f..6f41854a232 100644 --- a/tests/service/data/SyntaxTree/UnionCase/Missing name 07.fs.bsl +++ b/tests/service/data/SyntaxTree/UnionCase/Missing name 07.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/UnionCase/Missing name 07.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/UnionCase/Missing name 08.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/Missing name 08.fs.bsl index 238d9916e07..e1b5cadbba8 100644 --- a/tests/service/data/SyntaxTree/UnionCase/Missing name 08.fs.bsl +++ b/tests/service/data/SyntaxTree/UnionCase/Missing name 08.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/UnionCase/Missing name 08.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/UnionCase/Missing name 09.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/Missing name 09.fs.bsl index 47c92aa67e0..a52e7b434ac 100644 --- a/tests/service/data/SyntaxTree/UnionCase/Missing name 09.fs.bsl +++ b/tests/service/data/SyntaxTree/UnionCase/Missing name 09.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/UnionCase/Missing name 09.fs", false, QualifiedNameOfFile Module, - [], [], + [], [SynModuleOrNamespace ([Module], false, NamedModule, [Types diff --git a/tests/service/data/SyntaxTree/UnionCase/MultipleSynUnionCasesHaveBarRange.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/MultipleSynUnionCasesHaveBarRange.fs.bsl index 8691d476cc6..faec3705370 100644 --- a/tests/service/data/SyntaxTree/UnionCase/MultipleSynUnionCasesHaveBarRange.fs.bsl +++ b/tests/service/data/SyntaxTree/UnionCase/MultipleSynUnionCasesHaveBarRange.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/UnionCase/MultipleSynUnionCasesHaveBarRange.fs", false, - QualifiedNameOfFile MultipleSynUnionCasesHaveBarRange, [], [], + QualifiedNameOfFile MultipleSynUnionCasesHaveBarRange, [], [SynModuleOrNamespace ([MultipleSynUnionCasesHaveBarRange], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/UnionCase/PrivateKeywordHasRange.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/PrivateKeywordHasRange.fs.bsl index 21d1081b55d..d6be6d42c53 100644 --- a/tests/service/data/SyntaxTree/UnionCase/PrivateKeywordHasRange.fs.bsl +++ b/tests/service/data/SyntaxTree/UnionCase/PrivateKeywordHasRange.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/UnionCase/PrivateKeywordHasRange.fs", false, - QualifiedNameOfFile PrivateKeywordHasRange, [], [], + QualifiedNameOfFile PrivateKeywordHasRange, [], [SynModuleOrNamespace ([PrivateKeywordHasRange], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/UnionCase/Recover Function Type 01.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/Recover Function Type 01.fs.bsl index 4817546864d..83c6e4917ce 100644 --- a/tests/service/data/SyntaxTree/UnionCase/Recover Function Type 01.fs.bsl +++ b/tests/service/data/SyntaxTree/UnionCase/Recover Function Type 01.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/UnionCase/Recover Function Type 01.fs", false, - QualifiedNameOfFile Recover Function Type 01, [], [], + QualifiedNameOfFile Recover Function Type 01, [], [SynModuleOrNamespace ([Foo], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/UnionCase/Recover Function Type 02.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/Recover Function Type 02.fs.bsl index 0b908ef60f6..55e9eddd220 100644 --- a/tests/service/data/SyntaxTree/UnionCase/Recover Function Type 02.fs.bsl +++ b/tests/service/data/SyntaxTree/UnionCase/Recover Function Type 02.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/UnionCase/Recover Function Type 02.fs", false, - QualifiedNameOfFile Recover Function Type 02, [], [], + QualifiedNameOfFile Recover Function Type 02, [], [SynModuleOrNamespace ([Foo], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/UnionCase/Recover Function Type 03.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/Recover Function Type 03.fs.bsl index 97defcda3ce..10bb97ba64e 100644 --- a/tests/service/data/SyntaxTree/UnionCase/Recover Function Type 03.fs.bsl +++ b/tests/service/data/SyntaxTree/UnionCase/Recover Function Type 03.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/UnionCase/Recover Function Type 03.fs", false, - QualifiedNameOfFile Recover Function Type 03, [], [], + QualifiedNameOfFile Recover Function Type 03, [], [SynModuleOrNamespace ([Foo], false, DeclaredNamespace, [Types diff --git a/tests/service/data/SyntaxTree/UnionCase/SingleSynUnionCaseHasBarRange.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/SingleSynUnionCaseHasBarRange.fs.bsl index d5c4b3f2f80..355c2741f72 100644 --- a/tests/service/data/SyntaxTree/UnionCase/SingleSynUnionCaseHasBarRange.fs.bsl +++ b/tests/service/data/SyntaxTree/UnionCase/SingleSynUnionCaseHasBarRange.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/UnionCase/SingleSynUnionCaseHasBarRange.fs", false, - QualifiedNameOfFile SingleSynUnionCaseHasBarRange, [], [], + QualifiedNameOfFile SingleSynUnionCaseHasBarRange, [], [SynModuleOrNamespace ([SingleSynUnionCaseHasBarRange], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/UnionCase/SingleSynUnionCaseWithoutBar.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/SingleSynUnionCaseWithoutBar.fs.bsl index 32910732a1c..58f0ea60cf0 100644 --- a/tests/service/data/SyntaxTree/UnionCase/SingleSynUnionCaseWithoutBar.fs.bsl +++ b/tests/service/data/SyntaxTree/UnionCase/SingleSynUnionCaseWithoutBar.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/UnionCase/SingleSynUnionCaseWithoutBar.fs", false, - QualifiedNameOfFile SingleSynUnionCaseWithoutBar, [], [], + QualifiedNameOfFile SingleSynUnionCaseWithoutBar, [], [SynModuleOrNamespace ([SingleSynUnionCaseWithoutBar], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/UnionCase/SynUnionCaseKindFullType.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/SynUnionCaseKindFullType.fs.bsl index 20e3a15d262..71057648c5b 100644 --- a/tests/service/data/SyntaxTree/UnionCase/SynUnionCaseKindFullType.fs.bsl +++ b/tests/service/data/SyntaxTree/UnionCase/SynUnionCaseKindFullType.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/UnionCase/SynUnionCaseKindFullType.fs", false, - QualifiedNameOfFile SynUnionCaseKindFullType, [], [], + QualifiedNameOfFile SynUnionCaseKindFullType, [], [SynModuleOrNamespace ([SynUnionCaseKindFullType], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/UnionCase/UnionCaseFieldsCanHaveComments.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/UnionCaseFieldsCanHaveComments.fs.bsl index 51363b02c37..6c144a55a13 100644 --- a/tests/service/data/SyntaxTree/UnionCase/UnionCaseFieldsCanHaveComments.fs.bsl +++ b/tests/service/data/SyntaxTree/UnionCase/UnionCaseFieldsCanHaveComments.fs.bsl @@ -1,7 +1,7 @@ ImplFile (ParsedImplFileInput ("/root/UnionCase/UnionCaseFieldsCanHaveComments.fs", false, - QualifiedNameOfFile UnionCaseFieldsCanHaveComments, [], [], + QualifiedNameOfFile UnionCaseFieldsCanHaveComments, [], [SynModuleOrNamespace ([UnionCaseFieldsCanHaveComments], false, AnonModule, [Types diff --git a/tests/service/data/SyntaxTree/Val/InlineKeyword.fsi.bsl b/tests/service/data/SyntaxTree/Val/InlineKeyword.fsi.bsl index 8c04d7ba275..eca0b22aa41 100644 --- a/tests/service/data/SyntaxTree/Val/InlineKeyword.fsi.bsl +++ b/tests/service/data/SyntaxTree/Val/InlineKeyword.fsi.bsl @@ -1,6 +1,6 @@ SigFile (ParsedSigFileInput - ("/root/Val/InlineKeyword.fsi", QualifiedNameOfFile InlineKeyword, [], [], + ("/root/Val/InlineKeyword.fsi", QualifiedNameOfFile InlineKeyword, [], [SynModuleOrNamespaceSig ([X], false, DeclaredNamespace, [Val From 6041cdd1bd0583f785529dff3cfb7debe8ce7b1f Mon Sep 17 00:00:00 2001 From: Martin521 <29605222+Martin521@users.noreply.github.com> Date: Fri, 4 Oct 2024 14:16:48 +0000 Subject: [PATCH 19/35] fix merge issues --- src/Compiler/SyntaxTree/LexHelpers.fs | 1 - src/Compiler/lex.fsl | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/Compiler/SyntaxTree/LexHelpers.fs b/src/Compiler/SyntaxTree/LexHelpers.fs index fb4719397ea..736e4be04f5 100644 --- a/src/Compiler/SyntaxTree/LexHelpers.fs +++ b/src/Compiler/SyntaxTree/LexHelpers.fs @@ -102,7 +102,6 @@ let reusingLexbufForParsing lexbuf f = use _ = UseBuildPhase BuildPhase.Parse LexbufLocalXmlDocStore.ClearXmlDoc lexbuf LexbufCommentStore.ClearComments lexbuf - WarnScopes.ClearLexbufStore lexbuf try f () diff --git a/src/Compiler/lex.fsl b/src/Compiler/lex.fsl index 4178e693006..092f2d51257 100644 --- a/src/Compiler/lex.fsl +++ b/src/Compiler/lex.fsl @@ -1082,13 +1082,13 @@ rule token (args: LexArgs) (skip: bool) = parse let tok = fail args lexbuf (FSComp.SR.lexHashIfMustHaveIdent()) tok if not skip then tok else token args skip lexbuf } - | anywhite* ("#nowarn" | "#warnon") anystring newline - { - WarnScopes.ParseAndRegisterWarnDirective lexbuf - newline lexbuf - let tok = WHITESPACE (LexCont.Token (args.ifdefStack, args.stringNest)) - if not skip then tok else token args skip lexbuf - } + | anywhite* "#if" ident_char+ + | anywhite* "#else" ident_char+ + | anywhite* "#endif" ident_char+ + | anywhite* "#light" ident_char+ + { let n = (lexeme lexbuf).IndexOf('#') + lexbuf.StartPos <- lexbuf.StartPos.ShiftColumnBy(n) + HASH_IDENT(lexemeTrimLeft lexbuf (n+1)) } // We parse and process warn directives here during lexing, including anything that might be an argument. // But we stop early enough to pass to the parser ";;" (for compatibility) and "//" (for coloring). From 650df31a8af99e17495fde139bd404a4d65b321c Mon Sep 17 00:00:00 2001 From: Martin521 <29605222+Martin521@users.noreply.github.com> Date: Fri, 4 Oct 2024 18:06:47 +0000 Subject: [PATCH 20/35] ran fantomas --- src/Compiler/Driver/ParseAndCheckInputs.fs | 4 ++-- src/Compiler/Driver/ScriptClosure.fs | 4 +--- src/Compiler/Interactive/fsi.fs | 18 ++++++++++++------ src/Compiler/Service/ServiceLexing.fs | 2 +- src/Compiler/Service/TransparentCompiler.fs | 7 +------ 5 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/Compiler/Driver/ParseAndCheckInputs.fs b/src/Compiler/Driver/ParseAndCheckInputs.fs index c5c3bf72f26..8d77e759dae 100644 --- a/src/Compiler/Driver/ParseAndCheckInputs.fs +++ b/src/Compiler/Driver/ParseAndCheckInputs.fs @@ -932,7 +932,7 @@ let ProcessMetaCommandsFromInput decls |> List.iter (fun d -> match d with - | SynModuleSigDecl.HashDirective(ParsedHashDirective("WARN_DIRECTIVE_DUMMY",_,_), _) -> () + | SynModuleSigDecl.HashDirective(ParsedHashDirective("WARN_DIRECTIVE_DUMMY", _, _), _) -> () | SynModuleSigDecl.HashDirective(_, m) -> warning (Error(FSComp.SR.buildDirectivesInModulesAreIgnored (), m)) | SynModuleSigDecl.NestedModule(moduleDecls = subDecls) -> WarnOnIgnoredSpecDecls subDecls | _ -> ()) @@ -941,7 +941,7 @@ let ProcessMetaCommandsFromInput decls |> List.iter (fun d -> match d with - | SynModuleDecl.HashDirective(ParsedHashDirective("WARN_DIRECTIVE_DUMMY",_,_), _) -> () + | SynModuleDecl.HashDirective(ParsedHashDirective("WARN_DIRECTIVE_DUMMY", _, _), _) -> () | SynModuleDecl.HashDirective(_, m) -> warning (Error(FSComp.SR.buildDirectivesInModulesAreIgnored (), m)) | SynModuleDecl.NestedModule(decls = subDecls) -> WarnOnIgnoredImplDecls subDecls | _ -> ()) diff --git a/src/Compiler/Driver/ScriptClosure.fs b/src/Compiler/Driver/ScriptClosure.fs index 1ce3227dce3..70845f1a115 100644 --- a/src/Compiler/Driver/ScriptClosure.fs +++ b/src/Compiler/Driver/ScriptClosure.fs @@ -271,9 +271,7 @@ module ScriptPreprocessClosure = tcConfigB.AddLoadedSource(m, s, pathOfMetaCommandSource) try - ProcessMetaCommandsFromInput - (addReferenceDirective, addLoadedSource) - (tcConfigB, inp, pathOfMetaCommandSource, ()) + ProcessMetaCommandsFromInput (addReferenceDirective, addLoadedSource) (tcConfigB, inp, pathOfMetaCommandSource, ()) with ReportedError _ -> // Recover by using whatever did end up in the tcConfig () diff --git a/src/Compiler/Interactive/fsi.fs b/src/Compiler/Interactive/fsi.fs index e81cffd93f1..a3d7f7c38d6 100644 --- a/src/Compiler/Interactive/fsi.fs +++ b/src/Compiler/Interactive/fsi.fs @@ -2840,10 +2840,10 @@ type internal FsiDynamicCompiler WithImplicitHome (tcConfigB, directoryName sourceFile) (fun () -> ProcessMetaCommandsFromInput ((fun st (m, path, directive) -> - let st, _ = - fsiDynamicCompiler.PartiallyProcessReferenceOrPackageIncludePathDirective(ctok, st, directive, path, false, m) + let st, _ = + fsiDynamicCompiler.PartiallyProcessReferenceOrPackageIncludePathDirective(ctok, st, directive, path, false, m) - st), + st), (fun _ _ -> ())) (tcConfigB, input, !! Path.GetDirectoryName(sourceFile), istate)) @@ -3704,7 +3704,7 @@ type FsiInteractionProcessor tok Parser.interaction lexerWhichSavesLastToken tokenizer.LexBuffer) - + WarnScopes.MergeInto diagnosticOptions tokenizer.LexBuffer Some input @@ -4179,7 +4179,7 @@ type FsiInteractionProcessor // Parse the interaction. When FSI.EXE is waiting for input from the console the // parser thread is blocked somewhere deep this call. let action = ParseInteraction diagnosticOptions tokenizer - + if progress then fprintfn fsiConsoleOutput.Out "returned from ParseInteraction...calling runCodeOnMainThread..." @@ -4216,7 +4216,13 @@ type FsiInteractionProcessor let rec run istate = let status = - processor.ParseAndExecuteInteractionFromLexbuf((fun f istate -> f ctok istate), istate, tokenizer, tcConfigB.diagnosticsOptions, diagnosticsLogger) + processor.ParseAndExecuteInteractionFromLexbuf( + (fun f istate -> f ctok istate), + istate, + tokenizer, + tcConfigB.diagnosticsOptions, + diagnosticsLogger + ) ProcessStepStatus status None (fun _ istate -> run istate) diff --git a/src/Compiler/Service/ServiceLexing.fs b/src/Compiler/Service/ServiceLexing.fs index f9a4f256cfd..03891b4970e 100644 --- a/src/Compiler/Service/ServiceLexing.fs +++ b/src/Compiler/Service/ServiceLexing.fs @@ -935,7 +935,7 @@ type FSharpLineTokenizer(lexbuf: UnicodeLexing.Lexbuf, maxLength: int option, fi // Process: anywhite* ("//" [^'\n''\r']*)? let offset = beforeIdent + identLength processWhiteAndComment str offset delay cont) - + let processWarnDirective (str: string) leftc rightc cont = let hashIdx = str.IndexOf("#", StringComparison.Ordinal) let directive = WARN_DIRECTIVE(str, cont), leftc + hashIdx, rightc diff --git a/src/Compiler/Service/TransparentCompiler.fs b/src/Compiler/Service/TransparentCompiler.fs index 8f2b229310d..efc2e510050 100644 --- a/src/Compiler/Service/TransparentCompiler.fs +++ b/src/Compiler/Service/TransparentCompiler.fs @@ -2340,12 +2340,7 @@ type internal TransparentCompiler assumeDotNetFramework otherFlags - let otherFlags = - [ - yield "--noframework" - yield "--warn:3" - yield! otherFlags - ] + let otherFlags = [ yield "--noframework"; yield "--warn:3"; yield! otherFlags ] // Once we do have the script closure, we can populate the cache to re-use can later. let loadClosureKey = From aacab15f5080846d8e245e304a0fd5be49f5a868 Mon Sep 17 00:00:00 2001 From: Martin521 <29605222+Martin521@users.noreply.github.com> Date: Fri, 4 Oct 2024 18:41:06 +0000 Subject: [PATCH 21/35] fixed WARN_DIRECTIVE parse in fsi --- src/Compiler/Interactive/fsi.fs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Compiler/Interactive/fsi.fs b/src/Compiler/Interactive/fsi.fs index a3d7f7c38d6..d2f9adf363b 100644 --- a/src/Compiler/Interactive/fsi.fs +++ b/src/Compiler/Interactive/fsi.fs @@ -3882,6 +3882,9 @@ type FsiInteractionProcessor istate, Completed None + | ParsedHashDirective("WARN_DIRECTIVE_DUMMY", hashArguments, m) -> + istate, Completed None + | ParsedHashDirective(c, hashArguments, m) -> let arg = (parsedHashDirectiveArguments hashArguments tcConfigB.langVersion) warning (Error((FSComp.SR.fsiInvalidDirective (c, String.concat " " arg)), m)) From d36702e06976afaf102c03fc1f88b2455bd7124d Mon Sep 17 00:00:00 2001 From: Martin521 <29605222+Martin521@users.noreply.github.com> Date: Fri, 4 Oct 2024 19:12:24 +0000 Subject: [PATCH 22/35] disabled test on transitive #nowarn --- .../LegacyLanguageService/Tests.LanguageService.Script.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.Script.fs b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.Script.fs index 852758363c5..d9a87ced522 100644 --- a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.Script.fs +++ b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.Script.fs @@ -500,7 +500,7 @@ type UsingMSBuild() as this = AssertNoErrorsOrWarnings(project) // #nowarn seen in closed .fsx is global to the closure - [] + [] member public this.``Fsx.NoError.ScriptClosure.TransitiveLoad16``() = use _guard = this.UsingNewVS() let solution = this.CreateSolution() From 398a4a5cd5eeab21c2c86a44c83da50a9e6124cf Mon Sep 17 00:00:00 2001 From: Martin521 <29605222+Martin521@users.noreply.github.com> Date: Fri, 4 Oct 2024 19:33:14 +0000 Subject: [PATCH 23/35] fixed formatting and unused variable --- src/Compiler/Interactive/fsi.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Compiler/Interactive/fsi.fs b/src/Compiler/Interactive/fsi.fs index d2f9adf363b..890b5603554 100644 --- a/src/Compiler/Interactive/fsi.fs +++ b/src/Compiler/Interactive/fsi.fs @@ -3882,7 +3882,7 @@ type FsiInteractionProcessor istate, Completed None - | ParsedHashDirective("WARN_DIRECTIVE_DUMMY", hashArguments, m) -> + | ParsedHashDirective("WARN_DIRECTIVE_DUMMY", _, _) -> istate, Completed None | ParsedHashDirective(c, hashArguments, m) -> From c29e3f2cd919f43bd2802a172932f6f6ec63c4f8 Mon Sep 17 00:00:00 2001 From: Martin521 <29605222+Martin521@users.noreply.github.com> Date: Fri, 4 Oct 2024 19:35:32 +0000 Subject: [PATCH 24/35] fix formatting --- src/Compiler/Interactive/fsi.fs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Compiler/Interactive/fsi.fs b/src/Compiler/Interactive/fsi.fs index 890b5603554..e4ce9192577 100644 --- a/src/Compiler/Interactive/fsi.fs +++ b/src/Compiler/Interactive/fsi.fs @@ -3882,8 +3882,7 @@ type FsiInteractionProcessor istate, Completed None - | ParsedHashDirective("WARN_DIRECTIVE_DUMMY", _, _) -> - istate, Completed None + | ParsedHashDirective("WARN_DIRECTIVE_DUMMY", _, _) -> istate, Completed None | ParsedHashDirective(c, hashArguments, m) -> let arg = (parsedHashDirectiveArguments hashArguments tcConfigB.langVersion) From b2f656e0f6a5c7bcdffa919b72aca922b4174abd Mon Sep 17 00:00:00 2001 From: Martin521 <29605222+Martin521@users.noreply.github.com> Date: Sat, 5 Oct 2024 09:09:24 +0000 Subject: [PATCH 25/35] fix or skip legacy tests --- tests/fsharp/core/load-script/ProjectDriver.fsx | 3 ++- .../LegacyLanguageService/Tests.LanguageService.ErrorList.fs | 2 +- .../LegacyLanguageService/Tests.LanguageService.Script.fs | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/fsharp/core/load-script/ProjectDriver.fsx b/tests/fsharp/core/load-script/ProjectDriver.fsx index e614c5a3f72..e394078cc2a 100644 --- a/tests/fsharp/core/load-script/ProjectDriver.fsx +++ b/tests/fsharp/core/load-script/ProjectDriver.fsx @@ -1,9 +1,10 @@ // #Conformance #FSI #load "ThisProject.fsx" +#nowarn "44" [] let fn x = 0 -let y = fn 1 // This would be an 'obsolete' warning but ThisProject.fsx nowarns it +let y = fn 1 // This would be an 'obsolete' warning but for the #nowarn above printfn "Result = %d" (Namespace.Type.Method()) diff --git a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs index b5cc13f4501..8df930cf38b 100644 --- a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs +++ b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs @@ -519,7 +519,7 @@ type staticInInterface = |> List.exists(fun error -> (error.ToString().Contains("新規baProgram")))) // In this bug, particular warns were still present after nowarn - [] + [] member public this.``NoWarn.Bug5424``() = let fileContent = """ #nowarn "67" // this type test or downcast will always hold diff --git a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.Script.fs b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.Script.fs index d9a87ced522..70b51e1b921 100644 --- a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.Script.fs +++ b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.Script.fs @@ -1440,8 +1440,7 @@ type UsingMSBuild() as this = "#r \"\"" "#reference \"\"" "#load \"\"" - "#line 52" - "#nowarn 72"] + "#line 52"] ) /// There was a problem where an unclosed reference picked up the text of the reference on the next line. From 47ddb6681e47aed4d35f840aa824d4004d63ff17 Mon Sep 17 00:00:00 2001 From: Martin521 <29605222+Martin521@users.noreply.github.com> Date: Tue, 15 Oct 2024 14:56:16 +0000 Subject: [PATCH 26/35] enable intra-expression warn directives; tests; warnings --- .devcontainer/devcontainer.json | 2 +- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- .github/ISSUE_TEMPLATE/feature_request.md | 2 +- Directory.Build.props | 8 +- azure-pipelines-PR.yml | 6 + azure-pipelines.yml | 4 +- .../.FSharp.Compiler.Service/9.0.100.md | 2 +- .../.FSharp.Compiler.Service/9.0.200.md | 4 + .../.FSharp.Compiler.Service/preview.md | 11 + docs/release-notes/.Language/preview.md | 1 + docs/release-notes/.VisualStudio/17.12.md | 3 +- eng/{TSACondig.gdntsa => TSAConfig.gdntsa} | 4 +- eng/Version.Details.xml | 4 +- eng/Versions.props | 6 +- global.json | 4 +- src/Compiler/Checking/CheckDeclarations.fs | 10 +- .../CheckComputationExpressions.fs | 34 +- .../Checking/Expressions/CheckExpressions.fs | 12 +- .../Expressions/CheckSequenceExpressions.fs | 27 +- src/Compiler/Driver/CompilerDiagnostics.fs | 6 +- .../GraphChecking/FileContentMapping.fs | 2 +- src/Compiler/Driver/ParseAndCheckInputs.fs | 38 +- src/Compiler/Driver/ParseAndCheckInputs.fsi | 6 +- src/Compiler/Driver/ScriptClosure.fs | 16 +- src/Compiler/Driver/fsc.fs | 4 +- src/Compiler/FSComp.txt | 6 +- src/Compiler/FSharp.Compiler.Service.fsproj | 5 +- src/Compiler/Interactive/fsi.fs | 2 - src/Compiler/Service/FSharpCheckerResults.fs | 3 +- .../Service/FSharpParseFileResults.fs | 6 +- src/Compiler/Service/IncrementalBuild.fs | 1 + src/Compiler/Service/ServiceLexing.fs | 21 +- src/Compiler/Service/ServiceParseTreeWalk.fs | 2 +- src/Compiler/Service/ServiceParsedInputOps.fs | 4 +- src/Compiler/Service/ServiceStructure.fs | 4 +- src/Compiler/Service/TransparentCompiler.fs | 2 + src/Compiler/Service/service.fs | 4 +- src/Compiler/Service/service.fsi | 3 +- src/Compiler/SyntaxTree/LexHelpers.fs | 2 +- src/Compiler/SyntaxTree/LexHelpers.fsi | 2 +- src/Compiler/SyntaxTree/ParseHelpers.fs | 22 +- src/Compiler/SyntaxTree/ParseHelpers.fsi | 2 +- src/Compiler/SyntaxTree/SyntaxTree.fs | 6 +- src/Compiler/SyntaxTree/SyntaxTree.fsi | 6 +- src/Compiler/SyntaxTree/SyntaxTreeOps.fs | 4 +- src/Compiler/SyntaxTree/SyntaxTrivia.fs | 29 +- src/Compiler/SyntaxTree/SyntaxTrivia.fsi | 24 ++ src/Compiler/SyntaxTree/WarnScopes.fs | 86 ++-- src/Compiler/TypedTree/TypedTree.fs | 6 + src/Compiler/TypedTree/TypedTree.fsi | 1 + src/Compiler/TypedTree/TypedTreeBasics.fs | 2 +- src/Compiler/lex.fsl | 119 +++--- src/Compiler/pars.fsy | 29 +- src/Compiler/xlf/FSComp.txt.cs.xlf | 38 +- src/Compiler/xlf/FSComp.txt.de.xlf | 38 +- src/Compiler/xlf/FSComp.txt.es.xlf | 38 +- src/Compiler/xlf/FSComp.txt.fr.xlf | 38 +- src/Compiler/xlf/FSComp.txt.it.xlf | 38 +- src/Compiler/xlf/FSComp.txt.ja.xlf | 38 +- src/Compiler/xlf/FSComp.txt.ko.xlf | 38 +- src/Compiler/xlf/FSComp.txt.pl.xlf | 38 +- src/Compiler/xlf/FSComp.txt.pt-BR.xlf | 38 +- src/Compiler/xlf/FSComp.txt.ru.xlf | 38 +- src/Compiler/xlf/FSComp.txt.tr.xlf | 38 +- src/Compiler/xlf/FSComp.txt.zh-Hans.xlf | 38 +- src/Compiler/xlf/FSComp.txt.zh-Hant.xlf | 38 +- src/Compiler/xlf/FSStrings.cs.xlf | 2 +- src/Compiler/xlf/FSStrings.de.xlf | 2 +- src/Compiler/xlf/FSStrings.es.xlf | 2 +- src/Compiler/xlf/FSStrings.fr.xlf | 2 +- src/Compiler/xlf/FSStrings.it.xlf | 2 +- src/Compiler/xlf/FSStrings.ja.xlf | 2 +- src/Compiler/xlf/FSStrings.ko.xlf | 2 +- src/Compiler/xlf/FSStrings.pl.xlf | 2 +- src/Compiler/xlf/FSStrings.pt-BR.xlf | 2 +- src/Compiler/xlf/FSStrings.ru.xlf | 2 +- src/Compiler/xlf/FSStrings.tr.xlf | 2 +- src/Compiler/xlf/FSStrings.zh-Hans.xlf | 2 +- src/Compiler/xlf/FSStrings.zh-Hant.xlf | 2 +- src/FSharp.Core/xlf/FSCore.cs.xlf | 4 +- src/FSharp.Core/xlf/FSCore.de.xlf | 4 +- src/FSharp.Core/xlf/FSCore.es.xlf | 4 +- src/FSharp.Core/xlf/FSCore.fr.xlf | 4 +- src/FSharp.Core/xlf/FSCore.it.xlf | 4 +- src/FSharp.Core/xlf/FSCore.ja.xlf | 4 +- src/FSharp.Core/xlf/FSCore.ko.xlf | 4 +- src/FSharp.Core/xlf/FSCore.pl.xlf | 4 +- src/FSharp.Core/xlf/FSCore.pt-BR.xlf | 4 +- src/FSharp.Core/xlf/FSCore.ru.xlf | 4 +- src/FSharp.Core/xlf/FSCore.tr.xlf | 4 +- src/FSharp.Core/xlf/FSCore.zh-Hans.xlf | 4 +- src/FSharp.Core/xlf/FSCore.zh-Hant.xlf | 4 +- .../xlf/FSDependencyManager.txt.cs.xlf | 2 +- .../xlf/FSDependencyManager.txt.de.xlf | 2 +- .../xlf/FSDependencyManager.txt.es.xlf | 2 +- .../xlf/FSDependencyManager.txt.fr.xlf | 2 +- .../xlf/FSDependencyManager.txt.it.xlf | 2 +- .../xlf/FSDependencyManager.txt.ja.xlf | 2 +- .../xlf/FSDependencyManager.txt.ko.xlf | 2 +- .../xlf/FSDependencyManager.txt.pl.xlf | 2 +- .../xlf/FSDependencyManager.txt.pt-BR.xlf | 2 +- .../xlf/FSDependencyManager.txt.ru.xlf | 2 +- .../xlf/FSDependencyManager.txt.tr.xlf | 2 +- .../xlf/FSDependencyManager.txt.zh-Hans.xlf | 2 +- .../xlf/FSDependencyManager.txt.zh-Hant.xlf | 2 +- .../CompilerDirectives/Ifdef.fs | 57 +++ .../CompilerDirectives/NonStringArgs.fs | 112 +++++ .../CompilerDirectives/Nowarn.fs | 383 ++++++------------ .../CompilerService/AsyncMemoize.fs | 370 ++++++++--------- .../AttributeUsage/AttributeUsage.fs | 33 ++ .../ExceptionDefinitions.fs | 2 +- .../TypeAbbreviations/TypeAbbreviations.fs | 2 +- .../Types/UnionTypes/UnionTypes.fs | 4 +- .../ConstraintSolver/MemberConstraints.fs | 1 - .../EmittedIL/Literals.fs | 226 +++++++++-- .../EmittedIL/TryCatch/TryCatch.fs | 4 +- .../ErrorMessages/ClassesTests.fs | 17 +- .../ErrorMessages/TypeMismatchTests.fs | 2 +- .../FSharp.Compiler.ComponentTests.fsproj | 1 + .../Language/ComputationExpressionTests.fs | 232 +++++++++++ .../Nullness/NullableReferenceTypesTests.fs | 15 + .../Language/SequenceExpressionTests.fs | 27 +- .../Graph/CompilationFromCmdlineArgsTests.fs | 4 +- .../FSharpScriptTests.fs | 23 +- .../BuildGraphTests.fs | 19 +- ...ervice.SurfaceArea.netstandard20.debug.bsl | 32 +- ...vice.SurfaceArea.netstandard20.release.bsl | 32 +- .../ProjectAnalysisTests.fs | 9 +- .../WarnScopeTests.fs | 2 +- .../Microsoft.FSharp.Control/AsyncModule.fs | 75 ++-- .../Microsoft.FSharp.Control/AsyncType.fs | 61 +-- .../Microsoft.FSharp.Control/Cancellation.fs | 37 +- .../MailboxProcessorType.fs | 129 ++++-- .../Microsoft.FSharp.Control/Tasks.fs | 45 +- .../Microsoft.FSharp.Control/TasksDynamic.fs | 45 +- tests/FSharp.Test.Utilities/Compiler.fs | 52 +-- tests/FSharp.Test.Utilities/CompilerAssert.fs | 45 +- tests/FSharp.Test.Utilities/ILChecker.fs | 2 +- tests/FSharp.Test.Utilities/Peverifier.fs | 2 +- .../ProjectGeneration.fs | 5 +- tests/FSharp.Test.Utilities/TestFramework.fs | 123 +++--- tests/FSharp.Test.Utilities/Utilities.fs | 2 +- .../Libraries/Core/Async/AsyncTests.fs | 16 +- tests/fsharp/core/controlMailbox/test.fsx | 188 ++++----- tests/fsharp/typecheck/sigs/neg06.bsl | 2 +- tests/fsharp/typecheck/sigs/neg10.bsl | 4 +- tests/fsharp/typecheck/sigs/neg104.vsbsl | 2 +- tests/fsharp/typecheck/sigs/neg107.bsl | 20 +- tests/fsharp/typecheck/sigs/neg107.vsbsl | 20 +- tests/fsharp/typecheck/sigs/neg20.bsl | 2 +- tests/fsharp/typecheck/sigs/neg59.bsl | 8 +- tests/fsharp/typecheck/sigs/neg61.bsl | 6 +- .../fsharp/typecheck/sigs/version50/neg20.bsl | 2 +- .../ComputationExpressions/E_MissingReturn.fs | 2 +- .../E_MissingReturnFrom.fs | 2 +- .../ComputationExpressions/E_MissingUsing.fs | 2 +- .../ComputationExpressions/E_MissingYield.fs | 2 +- .../E_MissingYieldFrom.fs | 2 +- .../StructTypes/E_StructInheritance01b.fs | 2 +- .../TypeKindInference/infer_interface002e.fs | 4 +- .../Binding/InlineKeywordInBinding.fs.bsl | 17 +- ...ignShouldBePresentInLocalLetBinding.fs.bsl | 11 +- ...ouldBePresentInLocalLetBindingTyped.fs.bsl | 11 +- ...ldBePresentInSynExprLetOrUseBinding.fs.bsl | 17 +- ...atStartsAtAndAndEndsAfterExpression.fs.bsl | 12 +- ...geStartsAtAndAndEndsAfterExpression.fs.bsl | 12 +- .../Expression/List - Comprehension 01.fs.bsl | 5 +- .../Expression/List - Comprehension 02.fs.bsl | 3 +- ...LetOrUseContainsTheRangeOfInKeyword.fs.bsl | 6 +- .../SyntaxTree/Expression/Rarrow 01.fs.bsl | 4 +- .../SyntaxTree/Expression/Rarrow 02.fs.bsl | 2 +- .../SyntaxTree/Expression/Rarrow 03.fs.bsl | 5 +- ...BangContainsTheRangeOfTheEqualsSign.fs.bsl | 11 +- ...LetOrUseContainsTheRangeOfInKeyword.fs.bsl | 3 +- ...seDoesNotContainTheRangeOfInKeyword.fs.bsl | 11 +- ...rsDoesNotContainTheRangeOfInKeyword.fs.bsl | 3 +- ...eBindingContainsTheRangeOfInKeyword.fs.bsl | 3 +- .../Try with - Missing expr 04.fs.bsl | 3 +- .../SyntaxTree/Expression/WhileBang 01.fs.bsl | 5 +- .../SyntaxTree/Expression/WhileBang 02.fs.bsl | 5 +- .../SyntaxTree/Expression/WhileBang 03.fs.bsl | 4 +- .../SyntaxTree/Expression/WhileBang 04.fs.bsl | 4 +- .../SyntaxTree/Expression/WhileBang 05.fs.bsl | 4 +- .../SyntaxTree/Expression/WhileBang 06.fs.bsl | 4 +- .../LeadingKeyword/UseKeyword.fs.bsl | 11 +- .../LeadingKeyword/UseRecKeyword.fs.bsl | 11 +- .../RangeOfMultipleSynMatchClause.fs.bsl | 3 +- .../RangeOfSingleSynMatchClause.fs.bsl | 3 +- ...OfSingleSynMatchClauseFollowedByBar.fs.bsl | 3 +- .../data/SyntaxTree/Member/Inherit 01.fs.bsl | 3 +- .../data/SyntaxTree/Member/Inherit 03.fs.bsl | 3 +- .../data/SyntaxTree/Member/Inherit 04.fs.bsl | 3 +- .../data/SyntaxTree/Member/Inherit 05.fs.bsl | 2 +- .../data/SyntaxTree/Member/Inherit 08.fs.bsl | 2 +- ...StringAsParsedHashDirectiveArgument.fs.bsl | 9 +- .../Pattern/Typed - Missing type 05.fs.bsl | 3 +- .../Pattern/Typed - Missing type 06.fs.bsl | 5 +- .../Pattern/Typed - Missing type 09.fs.bsl | 3 +- .../Pattern/Typed - Missing type 10.fs.bsl | 5 +- .../Pattern/Typed - Missing type 11.fs.bsl | 5 +- .../Pattern/Typed - Missing type 12.fs.bsl | 5 +- ...nterpolatedStringOffsideInNestedLet.fs.bsl | 3 +- tests/service/data/TestTP/ProvidedTypes.fs | 6 - .../Template/xlf/Tutorial.fsx.cs.xlf | 8 +- .../Template/xlf/Tutorial.fsx.de.xlf | 8 +- .../Template/xlf/Tutorial.fsx.es.xlf | 8 +- .../Template/xlf/Tutorial.fsx.fr.xlf | 8 +- .../Template/xlf/Tutorial.fsx.it.xlf | 8 +- .../Template/xlf/Tutorial.fsx.ja.xlf | 8 +- .../Template/xlf/Tutorial.fsx.ko.xlf | 8 +- .../Template/xlf/Tutorial.fsx.pl.xlf | 8 +- .../Template/xlf/Tutorial.fsx.pt-BR.xlf | 8 +- .../Template/xlf/Tutorial.fsx.ru.xlf | 8 +- .../Template/xlf/Tutorial.fsx.tr.xlf | 8 +- .../Template/xlf/Tutorial.fsx.zh-Hans.xlf | 8 +- .../Template/xlf/Tutorial.fsx.zh-Hant.xlf | 8 +- .../CodeFixes/RemoveReturnOrYield.fs | 6 +- ...rosoft.VisualStudio.Package.Project.cs.xlf | 2 +- ...rosoft.VisualStudio.Package.Project.de.xlf | 2 +- ...rosoft.VisualStudio.Package.Project.es.xlf | 2 +- ...rosoft.VisualStudio.Package.Project.fr.xlf | 2 +- ...rosoft.VisualStudio.Package.Project.it.xlf | 2 +- ...rosoft.VisualStudio.Package.Project.ja.xlf | 2 +- ...rosoft.VisualStudio.Package.Project.ko.xlf | 2 +- ...rosoft.VisualStudio.Package.Project.pl.xlf | 2 +- ...oft.VisualStudio.Package.Project.pt-BR.xlf | 2 +- ...rosoft.VisualStudio.Package.Project.ru.xlf | 2 +- ...rosoft.VisualStudio.Package.Project.tr.xlf | 2 +- ...t.VisualStudio.Package.Project.zh-Hans.xlf | 2 +- ...t.VisualStudio.Package.Project.zh-Hant.xlf | 2 +- .../Resources/xlf/WCF.cs.xlf | 2 +- .../Resources/xlf/WCF.de.xlf | 2 +- .../Resources/xlf/WCF.es.xlf | 2 +- .../Resources/xlf/WCF.fr.xlf | 2 +- .../Resources/xlf/WCF.it.xlf | 2 +- .../Resources/xlf/WCF.ja.xlf | 2 +- .../Resources/xlf/WCF.ko.xlf | 2 +- .../Resources/xlf/WCF.pl.xlf | 2 +- .../Resources/xlf/WCF.pt-BR.xlf | 2 +- .../Resources/xlf/WCF.ru.xlf | 2 +- .../Resources/xlf/WCF.tr.xlf | 2 +- .../Resources/xlf/WCF.zh-Hans.xlf | 2 +- .../Resources/xlf/WCF.zh-Hant.xlf | 2 +- .../CodeFixes/RemoveReturnOrYieldTests.fs | 47 +++ 244 files changed, 2590 insertions(+), 1609 deletions(-) create mode 100644 docs/release-notes/.FSharp.Compiler.Service/preview.md rename eng/{TSACondig.gdntsa => TSAConfig.gdntsa} (90%) create mode 100644 tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Ifdef.fs diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 2600981e3c5..0c6c6881251 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,7 +1,7 @@ // For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at: { "name": "F#", - "image": "mcr.microsoft.com/dotnet/sdk:9.0.100-rc.1", + "image": "mcr.microsoft.com/dotnet/sdk:9.0.100-rc.2", "features": { "ghcr.io/devcontainers/features/common-utils:2.5.1": {}, "ghcr.io/devcontainers/features/git:1.3.2": {}, diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 6a22a1cca73..11f7848a276 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -4,7 +4,7 @@ about: Create a report to help us improve F# title: '' labels: [Bug, Needs-Triage] assignees: '' - +type: 'Bug' --- Please provide a succinct description of the issue. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 9902369d951..a23d1feb39e 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -4,7 +4,7 @@ about: Suggest an idea for the F# tools or compiler title: '' labels: [Feature Request, Needs-Triage] assignees: '' - +type: 'Feature' --- **Is your feature request related to a problem? Please describe.** diff --git a/Directory.Build.props b/Directory.Build.props index 7f5b362cb34..8802ca237b5 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -10,6 +10,11 @@ $(DotNetBuildSourceOnly) + + + $(NoWarn);FS0064;FS1182 + + - false + true true $(MSBuildThisFileDirectory)artifacts/ diff --git a/azure-pipelines-PR.yml b/azure-pipelines-PR.yml index 0c7bc9b5a17..9a5c59441e2 100644 --- a/azure-pipelines-PR.yml +++ b/azure-pipelines-PR.yml @@ -488,6 +488,8 @@ stages: displayName: Publish Test Results inputs: testResultsFormat: 'XUnit' + testRunTitle: WindowsCompressedMetadata $(_testKind) + mergeTestResults: true testResultsFiles: '*.xml' searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_configuration)' continueOnError: true @@ -558,7 +560,9 @@ stages: displayName: Publish Test Results inputs: testResultsFormat: 'XUnit' + testRunTitle: Linux testResultsFiles: '*.xml' + mergeTestResults: true searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' continueOnError: true condition: always() @@ -602,6 +606,8 @@ stages: inputs: testResultsFormat: 'XUnit' testResultsFiles: '*.xml' + testRunTitle: MacOS + mergeTestResults: true searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' continueOnError: true condition: always() diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 008ddfa8645..1e5aaebbdf9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -29,7 +29,7 @@ variables: # Should be 'current' release branch name, i.e. 'release/dev17.10' in dotnet/fsharp/refs/heads/main, 'release/dev17.10' in dotnet/fsharp/refs/heads/release/dev17.10 and 'release/dev17.9' in dotnet/fsharp/refs/heads/release/dev17.9 # Should **never** be 'main' in dotnet/fsharp/refs/heads/main, since it will start inserting to VS twice. - name: FSharpReleaseBranchName - value: release/dev17.12 + value: release/dev17.13 # VS Insertion branch name (NOT the same as F# branch) # Should be previous release branch or 'main' in 'main' and 'main' in release branch # (since for all *new* release branches we insert into VS main and for all *previous* releases we insert into corresponding VS release), @@ -88,7 +88,7 @@ extends: # Signed build # #-------------------------------------------------------------------------------------------------------------------# # Localization: we only run it for specific release branches - - ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/release/dev17.12') }}: + - ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/release/dev17.13') }}: - template: /eng/common/templates-official/job/onelocbuild.yml@self parameters: MirrorRepo: fsharp diff --git a/docs/release-notes/.FSharp.Compiler.Service/9.0.100.md b/docs/release-notes/.FSharp.Compiler.Service/9.0.100.md index d350b30edbe..51115b5ead0 100644 --- a/docs/release-notes/.FSharp.Compiler.Service/9.0.100.md +++ b/docs/release-notes/.FSharp.Compiler.Service/9.0.100.md @@ -32,7 +32,7 @@ * Allow access modifies to auto properties getters and setters ([Language suggestion #430](https://github.com/fsharp/fslang-suggestions/issues/430), [PR 16687](https://github.com/dotnet/fsharp/pull/16687), [PR 16861](https://github.com/dotnet/fsharp/pull/16861), [PR 17522](https://github.com/dotnet/fsharp/pull/17522)) * Render C# nullable-analysis attributes in tooltips ([PR #17485](https://github.com/dotnet/fsharp/pull/17485)) * Allow object expression without overrides. ([Language suggestion #632](https://github.com/fsharp/fslang-suggestions/issues/632), [PR #17387](https://github.com/dotnet/fsharp/pull/17387)) -* Enable FSharp 9.0 Language Version ([Issue #17497](https://github.com/dotnet/fsharp/issues/17438)), [PR](https://github.com/dotnet/fsharp/pull/17500))) +* Enable FSharp 9.0 Language Version ([Issue #17497](https://github.com/dotnet/fsharp/issues/17497)), [PR](https://github.com/dotnet/fsharp/pull/17500))) * Enable LanguageFeature.EnforceAttributeTargets in F# 9.0. ([Issue #17514](https://github.com/dotnet/fsharp/issues/17558), [PR #17516](https://github.com/dotnet/fsharp/pull/17558)) * Parser: better recovery for unfinished patterns ([PR #17231](https://github.com/dotnet/fsharp/pull/17231), [PR #17232](https://github.com/dotnet/fsharp/pull/17232))) * Enable consuming generic arguments defined as `allows ref struct` in C# ([Issue #17597](https://github.com/dotnet/fsharp/issues/17597), display them in tooltips [PR #17706](https://github.com/dotnet/fsharp/pull/17706)) diff --git a/docs/release-notes/.FSharp.Compiler.Service/9.0.200.md b/docs/release-notes/.FSharp.Compiler.Service/9.0.200.md index e58c882938b..185fa3a015f 100644 --- a/docs/release-notes/.FSharp.Compiler.Service/9.0.200.md +++ b/docs/release-notes/.FSharp.Compiler.Service/9.0.200.md @@ -5,6 +5,7 @@ * Fix extension methods support for non-reference system assemblies ([PR #17799](https://github.com/dotnet/fsharp/pull/17799)) * Ensure `frameworkTcImportsCache` mutations are thread-safe. ([PR #17795](https://github.com/dotnet/fsharp/pull/17795)) * Fix concurrency issue in `ILPreTypeDefImpl` ([PR #17812](https://github.com/dotnet/fsharp/pull/17812)) +* Fix nullness inference for member val and other OO scenarios ([PR #17845](https://github.com/dotnet/fsharp/pull/17845)) ### Added @@ -16,6 +17,9 @@ * Remove non-functional useSyntaxTreeCache option. ([PR #17768](https://github.com/dotnet/fsharp/pull/17768)) * Better ranges for CE `let!` and `use!` error reporting. ([PR #17712](https://github.com/dotnet/fsharp/pull/17712)) * Better ranges for CE `do!` error reporting. ([PR #17779](https://github.com/dotnet/fsharp/pull/17779)) +* Better ranges for CE `return, yield, return! and yield!` error reporting. ([PR #17792](https://github.com/dotnet/fsharp/pull/17792)) * Better ranges for CE `match!`. ([PR #17789](https://github.com/dotnet/fsharp/pull/17789)) +* Better ranges for CE `use` error reporting. ([PR #17811](https://github.com/dotnet/fsharp/pull/17811)) +* Better ranges for `inherit` error reporting. ([PR #17879](https://github.com/dotnet/fsharp/pull/17879)) ### Breaking Changes diff --git a/docs/release-notes/.FSharp.Compiler.Service/preview.md b/docs/release-notes/.FSharp.Compiler.Service/preview.md new file mode 100644 index 00000000000..52606f16d45 --- /dev/null +++ b/docs/release-notes/.FSharp.Compiler.Service/preview.md @@ -0,0 +1,11 @@ +### Fixed + + +### Added + +* Introduction of the `#warnon` compiler directive, enabling scoped nowarn / warnon sections according to [RFC FS-1146](https://github.com/fsharp/fslang-design/pull/782/files). ([Language suggestion #278](https://github.com/fsharp/fslang-suggestions/issues/278), [PR #17507](https://github.com/dotnet/fsharp/pull/17507)) + +### Changed + + +### Breaking Changes diff --git a/docs/release-notes/.Language/preview.md b/docs/release-notes/.Language/preview.md index b18d08e30c3..7c0e5c53ae6 100644 --- a/docs/release-notes/.Language/preview.md +++ b/docs/release-notes/.Language/preview.md @@ -1,6 +1,7 @@ ### Added * Better generic unmanaged structs handling. ([Language suggestion #692](https://github.com/fsharp/fslang-suggestions/issues/692), [PR #12154](https://github.com/dotnet/fsharp/pull/12154)) +* Introduction of the `#warnon` compiler directive, enabling scoped nowarn / warnon sections according to [RFC FS-1146](https://github.com/fsharp/fslang-design/pull/782/files). ([Language suggestion #278](https://github.com/fsharp/fslang-suggestions/issues/278), [PR #17507](https://github.com/dotnet/fsharp/pull/17507)) ### Fixed diff --git a/docs/release-notes/.VisualStudio/17.12.md b/docs/release-notes/.VisualStudio/17.12.md index 83df7173b2e..690ec481a20 100644 --- a/docs/release-notes/.VisualStudio/17.12.md +++ b/docs/release-notes/.VisualStudio/17.12.md @@ -5,9 +5,10 @@ ### Added ### Changed +* Fix unwanted navigation on hover [PR #17592](https://github.com/dotnet/fsharp/pull/17592) +* Update `RemoveReturnOrYield` code fix range calculation [PR #17792](https://github.com/dotnet/fsharp/pull/17792) * Fix unwanted navigation on hover [PR #17592](https://github.com/dotnet/fsharp/pull/17592)) * Remove non-functional useSyntaxTreeCache option. ([PR #17768](https://github.com/dotnet/fsharp/pull/17768)) - ### Breaking Changes * Enable FSharp 9.0 Language Version ([Issue #17497](https://github.com/dotnet/fsharp/issues/17438)), [PR](https://github.com/dotnet/fsharp/pull/17500))) diff --git a/eng/TSACondig.gdntsa b/eng/TSAConfig.gdntsa similarity index 90% rename from eng/TSACondig.gdntsa rename to eng/TSAConfig.gdntsa index 864c796b398..f4621b68272 100644 --- a/eng/TSACondig.gdntsa +++ b/eng/TSAConfig.gdntsa @@ -1,7 +1,7 @@ { "codebaseName": "FSharp-GitHub", "notificationAliases": [ - "mlinfraswat@microsoft.com" + "fsharp@microsoft.com" ], "codebaseAdmins": [ "EUROPE\\vlza", @@ -13,4 +13,4 @@ "areaPath": "DevDiv\\FSharp", "iterationPath": "DevDiv", "allTools": true -} \ No newline at end of file +} diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a6fe9dd9339..e9557ab4f4e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/source-build-reference-packages - 08649fed58d668737a54913f7d4c649a8da5dc6e + fd609e3b427601180d23633e2f1a4cdac6c42c20 diff --git a/eng/Versions.props b/eng/Versions.props index 614ced1604c..4252f548c66 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,13 +37,13 @@ $(FSMajorVersion).$(FSMinorVersion).$(FSBuildVersion) - 8.0.400 + 9.0.100-beta.24466.6 $(FSCorePackageVersionValue)-$(PreReleaseVersionLabel).* - 12 + 13 9 $(FSBuildVersion) $(FSRevisionVersion) @@ -53,7 +53,7 @@ 17 - 12 + 13 $(VSMajorVersion).0 $(VSMajorVersion).$(VSMinorVersion).0 $(VSAssemblyVersionPrefix).0 diff --git a/global.json b/global.json index b66eed16d21..3f653af33e0 100644 --- a/global.json +++ b/global.json @@ -1,10 +1,10 @@ { "sdk": { - "version": "9.0.100-rc.1.24452.12", + "version": "9.0.100-rc.2.24474.11", "allowPrerelease": true }, "tools": { - "dotnet": "9.0.100-rc.1.24452.12", + "dotnet": "9.0.100-rc.2.24474.11", "vs": { "version": "17.8", "components": [ diff --git a/src/Compiler/Checking/CheckDeclarations.fs b/src/Compiler/Checking/CheckDeclarations.fs index ebf8c286ab9..72820fafb7a 100644 --- a/src/Compiler/Checking/CheckDeclarations.fs +++ b/src/Compiler/Checking/CheckDeclarations.fs @@ -3622,7 +3622,11 @@ module EstablishTypeDefinitionCores = // Note: for a mutually recursive set we can't check this condition // until "isSealedTy" and "isClassTy" give reliable results. superTy |> Option.iter (fun ty -> - let m = match inherits with | [] -> m | (_, m, _) :: _ -> m + let m = + match inherits with + | [] -> m + | (synType, _, _) :: _ -> synType.Range + if isSealedTy g ty then errorR(Error(FSComp.SR.tcCannotInheritFromSealedType(), m)) elif not (isClassTy g ty) then @@ -4292,7 +4296,7 @@ module TcDeclarations = | SynMemberDefn.AutoProperty (range=m) :: _ -> errorR(InternalError("List.takeUntil is wrong, have auto property", m)) | SynMemberDefn.ImplicitInherit (range=m) :: _ -> errorR(Error(FSComp.SR.tcTypeDefinitionsWithImplicitConstructionMustHaveOneInherit(), m)) | SynMemberDefn.LetBindings (range=m) :: _ -> errorR(Error(FSComp.SR.tcTypeDefinitionsWithImplicitConstructionMustHaveLocalBindingsBeforeMembers(), m)) - | SynMemberDefn.Inherit (range=m) :: _ -> errorR(Error(FSComp.SR.tcInheritDeclarationMissingArguments(), m)) + | SynMemberDefn.Inherit (trivia= { InheritKeyword = m }) :: _ -> errorR(Error(FSComp.SR.tcInheritDeclarationMissingArguments(), m)) | SynMemberDefn.NestedType (range=m) :: _ -> errorR(Error(FSComp.SR.tcTypesCannotContainNestedTypes(), m)) | _ -> () | ds -> @@ -4464,7 +4468,7 @@ module TcDeclarations = let implements2 = members |> List.choose (function SynMemberDefn.Interface (interfaceType=ty) -> Some(ty, ty.Range) | _ -> None) let inherits = members |> List.choose (function - | SynMemberDefn.Inherit (ty, idOpt, m) -> Some(ty, m, idOpt) + | SynMemberDefn.Inherit (ty, idOpt, m, _) -> Some(ty, m, idOpt) | SynMemberDefn.ImplicitInherit (ty, _, idOpt, m) -> Some(ty, m, idOpt) | _ -> None) diff --git a/src/Compiler/Checking/Expressions/CheckComputationExpressions.fs b/src/Compiler/Checking/Expressions/CheckComputationExpressions.fs index d328f6a310a..645897a6793 100644 --- a/src/Compiler/Checking/Expressions/CheckComputationExpressions.fs +++ b/src/Compiler/Checking/Expressions/CheckComputationExpressions.fs @@ -1545,7 +1545,9 @@ let rec TryTranslateComputationExpression let dataCompPrior = translatedCtxt ( - TranslateComputationExpressionNoQueryOps ceenv (SynExpr.YieldOrReturn((true, false), varSpaceExpr, mClause)) + TranslateComputationExpressionNoQueryOps + ceenv + (SynExpr.YieldOrReturn((true, false), varSpaceExpr, mClause, SynExprYieldOrReturnTrivia.Zero)) ) // Rebind using for ... @@ -1576,7 +1578,9 @@ let rec TryTranslateComputationExpression let isYield = not (customOperationMaintainsVarSpaceUsingBind ceenv nm) translatedCtxt ( - TranslateComputationExpressionNoQueryOps ceenv (SynExpr.YieldOrReturn((isYield, false), varSpaceExpr, mClause)) + TranslateComputationExpressionNoQueryOps + ceenv + (SynExpr.YieldOrReturn((isYield, false), varSpaceExpr, mClause, SynExprYieldOrReturnTrivia.Zero)) ) // Now run the consumeCustomOpClauses @@ -1801,11 +1805,8 @@ let rec TryTranslateComputationExpression | SynExpr.LetOrUse( isUse = true bindings = [ SynBinding(kind = SynBindingKind.Normal; headPat = pat; expr = rhsExpr; debugPoint = spBind) ] - body = innerComp) -> - let mBind = - match spBind with - | DebugPointAtBinding.Yes m -> m - | _ -> rhsExpr.Range + body = innerComp + trivia = { LetOrUseKeyword = mBind }) -> if ceenv.isQuery then error (Error(FSComp.SR.tcUseMayNotBeUsedInQueries (), mBind)) @@ -2374,7 +2375,7 @@ let rec TryTranslateComputationExpression Some(translatedCtxt callExpr) - | SynExpr.YieldOrReturnFrom((true, _), synYieldExpr, m) -> + | SynExpr.YieldOrReturnFrom((true, _), synYieldExpr, _, { YieldOrReturnFromKeyword = m }) -> let yieldFromExpr = mkSourceExpr synYieldExpr ceenv.sourceMethInfo ceenv.builderValName @@ -2392,7 +2393,8 @@ let rec TryTranslateComputationExpression then error (Error(FSComp.SR.tcRequireBuilderMethod ("YieldFrom"), m)) - let yieldFromCall = mkSynCall "YieldFrom" m [ yieldFromExpr ] ceenv.builderValName + let yieldFromCall = + mkSynCall "YieldFrom" synYieldExpr.Range [ yieldFromExpr ] ceenv.builderValName let yieldFromCall = if IsControlFlowExpression synYieldExpr then @@ -2402,7 +2404,7 @@ let rec TryTranslateComputationExpression Some(translatedCtxt yieldFromCall) - | SynExpr.YieldOrReturnFrom((false, _), synReturnExpr, m) -> + | SynExpr.YieldOrReturnFrom((false, _), synReturnExpr, _, { YieldOrReturnFromKeyword = m }) -> let returnFromExpr = mkSourceExpr synReturnExpr ceenv.sourceMethInfo ceenv.builderValName @@ -2424,7 +2426,7 @@ let rec TryTranslateComputationExpression error (Error(FSComp.SR.tcRequireBuilderMethod ("ReturnFrom"), m)) let returnFromCall = - mkSynCall "ReturnFrom" m [ returnFromExpr ] ceenv.builderValName + mkSynCall "ReturnFrom" synReturnExpr.Range [ returnFromExpr ] ceenv.builderValName let returnFromCall = if IsControlFlowExpression synReturnExpr then @@ -2434,7 +2436,7 @@ let rec TryTranslateComputationExpression Some(translatedCtxt returnFromCall) - | SynExpr.YieldOrReturn((isYield, _), synYieldOrReturnExpr, m) -> + | SynExpr.YieldOrReturn((isYield, _), synYieldOrReturnExpr, _, { YieldOrReturnKeyword = m }) -> let methName = (if isYield then "Yield" else "Return") if ceenv.isQuery && not isYield then @@ -2452,10 +2454,10 @@ let rec TryTranslateComputationExpression ceenv.builderTy ) then - error (Error(FSComp.SR.tcRequireBuilderMethod (methName), m)) + error (Error(FSComp.SR.tcRequireBuilderMethod methName, m)) let yieldOrReturnCall = - mkSynCall methName m [ synYieldOrReturnExpr ] ceenv.builderValName + mkSynCall methName synYieldOrReturnExpr.Range [ synYieldOrReturnExpr ] ceenv.builderValName let yieldOrReturnCall = if IsControlFlowExpression synYieldOrReturnExpr then @@ -2759,7 +2761,7 @@ and TranslateComputationExpressionBind /// The inner option indicates if a custom operation is involved inside and convertSimpleReturnToExpr (ceenv: ComputationExpressionContext<'a>) comp varSpace innerComp = match innerComp with - | SynExpr.YieldOrReturn((false, _), returnExpr, m) -> + | SynExpr.YieldOrReturn((false, _), returnExpr, m, _) -> let returnExpr = SynExpr.DebugPoint(DebugPointAtLeafExpr.Yes m, false, returnExpr) Some(returnExpr, None) @@ -2901,7 +2903,7 @@ and TranslateComputationExpression (ceenv: ComputationExpressionContext<'a>) fir with | minfo :: _ when MethInfoHasAttribute ceenv.cenv.g m ceenv.cenv.g.attrib_DefaultValueAttribute minfo -> SynExpr.ImplicitZero m - | _ -> SynExpr.YieldOrReturn((false, true), SynExpr.Const(SynConst.Unit, m), m) + | _ -> SynExpr.YieldOrReturn((false, true), SynExpr.Const(SynConst.Unit, m), m, SynExprYieldOrReturnTrivia.Zero) let letBangBind = SynExpr.LetOrUseBang( diff --git a/src/Compiler/Checking/Expressions/CheckExpressions.fs b/src/Compiler/Checking/Expressions/CheckExpressions.fs index 3a01eaa2efe..4325d503206 100644 --- a/src/Compiler/Checking/Expressions/CheckExpressions.fs +++ b/src/Compiler/Checking/Expressions/CheckExpressions.fs @@ -5991,16 +5991,16 @@ and TcExprUndelayed (cenv: cenv) (overallTy: OverallTy) env tpenv (synExpr: SynE CallExprHasTypeSink cenv.tcSink (m, env.NameEnv, overallTy.Commit, env.AccessRights) TcQuotationExpr cenv overallTy env tpenv (oper, raw, ast, isFromQueryExpression, m) - | SynExpr.YieldOrReturn ((isTrueYield, _), _, m) - | SynExpr.YieldOrReturnFrom ((isTrueYield, _), _, m) when isTrueYield -> + | SynExpr.YieldOrReturn ((isTrueYield, _), _, _m, { YieldOrReturnKeyword = m }) + | SynExpr.YieldOrReturnFrom ((isTrueYield, _), _, _m, { YieldOrReturnFromKeyword = m }) when isTrueYield -> error(Error(FSComp.SR.tcConstructRequiresListArrayOrSequence(), m)) - | SynExpr.YieldOrReturn ((_, isTrueReturn), _, m) - | SynExpr.YieldOrReturnFrom ((_, isTrueReturn), _, m) when isTrueReturn -> + | SynExpr.YieldOrReturn ((_, isTrueReturn), _, _m, { YieldOrReturnKeyword = m }) + | SynExpr.YieldOrReturnFrom ((_, isTrueReturn), _, _m, { YieldOrReturnFromKeyword = m }) when isTrueReturn -> error(Error(FSComp.SR.tcConstructRequiresComputationExpressions(), m)) - | SynExpr.YieldOrReturn (_, _, m) - | SynExpr.YieldOrReturnFrom (_, _, m) + | SynExpr.YieldOrReturn (trivia = { YieldOrReturnKeyword = m }) + | SynExpr.YieldOrReturnFrom (trivia = { YieldOrReturnFromKeyword = m }) | SynExpr.ImplicitZero m -> error(Error(FSComp.SR.tcConstructRequiresSequenceOrComputations(), m)) diff --git a/src/Compiler/Checking/Expressions/CheckSequenceExpressions.fs b/src/Compiler/Checking/Expressions/CheckSequenceExpressions.fs index b627eef2922..3154d3e1e74 100644 --- a/src/Compiler/Checking/Expressions/CheckSequenceExpressions.fs +++ b/src/Compiler/Checking/Expressions/CheckSequenceExpressions.fs @@ -232,9 +232,10 @@ let TcSequenceExpression (cenv: TcFileState) env tpenv comp (overallTy: OverallT // 'use x = expr in expr' | SynExpr.LetOrUse( isUse = true - bindings = [ SynBinding(kind = SynBindingKind.Normal; headPat = pat; expr = rhsExpr; debugPoint = spBind) ] + bindings = [ SynBinding(kind = SynBindingKind.Normal; headPat = pat; expr = rhsExpr) ] body = innerComp - range = wholeExprMark) -> + range = wholeExprMark + trivia = { LetOrUseKeyword = mBind }) -> let bindPatTy = NewInferenceType g let inputExprTy = NewInferenceType g @@ -252,11 +253,6 @@ let TcSequenceExpression (cenv: TcFileState) env tpenv comp (overallTy: OverallT let envinner = { envinner with eIsControlFlow = true } tcSequenceExprBody envinner genOuterTy tpenv innerComp - let mBind = - match spBind with - | DebugPointAtBinding.Yes m -> m.NoteSourceConstruct(NotedSourceConstruct.Binding) - | _ -> inputExpr.Range - let inputExprMark = inputExpr.Range let matchv, matchExpr = @@ -353,43 +349,44 @@ let TcSequenceExpression (cenv: TcFileState) env tpenv comp (overallTy: OverallT Some(combinatorExpr, tpenv) - | SynExpr.YieldOrReturnFrom((isYield, _), synYieldExpr, m) -> + | SynExpr.YieldOrReturnFrom(flags = (isYield, _); expr = synYieldExpr; trivia = { YieldOrReturnFromKeyword = m }) -> let env = { env with eIsControlFlow = false } let resultExpr, genExprTy, tpenv = TcExprOfUnknownType cenv env tpenv synYieldExpr if not isYield then errorR (Error(FSComp.SR.tcUseYieldBangForMultipleResults (), m)) - AddCxTypeMustSubsumeType ContextInfo.NoContext env.DisplayEnv cenv.css m NoTrace genOuterTy genExprTy + AddCxTypeMustSubsumeType ContextInfo.NoContext env.DisplayEnv cenv.css synYieldExpr.Range NoTrace genOuterTy genExprTy - let resultExpr = mkCoerceExpr (resultExpr, genOuterTy, m, genExprTy) + let resultExpr = + mkCoerceExpr (resultExpr, genOuterTy, synYieldExpr.Range, genExprTy) let resultExpr = if IsControlFlowExpression synYieldExpr then resultExpr else - mkDebugPoint m resultExpr + mkDebugPoint resultExpr.Range resultExpr Some(resultExpr, tpenv) - | SynExpr.YieldOrReturn((isYield, _), synYieldExpr, m) -> + | SynExpr.YieldOrReturn(flags = (isYield, _); expr = synYieldExpr; trivia = { YieldOrReturnKeyword = m }) -> let env = { env with eIsControlFlow = false } let genResultTy = NewInferenceType g if not isYield then errorR (Error(FSComp.SR.tcSeqResultsUseYield (), m)) - UnifyTypes cenv env m genOuterTy (mkSeqTy cenv.g genResultTy) + UnifyTypes cenv env synYieldExpr.Range genOuterTy (mkSeqTy cenv.g genResultTy) let resultExpr, tpenv = TcExprFlex cenv flex true genResultTy env tpenv synYieldExpr - let resultExpr = mkCallSeqSingleton cenv.g m genResultTy resultExpr + let resultExpr = mkCallSeqSingleton cenv.g synYieldExpr.Range genResultTy resultExpr let resultExpr = if IsControlFlowExpression synYieldExpr then resultExpr else - mkDebugPoint m resultExpr + mkDebugPoint synYieldExpr.Range resultExpr Some(resultExpr, tpenv) diff --git a/src/Compiler/Driver/CompilerDiagnostics.fs b/src/Compiler/Driver/CompilerDiagnostics.fs index 0c01165db59..1e87efe00b6 100644 --- a/src/Compiler/Driver/CompilerDiagnostics.fs +++ b/src/Compiler/Driver/CompilerDiagnostics.fs @@ -424,18 +424,16 @@ type PhasedDiagnostic with | FSharpDiagnosticSeverity.Error -> FSharpDiagnosticSeverity.Error | FSharpDiagnosticSeverity.Warning when x.IsEnabled(severity, options) - && not (List.contains n options.WarnAsWarn) && ((options.GlobalWarnAsError && not (warnOff ())) || List.contains n options.WarnAsError && not (localNowarn ())) + && not (List.contains n options.WarnAsWarn) -> FSharpDiagnosticSeverity.Error | FSharpDiagnosticSeverity.Info when List.contains n options.WarnAsError && not (localNowarn ()) -> FSharpDiagnosticSeverity.Error - | FSharpDiagnosticSeverity.Warning when x.IsEnabled(severity, options) && not (warnOff ()) -> FSharpDiagnosticSeverity.Warning + | FSharpDiagnosticSeverity.Warning when localWarnon () -> FSharpDiagnosticSeverity.Warning | FSharpDiagnosticSeverity.Info when List.contains n options.WarnOn && not (warnOff ()) -> FSharpDiagnosticSeverity.Warning - | FSharpDiagnosticSeverity.Info when x.IsEnabled(severity, options) && not (warnOff ()) -> FSharpDiagnosticSeverity.Info - | _ -> FSharpDiagnosticSeverity.Hidden [] diff --git a/src/Compiler/Driver/GraphChecking/FileContentMapping.fs b/src/Compiler/Driver/GraphChecking/FileContentMapping.fs index 5fd190b1995..938034623ba 100644 --- a/src/Compiler/Driver/GraphChecking/FileContentMapping.fs +++ b/src/Compiler/Driver/GraphChecking/FileContentMapping.fs @@ -220,7 +220,7 @@ let visitSynMemberDefn (md: SynMemberDefn) : FileContentEntry list = | SynMemberDefn.Interface(interfaceType, _, members, _) -> yield! visitSynType interfaceType yield! collectFromOption (List.collect visitSynMemberDefn) members - | SynMemberDefn.Inherit(baseType, _, _) -> yield! visitSynType baseType + | SynMemberDefn.Inherit(baseType = t) -> yield! visitSynType t | SynMemberDefn.ValField(fieldInfo, _) -> yield! visitSynField fieldInfo | SynMemberDefn.NestedType _ -> () | SynMemberDefn.AutoProperty(attributes = attributes; typeOpt = typeOpt; synExpr = synExpr) -> diff --git a/src/Compiler/Driver/ParseAndCheckInputs.fs b/src/Compiler/Driver/ParseAndCheckInputs.fs index 8d77e759dae..a09b3d6949e 100644 --- a/src/Compiler/Driver/ParseAndCheckInputs.fs +++ b/src/Compiler/Driver/ParseAndCheckInputs.fs @@ -932,7 +932,6 @@ let ProcessMetaCommandsFromInput decls |> List.iter (fun d -> match d with - | SynModuleSigDecl.HashDirective(ParsedHashDirective("WARN_DIRECTIVE_DUMMY", _, _), _) -> () | SynModuleSigDecl.HashDirective(_, m) -> warning (Error(FSComp.SR.buildDirectivesInModulesAreIgnored (), m)) | SynModuleSigDecl.NestedModule(moduleDecls = subDecls) -> WarnOnIgnoredSpecDecls subDecls | _ -> ()) @@ -941,7 +940,6 @@ let ProcessMetaCommandsFromInput decls |> List.iter (fun d -> match d with - | SynModuleDecl.HashDirective(ParsedHashDirective("WARN_DIRECTIVE_DUMMY", _, _), _) -> () | SynModuleDecl.HashDirective(_, m) -> warning (Error(FSComp.SR.buildDirectivesInModulesAreIgnored (), m)) | SynModuleDecl.NestedModule(decls = subDecls) -> WarnOnIgnoredImplDecls subDecls | _ -> ()) @@ -993,6 +991,42 @@ let ApplyMetaCommandsFromInputToTcConfig (tcConfig: TcConfig, inp: ParsedInput, ProcessMetaCommandsFromInput (addReferenceDirective, addLoadedSource) (tcConfigB, inp, pathOfMetaCommandSource, ()) TcConfig.Create(tcConfigB, validate = false) +let CheckLegacyWarnDirectivePlacement (langVersion: LanguageVersion, WarnScopeMap warnScopes, inp: ParsedInput) = + if not (langVersion.SupportsFeature LanguageFeature.ScopedNowarn) then + + let sigSubmoduleRanges (SynModuleOrNamespaceSig(decls = decls)) = + decls + |> List.choose (function + | SynModuleSigDecl.NestedModule(range = m) -> Some m + | _ -> None) + + let implSubmoduleRanges (SynModuleOrNamespace(decls = decls)) = + decls + |> List.choose (function + | SynModuleDecl.NestedModule(range = m) -> Some m + | _ -> None) + + let subModuleRanges = + match inp with + | ParsedInput.SigFile sigFile -> sigFile.Contents |> List.collect sigSubmoduleRanges + | ParsedInput.ImplFile implFile -> implFile.Contents |> List.collect implSubmoduleRanges + + let getDirectiveLines warnScope = + match warnScope with + | WarnScope.Off m + | WarnScope.On m + | WarnScope.OpenOff m + | WarnScope.OpenOn m -> [ m.StartLine; m.EndLine ] + + let warnLines = + warnScopes.Values |> Seq.toList |> List.collect (List.collect getDirectiveLines) + + for mm in subModuleRanges do + for line in warnLines do + if line > mm.StartLine && line <= mm.EndLine then + let m = withStartEnd (mkPos line 0) (mkPos (line + 1) 0) mm + warning(Error(FSComp.SR.buildDirectivesInModulesAreIgnored(), m)) + /// Build the initial type checking environment let GetInitialTcEnv (assemblyName: string, initm: range, tcConfig: TcConfig, tcImports: TcImports, tcGlobals) = let initm = initm.StartRange diff --git a/src/Compiler/Driver/ParseAndCheckInputs.fsi b/src/Compiler/Driver/ParseAndCheckInputs.fsi index 495ed9341d8..afdfb30936e 100644 --- a/src/Compiler/Driver/ParseAndCheckInputs.fsi +++ b/src/Compiler/Driver/ParseAndCheckInputs.fsi @@ -13,6 +13,7 @@ open FSharp.Compiler.CompilerImports open FSharp.Compiler.Diagnostics open FSharp.Compiler.DependencyManager open FSharp.Compiler.DiagnosticsLogger +open FSharp.Compiler.Features open FSharp.Compiler.GraphChecking open FSharp.Compiler.NameResolution open FSharp.Compiler.Syntax @@ -82,9 +83,12 @@ val ProcessMetaCommandsFromInput: TcConfigBuilder * ParsedInput * string * 'T -> 'T -/// Process all the #r, #I etc. in an input. For non-scripts report warnings about ignored directives. +/// Process all the #r, #I etc. in an input. val ApplyMetaCommandsFromInputToTcConfig: TcConfig * ParsedInput * string * DependencyProvider -> TcConfig +/// Report warnings about ignored warn directives. +val CheckLegacyWarnDirectivePlacement: LanguageVersion * WarnScopeMap * ParsedInput -> unit + /// Parse one input stream val ParseOneInputStream: tcConfig: TcConfig * diff --git a/src/Compiler/Driver/ScriptClosure.fs b/src/Compiler/Driver/ScriptClosure.fs index 70845f1a115..958e928a30b 100644 --- a/src/Compiler/Driver/ScriptClosure.fs +++ b/src/Compiler/Driver/ScriptClosure.fs @@ -254,13 +254,7 @@ module ScriptPreprocessClosure = errorRecovery exn m [] - let ApplyMetaCommandsFromInputToTcConfigAndGatherNoWarn - ( - tcConfig: TcConfig, - inp: ParsedInput, - pathOfMetaCommandSource, - dependencyProvider - ) = + let ApplyMetaCommandsFromInputToTcConfig (tcConfig: TcConfig, inp: ParsedInput, pathOfMetaCommandSource, dependencyProvider) = let tcConfigB = tcConfig.CloneToBuilder() @@ -454,14 +448,10 @@ module ScriptPreprocessClosure = use _ = UseDiagnosticsLogger diagnosticsLogger let pathOfMetaCommandSource = !! Path.GetDirectoryName(fileName) let preSources = tcConfig.GetAvailableLoadedSources() + CheckLegacyWarnDirectivePlacement(tcConfig.langVersion, tcConfig.diagnosticsOptions.WarnScopes, parseResult) let tcConfigResult = - ApplyMetaCommandsFromInputToTcConfigAndGatherNoWarn( - tcConfig, - parseResult, - pathOfMetaCommandSource, - dependencyProvider - ) + ApplyMetaCommandsFromInputToTcConfig(tcConfig, parseResult, pathOfMetaCommandSource, dependencyProvider) tcConfig <- tcConfigResult // We accumulate the tcConfig in order to collect assembly references diff --git a/src/Compiler/Driver/fsc.fs b/src/Compiler/Driver/fsc.fs index 27163f3de2a..382e4d2c53c 100644 --- a/src/Compiler/Driver/fsc.fs +++ b/src/Compiler/Driver/fsc.fs @@ -643,7 +643,9 @@ let main1 if not tcConfig.continueAfterParseFailure then AbortOnError(diagnosticsLogger, exiter) - // Apply any nowarn flags + for input in inputs do + CheckLegacyWarnDirectivePlacement(tcConfig.langVersion, tcConfig.diagnosticsOptions.WarnScopes, fst input) + let tcConfig = (tcConfig, inputs) ||> List.fold (fun z (input, sourceFileDirectory) -> diff --git a/src/Compiler/FSComp.txt b/src/Compiler/FSComp.txt index c0f2692f69b..683a387aa3a 100644 --- a/src/Compiler/FSComp.txt +++ b/src/Compiler/FSComp.txt @@ -1784,5 +1784,7 @@ featureAllowAccessModifiersToAutoPropertiesGettersAndSetters,"Allow access modif 3871,tcAccessModifiersNotAllowedInSRTPConstraint,"Access modifiers cannot be applied to an SRTP constraint." featureAllowObjectExpressionWithoutOverrides,"Allow object expressions without overrides" 3872,tcPartialActivePattern,"Multi-case partial active patterns are not supported. Consider using a single-case partial active pattern or a full active pattern." -featureScopedNowarn,"Support for scoped enabling / disabling of warnings by #warn and #nowarn directives" -3873,lexWarnDirectiveMustBeFirst,"#nowarn/#warnon directives must appear as the first non-whitespace characters on a line" \ No newline at end of file +featureScopedNowarn,"Support for scoped enabling / disabling of warnings by #warn and #nowarn directives, also inside modules" +3873,lexWarnDirectiveMustBeFirst,"#nowarn/#warnon directives must appear as the first non-whitespace characters on a line" +3874,lexWarnDirectiveMustHaveArgs,"Warn directives must have warning number(s) as argument(s)" +3875,lexWarnDirectivesMustMatch,"There is another %s for this warning already in line %d." \ No newline at end of file diff --git a/src/Compiler/FSharp.Compiler.Service.fsproj b/src/Compiler/FSharp.Compiler.Service.fsproj index 6a3b3921d65..feb938a2b36 100644 --- a/src/Compiler/FSharp.Compiler.Service.fsproj +++ b/src/Compiler/FSharp.Compiler.Service.fsproj @@ -24,8 +24,11 @@ $(FSharpNetCoreProductDefaultTargetFramework);$(TargetFrameworks) $(DefineConstants);FSHARPCORE_USE_PACKAGE $(OtherFlags) --extraoptimizationloops:1 + + - $(OtherFlags) --warnon:1182 + $(OtherFlags) --nowarn:1182 + $(OtherFlags) --warnon:3218 diff --git a/src/Compiler/Interactive/fsi.fs b/src/Compiler/Interactive/fsi.fs index e4ce9192577..a3d7f7c38d6 100644 --- a/src/Compiler/Interactive/fsi.fs +++ b/src/Compiler/Interactive/fsi.fs @@ -3882,8 +3882,6 @@ type FsiInteractionProcessor istate, Completed None - | ParsedHashDirective("WARN_DIRECTIVE_DUMMY", _, _) -> istate, Completed None - | ParsedHashDirective(c, hashArguments, m) -> let arg = (parsedHashDirectiveArguments hashArguments tcConfigB.langVersion) warning (Error((FSComp.SR.fsiInvalidDirective (c, String.concat " " arg)), m)) diff --git a/src/Compiler/Service/FSharpCheckerResults.fs b/src/Compiler/Service/FSharpCheckerResults.fs index 268affd673a..09fb2d33b8f 100644 --- a/src/Compiler/Service/FSharpCheckerResults.fs +++ b/src/Compiler/Service/FSharpCheckerResults.fs @@ -3075,7 +3075,7 @@ module internal ParseAndCheckFile = let ApplyLoadClosure ( - tcConfig, + tcConfig: TcConfig, parsedMainInput, mainInputFileName: string, loadClosure: LoadClosure option, @@ -3165,6 +3165,7 @@ module internal ParseAndCheckFile = | FSharpDiagnosticSeverity.Hidden -> () | None -> + CheckLegacyWarnDirectivePlacement(tcConfig.langVersion, tcConfig.diagnosticsOptions.WarnScopes, parsedMainInput) // For non-scripts, check for disallow #r and #load. ApplyMetaCommandsFromInputToTcConfig( tcConfig, diff --git a/src/Compiler/Service/FSharpParseFileResults.fs b/src/Compiler/Service/FSharpParseFileResults.fs index d00b5fe7934..7b273f71430 100644 --- a/src/Compiler/Service/FSharpParseFileResults.fs +++ b/src/Compiler/Service/FSharpParseFileResults.fs @@ -573,11 +573,11 @@ type FSharpParseFileResults(diagnostics: FSharpDiagnostic[], input: ParsedInput, yield! checkRange m yield! walkExpr isControlFlow innerExpr - | SynExpr.YieldOrReturn(_, e, m) -> + | SynExpr.YieldOrReturn(_, e, m, _) -> yield! checkRange m yield! walkExpr false e - | SynExpr.YieldOrReturnFrom(_, e, _) + | SynExpr.YieldOrReturnFrom(_, e, _, _) | SynExpr.DoBang(expr = e) -> yield! checkRange e.Range yield! walkExpr false e @@ -814,7 +814,7 @@ type FSharpParseFileResults(diagnostics: FSharpDiagnostic[], input: ParsedInput, | SynMemberDefn.Interface(members = Some membs) -> for m in membs do yield! walkMember m - | SynMemberDefn.Inherit(_, _, m) -> + | SynMemberDefn.Inherit(range = m) -> // can break on the "inherit" clause yield! checkRange m | SynMemberDefn.ImplicitInherit(_, arg, _, m) -> diff --git a/src/Compiler/Service/IncrementalBuild.fs b/src/Compiler/Service/IncrementalBuild.fs index 459178e20db..3f7053821cb 100644 --- a/src/Compiler/Service/IncrementalBuild.fs +++ b/src/Compiler/Service/IncrementalBuild.fs @@ -263,6 +263,7 @@ type BoundModel private ( beforeFileChecked.Trigger fileName + CheckLegacyWarnDirectivePlacement(tcConfig.langVersion, tcConfig.diagnosticsOptions.WarnScopes, input) ApplyMetaCommandsFromInputToTcConfig (tcConfig, input, !! Path.GetDirectoryName(fileName), tcImports.DependencyProvider) |> ignore let sink = TcResultsSinkImpl(tcGlobals) let hadParseErrors = not (Array.isEmpty parseErrors) diff --git a/src/Compiler/Service/ServiceLexing.fs b/src/Compiler/Service/ServiceLexing.fs index 03891b4970e..f5f46a5e540 100644 --- a/src/Compiler/Service/ServiceLexing.fs +++ b/src/Compiler/Service/ServiceLexing.fs @@ -735,7 +735,7 @@ module internal LexerStateEncoding = ) | LexCont.EndLine(ifdefs, stringNest, econt) -> match econt with - | LexerEndlineContinuation.Skip(n, m) -> + | LexerEndlineContinuation.IfdefSkip(n, m) -> encodeLexCont ( FSharpTokenizerColorState.EndLineThenSkip, int64 n, @@ -835,7 +835,7 @@ module internal LexerStateEncoding = | FSharpTokenizerColorState.ExtendedInterpolatedString -> LexCont.String(ifdefs, stringNest, LexerStringStyle.ExtendedInterpolated, stringKind, delimLen, mkRange "file" p1 p1) | FSharpTokenizerColorState.EndLineThenSkip -> - LexCont.EndLine(ifdefs, stringNest, LexerEndlineContinuation.Skip(n1, mkRange "file" p1 p1)) + LexCont.EndLine(ifdefs, stringNest, LexerEndlineContinuation.IfdefSkip(n1, mkRange "file" p1 p1)) | FSharpTokenizerColorState.EndLineThenToken -> LexCont.EndLine(ifdefs, stringNest, LexerEndlineContinuation.Token) | _ -> LexCont.Token([], stringNest) @@ -938,13 +938,18 @@ type FSharpLineTokenizer(lexbuf: UnicodeLexing.Lexbuf, maxLength: int option, fi let processWarnDirective (str: string) leftc rightc cont = let hashIdx = str.IndexOf("#", StringComparison.Ordinal) - let directive = WARN_DIRECTIVE(str, cont), leftc + hashIdx, rightc + let commentIdx = str.IndexOf("//", StringComparison.Ordinal) - if (hashIdx <> 0) then - delayToken directive - WHITESPACE cont, leftc, rightc + hashIdx - 1 + if commentIdx > 0 then + delayToken (COMMENT cont, leftc + commentIdx - 1, rightc) + + let rightc = if commentIdx > 0 then leftc + commentIdx else rightc + + if (hashIdx > 0) then + delayToken (WARN_DIRECTIVE(range0, "", cont), hashIdx, rightc) + WHITESPACE cont, leftc, leftc + hashIdx - 1 else - directive + WARN_DIRECTIVE(range0, "", cont), leftc, rightc // Set up the initial file position do @@ -1046,7 +1051,7 @@ type FSharpLineTokenizer(lexbuf: UnicodeLexing.Lexbuf, maxLength: int option, fi | HASH_IF(m, lineStr, cont) when lineStr <> "" -> false, processHashIfLine m.StartColumn lineStr cont | HASH_ELSE(m, lineStr, cont) when lineStr <> "" -> false, processHashEndElse m.StartColumn lineStr 4 cont | HASH_ENDIF(m, lineStr, cont) when lineStr <> "" -> false, processHashEndElse m.StartColumn lineStr 5 cont - | WARN_DIRECTIVE(s, cont) -> false, processWarnDirective s leftc rightc cont + | WARN_DIRECTIVE(m, s, cont) -> false, processWarnDirective s leftc rightc cont | HASH_IDENT(ident) -> delayToken (IDENT ident, leftc + 1, rightc) false, (HASH, leftc, leftc) diff --git a/src/Compiler/Service/ServiceParseTreeWalk.fs b/src/Compiler/Service/ServiceParseTreeWalk.fs index e0957fe0140..ca1a1c5e657 100644 --- a/src/Compiler/Service/ServiceParseTreeWalk.fs +++ b/src/Compiler/Service/ServiceParseTreeWalk.fs @@ -996,7 +996,7 @@ module SyntaxTraversal = |> pick x | ok -> ok - | SynMemberDefn.Inherit(synType, _identOption, range) -> traverseInherit (synType, range) + | SynMemberDefn.Inherit(synType, _identOption, range, _) -> traverseInherit (synType, range) | SynMemberDefn.ValField _ -> None | SynMemberDefn.NestedType(synTypeDefn, _synAccessOption, _range) -> traverseSynTypeDefn path synTypeDefn diff --git a/src/Compiler/Service/ServiceParsedInputOps.fs b/src/Compiler/Service/ServiceParsedInputOps.fs index 0b3f0134545..cfbefd49ade 100644 --- a/src/Compiler/Service/ServiceParsedInputOps.fs +++ b/src/Compiler/Service/ServiceParsedInputOps.fs @@ -913,7 +913,7 @@ module ParsedInput = walkType t |> Option.orElseWith (fun () -> members |> Option.bind (List.tryPick walkMember)) - | SynMemberDefn.Inherit(t, _, _) -> walkType t + | SynMemberDefn.Inherit(baseType = t) -> walkType t | SynMemberDefn.ValField(fieldInfo = field) -> walkField field @@ -2240,7 +2240,7 @@ module ParsedInput = | SynMemberDefn.Interface(interfaceType = t; members = members) -> walkType t members |> Option.iter (List.iter walkMember) - | SynMemberDefn.Inherit(t, _, _) -> walkType t + | SynMemberDefn.Inherit(baseType = t) -> walkType t | SynMemberDefn.ValField(fieldInfo = field) -> walkField field | SynMemberDefn.NestedType(tdef, _, _) -> walkTypeDefn tdef | SynMemberDefn.AutoProperty(attributes = Attributes attrs; typeOpt = t; synExpr = e) -> diff --git a/src/Compiler/Service/ServiceStructure.fs b/src/Compiler/Service/ServiceStructure.fs index 6ca45aa6961..5fab5ef9eb5 100644 --- a/src/Compiler/Service/ServiceStructure.fs +++ b/src/Compiler/Service/ServiceStructure.fs @@ -246,11 +246,11 @@ module Structure = rcheck Scope.New Collapse.Below r e.Range parseExpr e - | SynExpr.YieldOrReturn(_, e, r) -> + | SynExpr.YieldOrReturn(_, e, r, _) -> rcheck Scope.YieldOrReturn Collapse.Below r r parseExpr e - | SynExpr.YieldOrReturnFrom(_, e, r) -> + | SynExpr.YieldOrReturnFrom(_, e, r, _) -> rcheck Scope.YieldOrReturnBang Collapse.Below r r parseExpr e diff --git a/src/Compiler/Service/TransparentCompiler.fs b/src/Compiler/Service/TransparentCompiler.fs index efc2e510050..f94b1399a63 100644 --- a/src/Compiler/Service/TransparentCompiler.fs +++ b/src/Compiler/Service/TransparentCompiler.fs @@ -1302,6 +1302,8 @@ type internal TransparentCompiler //beforeFileChecked.Trigger fileName + CheckLegacyWarnDirectivePlacement(tcConfig.langVersion, tcConfig.diagnosticsOptions.WarnScopes, input) + ApplyMetaCommandsFromInputToTcConfig(tcConfig, input, Path.GetDirectoryName fileName |> (!!), tcImports.DependencyProvider) |> ignore diff --git a/src/Compiler/Service/service.fs b/src/Compiler/Service/service.fs index 525faf3be3d..5f6588bd770 100644 --- a/src/Compiler/Service/service.fs +++ b/src/Compiler/Service/service.fs @@ -72,10 +72,10 @@ module CompileHelpers = try f exiter - 0 + None with e -> stopProcessingRecovery e range0 - 1 + Some e /// Compile using the given flags. Source files names are resolved via the FileSystem API. The output file must be given by a -o flag. let compileFromArgs (ctok, argv: string[], legacyReferenceResolver, tcImportsCapture, dynamicAssemblyCreator) = diff --git a/src/Compiler/Service/service.fsi b/src/Compiler/Service/service.fsi index 0e48a0d6360..3e4fde2229c 100644 --- a/src/Compiler/Service/service.fsi +++ b/src/Compiler/Service/service.fsi @@ -400,11 +400,12 @@ type public FSharpChecker = /// Compile using the given flags. Source files names are resolved via the FileSystem API. /// The output file must be given by a -o flag. /// The first argument is ignored and can just be "fsc.exe". + /// The method returns the collected diagnostics, and (possibly) a terminating exception. /// /// /// The command line arguments for the project build. /// An optional string used for tracing compiler operations associated with this request. - member Compile: argv: string[] * ?userOpName: string -> Async + member Compile: argv: string[] * ?userOpName: string -> Async /// /// Try to get type check results for a file. This looks up the results of recent type checks of the diff --git a/src/Compiler/SyntaxTree/LexHelpers.fs b/src/Compiler/SyntaxTree/LexHelpers.fs index 736e4be04f5..96b4a9a570b 100644 --- a/src/Compiler/SyntaxTree/LexHelpers.fs +++ b/src/Compiler/SyntaxTree/LexHelpers.fs @@ -249,7 +249,7 @@ let errorsInByteStringBuffer (buf: ByteBuffer) = else None -let newline (lexbuf: LexBuffer<_>) = lexbuf.EndPos <- lexbuf.EndPos.NextLine +let incrLine (lexbuf: LexBuffer<_>) = lexbuf.EndPos <- lexbuf.EndPos.NextLine let advanceColumnBy (lexbuf: LexBuffer<_>) n = lexbuf.EndPos <- lexbuf.EndPos.ShiftColumnBy(n) diff --git a/src/Compiler/SyntaxTree/LexHelpers.fsi b/src/Compiler/SyntaxTree/LexHelpers.fsi index 0ba901a05e0..63997f08988 100644 --- a/src/Compiler/SyntaxTree/LexHelpers.fsi +++ b/src/Compiler/SyntaxTree/LexHelpers.fsi @@ -101,7 +101,7 @@ type LargerThanOneByte = int type LargerThan127ButInsideByte = int val errorsInByteStringBuffer: ByteBuffer -> Option -val newline: Lexing.LexBuffer<'a> -> unit +val incrLine: Lexing.LexBuffer<'a> -> unit val advanceColumnBy: Lexing.LexBuffer<'a> -> n: int -> unit diff --git a/src/Compiler/SyntaxTree/ParseHelpers.fs b/src/Compiler/SyntaxTree/ParseHelpers.fs index 3b60428550f..df30e02caf2 100644 --- a/src/Compiler/SyntaxTree/ParseHelpers.fs +++ b/src/Compiler/SyntaxTree/ParseHelpers.fs @@ -166,9 +166,10 @@ type LexerIfdefStack = LexerIfdefStackEntries /// Specifies how the 'endline' function in the lexer should continue after /// it reaches end of line or eof. The options are to continue with 'token' function /// or to continue with 'skip' function. +[] type LexerEndlineContinuation = | Token - | Skip of int * range: range + | IfdefSkip of int * range: range type LexerIfdefExpression = | IfdefAnd of LexerIfdefExpression * LexerIfdefExpression @@ -972,7 +973,7 @@ let checkEndOfFileError t = | LexCont.MLOnly(_, _, m) -> reportParseErrorAt m (FSComp.SR.parsEofInIfOcaml ()) - | LexCont.EndLine(_, _, LexerEndlineContinuation.Skip(_, m)) -> reportParseErrorAt m (FSComp.SR.parsEofInDirective ()) + | LexCont.EndLine(_, _, LexerEndlineContinuation.IfdefSkip(_, m)) -> reportParseErrorAt m (FSComp.SR.parsEofInDirective ()) | LexCont.EndLine(endifs, nesting, LexerEndlineContinuation.Token) | LexCont.Token(endifs, nesting) -> @@ -1054,7 +1055,22 @@ let mkLocalBindings (mWhole, BindingSetPreAttrs(_, isRec, isUse, declsPreAttrs, else Some mIn) - SynExpr.LetOrUse(isRec, isUse, decls, body, mWhole, { InKeyword = mIn }) + let mLetOrUse = + match decls with + | SynBinding(trivia = trivia) :: _ -> trivia.LeadingKeyword.Range + | _ -> Range.Zero + + SynExpr.LetOrUse( + isRec, + isUse, + decls, + body, + mWhole, + { + LetOrUseKeyword = mLetOrUse + InKeyword = mIn + } + ) let mkDefnBindings (mWhole, BindingSetPreAttrs(_, isRec, isUse, declsPreAttrs, _bindingSetRange), attrs, vis, attrsm) = if isUse then diff --git a/src/Compiler/SyntaxTree/ParseHelpers.fsi b/src/Compiler/SyntaxTree/ParseHelpers.fsi index 52f4257d4c2..c98e7897a32 100644 --- a/src/Compiler/SyntaxTree/ParseHelpers.fsi +++ b/src/Compiler/SyntaxTree/ParseHelpers.fsi @@ -67,7 +67,7 @@ type LexerIfdefStack = LexerIfdefStackEntries type LexerEndlineContinuation = | Token - | Skip of int * range: range + | IfdefSkip of int * range: range type LexerIfdefExpression = | IfdefAnd of LexerIfdefExpression * LexerIfdefExpression diff --git a/src/Compiler/SyntaxTree/SyntaxTree.fs b/src/Compiler/SyntaxTree/SyntaxTree.fs index 895b4e6e4f0..dfff34ff745 100644 --- a/src/Compiler/SyntaxTree/SyntaxTree.fs +++ b/src/Compiler/SyntaxTree/SyntaxTree.fs @@ -705,9 +705,9 @@ type SynExpr = | SequentialOrImplicitYield of debugPoint: DebugPointAtSequential * expr1: SynExpr * expr2: SynExpr * ifNotStmt: SynExpr * range: range - | YieldOrReturn of flags: (bool * bool) * expr: SynExpr * range: range + | YieldOrReturn of flags: (bool * bool) * expr: SynExpr * range: range * trivia: SynExprYieldOrReturnTrivia - | YieldOrReturnFrom of flags: (bool * bool) * expr: SynExpr * range: range + | YieldOrReturnFrom of flags: (bool * bool) * expr: SynExpr * range: range * trivia: SynExprYieldOrReturnFromTrivia | LetOrUseBang of bindDebugPoint: DebugPointAtBinding * @@ -1497,7 +1497,7 @@ type SynMemberDefn = | Interface of interfaceType: SynType * withKeyword: range option * members: SynMemberDefns option * range: range - | Inherit of baseType: SynType * asIdent: Ident option * range: range + | Inherit of baseType: SynType * asIdent: Ident option * range: range * trivia: SynMemberDefnInheritTrivia | ValField of fieldInfo: SynField * range: range diff --git a/src/Compiler/SyntaxTree/SyntaxTree.fsi b/src/Compiler/SyntaxTree/SyntaxTree.fsi index 88535d582bd..22ed47c58fb 100644 --- a/src/Compiler/SyntaxTree/SyntaxTree.fsi +++ b/src/Compiler/SyntaxTree/SyntaxTree.fsi @@ -878,12 +878,12 @@ type SynExpr = /// F# syntax: yield expr /// F# syntax: return expr /// Computation expressions only - | YieldOrReturn of flags: (bool * bool) * expr: SynExpr * range: range + | YieldOrReturn of flags: (bool * bool) * expr: SynExpr * range: range * trivia: SynExprYieldOrReturnTrivia /// F# syntax: yield! expr /// F# syntax: return! expr /// Computation expressions only - | YieldOrReturnFrom of flags: (bool * bool) * expr: SynExpr * range: range + | YieldOrReturnFrom of flags: (bool * bool) * expr: SynExpr * range: range * trivia: SynExprYieldOrReturnFromTrivia /// F# syntax: let! pat = expr in expr /// F# syntax: use! pat = expr in expr @@ -1671,7 +1671,7 @@ type SynMemberDefn = | Interface of interfaceType: SynType * withKeyword: range option * members: SynMemberDefns option * range: range /// An 'inherit' definition within a class - | Inherit of baseType: SynType * asIdent: Ident option * range: range + | Inherit of baseType: SynType * asIdent: Ident option * range: range * trivia: SynMemberDefnInheritTrivia /// A 'val' definition within a class | ValField of fieldInfo: SynField * range: range diff --git a/src/Compiler/SyntaxTree/SyntaxTreeOps.fs b/src/Compiler/SyntaxTree/SyntaxTreeOps.fs index 680986ea503..8dc46313341 100644 --- a/src/Compiler/SyntaxTree/SyntaxTreeOps.fs +++ b/src/Compiler/SyntaxTree/SyntaxTreeOps.fs @@ -883,8 +883,8 @@ let rec synExprContainsError inpExpr = | SynExpr.InferredDowncast(e, _) | SynExpr.Lazy(e, _) | SynExpr.TraitCall(_, _, e, _) - | SynExpr.YieldOrReturn(_, e, _) - | SynExpr.YieldOrReturnFrom(_, e, _) + | SynExpr.YieldOrReturn(_, e, _, _) + | SynExpr.YieldOrReturnFrom(_, e, _, _) | SynExpr.DoBang(e, _, _) | SynExpr.Fixed(e, _) | SynExpr.DebugPoint(_, _, e) diff --git a/src/Compiler/SyntaxTree/SyntaxTrivia.fs b/src/Compiler/SyntaxTree/SyntaxTrivia.fs index 7e03572719e..2cd42701e70 100644 --- a/src/Compiler/SyntaxTree/SyntaxTrivia.fs +++ b/src/Compiler/SyntaxTree/SyntaxTrivia.fs @@ -85,10 +85,15 @@ type SynExprDotLambdaTrivia = [] type SynExprLetOrUseTrivia = { + LetOrUseKeyword: range InKeyword: range option } - static member Zero: SynExprLetOrUseTrivia = { InKeyword = None } + static member Zero: SynExprLetOrUseTrivia = + { + InKeyword = None + LetOrUseKeyword = Range.Zero + } [] type SynExprLetOrUseBangTrivia = @@ -117,6 +122,25 @@ type SynExprMatchBangTrivia = WithKeyword: range } +[] +type SynExprYieldOrReturnTrivia = + { + YieldOrReturnKeyword: range + } + + static member Zero: SynExprYieldOrReturnTrivia = { YieldOrReturnKeyword = Range.Zero } + +[] +type SynExprYieldOrReturnFromTrivia = + { + YieldOrReturnFromKeyword: range + } + + static member Zero: SynExprYieldOrReturnFromTrivia = + { + YieldOrReturnFromKeyword = Range.Zero + } + [] type SynExprDoBangTrivia = { DoBangKeyword: range } @@ -396,6 +420,9 @@ type SynMemberDefnAbstractSlotTrivia = static member Zero = { GetSetKeywords = None } +[] +type SynMemberDefnInheritTrivia = { InheritKeyword: range } + [] type SynFieldTrivia = { diff --git a/src/Compiler/SyntaxTree/SyntaxTrivia.fsi b/src/Compiler/SyntaxTree/SyntaxTrivia.fsi index 3c678a72679..ab6525bc010 100644 --- a/src/Compiler/SyntaxTree/SyntaxTrivia.fsi +++ b/src/Compiler/SyntaxTree/SyntaxTrivia.fsi @@ -129,6 +129,8 @@ type SynExprDotLambdaTrivia = [] type SynExprLetOrUseTrivia = { + /// The syntax range of the `let` or `use` keyword. + LetOrUseKeyword: range /// The syntax range of the `in` keyword. InKeyword: range option } @@ -177,6 +179,24 @@ type SynExprDoBangTrivia = DoBangKeyword: range } +/// Represents additional information for SynExpr.YieldOrReturn +[] +type SynExprYieldOrReturnTrivia = + { + /// The syntax range of the `yield` or `return` keyword. + YieldOrReturnKeyword: range + } + + static member Zero: SynExprYieldOrReturnTrivia + +/// Represents additional information for SynExpr.YieldOrReturnFrom +[] +type SynExprYieldOrReturnFromTrivia = + { + /// The syntax range of the `yield!` or `return!` keyword. + YieldOrReturnFromKeyword: range + } + /// Represents additional information for SynExpr.AnonRecd [] type SynExprAnonRecdTrivia = @@ -502,6 +522,10 @@ type SynMemberDefnAbstractSlotTrivia = static member Zero: SynMemberDefnAbstractSlotTrivia +/// Represents additional information for SynMemberDefn.Inherit +[] +type SynMemberDefnInheritTrivia = { InheritKeyword: range } + /// Represents additional information for SynField [] type SynFieldTrivia = diff --git a/src/Compiler/SyntaxTree/WarnScopes.fs b/src/Compiler/SyntaxTree/WarnScopes.fs index 15cc031637a..e5f07168b21 100644 --- a/src/Compiler/SyntaxTree/WarnScopes.fs +++ b/src/Compiler/SyntaxTree/WarnScopes.fs @@ -7,6 +7,10 @@ open FSharp.Compiler.Text open FSharp.Compiler.Text.Position open FSharp.Compiler.Text.Range open FSharp.Compiler.Diagnostics +open FSharp.Compiler.DiagnosticsLogger +open FSharp.Compiler.Features +open Internal.Utilities.Library +open System open System.Text.RegularExpressions [] @@ -55,35 +59,60 @@ module internal WarnScopes = | Nowarn of int * range | Warnon of int * range - let private getWarningNumber (s: string) = - let s = - if s.StartsWith "\"" && s.EndsWith "\"" then - s.Substring(1, s.Length - 2) + let private getNumber (langVersion: LanguageVersion) m (ns: string) = + let argFeature = LanguageFeature.ParsedHashDirectiveArgumentNonQuotes + + let removeQuotes (s: string) = + if s.StartsWithOrdinal "\"" && s.EndsWithOrdinal "\"" then + if s.StartsWithOrdinal "\"\"\"" && s.EndsWithOrdinal "\"\"\"" then + Some(s.Substring(3, s.Length - 6)) + else + Some(s.Substring(1, s.Length - 2)) + elif tryCheckLanguageFeatureAndRecover langVersion argFeature m then + Some s else - s + None - let s = if s.StartsWith "FS" then s[2..] else s + let removePrefix (s: string) = + if (s.StartsWithOrdinal "FS" && langVersion.SupportsFeature argFeature) then + Some(s.Substring 2, s) + else + Some(s, s) + + let parseInt (s: string, displ) = + match System.Int32.TryParse s with + | true, i -> Some i + | false, _ -> + warning (Error(FSComp.SR.buildInvalidWarningNumber displ, m)) + None - match System.Int32.TryParse s with - | true, i -> Some i - | false, _ -> None + ns |> removeQuotes |> Option.bind removePrefix |> Option.bind parseInt let private regex = Regex(" *#(nowarn|warnon)(?: +([^ \r\n/;]+))*(?: *(?:;;|\\/\\/).*)?", RegexOptions.Compiled ||| RegexOptions.CultureInvariant) - let private getDirectives text m = + let private getDirectives langVersion text m = let mkDirective (directiveId: string) (m: range) (c: Capture) = - let argRange () = - Range.withEnd (mkPos m.StartLine (c.Index + c.Length - 1)) (Range.shiftStart 0 c.Index m) + let argRange = + withEnd (mkPos m.StartLine (c.Index + c.Length)) (shiftStart 0 c.Index m) - match directiveId, getWarningNumber c.Value with - | "nowarn", Some n -> Some(WarnDirective.Nowarn(n, argRange ())) - | "warnon", Some n -> Some(WarnDirective.Warnon(n, argRange ())) - | _ -> None + match directiveId, getNumber langVersion argRange c.Value with + | "nowarn", Some n -> Some(WarnDirective.Nowarn(n, argRange)) + | "warnon", Some n -> Some(WarnDirective.Warnon(n, argRange)) + | _, Some n -> failwith $"getDirectives: unexpected directive id {directiveId}" + | _, None -> None let mGroups = (regex.Match text).Groups let dIdent = mGroups[1].Value - [ for c in mGroups[2].Captures -> c ] |> List.choose (mkDirective dIdent m) + let argCaptures = mGroups[2].Captures + + if dIdent = "warnon" then + checkLanguageFeatureError langVersion LanguageFeature.ScopedNowarn m + + if argCaptures.Count = 0 then + errorR (Error(FSComp.SR.lexWarnDirectiveMustHaveArgs (), m)) + + [ for c in argCaptures -> c ] |> List.choose (mkDirective dIdent m) let private index (fileIndex, warningNumber) = (int64 fileIndex <<< 32) + int64 warningNumber @@ -96,21 +125,27 @@ module internal WarnScopes = let private mkScope (m1: range) (m2: range) = mkFileIndexRange m1.FileIndex m1.Start m2.End - let private processWarnDirective (WarnScopeMap warnScopes) (wd: WarnDirective) = + let private processWarnDirective (langVersion: LanguageVersion) (WarnScopeMap warnScopes) (wd: WarnDirective) = match wd with | WarnDirective.Nowarn(n, m) -> let idx = index (m.FileIndex, n) match getScopes idx warnScopes with | WarnScope.OpenOn m' :: t -> warnScopes.Add(idx, WarnScope.On(mkScope m' m) :: t) - | WarnScope.OpenOff _ :: _ -> warnScopes + | WarnScope.OpenOff m' :: _ -> + if langVersion.SupportsFeature LanguageFeature.ScopedNowarn then + warning (Error(FSComp.SR.lexWarnDirectivesMustMatch ("#nowarn", m'.StartLine), m)) + + warnScopes | scopes -> warnScopes.Add(idx, WarnScope.OpenOff(mkScope m m) :: scopes) | WarnDirective.Warnon(n, m) -> let idx = index (m.FileIndex, n) match getScopes idx warnScopes with | WarnScope.OpenOff m' :: t -> warnScopes.Add(idx, WarnScope.Off(mkScope m' m) :: t) - | WarnScope.OpenOn _ :: _ -> warnScopes + | WarnScope.OpenOn m' :: _ -> + warning (Error(FSComp.SR.lexWarnDirectivesMustMatch ("#warnon", m'.StartLine), m)) + warnScopes | scopes -> warnScopes.Add(idx, WarnScope.OpenOn(mkScope m m) :: scopes) |> WarnScopeMap @@ -121,10 +156,11 @@ module internal WarnScopes = let idx = lineMap.TryFind idx |> Option.defaultValue idx let m = mkFileIndexRange idx (convert lexbuf.StartPos) (convert lexbuf.EndPos) let text = Lexbuf.LexemeString lexbuf - let directives = getDirectives text m + let directives = getDirectives lexbuf.LanguageVersion text m let warnScopes = - (getWarnScopes lexbuf, directives) ||> List.fold processWarnDirective + (getWarnScopes lexbuf, directives) + ||> List.fold (processWarnDirective lexbuf.LanguageVersion) lexbuf.BufferLocalStore[warnScopeKey] <- warnScopes @@ -177,14 +213,14 @@ module internal WarnScopes = let (WarnScopeMap warnScopes) = diagnosticOptions.WarnScopes let (LineMap lineMap) = diagnosticOptions.LineMap - match mo with - | None -> false - | Some m -> + match mo, diagnosticOptions.FSharp9CompatibleNowarn with + | Some m, false -> if lineMap.ContainsKey m.FileIndex then false else let scopes = getScopes (index (m.FileIndex, warningNumber)) warnScopes List.exists (isEnclosingWarnonScope m) scopes + | _ -> false let IsNowarn (diagnosticOptions: FSharpDiagnosticOptions) warningNumber (mo: range option) = let (WarnScopeMap warnScopes) = diagnosticOptions.WarnScopes diff --git a/src/Compiler/TypedTree/TypedTree.fs b/src/Compiler/TypedTree/TypedTree.fs index 8163cc5a65b..246bcd96d37 100644 --- a/src/Compiler/TypedTree/TypedTree.fs +++ b/src/Compiler/TypedTree/TypedTree.fs @@ -4359,6 +4359,12 @@ type NullnessVar() = member nv.IsSolved = solution.IsSome + member nv.IsFullySolved = + match solution with + | None -> false + | Some (Nullness.Known _) -> true + | Some (Nullness.Variable v) -> v.IsFullySolved + member nv.Set(nullness) = assert (not nv.IsSolved) solution <- Some nullness diff --git a/src/Compiler/TypedTree/TypedTree.fsi b/src/Compiler/TypedTree/TypedTree.fsi index 7a4efb4918c..12faeb13fdc 100644 --- a/src/Compiler/TypedTree/TypedTree.fsi +++ b/src/Compiler/TypedTree/TypedTree.fsi @@ -3101,6 +3101,7 @@ type NullnessVar = member Evaluate: unit -> NullnessInfo member TryEvaluate: unit -> NullnessInfo voption member IsSolved: bool + member IsFullySolved: bool member Set: Nullness -> unit member Unset: unit -> unit member Solution: Nullness diff --git a/src/Compiler/TypedTree/TypedTreeBasics.fs b/src/Compiler/TypedTree/TypedTreeBasics.fs index c8268ffcf8a..0ad62482b6a 100644 --- a/src/Compiler/TypedTree/TypedTreeBasics.fs +++ b/src/Compiler/TypedTree/TypedTreeBasics.fs @@ -284,7 +284,7 @@ let tryAddNullnessToTy nullnessNew (ty:TType) = let addNullnessToTy (nullness: Nullness) (ty:TType) = match nullness with | Nullness.Known NullnessInfo.WithoutNull -> ty - | Nullness.Variable nv when nv.IsSolved && nv.Evaluate() = NullnessInfo.WithoutNull -> ty + | Nullness.Variable nv when nv.IsFullySolved && nv.TryEvaluate() = ValueSome NullnessInfo.WithoutNull -> ty | _ -> match ty with | TType_var (tp, nullnessOrig) -> TType_var (tp, combineNullness nullnessOrig nullness) diff --git a/src/Compiler/lex.fsl b/src/Compiler/lex.fsl index 092f2d51257..de739ef7aff 100644 --- a/src/Compiler/lex.fsl +++ b/src/Compiler/lex.fsl @@ -194,9 +194,8 @@ let tryAppendXmlDoc (buff: (range * StringBuilder) option) (s:string) = // Utilities for parsing #if/#else/#endif -let shouldStartLine args lexbuf (m:range) err tok = - if (m.StartColumn <> 0) then fail args lexbuf err tok - else tok +let shouldStartLine args lexbuf (m:range) err = + if (m.StartColumn <> 0) then fail args lexbuf err () let shouldStartFile args lexbuf (m:range) err tok = if (m.StartColumn <> 0 || m.StartLine <> 1) then fail args lexbuf err tok @@ -334,6 +333,8 @@ let ident_char = let ident = ident_start_char ident_char* +// skip = true: skip whitespace (used by compiler, fsi etc) +// skip = false: send artificial tokens for whitespace (used by VS) rule token (args: LexArgs) (skip: bool) = parse | ident { Keywords.KeywordOrIdentifierToken args lexbuf (lexeme lexbuf) } @@ -752,7 +753,7 @@ rule token (args: LexArgs) (skip: bool) = parse else singleLineComment (None,1,m,m,args) skip lexbuf } | newline - { newline lexbuf + { incrLine lexbuf if not skip then WHITESPACE (LexCont.Token(args.ifdefStack, args.stringNest)) else token args skip lexbuf } @@ -821,12 +822,12 @@ rule token (args: LexArgs) (skip: bool) = parse WarnScopes.RegisterLineDirective(lexbuf, pos.FileIndex, fileIndex, line) else // add a newline when we don't apply a directive since we consumed a newline getting here - newline lexbuf + incrLine lexbuf token args skip lexbuf else // add a newline when we don't apply a directive since we consumed a newline getting here - newline lexbuf + incrLine lexbuf HASH_LINE (LexCont.Token (args.ifdefStack, args.stringNest)) } @@ -1032,56 +1033,47 @@ rule token (args: LexArgs) (skip: bool) = parse | anywhite* "#if" anywhite+ anystring { let m = lexbuf.LexemeRange + shouldStartLine args lexbuf m (FSComp.SR.lexHashIfMustBeFirst()) let lookup id = List.contains id args.conditionalDefines let lexed = lexeme lexbuf let isTrue, expr = evalIfDefExpression lexbuf.StartPos lexbuf.ReportLibraryOnlyFeatures lexbuf.LanguageVersion lexbuf.StrictIndentation args lookup lexed args.ifdefStack <- (IfDefIf,m) :: args.ifdefStack LexbufIfdefStore.SaveIfHash(lexbuf, lexed, expr, m) + let contCase = if isTrue then LexerEndlineContinuation.Token else LexerEndlineContinuation.IfdefSkip(0, m) + let tok = HASH_IF(m, lexed, LexCont.EndLine(args.ifdefStack, args.stringNest, contCase)) + if skip then endline contCase args skip lexbuf else tok } - // Get the token; make sure it starts at zero position & return - let cont, f = - if isTrue then - let cont = LexCont.EndLine(args.ifdefStack, args.stringNest, LexerEndlineContinuation.Token) - let f = endline LexerEndlineContinuation.Token args skip - cont, f - else - let cont = LexCont.EndLine(args.ifdefStack, args.stringNest, LexerEndlineContinuation.Skip(0, m)) - let f = endline (LexerEndlineContinuation.Skip(0, m)) args skip - cont, f - - let tok = shouldStartLine args lexbuf m (FSComp.SR.lexHashIfMustBeFirst()) (HASH_IF(m,lexed,cont)) - if not skip then tok else f lexbuf } - - | anywhite* "#else" anywhite* ("//" [^'\n''\r']*)? + | anywhite* "#else" anywhite* ("//" anystring)? { let lexed = (lexeme lexbuf) match args.ifdefStack with | [] -> LEX_FAILURE (FSComp.SR.lexHashElseNoMatchingIf()) | (IfDefElse,_) :: _rest -> LEX_FAILURE (FSComp.SR.lexHashEndifRequiredForElse()) | (IfDefIf,_) :: rest -> let m = lexbuf.LexemeRange + shouldStartLine args lexbuf m (FSComp.SR.lexHashElseMustBeFirst()) args.ifdefStack <- (IfDefElse,m) :: rest LexbufIfdefStore.SaveElseHash(lexbuf, lexed, m) - let tok = HASH_ELSE(m, lexed, LexCont.EndLine(args.ifdefStack, args.stringNest, LexerEndlineContinuation.Skip(0, m))) - let tok = shouldStartLine args lexbuf m (FSComp.SR.lexHashElseMustBeFirst()) tok - if not skip then tok else endline (LexerEndlineContinuation.Skip(0, m)) args skip lexbuf } + let tok = HASH_ELSE(m, lexed, LexCont.EndLine(args.ifdefStack, args.stringNest, LexerEndlineContinuation.IfdefSkip(0, m))) + if skip then endline (LexerEndlineContinuation.IfdefSkip(0, m)) args skip lexbuf else tok } - | anywhite* "#endif" anywhite* ("//" [^'\n''\r']*)? + | anywhite* "#endif" anywhite* ("//" anystring)? { let lexed = (lexeme lexbuf) let m = lexbuf.LexemeRange match args.ifdefStack with | []-> LEX_FAILURE (FSComp.SR.lexHashEndingNoMatchingIf()) | _ :: rest -> + shouldStartLine args lexbuf m (FSComp.SR.lexHashEndifMustBeFirst()) args.ifdefStack <- rest LexbufIfdefStore.SaveEndIfHash(lexbuf, lexed, m) let tok = HASH_ENDIF(m,lexed,LexCont.EndLine(args.ifdefStack, args.stringNest, LexerEndlineContinuation.Token)) - let tok = shouldStartLine args lexbuf m (FSComp.SR.lexHashEndifMustBeFirst()) tok if not skip then tok else endline LexerEndlineContinuation.Token args skip lexbuf } | "#if" { let tok = WHITESPACE (LexCont.Token (args.ifdefStack, args.stringNest)) let tok = fail args lexbuf (FSComp.SR.lexHashIfMustHaveIdent()) tok - if not skip then tok else token args skip lexbuf } + if skip then token args skip lexbuf else tok } + // Let the parser deal with these invalid directives | anywhite* "#if" ident_char+ | anywhite* "#else" ident_char+ | anywhite* "#endif" ident_char+ @@ -1090,14 +1082,17 @@ rule token (args: LexArgs) (skip: bool) = parse lexbuf.StartPos <- lexbuf.StartPos.ShiftColumnBy(n) HASH_IDENT(lexemeTrimLeft lexbuf (n+1)) } - // We parse and process warn directives here during lexing, including anything that might be an argument. - // But we stop early enough to pass to the parser ";;" (for compatibility) and "//" (for coloring). - | anywhite* ("#nowarn" | "#warnon") anywhite+ [^';''/''\r''\n']+ - { shouldStartLine args lexbuf lexbuf.LexemeRange (FSComp.SR.lexWarnDirectiveMustBeFirst()) () + | anywhite* ("#nowarn" | "#warnon") anywhite+ anystring + { let m = lexbuf.LexemeRange + shouldStartLine args lexbuf m (FSComp.SR.lexWarnDirectiveMustBeFirst()) WarnScopes.ParseAndRegisterWarnDirective lexbuf - let n = (lexeme lexbuf).IndexOf('#') - lexbuf.StartPos <- lexbuf.StartPos.ShiftColumnBy(n) - WARN_DIRECTIVE(lexemeTrimLeft lexbuf (n+1), LexCont.Token (args.ifdefStack, args.stringNest)) } + let tok = WARN_DIRECTIVE(m, lexeme lexbuf, LexCont.EndLine(args.ifdefStack, args.stringNest, LexerEndlineContinuation.Token)) + if skip then endline LexerEndlineContinuation.Token args skip lexbuf else tok } + + | anywhite* ("#nowarn" | "#warnon") + { let tok = WHITESPACE (LexCont.Token (args.ifdefStack, args.stringNest)) + let tok = fail args lexbuf (FSComp.SR.lexWarnDirectiveMustHaveArgs()) tok + if skip then token args skip lexbuf else tok } | surrogateChar surrogateChar @@ -1115,17 +1110,17 @@ and ifdefSkip (n: int) (m: range) (args: LexArgs) (skip: bool) = parse // If #if is the first thing on the line then increase depth, otherwise skip, because it is invalid (e.g. "(**) #if ...") if (m.StartColumn <> 0) then - if not skip then INACTIVECODE (LexCont.IfDefSkip(args.ifdefStack, args.stringNest, n, m)) - else ifdefSkip n m args skip lexbuf + if skip then ifdefSkip n m args skip lexbuf + else INACTIVECODE (LexCont.IfDefSkip(args.ifdefStack, args.stringNest, n, m)) else let lexed = lexeme lexbuf let lookup id = List.contains id args.conditionalDefines let _, expr = evalIfDefExpression lexbuf.StartPos lexbuf.ReportLibraryOnlyFeatures lexbuf.LanguageVersion lexbuf.StrictIndentation args lookup lexed LexbufIfdefStore.SaveIfHash(lexbuf, lexed, expr, m) - let tok = INACTIVECODE(LexCont.EndLine(args.ifdefStack, args.stringNest, LexerEndlineContinuation.Skip(n+1, m))) - if not skip then tok else endline (LexerEndlineContinuation.Skip(n+1, m)) args skip lexbuf } + let tok = INACTIVECODE(LexCont.EndLine(args.ifdefStack, args.stringNest, LexerEndlineContinuation.IfdefSkip(n+1, m))) + if skip then endline (LexerEndlineContinuation.IfdefSkip(n+1, m)) args skip lexbuf else tok } - | anywhite* "#else" anywhite* ("//" [^'\n''\r']*)? + | anywhite* "#else" anywhite* ("//" anystring)? { let lexed = (lexeme lexbuf) let m = lexbuf.LexemeRange @@ -1143,12 +1138,12 @@ and ifdefSkip (n: int) (m: range) (args: LexArgs) (skip: bool) = parse args.ifdefStack <- (IfDefElse,m) :: rest if not skip then HASH_ELSE(m,lexed,LexCont.EndLine(args.ifdefStack, args.stringNest, LexerEndlineContinuation.Token)) else endline LexerEndlineContinuation.Token args skip lexbuf - else + else LexbufIfdefStore.SaveElseHash(lexbuf, lexed, m) - if not skip then INACTIVECODE(LexCont.EndLine(args.ifdefStack, args.stringNest, LexerEndlineContinuation.Skip(n, m))) - else endline (LexerEndlineContinuation.Skip(n, m)) args skip lexbuf } + if not skip then INACTIVECODE(LexCont.EndLine(args.ifdefStack, args.stringNest, LexerEndlineContinuation.IfdefSkip(n, m))) + else endline (LexerEndlineContinuation.IfdefSkip(n, m)) args skip lexbuf } - | anywhite* "#endif" anywhite* ("//" [^'\n''\r']*)? + | anywhite* "#endif" anywhite* ("//" anystring)? { let lexed = lexeme lexbuf let m = lexbuf.LexemeRange @@ -1165,13 +1160,13 @@ and ifdefSkip (n: int) (m: range) (args: LexArgs) (skip: bool) = parse if not skip then HASH_ENDIF(m,lexed,LexCont.EndLine(args.ifdefStack, args.stringNest, LexerEndlineContinuation.Token)) else endline LexerEndlineContinuation.Token args skip lexbuf else + shouldStartLine args lexbuf m (FSComp.SR.lexWrongNestedHashEndif()) LexbufIfdefStore.SaveEndIfHash(lexbuf, lexed, m) - let tok = INACTIVECODE(LexCont.EndLine(args.ifdefStack, args.stringNest, LexerEndlineContinuation.Skip(n-1, m))) - let tok = shouldStartLine args lexbuf m (FSComp.SR.lexWrongNestedHashEndif()) tok - if not skip then tok else endline (LexerEndlineContinuation.Skip(n-1, m)) args skip lexbuf } + let tok = INACTIVECODE(LexCont.EndLine(args.ifdefStack, args.stringNest, LexerEndlineContinuation.IfdefSkip(n-1, m))) + if not skip then tok else endline (LexerEndlineContinuation.IfdefSkip(n-1, m)) args skip lexbuf } | newline - { newline lexbuf; ifdefSkip n m args skip lexbuf } + { incrLine lexbuf; ifdefSkip n m args skip lexbuf } | [^ ' ' '\n' '\r' ]+ @@ -1191,13 +1186,13 @@ and ifdefSkip (n: int) (m: range) (args: LexArgs) (skip: bool) = parse // or end of file and then calls the lexing function specified by 'cont' - either token or ifdefSkip and endline (cont: LexerEndlineContinuation) (args: LexArgs) (skip: bool) = parse | newline - { newline lexbuf + { incrLine lexbuf match cont with | LexerEndlineContinuation.Token -> if not skip then WHITESPACE(LexCont.Token (args.ifdefStack, args.stringNest)) else token args skip lexbuf - | LexerEndlineContinuation.Skip(n, m) -> + | LexerEndlineContinuation.IfdefSkip(n, m) -> if not skip then INACTIVECODE (LexCont.IfDefSkip(args.ifdefStack, args.stringNest, n, m)) else ifdefSkip n m args skip lexbuf } @@ -1206,7 +1201,7 @@ and endline (cont: LexerEndlineContinuation) (args: LexArgs) (skip: bool) = pars { match cont with | LexerEndlineContinuation.Token -> EOF(LexCont.Token(args.ifdefStack, args.stringNest)) - | LexerEndlineContinuation.Skip(n, m) -> + | LexerEndlineContinuation.IfdefSkip(n, m) -> EOF(LexCont.IfDefSkip(args.ifdefStack, args.stringNest, n, m)) } @@ -1220,7 +1215,7 @@ and endline (cont: LexerEndlineContinuation) (args: LexArgs) (skip: bool) = pars and singleQuoteString (sargs: LexerStringArgs) (skip: bool) = parse | '\\' newline anywhite* { let (_buf, _fin, m, kind, args) = sargs - newline lexbuf + incrLine lexbuf let text = lexeme lexbuf let text2 = text |> String.filter (fun c -> c <> ' ' && c <> '\t') advanceColumnBy lexbuf (text.Length - text2.Length) @@ -1349,7 +1344,7 @@ and singleQuoteString (sargs: LexerStringArgs) (skip: bool) = parse | newline { let (buf, _fin, m, kind, args) = sargs - newline lexbuf + incrLine lexbuf addUnicodeString buf (lexeme lexbuf) if not skip then STRING_TEXT (LexCont.String(args.ifdefStack, args.stringNest, LexerStringStyle.SingleQuote, kind, args.interpolationDelimiterLength, m)) @@ -1418,7 +1413,7 @@ and verbatimString (sargs: LexerStringArgs) (skip: bool) = parse | newline { let (buf, _fin, m, kind, args) = sargs - newline lexbuf + incrLine lexbuf addUnicodeString buf (lexeme lexbuf) if not skip then STRING_TEXT (LexCont.String(args.ifdefStack, args.stringNest, LexerStringStyle.Verbatim, kind, args.interpolationDelimiterLength, m)) @@ -1511,7 +1506,7 @@ and tripleQuoteString (sargs: LexerStringArgs) (skip: bool) = parse | newline { let (buf, _fin, m, kind, args) = sargs - newline lexbuf + incrLine lexbuf addUnicodeString buf (lexeme lexbuf) if not skip then STRING_TEXT (LexCont.String(args.ifdefStack, args.stringNest, LexerStringStyle.TripleQuote, kind, args.interpolationDelimiterLength, m)) @@ -1605,7 +1600,7 @@ and extendedInterpolatedString (sargs: LexerStringArgs) (skip: bool) = parse | newline { let (buf, _fin, m, kind, args) = sargs - newline lexbuf + incrLine lexbuf addUnicodeString buf (lexeme lexbuf) if not skip then STRING_TEXT (LexCont.String(args.ifdefStack, args.stringNest, LexerStringStyle.ExtendedInterpolated, kind, args.interpolationDelimiterLength, m)) @@ -1722,7 +1717,7 @@ and singleLineComment (cargs: SingleLineCommentArgs) (skip: bool) = parse | newline { let buff,_n, mStart, mEnd, args = cargs trySaveXmlDoc lexbuf buff - newline lexbuf + incrLine lexbuf // Saves the documentation (if we're collecting any) into a buffer-local variable. if not skip then LINE_COMMENT (LexCont.Token(args.ifdefStack, args.stringNest)) else @@ -1784,7 +1779,7 @@ and comment (cargs: BlockCommentArgs) (skip: bool) = parse | newline { let n, m, args = cargs - newline lexbuf + incrLine lexbuf if not skip then COMMENT (LexCont.Comment(args.ifdefStack, args.stringNest, n, m)) else comment cargs skip lexbuf } | "*)" @@ -1818,7 +1813,7 @@ and comment (cargs: BlockCommentArgs) (skip: bool) = parse and stringInComment (n: int) (m: range) (args: LexArgs) (skip: bool) = parse // Follow string lexing, skipping tokens until it finishes | '\\' newline anywhite* - { newline lexbuf + { incrLine lexbuf if not skip then COMMENT (LexCont.StringInComment(args.ifdefStack, args.stringNest, LexerStringStyle.SingleQuote, n, m)) else stringInComment n m args skip lexbuf } @@ -1840,7 +1835,7 @@ and stringInComment (n: int) (m: range) (args: LexArgs) (skip: bool) = parse else comment (n, m, args) skip lexbuf } | newline - { newline lexbuf + { incrLine lexbuf if not skip then COMMENT (LexCont.StringInComment(args.ifdefStack, args.stringNest, LexerStringStyle.SingleQuote, n, m)) else stringInComment n m args skip lexbuf } @@ -1870,7 +1865,7 @@ and verbatimStringInComment (n: int) (m: range) (args: LexArgs) (skip: bool) = p else verbatimStringInComment n m args skip lexbuf } | newline - { newline lexbuf + { incrLine lexbuf if not skip then COMMENT (LexCont.StringInComment(args.ifdefStack, args.stringNest, LexerStringStyle.Verbatim, n, m)) else verbatimStringInComment n m args skip lexbuf } @@ -1896,7 +1891,7 @@ and tripleQuoteStringInComment (n: int) (m: range) (args: LexArgs) (skip: bool) else tripleQuoteStringInComment n m args skip lexbuf } | newline - { newline lexbuf + { incrLine lexbuf if not skip then COMMENT (LexCont.StringInComment(args.ifdefStack, args.stringNest, LexerStringStyle.TripleQuote, n, m)) else tripleQuoteStringInComment n m args skip lexbuf } @@ -1918,7 +1913,7 @@ and mlOnly (m: range) (args: LexArgs) (skip: bool) = parse else mlOnly m args skip lexbuf } | newline - { newline lexbuf + { incrLine lexbuf if not skip then COMMENT (LexCont.MLOnly(args.ifdefStack, args.stringNest, m)) else mlOnly m args skip lexbuf } diff --git a/src/Compiler/pars.fsy b/src/Compiler/pars.fsy index 6f751d21965..e1b9a9cf0b0 100644 --- a/src/Compiler/pars.fsy +++ b/src/Compiler/pars.fsy @@ -151,8 +151,7 @@ let parse_error_rich = Some(fun (ctxt: ParseErrorContext<_>) -> /* These are artificial */ %token LEX_FAILURE %token COMMENT WHITESPACE HASH_LINE HASH_LIGHT INACTIVECODE LINE_COMMENT STRING_TEXT EOF -%token WARN_DIRECTIVE -%token HASH_IF HASH_ELSE HASH_ENDIF +%token HASH_IF HASH_ELSE HASH_ENDIF WARN_DIRECTIVE %start signatureFile implementationFile interaction typedSequentialExprEOF typEOF %type typedSequentialExprEOF @@ -479,8 +478,6 @@ interactiveSeparator: /* A #directive in a module, namespace or an interaction */ hashDirective: - | WARN_DIRECTIVE - { ParsedHashDirective("WARN_DIRECTIVE_DUMMY", [], rhs parseState 1) } | HASH IDENT hashDirectiveArgs { let m = match $3 with [] -> rhs2 parseState 1 2 | _ -> rhs2 parseState 1 3 ParsedHashDirective($2, $3, m) } @@ -2319,7 +2316,8 @@ opt_classDefn: inheritsDefn: | INHERIT atomTypeNonAtomicDeprecated optBaseSpec { let mDecl = unionRanges (rhs parseState 1) $2.Range - SynMemberDefn.Inherit($2, $3, mDecl) } + let trivia = { InheritKeyword = rhs parseState 1 } + SynMemberDefn.Inherit($2, $3, mDecl, trivia) } | INHERIT atomTypeNonAtomicDeprecated opt_HIGH_PRECEDENCE_APP atomicExprAfterType optBaseSpec { let mDecl = unionRanges (rhs parseState 1) $4.Range @@ -2327,8 +2325,9 @@ inheritsDefn: | INHERIT ends_coming_soon_or_recover { let mDecl = (rhs parseState 1) + let trivia = { InheritKeyword = (rhs parseState 1) } if not $2 then errorR (Error(FSComp.SR.parsTypeNameCannotBeEmpty (), mDecl)) - SynMemberDefn.Inherit(SynType.LongIdent(SynLongIdent([], [], [])), None, mDecl) } + SynMemberDefn.Inherit(SynType.LongIdent(SynLongIdent([], [], [])), None, mDecl, trivia) } optAsSpec: | asSpec @@ -4405,18 +4404,22 @@ declExpr: exprFromParseError (SynExpr.ForEach(spFor, spIn, SeqExprOnly false, true, $2, arbExpr ("forLoopCollection", mFor), arbExpr ("forLoopBody3", mForLoopBodyArb), mForLoopAll)) } | YIELD declExpr - { SynExpr.YieldOrReturn(($1, not $1), $2, unionRanges (rhs parseState 1) $2.Range) } + { let trivia: SynExprYieldOrReturnTrivia = { YieldOrReturnKeyword = rhs parseState 1 } + SynExpr.YieldOrReturn(($1, not $1), $2, (unionRanges (rhs parseState 1) $2.Range), trivia) } | YIELD_BANG declExpr - { SynExpr.YieldOrReturnFrom(($1, not $1), $2, unionRanges (rhs parseState 1) $2.Range) } + { let trivia: SynExprYieldOrReturnFromTrivia = { YieldOrReturnFromKeyword = rhs parseState 1 } + SynExpr.YieldOrReturnFrom(($1, not $1), $2, (unionRanges (rhs parseState 1) $2.Range), trivia) } | YIELD recover { let mYieldAll = rhs parseState 1 - SynExpr.YieldOrReturn(($1, not $1), arbExpr ("yield", mYieldAll), mYieldAll) } + let trivia: SynExprYieldOrReturnTrivia = { YieldOrReturnKeyword = rhs parseState 1 } + SynExpr.YieldOrReturn(($1, not $1), arbExpr ("yield", mYieldAll), mYieldAll, trivia) } | YIELD_BANG recover { let mYieldAll = rhs parseState 1 - SynExpr.YieldOrReturnFrom(($1, not $1), arbExpr ("yield!", mYieldAll), mYieldAll) } + let trivia: SynExprYieldOrReturnFromTrivia = { YieldOrReturnFromKeyword = rhs parseState 1 } + SynExpr.YieldOrReturnFrom(($1, not $1), arbExpr ("yield!", mYieldAll), mYieldAll, trivia) } | BINDER headBindingPattern EQUALS typedSequentialExprBlock IN opt_OBLOCKSEP moreBinders typedSequentialExprBlock %prec expr_let { let spBind = DebugPointAtBinding.Yes(rhs2 parseState 1 5) @@ -4461,7 +4464,8 @@ declExpr: { errorR(Error(FSComp.SR.parsArrowUseIsLimited(), lhs parseState)) let mArrow = rhs parseState 1 let expr = $2 mArrow - SynExpr.YieldOrReturn((true, true), expr, (unionRanges mArrow expr.Range)) } + let trivia: SynExprYieldOrReturnTrivia = { YieldOrReturnKeyword = rhs parseState 1 } + SynExpr.YieldOrReturn((true, true), expr, (unionRanges mArrow expr.Range), trivia) } | declExpr COLON_QMARK typ { SynExpr.TypeTest($1, $3, unionRanges $1.Range $3.Range) } @@ -5459,7 +5463,8 @@ arrowThenExprR: | RARROW typedSequentialExprBlockR { let mArrow = rhs parseState 1 let expr = $2 mArrow - SynExpr.YieldOrReturn((true, false), expr, unionRanges mArrow expr.Range) } + let trivia: SynExprYieldOrReturnTrivia = { YieldOrReturnKeyword = mArrow } + SynExpr.YieldOrReturn((true, false), expr, (unionRanges mArrow expr.Range), trivia) } forLoopBinder: | parenPattern IN declExpr diff --git a/src/Compiler/xlf/FSComp.txt.cs.xlf b/src/Compiler/xlf/FSComp.txt.cs.xlf index 2a0e0e2522b..0aa23ee2155 100644 --- a/src/Compiler/xlf/FSComp.txt.cs.xlf +++ b/src/Compiler/xlf/FSComp.txt.cs.xlf @@ -539,7 +539,7 @@ whitespace relaxation - uvolnění prázdných znaků + whitespace relaxation @@ -563,8 +563,8 @@ - Support for scoped enabling / disabling of warnings by #warn and #nowarn directives - Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives, also inside modules + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives, also inside modules @@ -822,6 +822,16 @@ #nowarn/#warnon directives must appear as the first non-whitespace characters on a line + + Warn directives must have warning number(s) as argument(s) + Warn directives must have warning number(s) as argument(s) + + + + There is another {0} for this warning already in line {1}. + There is another {0} for this warning already in line {1}. + + All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n Všechny prvky seznamu musí být implicitně převoditelné na typ prvního prvku, což je řazená kolekce členů o délce {0} typu\n {1} \nTento element je řazená kolekce členů o délce {2} typu\n {3} \n @@ -1134,7 +1144,7 @@ A constrained generic construct occurred in the resumable code specification - Ve specifikaci obnovitelného kódu došlo k omezené obecné konstrukci. + A constrained generic construct occurred in the resumable code specification @@ -1149,7 +1159,7 @@ A 'let rec' occurred in the resumable code specification - Ve specifikaci obnovitelného kódu došlo k „let rec“. + A 'let rec' occurred in the resumable code specification @@ -1454,7 +1464,7 @@ The following required properties have to be initialized:{0} - Je třeba inicializovat následující požadované vlastnosti:{0} + The following required properties have to be initialized:{0} @@ -1589,7 +1599,7 @@ Invalid resumable code. A 'let rec' occurred in the resumable code specification - Neplatný obnovitelný kód. Ve specifikaci obnovitelného kódu došlo k „let rec“. + Invalid resumable code. A 'let rec' occurred in the resumable code specification @@ -5909,7 +5919,7 @@ Specify debugging type: full, portable, embedded, pdbonly. ('{0}' is the default if no debugging type specified and enables attaching a debugger to a running program, 'portable' is a cross-platform format, 'embedded' is a cross-platform format embedded into the output file). - Zadejte typ ladění: full, portable, embedded, pdbonly. ({0} je výchozí hodnota v případě, že není zadaný žádný typ ladění, a umožňuje připojení ladicího programu ke spuštěnému programu, portable je formát pro různé platformy, embedded je formát pro různé platformy vložený do výstupního souboru). + Specify debugging type: full, portable, embedded, pdbonly. ('{0}' is the default if no debugging type specified and enables attaching a debugger to a running program, 'portable' is a cross-platform format, 'embedded' is a cross-platform format embedded into the output file). @@ -7164,7 +7174,7 @@ The resident compilation service was not used because a problem occurred in communicating with the server. - Rezidentní kompilační služba se nepoužila, protože došlo k potížím při komunikaci se serverem. + The resident compilation service was not used because a problem occurred in communicating with the server. @@ -7364,7 +7374,7 @@ An error occurred applying the static arguments to a provided type - Při použití statických argumentů u poskytnutého typu došlo k chybě. + An error occurred applying the static arguments to a provided type @@ -7429,7 +7439,7 @@ Assembly '{0}' has TypeProviderAssembly attribute with invalid value '{1}'. The value should be a valid assembly name - Základní atribut TypeProviderAssembly sestavení {0} má neplatnou hodnotu {1}. Hodnotou by měl být platný název sestavení. + Assembly '{0}' has TypeProviderAssembly attribute with invalid value '{1}'. The value should be a valid assembly name @@ -8014,7 +8024,7 @@ An error occurred applying the static arguments to a provided method - Při použití statických argumentů u poskytnuté metody došlo k chybě. + An error occurred applying the static arguments to a provided method @@ -8144,7 +8154,7 @@ The CallerMemberNameAttribute applied to parameter '{0}' will have no effect. It is overridden by the CallerFilePathAttribute. - Atribut CallerMemberNameAttribute použitý pro parametr {0} nebude mít žádný účinek. Přepisuje ho atribut CallerFilePathAttribute. + The CallerMemberNameAttribute applied to parameter '{0}' will have no effect. It is overridden by the CallerFilePathAttribute. @@ -8459,7 +8469,7 @@ Used to introduce a block of code that might generate an exception. Used together with 'with' or 'finally'. - Slouží k uvození bloku kódu, který může vygenerovat výjimku. Používá se společně s with nebo finally. + Used to introduce a block of code that might generate an exception. Used together with 'with' or 'finally'. diff --git a/src/Compiler/xlf/FSComp.txt.de.xlf b/src/Compiler/xlf/FSComp.txt.de.xlf index cc083aa2467..5c8711e3b1c 100644 --- a/src/Compiler/xlf/FSComp.txt.de.xlf +++ b/src/Compiler/xlf/FSComp.txt.de.xlf @@ -539,7 +539,7 @@ whitespace relaxation - Lockerung für Leerraum + whitespace relaxation @@ -563,8 +563,8 @@ - Support for scoped enabling / disabling of warnings by #warn and #nowarn directives - Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives, also inside modules + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives, also inside modules @@ -822,6 +822,16 @@ #nowarn/#warnon directives must appear as the first non-whitespace characters on a line + + Warn directives must have warning number(s) as argument(s) + Warn directives must have warning number(s) as argument(s) + + + + There is another {0} for this warning already in line {1}. + There is another {0} for this warning already in line {1}. + + All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n Alle Elemente einer Liste müssen implizit in den Typ des ersten Elements konvertiert werden. Hierbei handelt es sich um ein Tupel der Länge {0} vom Typ\n {1} \nDieses Element ist ein Tupel der Länge {2} vom Typ\n {3}. \n @@ -1134,7 +1144,7 @@ A constrained generic construct occurred in the resumable code specification - In der fortsetzbaren Codespezifikation ist ein eingeschränktes generisches Konstrukt aufgetreten. + A constrained generic construct occurred in the resumable code specification @@ -1149,7 +1159,7 @@ A 'let rec' occurred in the resumable code specification - "Let rec" ist in der fortsetzbaren Codespezifikation aufgetreten. + A 'let rec' occurred in the resumable code specification @@ -1454,7 +1464,7 @@ The following required properties have to be initialized:{0} - Die folgenden erforderlichen Eigenschaften müssen initialisiert werden:{0} + The following required properties have to be initialized:{0} @@ -1589,7 +1599,7 @@ Invalid resumable code. A 'let rec' occurred in the resumable code specification - Ungültiger fortsetzbarer Code. "Let rec" ist in der fortsetzbaren Codespezifikation aufgetreten + Invalid resumable code. A 'let rec' occurred in the resumable code specification @@ -5909,7 +5919,7 @@ Specify debugging type: full, portable, embedded, pdbonly. ('{0}' is the default if no debugging type specified and enables attaching a debugger to a running program, 'portable' is a cross-platform format, 'embedded' is a cross-platform format embedded into the output file). - Geben Sie den Debugtyp an: full, portable, embedded, pdbonly. ("{0}" ist der Standardwert, wenn kein Debugtyp angegeben wird, und ermöglicht das Anfügen eines Debuggers an ein aktuell ausgeführtes Programm. "portable" ist ein plattformübergreifendes Format, "embedded" ein plattformübergreifendes, in die Ausgabedatei eingebettetes Format). + Specify debugging type: full, portable, embedded, pdbonly. ('{0}' is the default if no debugging type specified and enables attaching a debugger to a running program, 'portable' is a cross-platform format, 'embedded' is a cross-platform format embedded into the output file). @@ -7164,7 +7174,7 @@ The resident compilation service was not used because a problem occurred in communicating with the server. - Der residente Kompilierungsdienst wurde nicht verwendet, da bei der Kommunikation mit dem Server ein Problem aufgetreten ist. + The resident compilation service was not used because a problem occurred in communicating with the server. @@ -7364,7 +7374,7 @@ An error occurred applying the static arguments to a provided type - Fehler beim Anwenden des statischen Arguments auf einen angegebenen Typ. + An error occurred applying the static arguments to a provided type @@ -7429,7 +7439,7 @@ Assembly '{0}' has TypeProviderAssembly attribute with invalid value '{1}'. The value should be a valid assembly name - Assembly '{0}' verfügt über ein TypeProviderAssembly-Attribut mit dem ungültigen Wert '{1}'. Beim Wert sollte es sich um einen gültigen Assemblynamen handeln. + Assembly '{0}' has TypeProviderAssembly attribute with invalid value '{1}'. The value should be a valid assembly name @@ -8014,7 +8024,7 @@ An error occurred applying the static arguments to a provided method - Fehler beim Anwenden der statischen Argumente auf eine angegebene Methode. + An error occurred applying the static arguments to a provided method @@ -8144,7 +8154,7 @@ The CallerMemberNameAttribute applied to parameter '{0}' will have no effect. It is overridden by the CallerFilePathAttribute. - Das auf Parameter "{0}" angewendete CallerMemberNameAttribute hat keine Auswirkung. Es wird vom CallerFilePathAttribute überschrieben. + The CallerMemberNameAttribute applied to parameter '{0}' will have no effect. It is overridden by the CallerFilePathAttribute. @@ -8459,7 +8469,7 @@ Used to introduce a block of code that might generate an exception. Used together with 'with' or 'finally'. - Wird verwendet, um einen Codeblock einzuführen, der unter Umständen eine Ausnahme generiert. Wird zusammen mit "with" oder "finally" verwendet. + Used to introduce a block of code that might generate an exception. Used together with 'with' or 'finally'. diff --git a/src/Compiler/xlf/FSComp.txt.es.xlf b/src/Compiler/xlf/FSComp.txt.es.xlf index b6bd49889a2..ffb757dad5c 100644 --- a/src/Compiler/xlf/FSComp.txt.es.xlf +++ b/src/Compiler/xlf/FSComp.txt.es.xlf @@ -539,7 +539,7 @@ whitespace relaxation - relajación de espacio en blanco + whitespace relaxation @@ -563,8 +563,8 @@ - Support for scoped enabling / disabling of warnings by #warn and #nowarn directives - Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives, also inside modules + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives, also inside modules @@ -822,6 +822,16 @@ #nowarn/#warnon directives must appear as the first non-whitespace characters on a line + + Warn directives must have warning number(s) as argument(s) + Warn directives must have warning number(s) as argument(s) + + + + There is another {0} for this warning already in line {1}. + There is another {0} for this warning already in line {1}. + + All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n Todos los elementos de una lista deben convertirse implícitamente en el tipo del primer elemento, que aquí es una tupla de longitud {0} de tipo\n {1} \nEste elemento es una tupla de longitud {2} de tipo\n {3} \n @@ -1134,7 +1144,7 @@ A constrained generic construct occurred in the resumable code specification - En la especificación del código resumible aparecía una construcción genérica restringida + A constrained generic construct occurred in the resumable code specification @@ -1149,7 +1159,7 @@ A 'let rec' occurred in the resumable code specification - Se ha producido "let rec" en la especificación de código reanudable + A 'let rec' occurred in the resumable code specification @@ -1454,7 +1464,7 @@ The following required properties have to be initialized:{0} - Se deben inicializar las siguientes propiedades necesarias:{0} + The following required properties have to be initialized:{0} @@ -1589,7 +1599,7 @@ Invalid resumable code. A 'let rec' occurred in the resumable code specification - Código reanudable no válido. Se ha producido "let rec" en la especificación de código reanudable + Invalid resumable code. A 'let rec' occurred in the resumable code specification @@ -5909,7 +5919,7 @@ Specify debugging type: full, portable, embedded, pdbonly. ('{0}' is the default if no debugging type specified and enables attaching a debugger to a running program, 'portable' is a cross-platform format, 'embedded' is a cross-platform format embedded into the output file). - Especifique el tipo de depuración: full, portable, embedded, pdbonly. ('{0}' es el valor predeterminado si no se especifica ningún tipo de depuración y permite conectar un depurador a un programa en ejecución, 'portable' es un formato multiplataforma, 'embedded' es un formato multiplataforma insertado en el archivo de salida). + Specify debugging type: full, portable, embedded, pdbonly. ('{0}' is the default if no debugging type specified and enables attaching a debugger to a running program, 'portable' is a cross-platform format, 'embedded' is a cross-platform format embedded into the output file). @@ -7164,7 +7174,7 @@ The resident compilation service was not used because a problem occurred in communicating with the server. - El servicio de compilación residente no se usó porque se produjo un problema en la comunicación con el servidor. + The resident compilation service was not used because a problem occurred in communicating with the server. @@ -7364,7 +7374,7 @@ An error occurred applying the static arguments to a provided type - Error al aplicar los argumentos estáticos a un tipo proporcionado. + An error occurred applying the static arguments to a provided type @@ -7429,7 +7439,7 @@ Assembly '{0}' has TypeProviderAssembly attribute with invalid value '{1}'. The value should be a valid assembly name - El ensamblado '{0}' tiene el atributo TypeProviderAssembly con el valor '{1}' no válido. El valor debe ser un nombre de ensamblado válido. + Assembly '{0}' has TypeProviderAssembly attribute with invalid value '{1}'. The value should be a valid assembly name @@ -8014,7 +8024,7 @@ An error occurred applying the static arguments to a provided method - Se produjo un error al aplicar los argumentos estáticos a un método proporcionado + An error occurred applying the static arguments to a provided method @@ -8144,7 +8154,7 @@ The CallerMemberNameAttribute applied to parameter '{0}' will have no effect. It is overridden by the CallerFilePathAttribute. - El CallerMemberNameAttribute aplicado al parámetro '{0}' no tendrá ningún efecto. Este se reemplaza por CallerFilePathAttribute. + The CallerMemberNameAttribute applied to parameter '{0}' will have no effect. It is overridden by the CallerFilePathAttribute. @@ -8459,7 +8469,7 @@ Used to introduce a block of code that might generate an exception. Used together with 'with' or 'finally'. - Se usa para incluir un bloque de código que puede generar una excepción. Se usa junto con with o finally. + Used to introduce a block of code that might generate an exception. Used together with 'with' or 'finally'. diff --git a/src/Compiler/xlf/FSComp.txt.fr.xlf b/src/Compiler/xlf/FSComp.txt.fr.xlf index 9ba4ef18c79..23e55fd1073 100644 --- a/src/Compiler/xlf/FSComp.txt.fr.xlf +++ b/src/Compiler/xlf/FSComp.txt.fr.xlf @@ -539,7 +539,7 @@ whitespace relaxation - assouplissement de la mise en retrait avec des espaces blancs + whitespace relaxation @@ -563,8 +563,8 @@ - Support for scoped enabling / disabling of warnings by #warn and #nowarn directives - Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives, also inside modules + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives, also inside modules @@ -822,6 +822,16 @@ #nowarn/#warnon directives must appear as the first non-whitespace characters on a line + + Warn directives must have warning number(s) as argument(s) + Warn directives must have warning number(s) as argument(s) + + + + There is another {0} for this warning already in line {1}. + There is another {0} for this warning already in line {1}. + + All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n Tous les éléments d’une liste doivent être implicitement convertibles en type du premier élément, qui est ici un tuple de longueur {0} de type\n {1} \nCet élément est un tuple de longueur {2} de type\n {3} \n @@ -1134,7 +1144,7 @@ A constrained generic construct occurred in the resumable code specification - Une construction générique contrainte s'est produite dans la spécification de code de reprise + A constrained generic construct occurred in the resumable code specification @@ -1149,7 +1159,7 @@ A 'let rec' occurred in the resumable code specification - Un «let rec» s’est produit dans la spécification de code pouvant être repris + A 'let rec' occurred in the resumable code specification @@ -1454,7 +1464,7 @@ The following required properties have to be initialized:{0} - Les propriétés requises suivantes doivent être initialisées :{0} + The following required properties have to be initialized:{0} @@ -1589,7 +1599,7 @@ Invalid resumable code. A 'let rec' occurred in the resumable code specification - Code pouvant être reprise non valide. Un «let rec» s’est produit dans la spécification de code pouvant être repris + Invalid resumable code. A 'let rec' occurred in the resumable code specification @@ -5909,7 +5919,7 @@ Specify debugging type: full, portable, embedded, pdbonly. ('{0}' is the default if no debugging type specified and enables attaching a debugger to a running program, 'portable' is a cross-platform format, 'embedded' is a cross-platform format embedded into the output file). - Spécifiez le type de débogage : full, portable, embedded, pdbonly. ('{0}' est la valeur par défaut si aucun type de débogage n'est spécifié. Cette valeur permet d'attacher un débogueur à un programme en cours d'exécution, 'portable' est un format multiplateforme, 'embedded' est un format multiplateforme incorporé dans le fichier de sortie). + Specify debugging type: full, portable, embedded, pdbonly. ('{0}' is the default if no debugging type specified and enables attaching a debugger to a running program, 'portable' is a cross-platform format, 'embedded' is a cross-platform format embedded into the output file). @@ -7164,7 +7174,7 @@ The resident compilation service was not used because a problem occurred in communicating with the server. - Le service de compilation résident n'a pas été utilisé en raison d'un problème lors de la communication avec le serveur. + The resident compilation service was not used because a problem occurred in communicating with the server. @@ -7364,7 +7374,7 @@ An error occurred applying the static arguments to a provided type - Une erreur s'est produite lors de l'application des arguments statiques à un type fourni + An error occurred applying the static arguments to a provided type @@ -7429,7 +7439,7 @@ Assembly '{0}' has TypeProviderAssembly attribute with invalid value '{1}'. The value should be a valid assembly name - L'assembly '{0}' a un attribut TypeProviderAssembly comportant la valeur non valide '{1}'. La valeur doit être un nom d'assembly valide + Assembly '{0}' has TypeProviderAssembly attribute with invalid value '{1}'. The value should be a valid assembly name @@ -8014,7 +8024,7 @@ An error occurred applying the static arguments to a provided method - Une erreur s'est produite durant l'application des arguments statiques à une méthode fournie + An error occurred applying the static arguments to a provided method @@ -8144,7 +8154,7 @@ The CallerMemberNameAttribute applied to parameter '{0}' will have no effect. It is overridden by the CallerFilePathAttribute. - CallerMemberNameAttribute, qui est appliqué au paramètre '{0}', n'aura aucun effet. Il est remplacé par CallerFilePathAttribute. + The CallerMemberNameAttribute applied to parameter '{0}' will have no effect. It is overridden by the CallerFilePathAttribute. @@ -8459,7 +8469,7 @@ Used to introduce a block of code that might generate an exception. Used together with 'with' or 'finally'. - Permet d'introduire un bloc de code pouvant générer une exception. Utilisé avec with ou finally. + Used to introduce a block of code that might generate an exception. Used together with 'with' or 'finally'. diff --git a/src/Compiler/xlf/FSComp.txt.it.xlf b/src/Compiler/xlf/FSComp.txt.it.xlf index 2580a67b847..48d84054ff4 100644 --- a/src/Compiler/xlf/FSComp.txt.it.xlf +++ b/src/Compiler/xlf/FSComp.txt.it.xlf @@ -539,7 +539,7 @@ whitespace relaxation - uso meno restrittivo degli spazi vuoti + whitespace relaxation @@ -563,8 +563,8 @@ - Support for scoped enabling / disabling of warnings by #warn and #nowarn directives - Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives, also inside modules + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives, also inside modules @@ -822,6 +822,16 @@ #nowarn/#warnon directives must appear as the first non-whitespace characters on a line + + Warn directives must have warning number(s) as argument(s) + Warn directives must have warning number(s) as argument(s) + + + + There is another {0} for this warning already in line {1}. + There is another {0} for this warning already in line {1}. + + All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n Tutti gli elementi di un elenco devono essere convertibili in modo implicito nel tipo del primo elemento, che qui è una tupla di lunghezza {0} di tipo\n {1} \nQuesto elemento è una tupla di lunghezza {2} di tipo\n {3} \n @@ -1134,7 +1144,7 @@ A constrained generic construct occurred in the resumable code specification - Costrutto generico vincolato nella specifica del codice ripristinabile + A constrained generic construct occurred in the resumable code specification @@ -1149,7 +1159,7 @@ A 'let rec' occurred in the resumable code specification - È stata rilevata una funzione 'let rec' nella specifica del codice ripristinabile + A 'let rec' occurred in the resumable code specification @@ -1454,7 +1464,7 @@ The following required properties have to be initialized:{0} - È necessario inizializzare le proprietà obbligatorie seguenti:{0} + The following required properties have to be initialized:{0} @@ -1589,7 +1599,7 @@ Invalid resumable code. A 'let rec' occurred in the resumable code specification - Codice ripristinabile non valido. È stato rilevata una funzione 'let rec' nella specifica del codice ripristinabile + Invalid resumable code. A 'let rec' occurred in the resumable code specification @@ -5909,7 +5919,7 @@ Specify debugging type: full, portable, embedded, pdbonly. ('{0}' is the default if no debugging type specified and enables attaching a debugger to a running program, 'portable' is a cross-platform format, 'embedded' is a cross-platform format embedded into the output file). - Consente di specificare il tipo di debug: full, portable, embedded, pdbonly. '{0}' è l'impostazione predefinita se non viene specificato il tipo di debug e consente di associare un debugger a un programma in esecuzione. 'portable' è un formato multipiattaforma. 'embedded' è un formato multipiattaforma incorporato nel file di output. + Specify debugging type: full, portable, embedded, pdbonly. ('{0}' is the default if no debugging type specified and enables attaching a debugger to a running program, 'portable' is a cross-platform format, 'embedded' is a cross-platform format embedded into the output file). @@ -7164,7 +7174,7 @@ The resident compilation service was not used because a problem occurred in communicating with the server. - Il servizio di compilazione residente non è stato usato perché si è verificato un problema nella comunicazione con il server. + The resident compilation service was not used because a problem occurred in communicating with the server. @@ -7364,7 +7374,7 @@ An error occurred applying the static arguments to a provided type - Errore durante l'applicazione degli argomenti statici a un tipo fornito + An error occurred applying the static arguments to a provided type @@ -7429,7 +7439,7 @@ Assembly '{0}' has TypeProviderAssembly attribute with invalid value '{1}'. The value should be a valid assembly name - Valore '{1}' non valido dell'attributo TypeProviderAssembly nell'assembly '{0}'. Il valore deve essere un nome di assembly valido. + Assembly '{0}' has TypeProviderAssembly attribute with invalid value '{1}'. The value should be a valid assembly name @@ -8014,7 +8024,7 @@ An error occurred applying the static arguments to a provided method - Si è verificato un errore durante l'applicazione degli argomenti statici a un metodo fornito + An error occurred applying the static arguments to a provided method @@ -8144,7 +8154,7 @@ The CallerMemberNameAttribute applied to parameter '{0}' will have no effect. It is overridden by the CallerFilePathAttribute. - CallerMemberNameAttribute applicato al parametro '{0}' non avrà alcun effetto. CallerFilePathAttribute ne eseguirà l'override. + The CallerMemberNameAttribute applied to parameter '{0}' will have no effect. It is overridden by the CallerFilePathAttribute. @@ -8459,7 +8469,7 @@ Used to introduce a block of code that might generate an exception. Used together with 'with' or 'finally'. - Usata per introdurre un blocco di codice che potrebbe generare un'eccezione. Usata insieme a with o finally. + Used to introduce a block of code that might generate an exception. Used together with 'with' or 'finally'. diff --git a/src/Compiler/xlf/FSComp.txt.ja.xlf b/src/Compiler/xlf/FSComp.txt.ja.xlf index 154c7ce90f7..ec3a88c534a 100644 --- a/src/Compiler/xlf/FSComp.txt.ja.xlf +++ b/src/Compiler/xlf/FSComp.txt.ja.xlf @@ -539,7 +539,7 @@ whitespace relaxation - 空白の緩和 + whitespace relaxation @@ -563,8 +563,8 @@ - Support for scoped enabling / disabling of warnings by #warn and #nowarn directives - Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives, also inside modules + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives, also inside modules @@ -822,6 +822,16 @@ #nowarn/#warnon directives must appear as the first non-whitespace characters on a line + + Warn directives must have warning number(s) as argument(s) + Warn directives must have warning number(s) as argument(s) + + + + There is another {0} for this warning already in line {1}. + There is another {0} for this warning already in line {1}. + + All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n リストのすべての要素は、最初の要素の型に暗黙的に変換できる必要があります。これは、型の長さ {0} のタプルです\n {1} \nこの要素は、型の長さ {2} のタプルです\n {3} \n @@ -1134,7 +1144,7 @@ A constrained generic construct occurred in the resumable code specification - 再開可能なコード指定で制約付きジェネリック コンストラクトが発生しました + A constrained generic construct occurred in the resumable code specification @@ -1149,7 +1159,7 @@ A 'let rec' occurred in the resumable code specification - 再開可能なコード仕様で 'let rec' が発生しました + A 'let rec' occurred in the resumable code specification @@ -1454,7 +1464,7 @@ The following required properties have to be initialized:{0} - 次の必須プロパティを初期化する必要があります:{0} + The following required properties have to be initialized:{0} @@ -1589,7 +1599,7 @@ Invalid resumable code. A 'let rec' occurred in the resumable code specification - 再開可能なコードが無効です。再開可能なコード仕様で 'let rec' が発生しました + Invalid resumable code. A 'let rec' occurred in the resumable code specification @@ -5909,7 +5919,7 @@ Specify debugging type: full, portable, embedded, pdbonly. ('{0}' is the default if no debugging type specified and enables attaching a debugger to a running program, 'portable' is a cross-platform format, 'embedded' is a cross-platform format embedded into the output file). - デバッグの種類 full、portable、pdbonly を指定します (デバッグの種類が指定されない場合には '{0}' が既定で、実行中のプログラムにデバッガーを付加することができます。'portable' はクロスプラットフォーム形式、'embedded' は出力ファイルに埋め込まれたクロスプラットフォーム形式です)。 + Specify debugging type: full, portable, embedded, pdbonly. ('{0}' is the default if no debugging type specified and enables attaching a debugger to a running program, 'portable' is a cross-platform format, 'embedded' is a cross-platform format embedded into the output file). @@ -7164,7 +7174,7 @@ The resident compilation service was not used because a problem occurred in communicating with the server. - サーバーとの通信で問題が発生したため、常駐コンパイル サービスが使用されませんでした。 + The resident compilation service was not used because a problem occurred in communicating with the server. @@ -7364,7 +7374,7 @@ An error occurred applying the static arguments to a provided type - 指定された型に静的引数を適用する際にエラーが発生しました + An error occurred applying the static arguments to a provided type @@ -7429,7 +7439,7 @@ Assembly '{0}' has TypeProviderAssembly attribute with invalid value '{1}'. The value should be a valid assembly name - アセンブリ '{0}' の TypeProviderAssembly 属性に、無効な値 '{1}' が含まれています。この値は有効なアセンブリ名であることが必要です + Assembly '{0}' has TypeProviderAssembly attribute with invalid value '{1}'. The value should be a valid assembly name @@ -8014,7 +8024,7 @@ An error occurred applying the static arguments to a provided method - 静的な引数を指定されたメソッドに適用する際エラーが発生しました + An error occurred applying the static arguments to a provided method @@ -8144,7 +8154,7 @@ The CallerMemberNameAttribute applied to parameter '{0}' will have no effect. It is overridden by the CallerFilePathAttribute. - パラメーター '{0}' に適用された CallerMemberNameAttribute は、CallerFilePathAttribute.によってオーバーライドされるため無効となります。 + The CallerMemberNameAttribute applied to parameter '{0}' will have no effect. It is overridden by the CallerFilePathAttribute. @@ -8459,7 +8469,7 @@ Used to introduce a block of code that might generate an exception. Used together with 'with' or 'finally'. - 例外を生成する可能性があるコード ブロックを開始するために使用します。with または finally と一緒に使用します。 + Used to introduce a block of code that might generate an exception. Used together with 'with' or 'finally'. diff --git a/src/Compiler/xlf/FSComp.txt.ko.xlf b/src/Compiler/xlf/FSComp.txt.ko.xlf index 713b3f60a87..b54f74c62e5 100644 --- a/src/Compiler/xlf/FSComp.txt.ko.xlf +++ b/src/Compiler/xlf/FSComp.txt.ko.xlf @@ -539,7 +539,7 @@ whitespace relaxation - 공백 완화 + whitespace relaxation @@ -563,8 +563,8 @@ - Support for scoped enabling / disabling of warnings by #warn and #nowarn directives - Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives, also inside modules + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives, also inside modules @@ -822,6 +822,16 @@ #nowarn/#warnon directives must appear as the first non-whitespace characters on a line + + Warn directives must have warning number(s) as argument(s) + Warn directives must have warning number(s) as argument(s) + + + + There is another {0} for this warning already in line {1}. + There is another {0} for this warning already in line {1}. + + All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n 목록의 모든 요소는 첫 번째 요소의 형식으로 암시적으로 변환할 수 있어야 합니다. 여기서는 형식이 \n {1}이고 길이가 {0}인 튜플입니다. \n이 요소는 형식이 \n {3}이고 길이가 {2}인 튜플입니다. \n @@ -1134,7 +1144,7 @@ A constrained generic construct occurred in the resumable code specification - 다시 시작 가능한 코드 사양에서 제약이 있는 제네릭 구문이 발생했습니다. + A constrained generic construct occurred in the resumable code specification @@ -1149,7 +1159,7 @@ A 'let rec' occurred in the resumable code specification - 다시 시작 가능한 코드 사양에서 'let rec'가 발생했습니다. + A 'let rec' occurred in the resumable code specification @@ -1454,7 +1464,7 @@ The following required properties have to be initialized:{0} - 다음 필수 속성을 초기화해야 합니다. {0} + The following required properties have to be initialized:{0} @@ -1589,7 +1599,7 @@ Invalid resumable code. A 'let rec' occurred in the resumable code specification - 다시 시작 가능한 코드가 잘못되었습니다. 다시 시작 가능한 코드 사양에서 'let rec'가 발생했습니다. + Invalid resumable code. A 'let rec' occurred in the resumable code specification @@ -5909,7 +5919,7 @@ Specify debugging type: full, portable, embedded, pdbonly. ('{0}' is the default if no debugging type specified and enables attaching a debugger to a running program, 'portable' is a cross-platform format, 'embedded' is a cross-platform format embedded into the output file). - 디버깅 형식(full, portable, embedded, pdbonly)을 지정합니다. '{0}'은(는) 디버깅 형식을 지정하지 않은 경우 기본값이며 디버거를 실행 중인 프로그램에 연결할 수 있습니다. 'portable'은 플랫폼 간 형식이고, 'embedded'는 출력 파일에 포함된 플랫폼 간 형식입니다. + Specify debugging type: full, portable, embedded, pdbonly. ('{0}' is the default if no debugging type specified and enables attaching a debugger to a running program, 'portable' is a cross-platform format, 'embedded' is a cross-platform format embedded into the output file). @@ -7164,7 +7174,7 @@ The resident compilation service was not used because a problem occurred in communicating with the server. - 서버와 통신하는 동안 문제가 발생하여 상주 컴파일 서비스를 사용하지 않았습니다. + The resident compilation service was not used because a problem occurred in communicating with the server. @@ -7364,7 +7374,7 @@ An error occurred applying the static arguments to a provided type - 제공된 형식에 정적 인수를 적용하는 동안 오류가 발생했습니다. + An error occurred applying the static arguments to a provided type @@ -7429,7 +7439,7 @@ Assembly '{0}' has TypeProviderAssembly attribute with invalid value '{1}'. The value should be a valid assembly name - {0}' 어셈블리에 포함된 TypeProviderAssembly 특성의 값('{1}')이 잘못되었습니다. 값은 올바른 어셈블리 이름이어야 합니다. + Assembly '{0}' has TypeProviderAssembly attribute with invalid value '{1}'. The value should be a valid assembly name @@ -8014,7 +8024,7 @@ An error occurred applying the static arguments to a provided method - 제공된 메서드에 정적 인수를 적용하는 동안 오류가 발생했습니다. + An error occurred applying the static arguments to a provided method @@ -8144,7 +8154,7 @@ The CallerMemberNameAttribute applied to parameter '{0}' will have no effect. It is overridden by the CallerFilePathAttribute. - {0}' 매개 변수에 적용되는 CallerMemberNameAttribute는 효과가 없습니다. CallerFilePathAttribute에서 재정의합니다. + The CallerMemberNameAttribute applied to parameter '{0}' will have no effect. It is overridden by the CallerFilePathAttribute. @@ -8459,7 +8469,7 @@ Used to introduce a block of code that might generate an exception. Used together with 'with' or 'finally'. - 예외를 생성할 수 있는 코드 블록을 지정하는 데 사용됩니다. with 또는 finally와 함께 사용됩니다. + Used to introduce a block of code that might generate an exception. Used together with 'with' or 'finally'. diff --git a/src/Compiler/xlf/FSComp.txt.pl.xlf b/src/Compiler/xlf/FSComp.txt.pl.xlf index 3ae19fb912e..0a6ca4c01d4 100644 --- a/src/Compiler/xlf/FSComp.txt.pl.xlf +++ b/src/Compiler/xlf/FSComp.txt.pl.xlf @@ -539,7 +539,7 @@ whitespace relaxation - rozluźnianie reguł dotyczących odstępów + whitespace relaxation @@ -563,8 +563,8 @@ - Support for scoped enabling / disabling of warnings by #warn and #nowarn directives - Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives, also inside modules + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives, also inside modules @@ -822,6 +822,16 @@ #nowarn/#warnon directives must appear as the first non-whitespace characters on a line + + Warn directives must have warning number(s) as argument(s) + Warn directives must have warning number(s) as argument(s) + + + + There is another {0} for this warning already in line {1}. + There is another {0} for this warning already in line {1}. + + All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n Wszystkie elementy tablicy muszą być niejawnie konwertowalne na typ pierwszego elementu, który w tym miejscu jest krotką o długości {0} typu\n {1} \nTen element jest krotką o długości {2} typu\n {3} \n @@ -1134,7 +1144,7 @@ A constrained generic construct occurred in the resumable code specification - W specyfikacji kodu z możliwością wznowienia wystąpiła ograniczona konstrukcja ogólna + A constrained generic construct occurred in the resumable code specification @@ -1149,7 +1159,7 @@ A 'let rec' occurred in the resumable code specification - W specyfikacji kodu z możliwością wznowienia, wystąpił błąd "let rec" + A 'let rec' occurred in the resumable code specification @@ -1454,7 +1464,7 @@ The following required properties have to be initialized:{0} - Następujące wymagane właściwości muszą zostać zainicjowane:{0} + The following required properties have to be initialized:{0} @@ -1589,7 +1599,7 @@ Invalid resumable code. A 'let rec' occurred in the resumable code specification - Nieprawidłowy kod z możliwością wznowienia. W specyfikacji kodu z możliwością wznowienia wystąpił element "let rec" + Invalid resumable code. A 'let rec' occurred in the resumable code specification @@ -5909,7 +5919,7 @@ Specify debugging type: full, portable, embedded, pdbonly. ('{0}' is the default if no debugging type specified and enables attaching a debugger to a running program, 'portable' is a cross-platform format, 'embedded' is a cross-platform format embedded into the output file). - Określ typ debugowania: full, portable, pdbonly. Wartość „{0}” jest wartością domyślną, jeśli nie określono typu debugowania, i umożliwia dołączenie debugera do działającego programu. Wartość „portable” określa format międzyplatformowy. Wartość „embedded” określa format międzyplatformowy osadzony w pliku wyjściowym. + Specify debugging type: full, portable, embedded, pdbonly. ('{0}' is the default if no debugging type specified and enables attaching a debugger to a running program, 'portable' is a cross-platform format, 'embedded' is a cross-platform format embedded into the output file). @@ -7164,7 +7174,7 @@ The resident compilation service was not used because a problem occurred in communicating with the server. - Rezydentna usługa kompilacji nie została użyta, ponieważ wystąpił problem z komunikowaniem się z serwerem. + The resident compilation service was not used because a problem occurred in communicating with the server. @@ -7364,7 +7374,7 @@ An error occurred applying the static arguments to a provided type - Wystąpił błąd podczas stosowania argumentów statycznych do udostępnionego typu + An error occurred applying the static arguments to a provided type @@ -7429,7 +7439,7 @@ Assembly '{0}' has TypeProviderAssembly attribute with invalid value '{1}'. The value should be a valid assembly name - Zestaw „{0}” ma atrybut TypeProviderAssembly z nieprawidłową wartością „{1}”. Wartość powinna być prawidłową nazwą zestawu + Assembly '{0}' has TypeProviderAssembly attribute with invalid value '{1}'. The value should be a valid assembly name @@ -8014,7 +8024,7 @@ An error occurred applying the static arguments to a provided method - Wystąpił błąd podczas stosowania argumentów statycznych dla podanej metody + An error occurred applying the static arguments to a provided method @@ -8144,7 +8154,7 @@ The CallerMemberNameAttribute applied to parameter '{0}' will have no effect. It is overridden by the CallerFilePathAttribute. - Zastosowanie elementu CallerMemberNameAttribute do parametru „{0}” nie odniesie żadnego skutku. Jest on przesłaniany przez element CallerFilePathAttribute. + The CallerMemberNameAttribute applied to parameter '{0}' will have no effect. It is overridden by the CallerFilePathAttribute. @@ -8459,7 +8469,7 @@ Used to introduce a block of code that might generate an exception. Used together with 'with' or 'finally'. - Używane do wprowadzania bloku kodu, który może generować wyjątek. Używane razem ze słowem kluczowym with lub finally. + Used to introduce a block of code that might generate an exception. Used together with 'with' or 'finally'. diff --git a/src/Compiler/xlf/FSComp.txt.pt-BR.xlf b/src/Compiler/xlf/FSComp.txt.pt-BR.xlf index a046a75abb5..2664ac9a79f 100644 --- a/src/Compiler/xlf/FSComp.txt.pt-BR.xlf +++ b/src/Compiler/xlf/FSComp.txt.pt-BR.xlf @@ -539,7 +539,7 @@ whitespace relaxation - atenuação de espaço em branco + whitespace relaxation @@ -563,8 +563,8 @@ - Support for scoped enabling / disabling of warnings by #warn and #nowarn directives - Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives, also inside modules + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives, also inside modules @@ -822,6 +822,16 @@ #nowarn/#warnon directives must appear as the first non-whitespace characters on a line + + Warn directives must have warning number(s) as argument(s) + Warn directives must have warning number(s) as argument(s) + + + + There is another {0} for this warning already in line {1}. + There is another {0} for this warning already in line {1}. + + All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n Todos os elementos de uma lista devem ser implicitamente conversíveis ao tipo do primeiro elemento, que aqui é uma tupla de comprimento {0} do tipo\n {1} \nEste elemento é uma tupla de comprimento {2} do tipo\n {3} \n @@ -1134,7 +1144,7 @@ A constrained generic construct occurred in the resumable code specification - Um constructo genérico restrito ocorreu na especificação de código retomável + A constrained generic construct occurred in the resumable code specification @@ -1149,7 +1159,7 @@ A 'let rec' occurred in the resumable code specification - Ocorreu um "let rec" na especificação do código retomável + A 'let rec' occurred in the resumable code specification @@ -1454,7 +1464,7 @@ The following required properties have to be initialized:{0} - As seguintes propriedades necessárias precisam ser inicializadas:{0} + The following required properties have to be initialized:{0} @@ -1589,7 +1599,7 @@ Invalid resumable code. A 'let rec' occurred in the resumable code specification - Código inválido retomável. Ocorreu um "let rec" na especificação do código retomável + Invalid resumable code. A 'let rec' occurred in the resumable code specification @@ -5909,7 +5919,7 @@ Specify debugging type: full, portable, embedded, pdbonly. ('{0}' is the default if no debugging type specified and enables attaching a debugger to a running program, 'portable' is a cross-platform format, 'embedded' is a cross-platform format embedded into the output file). - Especificar tipo de depuração: completo, portátil, incorporado, somente PDB. ('{0}' será o padrão se nenhum tipo de depuração for especificado e permite anexar um depurador a um programa em execução; 'portátil' é um formato multiplataforma; 'incorporado' é um formato multiplataforma incorporado no arquivo de saída). + Specify debugging type: full, portable, embedded, pdbonly. ('{0}' is the default if no debugging type specified and enables attaching a debugger to a running program, 'portable' is a cross-platform format, 'embedded' is a cross-platform format embedded into the output file). @@ -7164,7 +7174,7 @@ The resident compilation service was not used because a problem occurred in communicating with the server. - O serviço de compilação residente não foi usado porque houve um problema de comunicação com o servidor. + The resident compilation service was not used because a problem occurred in communicating with the server. @@ -7364,7 +7374,7 @@ An error occurred applying the static arguments to a provided type - Erro ao aplicar os argumentos estáticos a um tipo fornecido + An error occurred applying the static arguments to a provided type @@ -7429,7 +7439,7 @@ Assembly '{0}' has TypeProviderAssembly attribute with invalid value '{1}'. The value should be a valid assembly name - O assembly '{0}' possui um atributo TypeProviderAssembly com valor inválido '{1}'. O valor deve ser um nome de assembly válido + Assembly '{0}' has TypeProviderAssembly attribute with invalid value '{1}'. The value should be a valid assembly name @@ -8014,7 +8024,7 @@ An error occurred applying the static arguments to a provided method - Ocorreu um erro ao aplicar os argumentos estáticos para um método fornecido + An error occurred applying the static arguments to a provided method @@ -8144,7 +8154,7 @@ The CallerMemberNameAttribute applied to parameter '{0}' will have no effect. It is overridden by the CallerFilePathAttribute. - O CallerMemberNameAttribute aplicado ao parâmetro "{0}" não terá efeito. Ele é substituído pelo CallerFilePathAttribute. + The CallerMemberNameAttribute applied to parameter '{0}' will have no effect. It is overridden by the CallerFilePathAttribute. @@ -8459,7 +8469,7 @@ Used to introduce a block of code that might generate an exception. Used together with 'with' or 'finally'. - Usado para introduzir um bloco de código que pode gerar uma exceção. Usado junto com with ou finally. + Used to introduce a block of code that might generate an exception. Used together with 'with' or 'finally'. diff --git a/src/Compiler/xlf/FSComp.txt.ru.xlf b/src/Compiler/xlf/FSComp.txt.ru.xlf index 7210cb89163..c87714e23a5 100644 --- a/src/Compiler/xlf/FSComp.txt.ru.xlf +++ b/src/Compiler/xlf/FSComp.txt.ru.xlf @@ -539,7 +539,7 @@ whitespace relaxation - уменьшение строгости для пробелов + whitespace relaxation @@ -563,8 +563,8 @@ - Support for scoped enabling / disabling of warnings by #warn and #nowarn directives - Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives, also inside modules + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives, also inside modules @@ -822,6 +822,16 @@ #nowarn/#warnon directives must appear as the first non-whitespace characters on a line + + Warn directives must have warning number(s) as argument(s) + Warn directives must have warning number(s) as argument(s) + + + + There is another {0} for this warning already in line {1}. + There is another {0} for this warning already in line {1}. + + All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n Все элементы списка должны поддерживать неявное преобразование в тип первого элемента, который здесь является кортежем длиной {0} типа\n {1} \nЭтот элемент является кортежем длиной {2} типа\n {3} \n @@ -1134,7 +1144,7 @@ A constrained generic construct occurred in the resumable code specification - В спецификации возобновляемого кода возникла ограниченная универсальная конструкция + A constrained generic construct occurred in the resumable code specification @@ -1149,7 +1159,7 @@ A 'let rec' occurred in the resumable code specification - В спецификации возобновляемого кода возникла ошибка "let rec" + A 'let rec' occurred in the resumable code specification @@ -1454,7 +1464,7 @@ The following required properties have to be initialized:{0} - Необходимо инициализировать следующие обязательные свойства:{0} + The following required properties have to be initialized:{0} @@ -1589,7 +1599,7 @@ Invalid resumable code. A 'let rec' occurred in the resumable code specification - Недопустимый возобновляемый код. В спецификации возобновляемого кода возникла ошибка "let rec" + Invalid resumable code. A 'let rec' occurred in the resumable code specification @@ -5909,7 +5919,7 @@ Specify debugging type: full, portable, embedded, pdbonly. ('{0}' is the default if no debugging type specified and enables attaching a debugger to a running program, 'portable' is a cross-platform format, 'embedded' is a cross-platform format embedded into the output file). - Укажите тип отладки: full, portable, embedded, pdbonly (если тип отладки не указан, по умолчанию используется тип "{0}", позволяющий подключить отладчик к выполняющейся программе; тип portable представляет собой кроссплатформенный формат; тип embedded — кроссплатформенный формат, встроенный в выходной файл). + Specify debugging type: full, portable, embedded, pdbonly. ('{0}' is the default if no debugging type specified and enables attaching a debugger to a running program, 'portable' is a cross-platform format, 'embedded' is a cross-platform format embedded into the output file). @@ -7164,7 +7174,7 @@ The resident compilation service was not used because a problem occurred in communicating with the server. - Служба резидентной компиляции не использовалась, поскольку возникла проблема при взаимодействии с сервером. + The resident compilation service was not used because a problem occurred in communicating with the server. @@ -7364,7 +7374,7 @@ An error occurred applying the static arguments to a provided type - Ошибка при применении статических аргументов к предоставленному типу + An error occurred applying the static arguments to a provided type @@ -7429,7 +7439,7 @@ Assembly '{0}' has TypeProviderAssembly attribute with invalid value '{1}'. The value should be a valid assembly name - У сборки "{0}" имеется атрибут TypeProviderAssembly с недопустимым значением "{1}". Значение должно представлять собой допустимое имя сборки + Assembly '{0}' has TypeProviderAssembly attribute with invalid value '{1}'. The value should be a valid assembly name @@ -8014,7 +8024,7 @@ An error occurred applying the static arguments to a provided method - Произошла ошибка при применении статических аргументов к предоставленному методу + An error occurred applying the static arguments to a provided method @@ -8144,7 +8154,7 @@ The CallerMemberNameAttribute applied to parameter '{0}' will have no effect. It is overridden by the CallerFilePathAttribute. - Атрибут CallerMemberNameAttribute, примененный для параметра "{0}", не будет действовать. Он будет переопределен атрибутом CallerFilePathAttribute. + The CallerMemberNameAttribute applied to parameter '{0}' will have no effect. It is overridden by the CallerFilePathAttribute. @@ -8459,7 +8469,7 @@ Used to introduce a block of code that might generate an exception. Used together with 'with' or 'finally'. - Используется для введения блока кода, который может создать исключение. Используется вместе с with или finally. + Used to introduce a block of code that might generate an exception. Used together with 'with' or 'finally'. diff --git a/src/Compiler/xlf/FSComp.txt.tr.xlf b/src/Compiler/xlf/FSComp.txt.tr.xlf index 375d611bd74..3e5d3466a95 100644 --- a/src/Compiler/xlf/FSComp.txt.tr.xlf +++ b/src/Compiler/xlf/FSComp.txt.tr.xlf @@ -539,7 +539,7 @@ whitespace relaxation - boşluk genişlemesi + whitespace relaxation @@ -563,8 +563,8 @@ - Support for scoped enabling / disabling of warnings by #warn and #nowarn directives - Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives, also inside modules + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives, also inside modules @@ -822,6 +822,16 @@ #nowarn/#warnon directives must appear as the first non-whitespace characters on a line + + Warn directives must have warning number(s) as argument(s) + Warn directives must have warning number(s) as argument(s) + + + + There is another {0} for this warning already in line {1}. + There is another {0} for this warning already in line {1}. + + All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n Bir listenin tüm öğeleri örtük olarak ilk öğenin türüne dönüştürülebilir olmalıdır. Burada ilk öğe {0} uzunluğunda türü\n {1} \nolan bir demet. Bu öğe ise {2} uzunluğunda türü\n {3} \nolan bir demet. @@ -1134,7 +1144,7 @@ A constrained generic construct occurred in the resumable code specification - Sürdürülebilir kod belirtiminde kısıtlanmış bir genel yapı oluştu + A constrained generic construct occurred in the resumable code specification @@ -1149,7 +1159,7 @@ A 'let rec' occurred in the resumable code specification - Sürdürülebilir kod belirtiminde 'let rec' oluştu + A 'let rec' occurred in the resumable code specification @@ -1454,7 +1464,7 @@ The following required properties have to be initialized:{0} - Aşağıdaki gerekli özelliklerin başlatılması gerekiyor:{0} + The following required properties have to be initialized:{0} @@ -1589,7 +1599,7 @@ Invalid resumable code. A 'let rec' occurred in the resumable code specification - Geçersiz sürdürülebilir kod. Sürdürülebilir kod belirtiminde bir 'let rec' oluştu + Invalid resumable code. A 'let rec' occurred in the resumable code specification @@ -5909,7 +5919,7 @@ Specify debugging type: full, portable, embedded, pdbonly. ('{0}' is the default if no debugging type specified and enables attaching a debugger to a running program, 'portable' is a cross-platform format, 'embedded' is a cross-platform format embedded into the output file). - Hata ayıklama türünü belirtin: full, portable, embedded, pdbonly. (Hata ayıklama türü belirtilmemişse '{0}' varsayılandır ve çalışan bir programa hata ayıklayıcı iliştirmeyi etkinleştirir. 'portable' bir çoklu platform biçimidir, 'embedded' çıkış dosyasına gömülü bir çoklu platform biçimidir). + Specify debugging type: full, portable, embedded, pdbonly. ('{0}' is the default if no debugging type specified and enables attaching a debugger to a running program, 'portable' is a cross-platform format, 'embedded' is a cross-platform format embedded into the output file). @@ -7164,7 +7174,7 @@ The resident compilation service was not used because a problem occurred in communicating with the server. - Sunucuyla iletişimde bir sorun oluştuğu için yerleşik derleme hizmeti kullanılmadı. + The resident compilation service was not used because a problem occurred in communicating with the server. @@ -7364,7 +7374,7 @@ An error occurred applying the static arguments to a provided type - Sağlanan türe statik bağımsız değişkenler uygulanırken bir hata oluştu + An error occurred applying the static arguments to a provided type @@ -7429,7 +7439,7 @@ Assembly '{0}' has TypeProviderAssembly attribute with invalid value '{1}'. The value should be a valid assembly name - {0}' bütünleştirilmiş kodunun geçersiz '{1}' değerli TypeProviderAssembly özniteliği var. Bu değer geçerli bir bütünleştirilmiş kod adı olmalıdır + Assembly '{0}' has TypeProviderAssembly attribute with invalid value '{1}'. The value should be a valid assembly name @@ -8014,7 +8024,7 @@ An error occurred applying the static arguments to a provided method - Sağlanan metoda statik bağımsız değişkenler uygulanırken bir sorun oluştu + An error occurred applying the static arguments to a provided method @@ -8144,7 +8154,7 @@ The CallerMemberNameAttribute applied to parameter '{0}' will have no effect. It is overridden by the CallerFilePathAttribute. - {0}' parametresi için geçerli olan CallerMemberNameAttribute öğesinin hiçbir etkisi olmaz. CallerFilePathAttribute tarafından geçersiz kılındı. + The CallerMemberNameAttribute applied to parameter '{0}' will have no effect. It is overridden by the CallerFilePathAttribute. @@ -8459,7 +8469,7 @@ Used to introduce a block of code that might generate an exception. Used together with 'with' or 'finally'. - Özel durum oluşturabilen bir kod bloğunu tanıtmak için kullanılır. with veya finally ile birlikte kullanılır. + Used to introduce a block of code that might generate an exception. Used together with 'with' or 'finally'. diff --git a/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf b/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf index 450d05d1ca1..c2d667e4fea 100644 --- a/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf +++ b/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf @@ -539,7 +539,7 @@ whitespace relaxation - 空格松弛法 + whitespace relaxation @@ -563,8 +563,8 @@ - Support for scoped enabling / disabling of warnings by #warn and #nowarn directives - Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives, also inside modules + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives, also inside modules @@ -822,6 +822,16 @@ #nowarn/#warnon directives must appear as the first non-whitespace characters on a line + + Warn directives must have warning number(s) as argument(s) + Warn directives must have warning number(s) as argument(s) + + + + There is another {0} for this warning already in line {1}. + There is another {0} for this warning already in line {1}. + + All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n 列表的所有元素必须可隐式转换为第一个元素的类型，这是一个长度为 {0} 的类型的元组\n {1} \n此元素是长度为 {2} 类型的元组\n {3} \n @@ -1134,7 +1144,7 @@ A constrained generic construct occurred in the resumable code specification - 可恢复代码规范中发生受约束的泛型构造 + A constrained generic construct occurred in the resumable code specification @@ -1149,7 +1159,7 @@ A 'let rec' occurred in the resumable code specification - 可恢复代码规范中出现 "let rec" + A 'let rec' occurred in the resumable code specification @@ -1454,7 +1464,7 @@ The following required properties have to be initialized:{0} - 必须初始化以下必需属性: {0} + The following required properties have to be initialized:{0} @@ -1589,7 +1599,7 @@ Invalid resumable code. A 'let rec' occurred in the resumable code specification - 可恢复代码无效。可恢复代码规范中出现 "let rec" + Invalid resumable code. A 'let rec' occurred in the resumable code specification @@ -5909,7 +5919,7 @@ Specify debugging type: full, portable, embedded, pdbonly. ('{0}' is the default if no debugging type specified and enables attaching a debugger to a running program, 'portable' is a cross-platform format, 'embedded' is a cross-platform format embedded into the output file). - 指定调试类型: full、portable、embedded、pdbonly。(若未指定调试类型，则默认为“{0}”，它允许将调试程序附加到正在运行的程序。"portable" 是跨平台格式，"embedded" 是嵌入到输出文件中的跨平台格式)。 + Specify debugging type: full, portable, embedded, pdbonly. ('{0}' is the default if no debugging type specified and enables attaching a debugger to a running program, 'portable' is a cross-platform format, 'embedded' is a cross-platform format embedded into the output file). @@ -7164,7 +7174,7 @@ The resident compilation service was not used because a problem occurred in communicating with the server. - 未使用驻留编译服务，因为与服务器通信时发生问题。 + The resident compilation service was not used because a problem occurred in communicating with the server. @@ -7364,7 +7374,7 @@ An error occurred applying the static arguments to a provided type - 将静态参数应用于所提供类型时发生错误 + An error occurred applying the static arguments to a provided type @@ -7429,7 +7439,7 @@ Assembly '{0}' has TypeProviderAssembly attribute with invalid value '{1}'. The value should be a valid assembly name - 程序集“{0}”的 TypeProviderAssembly 特性具有无效值“{1}”。该值应为有效的程序集名称 + Assembly '{0}' has TypeProviderAssembly attribute with invalid value '{1}'. The value should be a valid assembly name @@ -8014,7 +8024,7 @@ An error occurred applying the static arguments to a provided method - 将静态参数应用于提供的方法时发生错误 + An error occurred applying the static arguments to a provided method @@ -8144,7 +8154,7 @@ The CallerMemberNameAttribute applied to parameter '{0}' will have no effect. It is overridden by the CallerFilePathAttribute. - 应用于参数“{0}”的 CallerMemberNameAttribute 不会起作用。它已由 CallerFilePathAttribute 替代。 + The CallerMemberNameAttribute applied to parameter '{0}' will have no effect. It is overridden by the CallerFilePathAttribute. @@ -8459,7 +8469,7 @@ Used to introduce a block of code that might generate an exception. Used together with 'with' or 'finally'. - 用于引入可能产生异常的代码块。与 with 或 finally 配合使用。 + Used to introduce a block of code that might generate an exception. Used together with 'with' or 'finally'. diff --git a/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf b/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf index d2bf1f4745d..cc73e3a05c6 100644 --- a/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf +++ b/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf @@ -539,7 +539,7 @@ whitespace relaxation - 空白字元放寬 + whitespace relaxation @@ -563,8 +563,8 @@ - Support for scoped enabling / disabling of warnings by #warn and #nowarn directives - Support for scoped enabling / disabling of warnings by #warn and #nowarn directives + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives, also inside modules + Support for scoped enabling / disabling of warnings by #warn and #nowarn directives, also inside modules @@ -822,6 +822,16 @@ #nowarn/#warnon directives must appear as the first non-whitespace characters on a line + + Warn directives must have warning number(s) as argument(s) + Warn directives must have warning number(s) as argument(s) + + + + There is another {0} for this warning already in line {1}. + There is another {0} for this warning already in line {1}. + + All elements of a list must be implicitly convertible to the type of the first element, which here is a tuple of length {0} of type\n {1} \nThis element is a tuple of length {2} of type\n {3} \n 清單的所有元素必須以隱含方式轉換成第一個元素的類型，這是類型為\n {1} \n的元組長度 {0}此元素是類型為\n {3} \n的元組長度 {2} @@ -1134,7 +1144,7 @@ A constrained generic construct occurred in the resumable code specification - 可繼續的程式碼規格中出現了限制式泛型建構 + A constrained generic construct occurred in the resumable code specification @@ -1149,7 +1159,7 @@ A 'let rec' occurred in the resumable code specification - 可繼續的程式碼規格中發生 'let rec' + A 'let rec' occurred in the resumable code specification @@ -1454,7 +1464,7 @@ The following required properties have to be initialized:{0} - 下列必要的屬性必須初始化:{0} + The following required properties have to be initialized:{0} @@ -1589,7 +1599,7 @@ Invalid resumable code. A 'let rec' occurred in the resumable code specification - 可繼續的程式碼無效。可繼續的程式碼規格中發生 'let rec' + Invalid resumable code. A 'let rec' occurred in the resumable code specification @@ -5909,7 +5919,7 @@ Specify debugging type: full, portable, embedded, pdbonly. ('{0}' is the default if no debugging type specified and enables attaching a debugger to a running program, 'portable' is a cross-platform format, 'embedded' is a cross-platform format embedded into the output file). - 指定偵錯類型: full、portable、embedded、pdbonly。(如果未指定偵錯類型，即預設為 '{0}'，並允許將偵錯工具附加到正在執行的程式，'portable' 為跨平台格式，'embedded' 為輸出檔案內嵌的跨平台格式)。 + Specify debugging type: full, portable, embedded, pdbonly. ('{0}' is the default if no debugging type specified and enables attaching a debugger to a running program, 'portable' is a cross-platform format, 'embedded' is a cross-platform format embedded into the output file). @@ -7164,7 +7174,7 @@ The resident compilation service was not used because a problem occurred in communicating with the server. - 未使用常駐編譯服務，因為伺服器發生通訊問題。 + The resident compilation service was not used because a problem occurred in communicating with the server. @@ -7364,7 +7374,7 @@ An error occurred applying the static arguments to a provided type - 將靜態引數套用至提供的類型時發生錯誤 + An error occurred applying the static arguments to a provided type @@ -7429,7 +7439,7 @@ Assembly '{0}' has TypeProviderAssembly attribute with invalid value '{1}'. The value should be a valid assembly name - 組件 '{0}' 的 TypeProviderAssembly 屬性值 '{1}' 無效。此值必須是有效的屬性名稱 + Assembly '{0}' has TypeProviderAssembly attribute with invalid value '{1}'. The value should be a valid assembly name @@ -8014,7 +8024,7 @@ An error occurred applying the static arguments to a provided method - 將靜態引數套用至所提供的方法時，發生錯誤 + An error occurred applying the static arguments to a provided method @@ -8144,7 +8154,7 @@ The CallerMemberNameAttribute applied to parameter '{0}' will have no effect. It is overridden by the CallerFilePathAttribute. - 套用至參數 '{0}' 的 CallerMemberNameAttribute 將不會有作用。CallerFilePathAttribute 會加以覆寫。 + The CallerMemberNameAttribute applied to parameter '{0}' will have no effect. It is overridden by the CallerFilePathAttribute. @@ -8459,7 +8469,7 @@ Used to introduce a block of code that might generate an exception. Used together with 'with' or 'finally'. - 用於引入可能會產生例外狀況的程式碼區塊。這會與 with 或 finally 並用。 + Used to introduce a block of code that might generate an exception. Used together with 'with' or 'finally'. diff --git a/src/Compiler/xlf/FSStrings.cs.xlf b/src/Compiler/xlf/FSStrings.cs.xlf index 810091c59f0..86a6be9d7e0 100644 --- a/src/Compiler/xlf/FSStrings.cs.xlf +++ b/src/Compiler/xlf/FSStrings.cs.xlf @@ -204,7 +204,7 @@ The {0} '{1}' cannot be defined because the name '{2}' clashes with the {3} '{4}' in this type or module - {0} {1} se nedá definovat, protože název {2} a {3} {4} v tomto typu nebo modulu jsou v konfliktu. + The {0} '{1}' cannot be defined because the name '{2}' clashes with the {3} '{4}' in this type or module diff --git a/src/Compiler/xlf/FSStrings.de.xlf b/src/Compiler/xlf/FSStrings.de.xlf index 12a7cc8d720..3b7f46a9769 100644 --- a/src/Compiler/xlf/FSStrings.de.xlf +++ b/src/Compiler/xlf/FSStrings.de.xlf @@ -204,7 +204,7 @@ The {0} '{1}' cannot be defined because the name '{2}' clashes with the {3} '{4}' in this type or module - {0} "{1}" kann nicht definiert werden, weil der Name "{2}" einen Konflikt mit {3} "{4}" in diesem Typ oder Modul verursacht. + The {0} '{1}' cannot be defined because the name '{2}' clashes with the {3} '{4}' in this type or module diff --git a/src/Compiler/xlf/FSStrings.es.xlf b/src/Compiler/xlf/FSStrings.es.xlf index 85b2e6b1cd4..f2b6d8ed1ca 100644 --- a/src/Compiler/xlf/FSStrings.es.xlf +++ b/src/Compiler/xlf/FSStrings.es.xlf @@ -204,7 +204,7 @@ The {0} '{1}' cannot be defined because the name '{2}' clashes with the {3} '{4}' in this type or module - No se puede definir el {0} '{1}' porque el nombre '{2}' está en conflicto con el {3} '{4}' de este tipo o módulo. + The {0} '{1}' cannot be defined because the name '{2}' clashes with the {3} '{4}' in this type or module diff --git a/src/Compiler/xlf/FSStrings.fr.xlf b/src/Compiler/xlf/FSStrings.fr.xlf index b3627df28f8..f3621e55e63 100644 --- a/src/Compiler/xlf/FSStrings.fr.xlf +++ b/src/Compiler/xlf/FSStrings.fr.xlf @@ -204,7 +204,7 @@ The {0} '{1}' cannot be defined because the name '{2}' clashes with the {3} '{4}' in this type or module - Impossible de définir le {0} '{1}', car le nom '{2}' est en conflit avec le {3} '{4}' dans ce type ou module + The {0} '{1}' cannot be defined because the name '{2}' clashes with the {3} '{4}' in this type or module diff --git a/src/Compiler/xlf/FSStrings.it.xlf b/src/Compiler/xlf/FSStrings.it.xlf index b042d7704b2..d67bbd27dca 100644 --- a/src/Compiler/xlf/FSStrings.it.xlf +++ b/src/Compiler/xlf/FSStrings.it.xlf @@ -204,7 +204,7 @@ The {0} '{1}' cannot be defined because the name '{2}' clashes with the {3} '{4}' in this type or module - Non è possibile definire {0} '{1}' perché il nome '{2}' è in conflitto con {3} '{4}' in questo tipo o modulo + The {0} '{1}' cannot be defined because the name '{2}' clashes with the {3} '{4}' in this type or module diff --git a/src/Compiler/xlf/FSStrings.ja.xlf b/src/Compiler/xlf/FSStrings.ja.xlf index 3b9c4d98e21..486c2fac349 100644 --- a/src/Compiler/xlf/FSStrings.ja.xlf +++ b/src/Compiler/xlf/FSStrings.ja.xlf @@ -204,7 +204,7 @@ The {0} '{1}' cannot be defined because the name '{2}' clashes with the {3} '{4}' in this type or module - 名前 '{2}' がこの型またはモジュールの {3} '{4}' と競合するため、{0} '{1}' を定義できません + The {0} '{1}' cannot be defined because the name '{2}' clashes with the {3} '{4}' in this type or module diff --git a/src/Compiler/xlf/FSStrings.ko.xlf b/src/Compiler/xlf/FSStrings.ko.xlf index 51c8cb1365f..506b9b9e2de 100644 --- a/src/Compiler/xlf/FSStrings.ko.xlf +++ b/src/Compiler/xlf/FSStrings.ko.xlf @@ -204,7 +204,7 @@ The {0} '{1}' cannot be defined because the name '{2}' clashes with the {3} '{4}' in this type or module - 이름 '{2}'이(가) 이 형식 또는 모듈의 {3} '{4}'과(와) 충돌하므로 {0} '{1}'을(를) 정의할 수 없습니다. + The {0} '{1}' cannot be defined because the name '{2}' clashes with the {3} '{4}' in this type or module diff --git a/src/Compiler/xlf/FSStrings.pl.xlf b/src/Compiler/xlf/FSStrings.pl.xlf index 29e36ab5bc9..30f8155bfc8 100644 --- a/src/Compiler/xlf/FSStrings.pl.xlf +++ b/src/Compiler/xlf/FSStrings.pl.xlf @@ -204,7 +204,7 @@ The {0} '{1}' cannot be defined because the name '{2}' clashes with the {3} '{4}' in this type or module - Nie można zdefiniować elementu {0} „{1}”, ponieważ nazwa „{2}” powoduje konflikt z elementem {3} „{4}” w tym typie lub module + The {0} '{1}' cannot be defined because the name '{2}' clashes with the {3} '{4}' in this type or module diff --git a/src/Compiler/xlf/FSStrings.pt-BR.xlf b/src/Compiler/xlf/FSStrings.pt-BR.xlf index b606d7339c5..cf7e3a94822 100644 --- a/src/Compiler/xlf/FSStrings.pt-BR.xlf +++ b/src/Compiler/xlf/FSStrings.pt-BR.xlf @@ -204,7 +204,7 @@ The {0} '{1}' cannot be defined because the name '{2}' clashes with the {3} '{4}' in this type or module - O {0} '{1}' não pode ser definido porque o nome '{2}' conflita com {3} '{4}' neste tipo ou módulo + The {0} '{1}' cannot be defined because the name '{2}' clashes with the {3} '{4}' in this type or module diff --git a/src/Compiler/xlf/FSStrings.ru.xlf b/src/Compiler/xlf/FSStrings.ru.xlf index 6367fb6f835..34278a4b234 100644 --- a/src/Compiler/xlf/FSStrings.ru.xlf +++ b/src/Compiler/xlf/FSStrings.ru.xlf @@ -204,7 +204,7 @@ The {0} '{1}' cannot be defined because the name '{2}' clashes with the {3} '{4}' in this type or module - {0} "{1}" не удается определить, так как имя "{2}" конфликтует с {3} "{4}" в данном типе или модуле + The {0} '{1}' cannot be defined because the name '{2}' clashes with the {3} '{4}' in this type or module diff --git a/src/Compiler/xlf/FSStrings.tr.xlf b/src/Compiler/xlf/FSStrings.tr.xlf index 029b16cd9b5..a2601885c52 100644 --- a/src/Compiler/xlf/FSStrings.tr.xlf +++ b/src/Compiler/xlf/FSStrings.tr.xlf @@ -204,7 +204,7 @@ The {0} '{1}' cannot be defined because the name '{2}' clashes with the {3} '{4}' in this type or module - {2}' adı bu türde veya modülde {3} '{4}' ile çakıştığı için {0} '{1}' tanımlanamıyor + The {0} '{1}' cannot be defined because the name '{2}' clashes with the {3} '{4}' in this type or module diff --git a/src/Compiler/xlf/FSStrings.zh-Hans.xlf b/src/Compiler/xlf/FSStrings.zh-Hans.xlf index 54599b23672..66a54f3d2bb 100644 --- a/src/Compiler/xlf/FSStrings.zh-Hans.xlf +++ b/src/Compiler/xlf/FSStrings.zh-Hans.xlf @@ -204,7 +204,7 @@ The {0} '{1}' cannot be defined because the name '{2}' clashes with the {3} '{4}' in this type or module - 无法定义 {0}“{1}”，因为名称“{2}”与此类型或模块中的 {3}“{4}”冲突 + The {0} '{1}' cannot be defined because the name '{2}' clashes with the {3} '{4}' in this type or module diff --git a/src/Compiler/xlf/FSStrings.zh-Hant.xlf b/src/Compiler/xlf/FSStrings.zh-Hant.xlf index c200aa576c1..35280cee60f 100644 --- a/src/Compiler/xlf/FSStrings.zh-Hant.xlf +++ b/src/Compiler/xlf/FSStrings.zh-Hant.xlf @@ -204,7 +204,7 @@ The {0} '{1}' cannot be defined because the name '{2}' clashes with the {3} '{4}' in this type or module - 無法定義 {0} '{1}'，因為名稱 '{2}' 與這個類型或模組中的 {3} '{4}' 相衝突 + The {0} '{1}' cannot be defined because the name '{2}' clashes with the {3} '{4}' in this type or module diff --git a/src/FSharp.Core/xlf/FSCore.cs.xlf b/src/FSharp.Core/xlf/FSCore.cs.xlf index 436ba705358..a122fa694dd 100644 --- a/src/FSharp.Core/xlf/FSCore.cs.xlf +++ b/src/FSharp.Core/xlf/FSCore.cs.xlf @@ -564,7 +564,7 @@ Bad integer supplied to dynamic formatter - Dynamickému formátovacímu modulu byla předána chybná celočíselná hodnota. + Bad integer supplied to dynamic formatter @@ -594,7 +594,7 @@ Bad format specifier (precision) - Chybný specifikátor formátu (přesnost) + Bad format specifier (precision) diff --git a/src/FSharp.Core/xlf/FSCore.de.xlf b/src/FSharp.Core/xlf/FSCore.de.xlf index df2b28aaecb..28ad0276d47 100644 --- a/src/FSharp.Core/xlf/FSCore.de.xlf +++ b/src/FSharp.Core/xlf/FSCore.de.xlf @@ -564,7 +564,7 @@ Bad integer supplied to dynamic formatter - Für den dynamischen Formatierer wurde ein ungültiger Integer bereitgestellt. + Bad integer supplied to dynamic formatter @@ -594,7 +594,7 @@ Bad format specifier (precision) - Ungültiger Formatbezeichner (precision) + Bad format specifier (precision) diff --git a/src/FSharp.Core/xlf/FSCore.es.xlf b/src/FSharp.Core/xlf/FSCore.es.xlf index a1e7d0f7fa8..55f8c1c965d 100644 --- a/src/FSharp.Core/xlf/FSCore.es.xlf +++ b/src/FSharp.Core/xlf/FSCore.es.xlf @@ -564,7 +564,7 @@ Bad integer supplied to dynamic formatter - Se proporcionó un entero incorrecto a un formateador dinámico. + Bad integer supplied to dynamic formatter @@ -594,7 +594,7 @@ Bad format specifier (precision) - Especificador de formato incorrecto (precisión). + Bad format specifier (precision) diff --git a/src/FSharp.Core/xlf/FSCore.fr.xlf b/src/FSharp.Core/xlf/FSCore.fr.xlf index ff8acfc83c4..a7499ae558b 100644 --- a/src/FSharp.Core/xlf/FSCore.fr.xlf +++ b/src/FSharp.Core/xlf/FSCore.fr.xlf @@ -564,7 +564,7 @@ Bad integer supplied to dynamic formatter - Entier incorrect fourni au formateur dynamique + Bad integer supplied to dynamic formatter @@ -594,7 +594,7 @@ Bad format specifier (precision) - Spécificateur de format incorrect (précision) + Bad format specifier (precision) diff --git a/src/FSharp.Core/xlf/FSCore.it.xlf b/src/FSharp.Core/xlf/FSCore.it.xlf index 3643c1ce16c..a4abe452956 100644 --- a/src/FSharp.Core/xlf/FSCore.it.xlf +++ b/src/FSharp.Core/xlf/FSCore.it.xlf @@ -564,7 +564,7 @@ Bad integer supplied to dynamic formatter - Intero non valido fornito al formattatore dinamico + Bad integer supplied to dynamic formatter @@ -594,7 +594,7 @@ Bad format specifier (precision) - Identificatore di formato non valido (precision) + Bad format specifier (precision) diff --git a/src/FSharp.Core/xlf/FSCore.ja.xlf b/src/FSharp.Core/xlf/FSCore.ja.xlf index 285dfb02872..147f7c018cd 100644 --- a/src/FSharp.Core/xlf/FSCore.ja.xlf +++ b/src/FSharp.Core/xlf/FSCore.ja.xlf @@ -564,7 +564,7 @@ Bad integer supplied to dynamic formatter - 動的フォーマッタに対して指定された整数が正しくありません + Bad integer supplied to dynamic formatter @@ -594,7 +594,7 @@ Bad format specifier (precision) - 書式指定子 (精度) が正しくありません + Bad format specifier (precision) diff --git a/src/FSharp.Core/xlf/FSCore.ko.xlf b/src/FSharp.Core/xlf/FSCore.ko.xlf index e5a88b267b0..8341b342f7a 100644 --- a/src/FSharp.Core/xlf/FSCore.ko.xlf +++ b/src/FSharp.Core/xlf/FSCore.ko.xlf @@ -564,7 +564,7 @@ Bad integer supplied to dynamic formatter - 동적 포맷터에 제공된 정수가 잘못되었습니다. + Bad integer supplied to dynamic formatter @@ -594,7 +594,7 @@ Bad format specifier (precision) - 잘못된 형식 지정자(전체 자릿수) + Bad format specifier (precision) diff --git a/src/FSharp.Core/xlf/FSCore.pl.xlf b/src/FSharp.Core/xlf/FSCore.pl.xlf index a64948b4609..6ddd003084a 100644 --- a/src/FSharp.Core/xlf/FSCore.pl.xlf +++ b/src/FSharp.Core/xlf/FSCore.pl.xlf @@ -564,7 +564,7 @@ Bad integer supplied to dynamic formatter - Do dynamicznego modułu formatującego została przekazana błędna liczba całkowita. + Bad integer supplied to dynamic formatter @@ -594,7 +594,7 @@ Bad format specifier (precision) - Błędny specyfikator formatu (dokładności). + Bad format specifier (precision) diff --git a/src/FSharp.Core/xlf/FSCore.pt-BR.xlf b/src/FSharp.Core/xlf/FSCore.pt-BR.xlf index 591a8e6560f..956db72820d 100644 --- a/src/FSharp.Core/xlf/FSCore.pt-BR.xlf +++ b/src/FSharp.Core/xlf/FSCore.pt-BR.xlf @@ -564,7 +564,7 @@ Bad integer supplied to dynamic formatter - Inteiro incorreto fornecido a formatador dinâmico + Bad integer supplied to dynamic formatter @@ -594,7 +594,7 @@ Bad format specifier (precision) - Especificador de formato incorreto (precisão) + Bad format specifier (precision) diff --git a/src/FSharp.Core/xlf/FSCore.ru.xlf b/src/FSharp.Core/xlf/FSCore.ru.xlf index edb281a0102..cb0ca39bd08 100644 --- a/src/FSharp.Core/xlf/FSCore.ru.xlf +++ b/src/FSharp.Core/xlf/FSCore.ru.xlf @@ -564,7 +564,7 @@ Bad integer supplied to dynamic formatter - Динамическому форматтеру передано неверное целое + Bad integer supplied to dynamic formatter @@ -594,7 +594,7 @@ Bad format specifier (precision) - Неверный спецификатор формата (точность) + Bad format specifier (precision) diff --git a/src/FSharp.Core/xlf/FSCore.tr.xlf b/src/FSharp.Core/xlf/FSCore.tr.xlf index d0ab6c80129..b4c445d67ee 100644 --- a/src/FSharp.Core/xlf/FSCore.tr.xlf +++ b/src/FSharp.Core/xlf/FSCore.tr.xlf @@ -564,7 +564,7 @@ Bad integer supplied to dynamic formatter - Dinamik biçimlendiriciye yanlış tamsayı sağlandı + Bad integer supplied to dynamic formatter @@ -594,7 +594,7 @@ Bad format specifier (precision) - Hatalı biçim belirticisi (duyarlık) + Bad format specifier (precision) diff --git a/src/FSharp.Core/xlf/FSCore.zh-Hans.xlf b/src/FSharp.Core/xlf/FSCore.zh-Hans.xlf index 498188f67af..dc922154be2 100644 --- a/src/FSharp.Core/xlf/FSCore.zh-Hans.xlf +++ b/src/FSharp.Core/xlf/FSCore.zh-Hans.xlf @@ -564,7 +564,7 @@ Bad integer supplied to dynamic formatter - 提供给动态格式化程序的整数错误 + Bad integer supplied to dynamic formatter @@ -594,7 +594,7 @@ Bad format specifier (precision) - 错误的格式说明符(精度) + Bad format specifier (precision) diff --git a/src/FSharp.Core/xlf/FSCore.zh-Hant.xlf b/src/FSharp.Core/xlf/FSCore.zh-Hant.xlf index 7e5727be136..9d2cb35be7a 100644 --- a/src/FSharp.Core/xlf/FSCore.zh-Hant.xlf +++ b/src/FSharp.Core/xlf/FSCore.zh-Hant.xlf @@ -564,7 +564,7 @@ Bad integer supplied to dynamic formatter - 提供給動態格式器的整數錯誤 + Bad integer supplied to dynamic formatter @@ -594,7 +594,7 @@ Bad format specifier (precision) - 不正確的格式修飾詞 (精確度) + Bad format specifier (precision) diff --git a/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.cs.xlf b/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.cs.xlf index 2f9b9728cd8..800c2e40248 100644 --- a/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.cs.xlf +++ b/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.cs.xlf @@ -4,7 +4,7 @@ PackageManager cannot reference the System Package '{0}' - PackageManager se nemůže odkazovat na systémový balíček {0}. + PackageManager cannot reference the System Package '{0}' diff --git a/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.de.xlf b/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.de.xlf index 233c6a93dd3..f3762130515 100644 --- a/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.de.xlf +++ b/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.de.xlf @@ -4,7 +4,7 @@ PackageManager cannot reference the System Package '{0}' - PackageManager kann nicht auf das Systempaket "{0}" verweisen. + PackageManager cannot reference the System Package '{0}' diff --git a/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.es.xlf b/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.es.xlf index 2f7b192634c..2851c230dab 100644 --- a/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.es.xlf +++ b/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.es.xlf @@ -4,7 +4,7 @@ PackageManager cannot reference the System Package '{0}' - PackageManager no puede hacer referencia al paquete del sistema "{0}". + PackageManager cannot reference the System Package '{0}' diff --git a/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.fr.xlf b/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.fr.xlf index 5d83dfd795a..8ab1dccc35f 100644 --- a/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.fr.xlf +++ b/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.fr.xlf @@ -4,7 +4,7 @@ PackageManager cannot reference the System Package '{0}' - PackageManager ne peut pas référencer le package système '{0}' + PackageManager cannot reference the System Package '{0}' diff --git a/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.it.xlf b/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.it.xlf index 9a40ea0246c..c605c4af3ba 100644 --- a/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.it.xlf +++ b/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.it.xlf @@ -4,7 +4,7 @@ PackageManager cannot reference the System Package '{0}' - PackageManager non può fare riferimento al pacchetto di sistema '{0}' + PackageManager cannot reference the System Package '{0}' diff --git a/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.ja.xlf b/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.ja.xlf index 74a4a7a452c..2e19d06a10f 100644 --- a/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.ja.xlf +++ b/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.ja.xlf @@ -4,7 +4,7 @@ PackageManager cannot reference the System Package '{0}' - PackageManager がシステム パッケージ '{0}' を参照できません + PackageManager cannot reference the System Package '{0}' diff --git a/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.ko.xlf b/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.ko.xlf index 9837ed7ad3a..01d252b6243 100644 --- a/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.ko.xlf +++ b/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.ko.xlf @@ -4,7 +4,7 @@ PackageManager cannot reference the System Package '{0}' - PackageManager에서 시스템 패키지 '{0}'을(를) 참조할 수 없습니다. + PackageManager cannot reference the System Package '{0}' diff --git a/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.pl.xlf b/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.pl.xlf index 6b7b5475c99..4ae0d2e448e 100644 --- a/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.pl.xlf +++ b/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.pl.xlf @@ -4,7 +4,7 @@ PackageManager cannot reference the System Package '{0}' - Program PacketManager nie może odwoływać się do pakietu systemowego „{0}” + PackageManager cannot reference the System Package '{0}' diff --git a/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.pt-BR.xlf b/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.pt-BR.xlf index 2fb1ed02a8a..7e8409fd8d7 100644 --- a/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.pt-BR.xlf +++ b/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.pt-BR.xlf @@ -4,7 +4,7 @@ PackageManager cannot reference the System Package '{0}' - PackageManager não pode referenciar o pacote do sistema '{0}' + PackageManager cannot reference the System Package '{0}' diff --git a/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.ru.xlf b/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.ru.xlf index c1193b57c8b..dafbfb8243d 100644 --- a/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.ru.xlf +++ b/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.ru.xlf @@ -4,7 +4,7 @@ PackageManager cannot reference the System Package '{0}' - PackageManager не может ссылаться на системный пакет "{0}" + PackageManager cannot reference the System Package '{0}' diff --git a/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.tr.xlf b/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.tr.xlf index 5a870233d01..312793af714 100644 --- a/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.tr.xlf +++ b/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.tr.xlf @@ -4,7 +4,7 @@ PackageManager cannot reference the System Package '{0}' - PackageManager, '{0}' Sistem Paketine başvuramıyor + PackageManager cannot reference the System Package '{0}' diff --git a/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.zh-Hans.xlf b/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.zh-Hans.xlf index 520ae8c35a4..7e04d921b0a 100644 --- a/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.zh-Hans.xlf +++ b/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.zh-Hans.xlf @@ -4,7 +4,7 @@ PackageManager cannot reference the System Package '{0}' - PackageManager 无法引用系统包“{0}” + PackageManager cannot reference the System Package '{0}' diff --git a/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.zh-Hant.xlf b/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.zh-Hant.xlf index e8bde94aaff..d82293b0cf2 100644 --- a/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.zh-Hant.xlf +++ b/src/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.zh-Hant.xlf @@ -4,7 +4,7 @@ PackageManager cannot reference the System Package '{0}' - PackageManager 無法參考系統套件 '{0}' + PackageManager cannot reference the System Package '{0}' diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Ifdef.fs b/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Ifdef.fs new file mode 100644 index 00000000000..99d019504d6 --- /dev/null +++ b/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Ifdef.fs @@ -0,0 +1,57 @@ +namespace CompilerDirectives + +open Xunit +open FSharp.Test.Compiler + +module Ifdef = + + let ifdefSource = """ +[] +let main _ = + #if MYDEFINE1 + 1 + #else + 2 + #endif +""" + + [] + [] + [] + let ifdefTest (mydefine, expectedExitCode) = + + FSharp ifdefSource + |> withDefines [mydefine] + |> compileExeAndRun + |> withExitCode expectedExitCode + + + let sourceExtraEndif = """ +#if MYDEFINE1 +printf "1" +#endif +(**)#endif(**) +0 +""" + + [] + let extraEndif () = + + FSharp sourceExtraEndif + |> withDefines ["MYDEFINE1"] + |> asExe + |> compile + |> withDiagnosticMessage "#endif has no matching #if in implementation file" + + let sourceUnknownHash = """ +module A +#ifxx +#abc +""" + + [] + let unknownHashDirectiveIsIgnored () = + + FSharp sourceUnknownHash + |> compile + |> shouldSucceed \ No newline at end of file diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/NonStringArgs.fs b/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/NonStringArgs.fs index f6412f22ef6..d9838581591 100644 --- a/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/NonStringArgs.fs +++ b/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/NonStringArgs.fs @@ -6,6 +6,118 @@ open FSharp.Test.Compiler module NonStringArgs = + [] + [] + [] + let ``#nowarn - errors - separate`` (languageVersion) = + + FSharp """ +#nowarn "988" +#nowarn FS +#nowarn FSBLAH +#nowarn ACME +#nowarn "FS" +#nowarn "FSBLAH" +#nowarn "ACME" + """ + |> withLangVersion languageVersion + |> asExe + |> compile + |> shouldFail + |> withDiagnostics [ + if languageVersion = "8.0" then + (Error 3350, Line 3, Col 9, Line 3, Col 11, "Feature '# directives with non-quoted string arguments' is not available in F# 8.0. Please use language version 9.0 or greater.") + (Error 3350, Line 4, Col 9, Line 4, Col 15, "Feature '# directives with non-quoted string arguments' is not available in F# 8.0. Please use language version 9.0 or greater.") + (Error 3350, Line 5, Col 9, Line 5, Col 13, "Feature '# directives with non-quoted string arguments' is not available in F# 8.0. Please use language version 9.0 or greater.") + (Warning 203, Line 6, Col 9, Line 6, Col 13, "Invalid warning number 'FS'") + (Warning 203, Line 7, Col 9, Line 7, Col 17, "Invalid warning number 'FSBLAH'") + (Warning 203, Line 8, Col 9, Line 8, Col 15, "Invalid warning number 'ACME'") + else + (Warning 203, Line 3, Col 9, Line 3, Col 11, "Invalid warning number 'FS'"); + (Warning 203, Line 4, Col 9, Line 4, Col 15, "Invalid warning number 'FSBLAH'"); + (Warning 203, Line 5, Col 9, Line 5, Col 13, "Invalid warning number 'ACME'"); + (Warning 203, Line 6, Col 9, Line 6, Col 13, "Invalid warning number 'FS'"); + (Warning 203, Line 7, Col 9, Line 7, Col 17, "Invalid warning number 'FSBLAH'"); + (Warning 203, Line 8, Col 9, Line 8, Col 15, "Invalid warning number 'ACME'") + ] + + [] + [] + [] + [] + let ``#nowarn - errors - inline`` (languageVersion) = + + FSharp """ +#nowarn "988" +#nowarn FS FSBLAH ACME "FS" "FSBLAH" "ACME" + """ + |> withLangVersion languageVersion + |> asExe + |> compile + |> shouldFail + |> withDiagnostics [ + if languageVersion = "8.0" then + (Error 3350, Line 3, Col 9, Line 3, Col 11, "Feature '# directives with non-quoted string arguments' is not available in F# 8.0. Please use language version 9.0 or greater.") + (Error 3350, Line 3, Col 12, Line 3, Col 18, "Feature '# directives with non-quoted string arguments' is not available in F# 8.0. Please use language version 9.0 or greater.") + (Error 3350, Line 3, Col 19, Line 3, Col 23, "Feature '# directives with non-quoted string arguments' is not available in F# 8.0. Please use language version 9.0 or greater.") + (Warning 203, Line 3, Col 24, Line 3, Col 28, "Invalid warning number 'FS'") + (Warning 203, Line 3, Col 29, Line 3, Col 37, "Invalid warning number 'FSBLAH'") + (Warning 203, Line 3, Col 38, Line 3, Col 44, "Invalid warning number 'ACME'") + else + (Warning 203, Line 3, Col 9, Line 3, Col 11, "Invalid warning number 'FS'"); + (Warning 203, Line 3, Col 12, Line 3, Col 18, "Invalid warning number 'FSBLAH'"); + (Warning 203, Line 3, Col 19, Line 3, Col 23, "Invalid warning number 'ACME'"); + (Warning 203, Line 3, Col 24, Line 3, Col 28, "Invalid warning number 'FS'"); + (Warning 203, Line 3, Col 29, Line 3, Col 37, "Invalid warning number 'FSBLAH'"); + (Warning 203, Line 3, Col 38, Line 3, Col 44, "Invalid warning number 'ACME'") + ] + + + [] + [] + [] + [] + let ``#nowarn - realcode`` (langVersion) = + + let compileResult = + FSharp """ +#nowarn 20 FS1104 "3391" "FS3221" + +module Exception = + exception ``Crazy@name.p`` of string + +module Decimal = + type T1 = { a : decimal } + module M0 = + type T1 = { a : int;} + let x = { a = 10 } // error - 'expecting decimal' (which means we are not seeing M0.T1) + +module MismatchedYields = + let collection () = [ + yield "Hello" + "And this" + ] +module DoBinding = + let square x = x * x + square 32 + """ + |> withLangVersion langVersion + |> asExe + |> compile + + if langVersion = "8.0" then + compileResult + |> shouldFail + |> withDiagnostics [ + (Error 3350, Line 2, Col 9, Line 2, Col 11, "Feature '# directives with non-quoted string arguments' is not available in F# 8.0. Please use language version 9.0 or greater.") + (Error 3350, Line 2, Col 12, Line 2, Col 18, "Feature '# directives with non-quoted string arguments' is not available in F# 8.0. Please use language version 9.0 or greater.") + (Warning 203, Line 2, Col 26, Line 2, Col 34, "Invalid warning number 'FS3221'") + (Warning 1104, Line 5, Col 15, Line 5, Col 31, "Identifiers containing '@' are reserved for use in F# code generation") + ] + else + compileResult + |> shouldSucceed + [] [] diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Nowarn.fs b/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Nowarn.fs index ec3878faee4..432b3c5c203 100644 --- a/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Nowarn.fs +++ b/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Nowarn.fs @@ -3,273 +3,136 @@ namespace CompilerDirectives open Xunit open FSharp.Test.Compiler +open FSharp.Test +open System +open System.Text module Nowarn = - let warning20Text = "The result of this expression has type 'string' and is implicitly ignored. Consider using 'ignore' to discard this value explicitly, e.g. 'expr |> ignore', or 'let' to bind the result to a name, e.g. 'let result = expr'." - let private warning25Text = "Incomplete pattern matches on this expression. For example, the value 'Some (_)' may indicate a case not covered by the pattern(s)." - let private warning44Text = "This construct is deprecated" + let private intro = "module A" + let private nowarn n = $"#nowarn {n}" + let private warnon n = $"#warnon {n}" + let private line1 = """#line 1 "some.fsy" """ + let private line10 = """#line 10 "some.fsy" """ + let private make20 = "1" + let private make25 = "match None with None -> ()" + let private subIntro = ["namespace A"; "module B ="] + let private vp = "PREVIEW" + let private v9 = "9.0" + let private fs = String.concat Environment.NewLine >> FsSource + let private fsSubModule lines = subIntro @ (lines |> List.map (fun s -> " " + s)) |> fs + let private fsi = String.concat System.Environment.NewLine >> FsiSource + let private fsx = String.concat System.Environment.NewLine >> FsxSourceCode - - let consistencySource1a = """ -module A -#nowarn "20" -#line 5 "xyz1a.fs" -"" - """ - - // need different file names here because of global table - let consistencySource1b = """ -module A -#nowarn "20" -#line 5 "xyz1b.fs" -"" - """ - - let consistencySource2a = """ -module A -#nowarn "20" -#line 1 "xyz2a.fs" -"" - """ - - let consistencySource2b = """ -module A -#nowarn "20" -#line 1 "xyz2b.fs" -"" - """ - - let consistencySource2c = """ -module A -#nowarn "20" -#line 1 "xyz2c.fs" -"" - """ - - - [] - let inconsistentInteractionBetweenLineAndNowarn1 () = - - FSharp consistencySource1a - |> withLangVersion90 - |> compile - |> shouldSucceed - - [] - let inconsistentInteractionBetweenLineAndNowarn2 () = - - FSharp consistencySource2a - |> withLangVersion90 - |> compile - |> shouldSucceed - - [] - let consistentInteractionBetweenLineAndNowarn1 () = - - FSharp consistencySource1b - |> withLangVersionPreview - |> compile - |> shouldSucceed - - [] - let consistentInteractionBetweenLineAndNowarn2 () = - - FSharp consistencySource2b - |> withLangVersionPreview - |> compile - |> shouldSucceed - - [] - let consistentInteractionBetweenLineAndNowarn2AsError () = - - FSharp consistencySource2c - |> withLangVersionPreview - |> withOptions ["--warnaserror+"] - |> compile - |> shouldSucceed - - - let doubleSemiSource = """ -module A -#nowarn "20";; -"" -#warnon "20" // comment -"" - """ - - [] - let acceptDoubleSemicolonAfterDirective () = - - FSharp doubleSemiSource - |> withLangVersionPreview - |> compile - |> withDiagnostics [ - Warning 20, Line 6, Col 1, Line 6, Col 3, warning20Text - ] - - let private sourceForNowarnInsideModule = """ -namespace A -module B = - #nowarn "9999" - type C = int -""" - - [] - let nowarnInModule () = - FSharp sourceForNowarnInsideModule - |> withLangVersionPreview - |> compile - |> shouldSucceed - - let private sourceForWarningIsSuppressed = """ -module A -match None with None -> () -#nowarn "25" -match None with None -> () -#warnon "25" -match None with None -> () -#nowarn "25" -match None with None -> () - """ - - [] - let warningIsSuppressedBetweenNowarnAndWarnonDirectives () = - FSharp sourceForWarningIsSuppressed - |> withLangVersionPreview - |> compile - |> withDiagnostics [ - Warning 25, Line 3, Col 7, Line 3, Col 11, warning25Text - Warning 25, Line 7, Col 7, Line 7, Col 11, warning25Text - ] - - let private sigSourceForWarningIsSuppressedInSigFile = """ -namespace A -open System -[] -type T = class end -type T2 = T -#nowarn "44" -type T3 = T -#warnon "44" -type T4 = T -#nowarn "44" -type T5 = T - """ + let private fsiSource44 = [ + "namespace A" + "[]" + "type T = class end" + "type T2 = T" + "#nowarn 44" + "type T3 = T" + "#warnon 44" + "type T4 = T" + "#nowarn 44" + "type T5 = T" + ] - let private sourceForWarningIsSuppressedInSigFile = """ -namespace A -#nowarn "44" -open System -[] -type T = class end -type T2 = T -type T3 = T -type T4 = T -type T5 = T - """ + let private fsSource44 = [ + "namespace A" + "#nowarn 44" + "[]" + "type T = class end" + "type T2 = T" + "type T3 = T" + "type T4 = T" + "type T5 = T" + ] - [] - let warningIsSuppressedBetweenNowarnAndWarnonDirectivesInASignatureFile () = - Fsi sigSourceForWarningIsSuppressedInSigFile - |> withAdditionalSourceFile (FsSource sourceForWarningIsSuppressedInSigFile) - |> withLangVersionPreview - |> compile - |> withDiagnostics [ - Warning 44, Line 6, Col 11, Line 6, Col 12, warning44Text - Warning 44, Line 10, Col 11, Line 10, Col 12, warning44Text + let private testData = [ + vp, [], [fs [intro; make20]], [Warning 20, 2] + vp, [], [fs [intro; nowarn 20; make20]], [] + vp, [], [fs [intro; "#nowarn 20;;"; make20]], [] + vp, [], [fs [intro; make20; nowarn 20; make20; warnon 20; make20]], [Warning 20, 2; Warning 20, 6] + v9, [], [fs [intro; make20; nowarn 20; make20; warnon 20; make20]], [Error 3350, 5] + vp, [], [fs [intro; nowarn 20; line1; make20]], [] + v9, [], [fs [intro; nowarn 20; line1; make20]], [] // warning in real v9 + vp, [], [fs [intro; nowarn 20; line10; make20]], [] + v9, [], [fs [intro; nowarn 20; line10; make20]], [] + vp, [], [fs [intro; nowarn 20; line1; make20; warnon 20; make20]], [] // this will change if we go for the proposed RFC + v9, [], [fs [intro; nowarn 20; line1; make20; warnon 20; make20]], [Error 3350, 2] + vp, ["--nowarn:20"], [fs [intro; make20]], [] + v9, ["--nowarn:20"], [fs [intro; make20]], [] + vp, ["--nowarn:20"], [fs [intro; warnon 20; make20]], [Warning 20, 3] + v9, ["--nowarn:20"], [fs [intro; warnon 20; make20]], [Error 3350, 2] + vp, ["--warnon:3579"], [fs [intro; """ignore $"{1}" """]], [Warning 3579, 2] + v9, ["--warnon:3579"], [fs [intro; """ignore $"{1}" """]], [Warning 3579, 2] + vp, [], [fs [intro; "#warnon 3579"; """ignore $"{1}" """]], [Warning 3579, 3] + v9, [], [fs [intro; "#warnon 3579"; """ignore $"{1}" """]], [Error 3350, 2] + vp, ["--warnaserror"], [fs [intro; make20]], [Error 20, 2] + vp, ["--warnaserror"; "--nowarn:20"], [fs [intro; make20]], [] + vp, ["--warnaserror"; "--nowarn:20"], [fs [intro; warnon 20; make20]], [Error 20, 3] + v9, ["--warnaserror"; "--nowarn:20"], [fs [intro; warnon 20; make20]], [Error 3350, 2] + vp, ["--warnaserror"], [fs [intro; nowarn 20; make20]], [] + vp, ["--warnaserror"; "--warnaserror-:20"], [fs [intro; make20]], [Warning 20, 2] + vp, ["--warnaserror:20"], [fs [intro; nowarn 20; make20]], [] + vp, [], [fsSubModule [nowarn 20; make20]], [] + v9, [], [fsSubModule [nowarn 20; make20]], [Warning 236, 3] + vp, [], [fsSubModule [make20; nowarn 20; make20; warnon 20; make20]], [Warning 20, 3; Warning 20, 7] + v9, [], [fsSubModule [make20; nowarn 20; make20; warnon 20; make20]], [Error 3350, 6] + vp, [], [fsi fsiSource44; fs fsSource44], [Warning 44, 4; Warning 44, 8] + v9, [], [fsi fsiSource44; fs fsSource44], [Error 3350, 7] + vp, [], [fsx [intro; make20; nowarn 20; make20; warnon 20; make20]], [] // 20 is not checked in scripts + vp, [], [fsx [intro; make25; nowarn 25; make25; warnon 25; make25]], [Warning 25, 2; Warning 25, 6] + v9, [], [fsx [intro; make25; nowarn 25; make25; warnon 25; make25]], [Error 3350, 5] + vp, [], [fs [intro; "let x ="; nowarn 20; " 1"; warnon 20; " 2"; " 3"; "4"]], [Warning 20, 6; Warning 20, 8] + vp, [], [fs [intro; nowarn 20; nowarn 20; warnon 20; make20]], [Warning 3875, 3; Warning 20, 5] + v9, [], [fs [intro; nowarn 20; nowarn 20; warnon 20; make20]], [Error 3350, 4] + vp, [], [fs [intro; "#nowarn \"\"\"20\"\"\" "; make20]], [] ] - let private scriptForWarningIsSuppressed = """ - -match None with None -> () -#nowarn "25" -match None with None -> () -#warnon "25" -match None with None -> () -#nowarn "25" -match None with None -> () - """ - - [] - let warningIsSuppressedBetweenNowarnAndWarnonInScript () = - Fsx scriptForWarningIsSuppressed - |> withLangVersionPreview - |> compile - |> withDiagnostics [ - Warning 25, Line 3, Col 7, Line 3, Col 11, warning25Text - Warning 25, Line 7, Col 7, Line 7, Col 11, warning25Text - ] - - [] - [] + let testMemberData = + testData |> List.mapi (fun i (v, fl, sources, diags) -> [| + box (i + 1) + box v + box fl + box (List.toArray sources) + box (List.toArray diags) |]) + + let private testFailed (expected: (ErrorType * int) list) (actual: ErrorInfo list) = + expected.Length <> actual.Length + || (List.zip expected actual |> List.exists(fun((error, line), d) -> error <> d.Error || line <> d.Range.StartLine)) + + let withDiags testId langVersion flags (sources: SourceCodeFileKind list) (expected: (ErrorType * int) list) (result: CompilationResult) = + let actual = result.Output.Diagnostics + if testFailed expected actual then + let sb = new StringBuilder() + let print (s: string) = sb.AppendLine s |> ignore + print "" + print $"test {testId} of {testData.Length}" + print " language version:" + print $" {langVersion}" + print " added compiler options:" + for flag in flags do print $" {flag}" + for source in sources do + print $" source code %s{source.GetSourceFileName}:" + let text = source.GetSourceText |> Option.defaultValue "" + let lines = text.Split(Environment.NewLine) |> Array.toList + for line in lines do print $" {line}" + print $" expected diagnostics:" + for (error, line) in expected do print $" {error} in line {line}" + print $" actual diagnostics:" + for d in actual do print $" {d.Error} in line {d.Range.StartLine}" + Assert.Fail(string sb) + + [] [] - let ``#nowarn - errors`` (languageVersion) = - - FSharp """ -#nowarn "988" -#nowarn FS -#nowarn FSBLAH -#nowarn ACME -#nowarn "FS" -#nowarn "FSBLAH" -#nowarn "ACME" - """ - |> withLangVersion languageVersion - |> asExe + let testWarnScopes testId langVersion flags (sourceArray: SourceCodeFileKind array) expectedDiags = + let sources = Array.toList sourceArray + sources.Head + |> fsFromString + |> FS + |> withAdditionalSourceFiles sources.Tail + |> withLangVersion langVersion + |> withOptions flags |> compile - |> shouldSucceed - - [] - [] - [] - let ``#nowarn - errors - inline`` (languageVersion) = - - FSharp """ -#nowarn "988" -#nowarn FS FSBLAH ACME "FS" "FSBLAH" "ACME" - """ - |> withLangVersion languageVersion - |> asExe - |> compile - |> shouldSucceed - - - [] - [] - [] - let ``#nowarn - realcode`` (langVersion) = - - let compileResult = - FSharp """ -#nowarn 20 FS1104 "3391" "FS3221" - -module Exception = - exception ``Crazy@name.p`` of string - -module Decimal = - type T1 = { a : decimal } - module M0 = - type T1 = { a : int;} - let x = { a = 10 } // error - 'expecting decimal' (which means we are not seeing M0.T1) - -module MismatchedYields = - let collection () = [ - yield "Hello" - "And this" - ] -module DoBinding = - let square x = x * x - square 32 - """ - |> withLangVersion langVersion - |> asExe - |> compile - - if langVersion = "8.0" then - compileResult - |> shouldSucceed - else - compileResult - |> shouldSucceed - + |> withDiags testId langVersion flags sources (Array.toList expectedDiags) diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerService/AsyncMemoize.fs b/tests/FSharp.Compiler.ComponentTests/CompilerService/AsyncMemoize.fs index 72dd62e397c..7b65ba798fe 100644 --- a/tests/FSharp.Compiler.ComponentTests/CompilerService/AsyncMemoize.fs +++ b/tests/FSharp.Compiler.ComponentTests/CompilerService/AsyncMemoize.fs @@ -2,164 +2,149 @@ module CompilerService.AsyncMemoize open System open System.Threading -open Xunit open Internal.Utilities.Collections open System.Threading.Tasks open System.Diagnostics -open System.Collections.Concurrent + open FSharp.Compiler.DiagnosticsLogger open FSharp.Compiler.Diagnostics -open FSharp.Compiler.BuildGraph +open Xunit -let timeout = TimeSpan.FromSeconds 10. +[] +module internal JobEvents = -let waitFor (mre: ManualResetEvent) = - if not <| mre.WaitOne timeout then - failwith "waitFor timed out" + let publishEvent (cache: AsyncMemoize<_, _, _>) = + let wrapper = Event<_>() + cache.OnEvent (fun e -> lock wrapper <| fun () -> wrapper.Trigger e) + wrapper.Publish |> Event.map (fun (jobEvent, (_,k,_)) -> jobEvent, k) -let waitUntil condition value = - task { - let sw = Stopwatch.StartNew() - while not <| condition value do - if sw.Elapsed > timeout then - failwith "waitUntil timed out" - do! Task.Delay 10 - } + let collectEvents cache = + cache |> publishEvent |> Event.scan (fun es e -> e :: es) [] |> Event.map List.rev -let rec internal spinFor (duration: TimeSpan) = - async { - let sw = Stopwatch.StartNew() - do! Async.Sleep 10 - let remaining = duration - sw.Elapsed - if remaining > TimeSpan.Zero then - return! spinFor remaining - } - -#if BUILDING_WITH_LKG -type internal EventRecorder<'a, 'b, 'c when 'a : equality and 'b : equality>(memoize: AsyncMemoize<'a,'b,'c>) as self = -#else -type internal EventRecorder<'a, 'b, 'c when 'a : equality and 'b : equality and 'a:not null and 'b:not null>(memoize: AsyncMemoize<'a,'b,'c>) as self = -#endif + /// Exposes a live view of the list of JobEvents generated by AsyncMemoize. + let observe cache = + let updateAvailable = new AutoResetEvent(false) + let mutable recorded = [] - let events = ConcurrentQueue() + let update next = + Debug.WriteLine $"%A{next}" + recorded <- next + updateAvailable.Set() |> ignore - do memoize.OnEvent self.Add + collectEvents cache |> Event.add update - member _.Add (e, (_label, k, _version)) = events.Enqueue (e, k) + let waitForUpdate = updateAvailable |> Async.AwaitWaitHandle |> Async.Ignore - member _.Received value = events |> Seq.exists (fst >> (=) value) - - member _.CountOf value count = events |> Seq.filter (fst >> (=) value) |> Seq.length |> (=) count + async { + Debug.WriteLine $"current: %A{recorded}" + return recorded, waitForUpdate + } - member _.ShouldBe (expected) = - let expected = expected |> Seq.toArray - let actual = events |> Seq.toArray - Assert.Equal<_ array>(expected, actual) + let countOf value count events = events |> Seq.filter (fst >> (=) value) |> Seq.length |> (=) count - member _.Sequence = events |> Seq.map id + let received value events = events |> Seq.exists (fst >> (=) value) + let waitUntil observedCache condition = + let rec loop() = async { + let! current, waitForUpdate = observedCache + if current |> condition |> not then + do! waitForUpdate + return! loop() + } + loop() [] let ``Basics``() = - - let computation key = async { - do! Async.Sleep 1 - return key * 2 - } - - let memoize = AsyncMemoize() - let events = EventRecorder(memoize) - - let result = - seq { - memoize.Get'(5, computation 5) - memoize.Get'(5, computation 5) - memoize.Get'(2, computation 2) - memoize.Get'(5, computation 5) - memoize.Get'(3, computation 3) - memoize.Get'(2, computation 2) + task { + let computation key = async { + do! Async.Sleep 1 + return key * 2 } - |> Async.Parallel - |> Async.RunSynchronously - let expected = [| 10; 10; 4; 10; 6; 4|] + let memoize = AsyncMemoize() + let events = observe memoize + + let result = + seq { + memoize.Get'(5, computation 5) + memoize.Get'(5, computation 5) + memoize.Get'(2, computation 2) + memoize.Get'(5, computation 5) + memoize.Get'(3, computation 3) + memoize.Get'(2, computation 2) + } + |> Async.Parallel + |> Async.RunSynchronously - Assert.Equal(expected, result) + let expected = [| 10; 10; 4; 10; 6; 4|] - (waitUntil (events.CountOf Finished) 3).Wait() + Assert.Equal(expected, result) - let groups = events.Sequence |> Seq.groupBy snd |> Seq.toList - Assert.Equal(3, groups.Length) - for key, events in groups do - Assert.Equal>(Set [ Requested, key; Started, key; Finished, key ], Set events) + do! waitUntil events (countOf Finished 3) + let! current, _ = events + let groups = current |> Seq.groupBy snd |> Seq.toList + Assert.Equal(3, groups.Length) + for key, events in groups do + Assert.Equal>(Set [ Requested, key; Started, key; Finished, key ], Set events) + } [] let ``We can cancel a job`` () = task { - let jobStarted = new ManualResetEvent(false) + let jobStarted = new ManualResetEventSlim(false) + let cts = new CancellationTokenSource() + let ctsCancelled = new ManualResetEventSlim(false) - let computation action = async { - action() |> ignore - do! spinFor timeout + let computation = async { + use! _catch = Async.OnCancel ignore + jobStarted.Set() + ctsCancelled.Wait() + do! async { } failwith "Should be canceled before it gets here" } let memoize = AsyncMemoize<_, int, _>() - let events = EventRecorder(memoize) - - use cts1 = new CancellationTokenSource() - use cts2 = new CancellationTokenSource() - use cts3 = new CancellationTokenSource() + let events = observe memoize let key = 1 - let _task1 = Async.StartAsTask( memoize.Get'(key, computation jobStarted.Set), cancellationToken = cts1.Token) - - waitFor jobStarted - jobStarted.Reset() |> ignore + let _task1 = Async.StartAsTask( memoize.Get'(1, computation), cancellationToken = cts.Token) - let _task2 = Async.StartAsTask( memoize.Get'(key, computation ignore), cancellationToken = cts2.Token) - let _task3 = Async.StartAsTask( memoize.Get'(key, computation ignore), cancellationToken = cts3.Token) + jobStarted.Wait() + cts.Cancel() + ctsCancelled.Set() - do! waitUntil (events.CountOf Requested) 3 + do! waitUntil events (received Canceled) + let! current, _ = events - cts1.Cancel() - cts2.Cancel() - - waitFor jobStarted - - cts3.Cancel() - - do! waitUntil events.Received Canceled - - events.ShouldBe [ - Requested, key - Started, key - Requested, key - Requested, key - Restarted, key - Canceled, key - ] + Assert.Equal<_ list>( + [ + Requested, key + Started, key + Canceled, key + ], + current + ) } [] let ``Job is restarted if first requestor cancels`` () = task { - let jobStarted = new ManualResetEvent(false) + let jobStarted = new SemaphoreSlim(0) - let jobCanComplete = new ManualResetEvent(false) + let jobCanComplete = new ManualResetEventSlim(false) let computation key = async { - jobStarted.Set() |> ignore - waitFor jobCanComplete + jobStarted.Release() |> ignore + + jobCanComplete.Wait() return key * 2 } let memoize = AsyncMemoize<_, int, _>() - let events = EventRecorder(memoize) - + let events = observe memoize use cts1 = new CancellationTokenSource() use cts2 = new CancellationTokenSource() @@ -169,48 +154,49 @@ let ``Job is restarted if first requestor cancels`` () = let _task1 = Async.StartAsTask( memoize.Get'(key, computation key), cancellationToken = cts1.Token) - waitFor jobStarted - jobStarted.Reset() |> ignore - + do! jobStarted.WaitAsync() let _task2 = Async.StartAsTask( memoize.Get'(key, computation key), cancellationToken = cts2.Token) let _task3 = Async.StartAsTask( memoize.Get'(key, computation key), cancellationToken = cts3.Token) - do! waitUntil (events.CountOf Requested) 3 + do! waitUntil events (countOf Requested 3) cts1.Cancel() - waitFor jobStarted - jobCanComplete.Set() |> ignore + do! jobStarted.WaitAsync() + let! result = _task2 Assert.Equal(2, result) - events.ShouldBe [ - Requested, key + let! current, _ = events + + Assert.Equal<_ list>( + [ Requested, key Started, key Requested, key Requested, key Restarted, key - Finished, key ] + Finished, key ], + current + ) } [] let ``Job is restarted if first requestor cancels but keeps running if second requestor cancels`` () = task { - let jobStarted = new ManualResetEvent(false) + let jobStarted = new ManualResetEventSlim(false) - let jobCanComplete = new ManualResetEvent(false) + let jobCanComplete = new ManualResetEventSlim(false) let computation key = async { jobStarted.Set() |> ignore - waitFor jobCanComplete + jobCanComplete.Wait() return key * 2 } let memoize = AsyncMemoize<_, int, _>() - let events = EventRecorder(memoize) - + let events = observe memoize use cts1 = new CancellationTokenSource() use cts2 = new CancellationTokenSource() @@ -220,17 +206,17 @@ let ``Job is restarted if first requestor cancels but keeps running if second re let _task1 = Async.StartAsTask( memoize.Get'(key, computation key), cancellationToken = cts1.Token) - waitFor jobStarted + jobStarted.Wait() jobStarted.Reset() |> ignore let _task2 = Async.StartAsTask( memoize.Get'(key, computation key), cancellationToken = cts2.Token) let _task3 = Async.StartAsTask( memoize.Get'(key, computation key), cancellationToken = cts3.Token) - do! waitUntil (events.CountOf Requested) 3 + do! waitUntil events (countOf Requested 3) cts1.Cancel() - waitFor jobStarted + jobStarted.Wait() cts2.Cancel() @@ -239,13 +225,17 @@ let ``Job is restarted if first requestor cancels but keeps running if second re let! result = _task3 Assert.Equal(2, result) - events.ShouldBe [ - Requested, key + let! current, _ = events + + Assert.Equal<_ list>( + [ Requested, key Started, key Requested, key Requested, key Restarted, key - Finished, key ] + Finished, key ], + current + ) } @@ -376,59 +366,56 @@ let ``Stress test`` () = [] [] let ``Cancel running jobs with the same key`` cancelDuplicate expectFinished = - task { - let cache = AsyncMemoize(cancelDuplicateRunningJobs=cancelDuplicate) - - let mutable started = 0 - let mutable finished = 0 + let cache = AsyncMemoize(cancelDuplicateRunningJobs=cancelDuplicate) - let job1started = new ManualResetEvent(false) - let job1finished = new ManualResetEvent(false) + let mutable started = 0 + let mutable finished = 0 - let jobCanContinue = new ManualResetEvent(false) + let job1started = new ManualResetEventSlim(false) + let job1finished = new ManualResetEventSlim(false) - let job2started = new ManualResetEvent(false) - let job2finished = new ManualResetEvent(false) + let jobCanContinue = new ManualResetEventSlim(false) - let work onStart onFinish = async { - Interlocked.Increment &started |> ignore - onStart() |> ignore - waitFor jobCanContinue - do! spinFor (TimeSpan.FromMilliseconds 100) - Interlocked.Increment &finished |> ignore - onFinish() |> ignore - } + let job2started = new ManualResetEventSlim(false) + let job2finished = new ManualResetEventSlim(false) - let key1 = - { new ICacheKey<_, _> with - member _.GetKey() = 1 - member _.GetVersion() = 1 - member _.GetLabel() = "key1" } + let work onStart onFinish = async { + Interlocked.Increment &started |> ignore + onStart() |> ignore + jobCanContinue.Wait() + do! Async.Sleep 100 + Interlocked.Increment &finished |> ignore + onFinish() |> ignore + } - cache.Get(key1, work job1started.Set job1finished.Set) |> Async.Start + let key1 = + { new ICacheKey<_, _> with + member _.GetKey() = 1 + member _.GetVersion() = 1 + member _.GetLabel() = "key1" } - waitFor job1started + cache.Get(key1, work job1started.Set job1finished.Set) |> Async.Catch |> Async.Ignore |> Async.Start - let key2 = - { new ICacheKey<_, _> with - member _.GetKey() = key1.GetKey() - member _.GetVersion() = key1.GetVersion() + 1 - member _.GetLabel() = "key2" } + job1started.Wait() - cache.Get(key2, work job2started.Set job2finished.Set ) |> Async.Start + let key2 = + { new ICacheKey<_, _> with + member _.GetKey() = key1.GetKey() + member _.GetVersion() = key1.GetVersion() + 1 + member _.GetLabel() = "key2" } - waitFor job2started + cache.Get(key2, work job2started.Set job2finished.Set ) |> Async.Catch |> Async.Ignore |> Async.Start - jobCanContinue.Set() |> ignore + job2started.Wait() - waitFor job2finished + jobCanContinue.Set() |> ignore - if not cancelDuplicate then - waitFor job1finished - - Assert.Equal((2, expectFinished), (started, finished)) - } + job2finished.Wait() + + if not cancelDuplicate then + job1finished.Wait() + Assert.Equal((2, expectFinished), (started, finished)) type DummyException(msg) = inherit Exception(msg) @@ -490,7 +477,7 @@ let ``Preserve thread static diagnostics`` () = let diagnostics = diagnosticsLogger.GetDiagnostics() - //Assert.Equal(3, diagnostics.Length) + Assert.Equal(4, diagnostics.Length) return result, diagnostics } @@ -498,9 +485,9 @@ let ``Preserve thread static diagnostics`` () = let results = (Task.WhenAll tasks).Result - let _diagnosticCounts = results |> Seq.map snd |> Seq.map Array.length |> Seq.groupBy id |> Seq.map (fun (k, v) -> k, v |> Seq.length) |> Seq.sortBy fst |> Seq.toList + let diagnosticCounts = results |> Seq.map snd |> Seq.map Array.length |> Seq.groupBy id |> Seq.map (fun (k, v) -> k, v |> Seq.length) |> Seq.sortBy fst |> Seq.toList - //Assert.Equal<(int * int) list>([4, 100], diagnosticCounts) + Assert.Equal<(int * int) list>([4, 100], diagnosticCounts) let diagnosticMessages = results |> Seq.map snd |> Seq.map (Array.map (fun (d, _) -> d.Exception.Message) >> Array.toList) |> Set @@ -523,7 +510,7 @@ let ``Preserve thread static diagnostics already completed job`` () = return Ok input } - async { + task { let diagnosticsLogger = CompilationDiagnosticLogger($"Testing", FSharpDiagnosticOptions.Default) @@ -534,10 +521,9 @@ let ``Preserve thread static diagnostics already completed job`` () = let diagnosticMessages = diagnosticsLogger.GetDiagnostics() |> Array.map (fun (d, _) -> d.Exception.Message) |> Array.toList - Assert.Equal>(["job 1 error"; "job 1 error"], diagnosticMessages) + Assert.Equal<_ list>(["job 1 error"; "job 1 error"], diagnosticMessages) } - |> Async.StartAsTask [] @@ -550,34 +536,22 @@ let ``We get diagnostics from the job that failed`` () = member _.GetVersion() = 1 member _.GetLabel() = "job1" } - let job (input: int) = async { - let ex = DummyException($"job {input} error") - do! Async.Sleep 100 - DiagnosticsThreadStatics.DiagnosticsLogger.Error(ex) + let job = async { + let ex = DummyException($"job error") + + // no recovery + DiagnosticsThreadStatics.DiagnosticsLogger.Error ex return 5 } - let result = - [1; 2] - |> Seq.map (fun i -> - async { - let diagnosticsLogger = CompilationDiagnosticLogger($"Testing", FSharpDiagnosticOptions.Default) - - use _ = new CompilationGlobalsScope(diagnosticsLogger, BuildPhase.Optimize) - try - let! _ = cache.Get(key, job i ) - () - with _ -> - () - let diagnosticMessages = diagnosticsLogger.GetDiagnostics() |> Array.map (fun (d, _) -> d.Exception.Message) |> Array.toList - - return diagnosticMessages - }) - |> Async.Parallel - |> Async.StartAsTask - |> (fun t -> t.Result) - |> Array.toList - - Assert.True( - result = [["job 1 error"]; ["job 1 error"]] || - result = [["job 2 error"]; ["job 2 error"]] ) + task { + let logger = CapturingDiagnosticsLogger("AsyncMemoize diagnostics test") + + SetThreadDiagnosticsLoggerNoUnwind logger + + do! cache.Get(key, job ) |> Async.Catch |> Async.Ignore + + let messages = logger.Diagnostics |> List.map fst |> List.map _.Exception.Message + + Assert.Equal<_ list>(["job error"], messages) + } diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/AttributeUsage.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/AttributeUsage.fs index f6d8a0cc530..9b7cdc5a053 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/AttributeUsage.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/AttributeUsage.fs @@ -933,3 +933,36 @@ and [] |> verifyCompile |> shouldSucceed #endif + + [] // Regression for https://github.com/dotnet/fsharp/issues/14304 + let ``Construct an object with default and params parameters using parameterless constructor`` () = + Fsx """ +open System +open System.Runtime.InteropServices + +type DefaultAndParams([]x: int, [] value: string[]) = + inherit Attribute() + +type ParamsOnly([] value: string[]) = + inherit Attribute() + +type DefaultOnly([]x: int) = + inherit Attribute() + +[] +type Q1 = struct end + +[] // ok +type Q11 = struct end + +[] // ok +type Q12 = struct end + +[] +type Q2 = struct end + +[] +type Q3 = struct end + """ + |> typecheck + |> shouldSucceed \ No newline at end of file diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/ExceptionDefinitions.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/ExceptionDefinitions.fs index fb7785d3758..1ec630b6e98 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/ExceptionDefinitions.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/ExceptionDefinitions.fs @@ -289,7 +289,7 @@ module ExceptionDefinition = |> compile |> shouldFail |> withDiagnostics [ - (Error 945, Line 9, Col 5, Line 9, Col 24, "Cannot inherit a sealed type") + (Error 945, Line 9, Col 13, Line 9, Col 22, "Cannot inherit a sealed type") (Error 1133, Line 9, Col 5, Line 9, Col 24, "No constructors are available for the type 'FSharpExn'") ] diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/TypeAbbreviations.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/TypeAbbreviations.fs index 80db08b3025..365f1af46b7 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/TypeAbbreviations.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/TypeAbbreviations.fs @@ -157,7 +157,7 @@ module TypeAbbreviations = |> verifyCompile |> shouldFail |> withDiagnostics [ - (Error 945, Line 9, Col 9, Line 9, Col 22, "Cannot inherit a sealed type") + (Error 945, Line 9, Col 17, Line 9, Col 22, "Cannot inherit a sealed type") ] //SOURCE=E_PrivateTypeAbbreviation02.fs SCFLAGS="--test:ErrorRanges" # E_PrivateTypeAbbreviation02.fs diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/UnionTypes.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/UnionTypes.fs index 26acb4b9d0f..0c61d444a9d 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/UnionTypes.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/UnionTypes.fs @@ -195,8 +195,8 @@ module UnionTypes = |> verifyCompile |> shouldFail |> withDiagnostics [ - (Error 961, Line 10, Col 5, Line 10, Col 22, "This 'inherit' declaration specifies the inherited type but no arguments. Consider supplying arguments, e.g. 'inherit BaseType(args)'.") - (Error 945, Line 10, Col 5, Line 10, Col 22, "Cannot inherit a sealed type") + (Error 961, Line 10, Col 5, Line 10, Col 12, "This 'inherit' declaration specifies the inherited type but no arguments. Consider supplying arguments, e.g. 'inherit BaseType(args)'.") + (Error 945, Line 10, Col 13, Line 10, Col 22, "Cannot inherit a sealed type") ] //SOURCE=E_LowercaseDT.fs # E_LowercaseDT.fs diff --git a/tests/FSharp.Compiler.ComponentTests/ConstraintSolver/MemberConstraints.fs b/tests/FSharp.Compiler.ComponentTests/ConstraintSolver/MemberConstraints.fs index b3c33031acb..c560008da0c 100644 --- a/tests/FSharp.Compiler.ComponentTests/ConstraintSolver/MemberConstraints.fs +++ b/tests/FSharp.Compiler.ComponentTests/ConstraintSolver/MemberConstraints.fs @@ -45,7 +45,6 @@ else () |> compile |> run |> shouldSucceed - |> withExitCode 0 [] let ``Respect nowarn 957 for extension method`` () = diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/Literals.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/Literals.fs index d2dc41a3235..1477db7754c 100644 --- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/Literals.fs +++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/Literals.fs @@ -176,37 +176,118 @@ let [] x = System.Int32.MaxValue + 1 } [] - let ``Arithmetic can be used for constructing decimal literals``() = + let ``Decimal literals are properly initialized``() = FSharp """ -module LiteralArithmetic +module DecimalInit [] -let x = 1m + 2m +let x = 5.5m """ |> withLangVersion80 |> compile |> shouldSucceed |> verifyIL [ - """.field public static initonly valuetype [runtime]System.Decimal x""" - """.custom instance void [runtime]System.Runtime.CompilerServices.DecimalConstantAttribute::.ctor(uint8, + """ +.class public abstract auto ansi sealed DecimalInit + extends [runtime]System.Object +{ + .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) + .field public static initonly valuetype [runtime]System.Decimal x + .custom instance void [runtime]System.Runtime.CompilerServices.DecimalConstantAttribute::.ctor(uint8, uint8, int32, int32, - int32) = ( 01 00 00 00 00 00 00 00 00 00 00 00 03 00 00 00 - 00 00 )""" - """.maxstack 8""" - """IL_0000: ldc.i4.3""" - """IL_0001: ldc.i4.0""" - """IL_0002: ldc.i4.0""" - """IL_0003: ldc.i4.0""" - """IL_0004: ldc.i4.0""" - """IL_0005: newobj instance void [runtime]System.Decimal::.ctor(int32, + int32) = ( 01 00 01 00 00 00 00 00 00 00 00 00 37 00 00 00 + 00 00 ) + .custom instance void [runtime]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [runtime]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) + .method private specialname rtspecialname static void .cctor() cil managed + { + + .maxstack 8 + IL_0000: ldc.i4.0 + IL_0001: stsfld int32 ''.$DecimalInit::init@ + IL_0006: ldsfld int32 ''.$DecimalInit::init@ + IL_000b: pop + IL_000c: ret + } + + .method assembly specialname static void staticInitialization@() cil managed + { + + .maxstack 8 + IL_0000: ldc.i4.s 55 + IL_0002: ldc.i4.0 + IL_0003: ldc.i4.0 + IL_0004: ldc.i4.0 + IL_0005: ldc.i4.1 + IL_0006: newobj instance void [runtime]System.Decimal::.ctor(int32, int32, int32, bool, - uint8)""" - """IL_000a: stsfld valuetype [runtime]System.Decimal LiteralArithmetic::x""" - """IL_000f: ret""" + uint8) + IL_000b: stsfld valuetype [runtime]System.Decimal DecimalInit::x + IL_0010: ret + } + +} + +.class private abstract auto ansi sealed ''.$DecimalInit + extends [runtime]System.Object +{ + .field static assembly int32 init@ + .custom instance void [runtime]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [runtime]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) + .custom instance void [runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 ) + .custom instance void [runtime]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 ) + .method private specialname rtspecialname static void .cctor() cil managed + { + + .maxstack 8 + IL_0000: call void DecimalInit::staticInitialization@() + IL_0005: ret + } + +} +""" + ] + + [] + let ``Arithmetic can be used for constructing decimal literals``() = + FSharp """ +module LiteralArithmetic + +[] +let x = 1m + 2m + """ + |> withLangVersion80 + |> compile + |> shouldSucceed + |> verifyIL [ + """.field public static initonly valuetype [runtime]System.Decimal x +.custom instance void [runtime]System.Runtime.CompilerServices.DecimalConstantAttribute::.ctor(uint8, + uint8, + int32, + int32, + int32) = ( 01 00 00 00 00 00 00 00 00 00 00 00 03 00 00 00 + 00 00 )""" + """ +.method assembly specialname static void staticInitialization@() cil managed +{ + +.maxstack 8 +IL_0000: ldc.i4.3 +IL_0001: ldc.i4.0 +IL_0002: ldc.i4.0 +IL_0003: ldc.i4.0 +IL_0004: ldc.i4.0 +IL_0005: newobj instance void [runtime]System.Decimal::.ctor(int32, + int32, + int32, + bool, + uint8) +IL_000a: stsfld valuetype [runtime]System.Decimal LiteralArithmetic::x +IL_000f: ret +} +""" ] [] @@ -226,28 +307,45 @@ let test () = |> compile |> shouldSucceed |> verifyIL [ - """.field public static initonly valuetype [runtime]System.Decimal x""" - """ .custom instance void [runtime]System.Runtime.CompilerServices.DecimalConstantAttribute::.ctor(uint8, - uint8, - int32, - int32, - int32) = ( 01 00 00 00 00 00 00 00 00 00 00 00 05 00 00 00 - 00 00 )""" - """IL_0016: call bool [netstandard]System.Decimal::op_Equality(valuetype [netstandard]System.Decimal, - valuetype [netstandard]System.Decimal)""" - """.maxstack 8""" - """IL_0000: ldc.i4.5""" - """IL_0001: ldc.i4.0""" - """IL_0002: ldc.i4.0""" - """IL_0003: ldc.i4.0""" - """IL_0004: ldc.i4.0""" - """IL_0005: newobj instance void [runtime]System.Decimal::.ctor(int32, - int32, - int32, - bool, - uint8)""" - """IL_000a: stsfld valuetype [runtime]System.Decimal PatternMatch::x""" - """IL_000f: ret""" + """ +.field public static initonly valuetype [runtime]System.Decimal x +.custom instance void [runtime]System.Runtime.CompilerServices.DecimalConstantAttribute::.ctor(uint8, + uint8, + int32, + int32, + int32) = ( 01 00 00 00 00 00 00 00 00 00 00 00 05 00 00 00 + 00 00 )""" + """ +.method public static int32 test() cil managed + { + +.maxstack 8 +.locals init (valuetype [runtime]System.Decimal V_0) +IL_0000: ldc.i4.5 +IL_0001: ldc.i4.0 +IL_0002: ldc.i4.0 +IL_0003: ldc.i4.0 +IL_0004: ldc.i4.0 +IL_0005: newobj instance void [netstandard]System.Decimal::.ctor(int32, + int32, + int32, + bool, + uint8) +IL_000a: stloc.0 +IL_000b: ldloc.0 +IL_000c: ldc.i4.5 +IL_000d: ldc.i4.0 +IL_000e: ldc.i4.0 +IL_000f: ldc.i4.0 +IL_0010: ldc.i4.0 +IL_0011: newobj instance void [netstandard]System.Decimal::.ctor(int32, + int32, + int32, + bool, + uint8) +IL_0016: call bool [netstandard]System.Decimal::op_Equality(valuetype [netstandard]System.Decimal, + valuetype [netstandard]System.Decimal) + """ ] [] @@ -264,6 +362,56 @@ let y = 42m |> withLangVersion80 |> compile |> shouldSucceed + |> verifyIL [ + """ +.field public static initonly valuetype [runtime]System.Decimal x +.custom instance void [runtime]System.Runtime.CompilerServices.DecimalConstantAttribute::.ctor(uint8, + uint8, + int32, + int32, + int32) = ( 01 00 00 00 00 00 00 00 00 00 00 00 29 00 00 00 + 00 00 ) +""" + """ +.field public static initonly valuetype [runtime]System.Decimal y +.custom instance void [runtime]System.Runtime.CompilerServices.DecimalConstantAttribute::.ctor(uint8, + uint8, + int32, + int32, + int32) = ( 01 00 00 00 00 00 00 00 00 00 00 00 2A 00 00 00 + 00 00 ) +""" + """ +.method assembly specialname static void staticInitialization@() cil managed +{ + +.maxstack 8 +IL_0000: ldc.i4.s 41 +IL_0002: ldc.i4.0 +IL_0003: ldc.i4.0 +IL_0004: ldc.i4.0 +IL_0005: ldc.i4.0 +IL_0006: newobj instance void [runtime]System.Decimal::.ctor(int32, + int32, + int32, + bool, + uint8) +IL_000b: stsfld valuetype [runtime]System.Decimal DecimalLiterals::x +IL_0010: ldc.i4.s 42 +IL_0012: ldc.i4.0 +IL_0013: ldc.i4.0 +IL_0014: ldc.i4.0 +IL_0015: ldc.i4.0 +IL_0016: newobj instance void [runtime]System.Decimal::.ctor(int32, + int32, + int32, + bool, + uint8) +IL_001b: stsfld valuetype [runtime]System.Decimal DecimalLiterals::y +IL_0020: ret +} +""" + ] [] let ``Compilation fails when using arithmetic with a non-literal in literal``() = diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/TryCatch/TryCatch.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/TryCatch/TryCatch.fs index 9a43d34d429..1e5187167a7 100644 --- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/TryCatch/TryCatch.fs +++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/TryCatch/TryCatch.fs @@ -56,9 +56,9 @@ let ``Stackoverflow reproduction`` compilation = | CompilationResult.Success ({OutputPath = Some dllFile} as s) -> let fsharpCoreFile = typeof>.Assembly.Location File.Copy(fsharpCoreFile, Path.Combine(Path.GetDirectoryName(dllFile), Path.GetFileName(fsharpCoreFile)), true) - let exitCode, _stdout, _stderr = CompilerAssert.ExecuteAndReturnResult (dllFile, isFsx=false, deps = s.Dependencies, newProcess=true) + let _exitCode, _stdout, stderr, _exn = CompilerAssert.ExecuteAndReturnResult (dllFile, isFsx=false, deps = s.Dependencies, newProcess=true) - Assert.NotEqual(0,exitCode) + Assert.True(stderr.Contains "stack overflow" || stderr.Contains "StackOverflow") | _ -> failwith (sprintf "%A" compilationResult) diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ClassesTests.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ClassesTests.fs index 55f4d1cbf1b..44e8e202a94 100644 --- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ClassesTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ClassesTests.fs @@ -815,4 +815,19 @@ type A() = default this.M() = () """ |> typecheck - |> shouldSucceed \ No newline at end of file + |> shouldSucceed + + [] + let ``This 'inherit' declaration specifies the inherited type but no arguments. Consider supplying arguments, e. g. 'inherit BaseType(args)'`` () = + Fsx """ +type IA = interface end + +type Class() = + inherit IA + """ + |> typecheck + |> shouldFail + |> withDiagnostics [ + (Error 961, Line 5, Col 5, Line 5, Col 12, "This 'inherit' declaration specifies the inherited type but no arguments. Consider supplying arguments, e.g. 'inherit BaseType(args)'.") + (Error 946, Line 5, Col 13, Line 5, Col 15, "Cannot inherit from interface type. Use interface ... with instead.") + ] \ No newline at end of file diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/TypeMismatchTests.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/TypeMismatchTests.fs index 34263b3f7bc..53cb33b5b78 100644 --- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/TypeMismatchTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/TypeMismatchTests.fs @@ -347,7 +347,7 @@ let f4 = |> withDiagnostics [ (Error 1, Line 6, Col 9, Line 6, Col 16, "This expression was expected to have type\n 'int' \nbut here has type\n 'string' ") (Error 1, Line 12, Col 13, Line 12, Col 16, "This expression was expected to have type\n 'int' \nbut here has type\n 'string' ") - (Error 193, Line 21, Col 9, Line 21, Col 24, "Type constraint mismatch. The type \n 'int list' \nis not compatible with type\n 'string seq' \n") + (Error 193, Line 21, Col 16, Line 21, Col 24, "Type constraint mismatch. The type \n 'int list' \nis not compatible with type\n 'string seq' \n") (Error 1, Line 28, Col 9, Line 28, Col 12, "This expression was expected to have type\n 'int64' \nbut here has type\n 'float' ") ] diff --git a/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj b/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj index d73f54e0763..22b003a7d61 100644 --- a/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj +++ b/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj @@ -32,6 +32,7 @@ FsUnit.fs + diff --git a/tests/FSharp.Compiler.ComponentTests/Language/ComputationExpressionTests.fs b/tests/FSharp.Compiler.ComponentTests/Language/ComputationExpressionTests.fs index 319d79aa8ea..3555e97fd2d 100644 --- a/tests/FSharp.Compiler.ComponentTests/Language/ComputationExpressionTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/Language/ComputationExpressionTests.fs @@ -493,4 +493,236 @@ let run r2 r3 = |> shouldFail |> withDiagnostics [ (Error 750, Line 3, Col 5, Line 3, Col 11, "This construct may only be used within computation expressions") + ] + + [] + let ``This control construct may only be used if the computation expression builder defines a 'Yield' method`` () = + Fsx """ +let f3 = + async { + if true then + yield "a" + else + yield "b" + } + """ + |> ignoreWarnings + |> typecheck + |> shouldFail + |> withDiagnostics [ + (Error 708, Line 5, Col 13, Line 5, Col 18, "This control construct may only be used if the computation expression builder defines a 'Yield' method") + ] + + [] + let ``This control construct may only be used if the computation expression builder defines a 'YieldFrom' method`` () = + Fsx """ +let f3 = + async { + if true then + yield! "a" + else + yield "b" + } + """ + |> ignoreWarnings + |> typecheck + |> shouldFail + |> withDiagnostics [ + (Error 708, Line 5, Col 13, Line 5, Col 19, "This control construct may only be used if the computation expression builder defines a 'YieldFrom' method") + ] + + + [] + let ``This control construct may only be used if the computation expression builder defines a 'Return' method`` () = + Fsx """ +module Result = + let zip x1 x2 = + match x1,x2 with + | Ok x1res, Ok x2res -> Ok (x1res, x2res) + | Error e, _ -> Error e + | _, Error e -> Error e + +type ResultBuilder() = + member _.MergeSources(t1: Result<'T,'U>, t2: Result<'T1,'U>) = Result.zip t1 t2 + member _.BindReturn(x: Result<'T,'U>, f) = Result.map f x + member _.Delay(f) = f() + + member _.TryWith(r: Result<'T,'U>, f) = + match r with + | Ok x -> Ok x + | Error e -> f e + +let result = ResultBuilder() + +let run r2 r3 = + result { + match r2 with + | Ok x -> return x + | Error e -> return e + } + """ + |> ignoreWarnings + |> typecheck + |> shouldFail + |> withDiagnostics [ + (Error 708, Line 24, Col 19, Line 24, Col 25, "This control construct may only be used if the computation expression builder defines a 'Return' method") + ] + + + [] + let ``This control construct may only be used if the computation expression builder defines a 'ReturnFrom' method`` () = + Fsx """ +module Result = + let zip x1 x2 = + match x1,x2 with + | Ok x1res, Ok x2res -> Ok (x1res, x2res) + | Error e, _ -> Error e + | _, Error e -> Error e + +type ResultBuilder() = + member _.MergeSources(t1: Result<'T,'U>, t2: Result<'T1,'U>) = Result.zip t1 t2 + member _.BindReturn(x: Result<'T,'U>, f) = Result.map f x + member _.Delay(f) = f() + + member _.TryWith(r: Result<'T,'U>, f) = + match r with + | Ok x -> Ok x + | Error e -> f e + +let result = ResultBuilder() + +let run r2 r3 = + result { + match r2 with + | Ok x -> return! x + | Error e -> return e + } + """ + |> ignoreWarnings + |> typecheck + |> shouldFail + |> withDiagnostics [ + (Error 708, Line 24, Col 19, Line 24, Col 26, "This control construct may only be used if the computation expression builder defines a 'ReturnFrom' method") + ] + + [] + let ``Type constraint mismatch when using return!`` () = + Fsx """ +open System.Threading.Tasks + +let maybeTask = task { return false } + +let indexHandler (): Task = + task { + return! maybeTask + } + """ + |> ignoreWarnings + |> typecheck + |> shouldFail + |> withDiagnostics [ + (Error 193, Line 8, Col 17, Line 8, Col 26, "Type constraint mismatch. The type \n 'TaskCode' \nis not compatible with type\n 'TaskCode' \n") + ] + + [] + let ``Type constraint mismatch when using return`` () = + Fsx """ +open System.Threading.Tasks + +let maybeTask = task { return false } + +let indexHandler (): Task = + task { + return maybeTask + } + """ + |> ignoreWarnings + |> typecheck + |> shouldFail + |> withDiagnostics [ + (Error 1, Line 8, Col 16, Line 8, Col 25, "This expression was expected to have type + 'string' +but here has type + 'Task' ") + ] + + [] + let ``use expressions may not be used in queries(SynExpr.Sequential)`` () = + Fsx """ +let x11 = + query { for c in [1..10] do + use x = { new System.IDisposable with __.Dispose() = () } + yield 1 } + """ + |> ignoreWarnings + |> typecheck + |> shouldFail + |> withDiagnostics [ + (Error 3142, Line 4, Col 13, Line 4, Col 16, "'use' expressions may not be used in queries") + ] + + [] + let ``use, This control construct may only be used if the computation expression builder defines a 'Using' method`` () = + Fsx """ +module Result = + let zip x1 x2 = + match x1,x2 with + | Ok x1res, Ok x2res -> Ok (x1res, x2res) + | Error e, _ -> Error e + | _, Error e -> Error e + +type ResultBuilder() = + member _.MergeSources(t1: Result<'T,'U>, t2: Result<'T1,'U>) = Result.zip t1 t2 + member _.BindReturn(x: Result<'T,'U>, f) = Result.map f x + + member _.YieldReturn(x: Result<'T,'U>) = x + member _.Return(x: 'T) = Ok x + +let result = ResultBuilder() + +let run r2 r3 = + result { + use b = r2 + return Ok 0 + } + """ + |> ignoreWarnings + |> typecheck + |> shouldFail + |> withDiagnostics [ + (Error 708, Line 20, Col 9, Line 20, Col 12, "This control construct may only be used if the computation expression builder defines a 'Using' method") + ] + + [] + let ``This 'let' definition may not be used in a query. Only simple value definitions may be used in queries.`` () = + Fsx """ +let x18rec2 = + query { + for d in [1..10] do + let rec f x = x + 1 // error expected here - no recursive functions + and g x = f x + 2 + select (f d) + } + +let x18inline = + query { + for d in [1..10] do + let inline f x = x + 1 // error expected here - no inline functions + select (f d) + } + +let x18mutable = + query { + for d in [1..10] do + let mutable v = 1 // error expected here - no mutable values + select (f d) + } + + """ + |> typecheck + |> shouldFail + |> withDiagnostics [ + (Error 3147, Line 5, Col 17, Line 5, Col 20, "This 'let' definition may not be used in a query. Only simple value definitions may be used in queries.") + (Error 3147, Line 13, Col 20, Line 13, Col 23, "This 'let' definition may not be used in a query. Only simple value definitions may be used in queries.") + (Error 3147, Line 20, Col 21, Line 20, Col 22, "This 'let' definition may not be used in a query. Only simple value definitions may be used in queries.") ] \ No newline at end of file diff --git a/tests/FSharp.Compiler.ComponentTests/Language/Nullness/NullableReferenceTypesTests.fs b/tests/FSharp.Compiler.ComponentTests/Language/Nullness/NullableReferenceTypesTests.fs index 1edfbfd7961..0da1169b9a8 100644 --- a/tests/FSharp.Compiler.ComponentTests/Language/Nullness/NullableReferenceTypesTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/Language/Nullness/NullableReferenceTypesTests.fs @@ -144,6 +144,21 @@ let nonStrictFunc(x:string | null) = strictFunc(x) |> shouldFail |> withDiagnostics [ Error 3261, Line 4, Col 49, Line 4, Col 50, "Nullness warning: The types 'string' and 'string | null' do not have equivalent nullability."] + +[] +let ``Can have nullable prop of same type T within a custom type T``() = + FSharp """ +module MyLib +type T () = + let mutable v : T | null = null + member val P : T | null = null with get, set + member this.M() = + v <- null + this.P <- null + """ + |> asLibrary + |> typeCheckWithStrictNullness + |> shouldSucceed [] [] diff --git a/tests/FSharp.Compiler.ComponentTests/Language/SequenceExpressionTests.fs b/tests/FSharp.Compiler.ComponentTests/Language/SequenceExpressionTests.fs index 982ae0c820b..8247eaf60e3 100644 --- a/tests/FSharp.Compiler.ComponentTests/Language/SequenceExpressionTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/Language/SequenceExpressionTests.fs @@ -442,4 +442,29 @@ let typedSeq = |> withErrorCode 30 |> withDiagnosticMessageMatches "Value restriction: The value 'typedSeq' has an inferred generic type" |> withDiagnosticMessageMatches "val typedSeq: '_a seq" - \ No newline at end of file + +[] +let ``yield may only be used within list, array, and sequence expressions``() = + Fsx """ +let f1 = yield [ 3; 4 ] +let f2 = yield! [ 3; 4 ] + """ + |> typecheck + |> shouldFail + |> withDiagnostics [ + (Error 747, Line 2, Col 10, Line 2, Col 15, "This construct may only be used within list, array and sequence expressions, e.g. expressions of the form 'seq { ... }', '[ ... ]' or '[| ... |]'. These use the syntax 'for ... in ... do ... yield...' to generate elements"); + (Error 747, Line 3, Col 10, Line 3, Col 16, "This construct may only be used within list, array and sequence expressions, e.g. expressions of the form 'seq { ... }', '[ ... ]' or '[| ... |]'. These use the syntax 'for ... in ... do ... yield...' to generate elements") + ] + +[] +let ``return may only be used within list, array, and sequence expressions``() = + Fsx """ +let f1 = return [ 3; 4 ] +let f2 = return! [ 3; 4 ] + """ + |> typecheck + |> shouldFail + |> withDiagnostics [ + (Error 748, Line 2, Col 10, Line 2, Col 16, "This construct may only be used within computation expressions. To return a value from an ordinary function simply write the expression without 'return'."); + (Error 748, Line 3, Col 10, Line 3, Col 17, "This construct may only be used within computation expressions. To return a value from an ordinary function simply write the expression without 'return'.") + ] \ No newline at end of file diff --git a/tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/CompilationFromCmdlineArgsTests.fs b/tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/CompilationFromCmdlineArgsTests.fs index 9cfbbb9df80..294db344223 100644 --- a/tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/CompilationFromCmdlineArgsTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/CompilationFromCmdlineArgsTests.fs @@ -38,12 +38,12 @@ module CompilationFromCmdlineArgsTests = yield! methodOptions method |] - let diagnostics, exitCode = checker.Compile(args) |> Async.RunSynchronously + let diagnostics, exn = checker.Compile(args) |> Async.RunSynchronously for diag in diagnostics do printfn "%A" diag - Assert.Equal(exitCode, 0) + Assert.Equal(exn, None) finally Environment.CurrentDirectory <- oldWorkDir diff --git a/tests/FSharp.Compiler.Private.Scripting.UnitTests/FSharpScriptTests.fs b/tests/FSharp.Compiler.Private.Scripting.UnitTests/FSharpScriptTests.fs index aff47308ad2..bf3a9cbaac6 100644 --- a/tests/FSharp.Compiler.Private.Scripting.UnitTests/FSharpScriptTests.fs +++ b/tests/FSharp.Compiler.Private.Scripting.UnitTests/FSharpScriptTests.fs @@ -12,12 +12,16 @@ open System.Threading.Tasks open FSharp.Compiler.Interactive open FSharp.Compiler.Interactive.Shell open FSharp.Test.ScriptHelpers -open FSharp.Test.Utilities open Xunit type InteractiveTests() = + let copyHousingToTemp() = + let tempName = TestFramework.getTemporaryFileName() + File.Copy(__SOURCE_DIRECTORY__ ++ "housing.csv", tempName + ".csv") + tempName + [] member _.``ValueRestriction error message should not have type variables fully solved``() = use script = new FSharpScript() @@ -248,10 +252,10 @@ System.Configuration.ConfigurationManager.AppSettings.Item "Environment" <- "LOC if RuntimeInformation.ProcessArchitecture = Architecture.Arm64 then () else - let code = @" -#r ""nuget:Microsoft.ML,version=1.4.0-preview"" -#r ""nuget:Microsoft.ML.AutoML,version=0.16.0-preview"" -#r ""nuget:Microsoft.Data.Analysis,version=0.4.0"" + let code = $""" +#r "nuget:Microsoft.ML,version=1.4.0-preview" +#r "nuget:Microsoft.ML.AutoML,version=0.16.0-preview" +#r "nuget:Microsoft.Data.Analysis,version=0.4.0" open System open System.IO @@ -267,7 +271,7 @@ let Shuffle (arr:int[]) = arr.[i] <- temp arr -let housingPath = ""housing.csv"" +let housingPath = @"{copyHousingToTemp()}.csv" let housingData = DataFrame.LoadCsv(housingPath) let randomIndices = (Shuffle(Enumerable.Range(0, (int (housingData.Rows.Count) - 1)).ToArray())) let testSize = int (float (housingData.Rows.Count) * 0.1) @@ -281,11 +285,11 @@ open Microsoft.ML.AutoML let mlContext = MLContext() let experiment = mlContext.Auto().CreateRegressionExperiment(maxExperimentTimeInSeconds = 15u) -let result = experiment.Execute(housing_train, labelColumnName = ""median_house_value"") +let result = experiment.Execute(housing_train, labelColumnName = "median_house_value") let details = result.RunDetails -printfn ""%A"" result +printfn "{@"%A"}" result 123 -" +""" use script = new FSharpScript(additionalArgs=[| |]) let opt = script.Eval(code) |> getValue let value = opt.Value @@ -511,3 +515,4 @@ let add (col:IServiceCollection) = use script = new FSharpScript(additionalArgs=[| |]) let _value,diag = script.Eval(code) Assert.Empty(diag) + diff --git a/tests/FSharp.Compiler.Service.Tests/BuildGraphTests.fs b/tests/FSharp.Compiler.Service.Tests/BuildGraphTests.fs index 16b0ff7b878..4769b4c322d 100644 --- a/tests/FSharp.Compiler.Service.Tests/BuildGraphTests.fs +++ b/tests/FSharp.Compiler.Service.Tests/BuildGraphTests.fs @@ -385,22 +385,17 @@ module BuildGraphTests = for i in 1 .. 300 do async { - Interlocked.Increment(&count) |> ignore - errorR (ExampleException $"{i}") + errorR (ExampleException $"{Interlocked.Increment(&count)}") + error (ExampleException $"{Interlocked.Increment(&count)}") } ] - let run = - tasks |> MultipleDiagnosticsLoggers.Parallel |> Async.Catch |> Async.StartAsTask - - Assert.True( - run.Wait(1000), - "MultipleDiagnosticsLoggers.Parallel did not finish." - ) - - // Diagnostics from all started tasks should be collected despite the exception. - errorCountShouldBe count + task { + do! tasks |> MultipleDiagnosticsLoggers.Parallel |> Async.Catch |> Async.Ignore + // Diagnostics from all started tasks should be collected despite the exception. + errorCountShouldBe count + } [] let ``AsyncLocal diagnostics context flows correctly`` () = diff --git a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.debug.bsl b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.debug.bsl index 0d8aa5b19f6..7348a0c072a 100644 --- a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.debug.bsl +++ b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.debug.bsl @@ -2166,7 +2166,7 @@ FSharp.Compiler.CodeAnalysis.FSharpChecker: Microsoft.FSharp.Control.FSharpAsync FSharp.Compiler.CodeAnalysis.FSharpChecker: Microsoft.FSharp.Control.FSharpAsync`1[System.Tuple`2[FSharp.Compiler.CodeAnalysis.FSharpParseFileResults,FSharp.Compiler.CodeAnalysis.FSharpCheckFileResults]] GetBackgroundCheckResultsForFileInProject(System.String, FSharp.Compiler.CodeAnalysis.FSharpProjectOptions, Microsoft.FSharp.Core.FSharpOption`1[System.String]) FSharp.Compiler.CodeAnalysis.FSharpChecker: Microsoft.FSharp.Control.FSharpAsync`1[System.Tuple`2[FSharp.Compiler.CodeAnalysis.FSharpProjectOptions,Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Diagnostics.FSharpDiagnostic]]] GetProjectOptionsFromScript(System.String, FSharp.Compiler.Text.ISourceText, Microsoft.FSharp.Core.FSharpOption`1[System.Boolean], Microsoft.FSharp.Core.FSharpOption`1[System.DateTime], Microsoft.FSharp.Core.FSharpOption`1[System.String[]], Microsoft.FSharp.Core.FSharpOption`1[System.Boolean], Microsoft.FSharp.Core.FSharpOption`1[System.Boolean], Microsoft.FSharp.Core.FSharpOption`1[System.Boolean], Microsoft.FSharp.Core.FSharpOption`1[System.String], Microsoft.FSharp.Core.FSharpOption`1[System.Int64], Microsoft.FSharp.Core.FSharpOption`1[System.String]) FSharp.Compiler.CodeAnalysis.FSharpChecker: Microsoft.FSharp.Control.FSharpAsync`1[System.Tuple`2[FSharp.Compiler.CodeAnalysis.ProjectSnapshot+FSharpProjectSnapshot,Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Diagnostics.FSharpDiagnostic]]] GetProjectSnapshotFromScript(System.String, FSharp.Compiler.Text.ISourceTextNew, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.CodeAnalysis.DocumentSource], Microsoft.FSharp.Core.FSharpOption`1[System.Boolean], Microsoft.FSharp.Core.FSharpOption`1[System.DateTime], Microsoft.FSharp.Core.FSharpOption`1[System.String[]], Microsoft.FSharp.Core.FSharpOption`1[System.Boolean], Microsoft.FSharp.Core.FSharpOption`1[System.Boolean], Microsoft.FSharp.Core.FSharpOption`1[System.Boolean], Microsoft.FSharp.Core.FSharpOption`1[System.String], Microsoft.FSharp.Core.FSharpOption`1[System.Int64], Microsoft.FSharp.Core.FSharpOption`1[System.String]) -FSharp.Compiler.CodeAnalysis.FSharpChecker: Microsoft.FSharp.Control.FSharpAsync`1[System.Tuple`2[FSharp.Compiler.Diagnostics.FSharpDiagnostic[],System.Int32]] Compile(System.String[], Microsoft.FSharp.Core.FSharpOption`1[System.String]) +FSharp.Compiler.CodeAnalysis.FSharpChecker: Microsoft.FSharp.Control.FSharpAsync`1[System.Tuple`2[FSharp.Compiler.Diagnostics.FSharpDiagnostic[],Microsoft.FSharp.Core.FSharpOption`1[System.Exception]]] Compile(System.String[], Microsoft.FSharp.Core.FSharpOption`1[System.String]) FSharp.Compiler.CodeAnalysis.FSharpChecker: Microsoft.FSharp.Control.FSharpAsync`1[System.Tuple`2[FSharp.Compiler.Text.Range,FSharp.Compiler.Text.Range][]] MatchBraces(System.String, FSharp.Compiler.Text.ISourceText, FSharp.Compiler.CodeAnalysis.FSharpParsingOptions, Microsoft.FSharp.Core.FSharpOption`1[System.String]) FSharp.Compiler.CodeAnalysis.FSharpChecker: Microsoft.FSharp.Control.FSharpAsync`1[System.Tuple`2[FSharp.Compiler.Text.Range,FSharp.Compiler.Text.Range][]] MatchBraces(System.String, System.String, FSharp.Compiler.CodeAnalysis.FSharpProjectOptions, Microsoft.FSharp.Core.FSharpOption`1[System.String]) FSharp.Compiler.CodeAnalysis.FSharpChecker: Microsoft.FSharp.Control.IEvent`2[Microsoft.FSharp.Control.FSharpHandler`1[FSharp.Compiler.CodeAnalysis.FSharpProjectOptions],FSharp.Compiler.CodeAnalysis.FSharpProjectOptions] ProjectChecked @@ -7717,8 +7717,22 @@ FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewTyped(FSharp.C FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewUpcast(FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Syntax.SynType, FSharp.Compiler.Text.Range) FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewWhile(FSharp.Compiler.Syntax.DebugPointAtWhile, FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range) FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewWhileBang(FSharp.Compiler.Syntax.DebugPointAtWhile, FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range) -FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewYieldOrReturn(System.Tuple`2[System.Boolean,System.Boolean], FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range) -FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewYieldOrReturnFrom(System.Tuple`2[System.Boolean,System.Boolean], FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range) +FSharp.Compiler.Syntax.SynExpr+YieldOrReturn: FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia get_trivia() +FSharp.Compiler.Syntax.SynExpr+YieldOrReturn: FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia trivia +FSharp.Compiler.Syntax.SynExpr+YieldOrReturnFrom: FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnFromTrivia get_trivia() +FSharp.Compiler.Syntax.SynExpr+YieldOrReturnFrom: FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnFromTrivia trivia +FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewYieldOrReturn(System.Tuple`2[System.Boolean,System.Boolean], FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range, FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia) +FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewYieldOrReturnFrom(System.Tuple`2[System.Boolean,System.Boolean], FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range, FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnFromTrivia) +FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnFromTrivia: FSharp.Compiler.Text.Range YieldOrReturnFromKeyword +FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnFromTrivia: FSharp.Compiler.Text.Range get_YieldOrReturnFromKeyword() +FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnFromTrivia: System.String ToString() +FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnFromTrivia: Void .ctor(FSharp.Compiler.Text.Range) +FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia: FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia Zero +FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia: FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia get_Zero() +FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia: FSharp.Compiler.Text.Range YieldOrReturnKeyword +FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia: FSharp.Compiler.Text.Range get_YieldOrReturnKeyword() +FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia: System.String ToString() +FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia: Void .ctor(FSharp.Compiler.Text.Range) FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr+AddressOf FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr+AnonRecd FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr+App @@ -8186,7 +8200,13 @@ FSharp.Compiler.Syntax.SynMemberDefn: FSharp.Compiler.Syntax.SynMemberDefn NewAu FSharp.Compiler.Syntax.SynMemberDefn: FSharp.Compiler.Syntax.SynMemberDefn NewGetSetMember(Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.SynBinding], Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.SynBinding], FSharp.Compiler.Text.Range, FSharp.Compiler.SyntaxTrivia.SynMemberGetSetTrivia) FSharp.Compiler.Syntax.SynMemberDefn: FSharp.Compiler.Syntax.SynMemberDefn NewImplicitCtor(Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.SynAccess], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynAttributeList], FSharp.Compiler.Syntax.SynPat, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.Ident], FSharp.Compiler.Xml.PreXmlDoc, FSharp.Compiler.Text.Range, FSharp.Compiler.SyntaxTrivia.SynMemberDefnImplicitCtorTrivia) FSharp.Compiler.Syntax.SynMemberDefn: FSharp.Compiler.Syntax.SynMemberDefn NewImplicitInherit(FSharp.Compiler.Syntax.SynType, FSharp.Compiler.Syntax.SynExpr, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.Ident], FSharp.Compiler.Text.Range) -FSharp.Compiler.Syntax.SynMemberDefn: FSharp.Compiler.Syntax.SynMemberDefn NewInherit(FSharp.Compiler.Syntax.SynType, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.Ident], FSharp.Compiler.Text.Range) +FSharp.Compiler.Syntax.SynMemberDefn+Inherit: FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia get_trivia() +FSharp.Compiler.Syntax.SynMemberDefn+Inherit: FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia trivia +FSharp.Compiler.Syntax.SynMemberDefn: FSharp.Compiler.Syntax.SynMemberDefn NewInherit(FSharp.Compiler.Syntax.SynType, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.Ident], FSharp.Compiler.Text.Range, FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia) +FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia: FSharp.Compiler.Text.Range InheritKeyword +FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia: FSharp.Compiler.Text.Range get_InheritKeyword() +FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia: System.String ToString() +FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia: Void .ctor(FSharp.Compiler.Text.Range) FSharp.Compiler.Syntax.SynMemberDefn: FSharp.Compiler.Syntax.SynMemberDefn NewInterface(FSharp.Compiler.Syntax.SynType, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range], Microsoft.FSharp.Core.FSharpOption`1[Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynMemberDefn]], FSharp.Compiler.Text.Range) FSharp.Compiler.Syntax.SynMemberDefn: FSharp.Compiler.Syntax.SynMemberDefn NewLetBindings(Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynBinding], Boolean, Boolean, FSharp.Compiler.Text.Range) FSharp.Compiler.Syntax.SynMemberDefn: FSharp.Compiler.Syntax.SynMemberDefn NewMember(FSharp.Compiler.Syntax.SynBinding, FSharp.Compiler.Text.Range) @@ -10266,7 +10286,9 @@ FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: FSharp.Compiler.SyntaxTrivia FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range] InKeyword FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range] get_InKeyword() FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: System.String ToString() -FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: Void .ctor(Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range]) +FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: FSharp.Compiler.Text.Range LetOrUseKeyword +FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: FSharp.Compiler.Text.Range get_LetOrUseKeyword() +FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: Void .ctor(FSharp.Compiler.Text.Range, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range]) FSharp.Compiler.SyntaxTrivia.SynExprMatchBangTrivia: FSharp.Compiler.Text.Range MatchBangKeyword FSharp.Compiler.SyntaxTrivia.SynExprMatchBangTrivia: FSharp.Compiler.Text.Range WithKeyword FSharp.Compiler.SyntaxTrivia.SynExprMatchBangTrivia: FSharp.Compiler.Text.Range get_MatchBangKeyword() diff --git a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.release.bsl b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.release.bsl index 79b5b9a68ef..c6fb2c25f61 100644 --- a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.release.bsl +++ b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.release.bsl @@ -2166,7 +2166,7 @@ FSharp.Compiler.CodeAnalysis.FSharpChecker: Microsoft.FSharp.Control.FSharpAsync FSharp.Compiler.CodeAnalysis.FSharpChecker: Microsoft.FSharp.Control.FSharpAsync`1[System.Tuple`2[FSharp.Compiler.CodeAnalysis.FSharpParseFileResults,FSharp.Compiler.CodeAnalysis.FSharpCheckFileResults]] GetBackgroundCheckResultsForFileInProject(System.String, FSharp.Compiler.CodeAnalysis.FSharpProjectOptions, Microsoft.FSharp.Core.FSharpOption`1[System.String]) FSharp.Compiler.CodeAnalysis.FSharpChecker: Microsoft.FSharp.Control.FSharpAsync`1[System.Tuple`2[FSharp.Compiler.CodeAnalysis.FSharpProjectOptions,Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Diagnostics.FSharpDiagnostic]]] GetProjectOptionsFromScript(System.String, FSharp.Compiler.Text.ISourceText, Microsoft.FSharp.Core.FSharpOption`1[System.Boolean], Microsoft.FSharp.Core.FSharpOption`1[System.DateTime], Microsoft.FSharp.Core.FSharpOption`1[System.String[]], Microsoft.FSharp.Core.FSharpOption`1[System.Boolean], Microsoft.FSharp.Core.FSharpOption`1[System.Boolean], Microsoft.FSharp.Core.FSharpOption`1[System.Boolean], Microsoft.FSharp.Core.FSharpOption`1[System.String], Microsoft.FSharp.Core.FSharpOption`1[System.Int64], Microsoft.FSharp.Core.FSharpOption`1[System.String]) FSharp.Compiler.CodeAnalysis.FSharpChecker: Microsoft.FSharp.Control.FSharpAsync`1[System.Tuple`2[FSharp.Compiler.CodeAnalysis.ProjectSnapshot+FSharpProjectSnapshot,Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Diagnostics.FSharpDiagnostic]]] GetProjectSnapshotFromScript(System.String, FSharp.Compiler.Text.ISourceTextNew, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.CodeAnalysis.DocumentSource], Microsoft.FSharp.Core.FSharpOption`1[System.Boolean], Microsoft.FSharp.Core.FSharpOption`1[System.DateTime], Microsoft.FSharp.Core.FSharpOption`1[System.String[]], Microsoft.FSharp.Core.FSharpOption`1[System.Boolean], Microsoft.FSharp.Core.FSharpOption`1[System.Boolean], Microsoft.FSharp.Core.FSharpOption`1[System.Boolean], Microsoft.FSharp.Core.FSharpOption`1[System.String], Microsoft.FSharp.Core.FSharpOption`1[System.Int64], Microsoft.FSharp.Core.FSharpOption`1[System.String]) -FSharp.Compiler.CodeAnalysis.FSharpChecker: Microsoft.FSharp.Control.FSharpAsync`1[System.Tuple`2[FSharp.Compiler.Diagnostics.FSharpDiagnostic[],System.Int32]] Compile(System.String[], Microsoft.FSharp.Core.FSharpOption`1[System.String]) +FSharp.Compiler.CodeAnalysis.FSharpChecker: Microsoft.FSharp.Control.FSharpAsync`1[System.Tuple`2[FSharp.Compiler.Diagnostics.FSharpDiagnostic[],Microsoft.FSharp.Core.FSharpOption`1[System.Exception]]] Compile(System.String[], Microsoft.FSharp.Core.FSharpOption`1[System.String]) FSharp.Compiler.CodeAnalysis.FSharpChecker: Microsoft.FSharp.Control.FSharpAsync`1[System.Tuple`2[FSharp.Compiler.Text.Range,FSharp.Compiler.Text.Range][]] MatchBraces(System.String, FSharp.Compiler.Text.ISourceText, FSharp.Compiler.CodeAnalysis.FSharpParsingOptions, Microsoft.FSharp.Core.FSharpOption`1[System.String]) FSharp.Compiler.CodeAnalysis.FSharpChecker: Microsoft.FSharp.Control.FSharpAsync`1[System.Tuple`2[FSharp.Compiler.Text.Range,FSharp.Compiler.Text.Range][]] MatchBraces(System.String, System.String, FSharp.Compiler.CodeAnalysis.FSharpProjectOptions, Microsoft.FSharp.Core.FSharpOption`1[System.String]) FSharp.Compiler.CodeAnalysis.FSharpChecker: Microsoft.FSharp.Control.IEvent`2[Microsoft.FSharp.Control.FSharpHandler`1[FSharp.Compiler.CodeAnalysis.FSharpProjectOptions],FSharp.Compiler.CodeAnalysis.FSharpProjectOptions] ProjectChecked @@ -7713,8 +7713,22 @@ FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewTyped(FSharp.C FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewUpcast(FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Syntax.SynType, FSharp.Compiler.Text.Range) FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewWhile(FSharp.Compiler.Syntax.DebugPointAtWhile, FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range) FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewWhileBang(FSharp.Compiler.Syntax.DebugPointAtWhile, FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range) -FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewYieldOrReturn(System.Tuple`2[System.Boolean,System.Boolean], FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range) -FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewYieldOrReturnFrom(System.Tuple`2[System.Boolean,System.Boolean], FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range) +FSharp.Compiler.Syntax.SynExpr+YieldOrReturn: FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia get_trivia() +FSharp.Compiler.Syntax.SynExpr+YieldOrReturn: FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia trivia +FSharp.Compiler.Syntax.SynExpr+YieldOrReturnFrom: FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnFromTrivia get_trivia() +FSharp.Compiler.Syntax.SynExpr+YieldOrReturnFrom: FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnFromTrivia trivia +FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewYieldOrReturn(System.Tuple`2[System.Boolean,System.Boolean], FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range, FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia) +FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewYieldOrReturnFrom(System.Tuple`2[System.Boolean,System.Boolean], FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range, FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnFromTrivia) +FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnFromTrivia: FSharp.Compiler.Text.Range YieldOrReturnFromKeyword +FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnFromTrivia: FSharp.Compiler.Text.Range get_YieldOrReturnFromKeyword() +FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnFromTrivia: System.String ToString() +FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnFromTrivia: Void .ctor(FSharp.Compiler.Text.Range) +FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia: FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia Zero +FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia: FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia get_Zero() +FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia: FSharp.Compiler.Text.Range YieldOrReturnKeyword +FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia: FSharp.Compiler.Text.Range get_YieldOrReturnKeyword() +FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia: System.String ToString() +FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia: Void .ctor(FSharp.Compiler.Text.Range) FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr+AddressOf FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr+AnonRecd FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr+App @@ -8182,7 +8196,13 @@ FSharp.Compiler.Syntax.SynMemberDefn: FSharp.Compiler.Syntax.SynMemberDefn NewAu FSharp.Compiler.Syntax.SynMemberDefn: FSharp.Compiler.Syntax.SynMemberDefn NewGetSetMember(Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.SynBinding], Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.SynBinding], FSharp.Compiler.Text.Range, FSharp.Compiler.SyntaxTrivia.SynMemberGetSetTrivia) FSharp.Compiler.Syntax.SynMemberDefn: FSharp.Compiler.Syntax.SynMemberDefn NewImplicitCtor(Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.SynAccess], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynAttributeList], FSharp.Compiler.Syntax.SynPat, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.Ident], FSharp.Compiler.Xml.PreXmlDoc, FSharp.Compiler.Text.Range, FSharp.Compiler.SyntaxTrivia.SynMemberDefnImplicitCtorTrivia) FSharp.Compiler.Syntax.SynMemberDefn: FSharp.Compiler.Syntax.SynMemberDefn NewImplicitInherit(FSharp.Compiler.Syntax.SynType, FSharp.Compiler.Syntax.SynExpr, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.Ident], FSharp.Compiler.Text.Range) -FSharp.Compiler.Syntax.SynMemberDefn: FSharp.Compiler.Syntax.SynMemberDefn NewInherit(FSharp.Compiler.Syntax.SynType, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.Ident], FSharp.Compiler.Text.Range) +FSharp.Compiler.Syntax.SynMemberDefn+Inherit: FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia get_trivia() +FSharp.Compiler.Syntax.SynMemberDefn+Inherit: FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia trivia +FSharp.Compiler.Syntax.SynMemberDefn: FSharp.Compiler.Syntax.SynMemberDefn NewInherit(FSharp.Compiler.Syntax.SynType, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.Ident], FSharp.Compiler.Text.Range, FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia) +FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia: FSharp.Compiler.Text.Range InheritKeyword +FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia: FSharp.Compiler.Text.Range get_InheritKeyword() +FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia: System.String ToString() +FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia: Void .ctor(FSharp.Compiler.Text.Range) FSharp.Compiler.Syntax.SynMemberDefn: FSharp.Compiler.Syntax.SynMemberDefn NewInterface(FSharp.Compiler.Syntax.SynType, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range], Microsoft.FSharp.Core.FSharpOption`1[Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynMemberDefn]], FSharp.Compiler.Text.Range) FSharp.Compiler.Syntax.SynMemberDefn: FSharp.Compiler.Syntax.SynMemberDefn NewLetBindings(Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynBinding], Boolean, Boolean, FSharp.Compiler.Text.Range) FSharp.Compiler.Syntax.SynMemberDefn: FSharp.Compiler.Syntax.SynMemberDefn NewMember(FSharp.Compiler.Syntax.SynBinding, FSharp.Compiler.Text.Range) @@ -10266,7 +10286,9 @@ FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: FSharp.Compiler.SyntaxTrivia FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range] InKeyword FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range] get_InKeyword() FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: System.String ToString() -FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: Void .ctor(Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range]) +FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: FSharp.Compiler.Text.Range LetOrUseKeyword +FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: FSharp.Compiler.Text.Range get_LetOrUseKeyword() +FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: Void .ctor(FSharp.Compiler.Text.Range, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range]) FSharp.Compiler.SyntaxTrivia.SynExprMatchBangTrivia: FSharp.Compiler.Text.Range MatchBangKeyword FSharp.Compiler.SyntaxTrivia.SynExprMatchBangTrivia: FSharp.Compiler.Text.Range WithKeyword FSharp.Compiler.SyntaxTrivia.SynExprMatchBangTrivia: FSharp.Compiler.Text.Range get_MatchBangKeyword() diff --git a/tests/FSharp.Compiler.Service.Tests/ProjectAnalysisTests.fs b/tests/FSharp.Compiler.Service.Tests/ProjectAnalysisTests.fs index 78d03ac8a9b..5752f9de41c 100644 --- a/tests/FSharp.Compiler.Service.Tests/ProjectAnalysisTests.fs +++ b/tests/FSharp.Compiler.Service.Tests/ProjectAnalysisTests.fs @@ -123,7 +123,14 @@ let ``Test project1 and make sure TcImports gets cleaned up`` () = let weakTcImports = test () checker.InvalidateConfiguration Project1.options checker.ClearLanguageServiceRootCachesAndCollectAndFinalizeAllTransients() - GC.Collect(2, GCCollectionMode.Forced, blocking = true) + + //collect 2 more times for good measure, + // See for example: https://github.com/dotnet/runtime/discussions/108081 + GC.Collect() + GC.WaitForPendingFinalizers() + GC.Collect() + GC.WaitForPendingFinalizers() + Assert.False weakTcImports.IsAlive [] diff --git a/tests/FSharp.Compiler.Service.Tests/WarnScopeTests.fs b/tests/FSharp.Compiler.Service.Tests/WarnScopeTests.fs index 0b02e81b1c2..c0d983bff6e 100644 --- a/tests/FSharp.Compiler.Service.Tests/WarnScopeTests.fs +++ b/tests/FSharp.Compiler.Service.Tests/WarnScopeTests.fs @@ -18,7 +18,7 @@ match None with None -> () [] let WarnScopesWorkAsExpected () = let file = "WarnScopesInScript.fs" - let parseResult, typeCheckResults = parseAndCheckScript(file, sourceForWarnScopes) + let parseResult, typeCheckResults = parseAndCheckScriptPreview(file, sourceForWarnScopes) Assert.Equal(parseResult.Diagnostics.Length, 0) Assert.Equal(typeCheckResults.Diagnostics.Length, 2) Assert.Equal(typeCheckResults.Diagnostics[0].ErrorNumber, 25) diff --git a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/AsyncModule.fs b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/AsyncModule.fs index 145d9a70c3e..213ff435adf 100644 --- a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/AsyncModule.fs +++ b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/AsyncModule.fs @@ -7,6 +7,7 @@ namespace FSharp.Core.UnitTests.Control open System open System.Threading +open System.Threading.Tasks open FSharp.Core.UnitTests.LibraryTestFx open Xunit open FsCheck @@ -273,8 +274,7 @@ type AsyncModule() = } Async.RunSynchronously test - // test is flaky: https://github.com/dotnet/fsharp/issues/11586 - //[] + [] member _.``OnCancel.RaceBetweenCancellationHandlerAndDisposingHandlerRegistration``() = let test() = use flag = new ManualResetEvent(false) @@ -297,8 +297,7 @@ type AsyncModule() = for _i = 1 to 300 do test() - // test is flaky: https://github.com/dotnet/fsharp/issues/11586 - //[] + [] member _.``OnCancel.RaceBetweenCancellationAndDispose``() = let mutable flag = 0 let cts = new System.Threading.CancellationTokenSource() @@ -316,8 +315,7 @@ type AsyncModule() = :? System.OperationCanceledException -> () Assert.AreEqual(1, flag) - // test is flaky: https://github.com/dotnet/fsharp/issues/11586 - //[] + [] member _.``OnCancel.CancelThatWasSignalledBeforeRunningTheComputation``() = let test() = let cts = new System.Threading.CancellationTokenSource() @@ -379,23 +377,25 @@ type AsyncModule() = [] member _.``AwaitWaitHandle.DisposedWaitHandle2``() = - let wh = new System.Threading.ManualResetEvent(false) - let barrier = new System.Threading.ManualResetEvent(false) + let wh = new ManualResetEvent(false) + let started = new ManualResetEventSlim(false) - let test = async { - let! timeout = Async.AwaitWaitHandle(wh, 10000) - Assert.False(timeout, "Timeout expected") - barrier.Set() |> ignore + let test = + async { + started.Set() + let! timeout = Async.AwaitWaitHandle(wh, 5000) + Assert.False(timeout, "Timeout expected") } - Async.Start test - - // await 3 secs then dispose waithandle - nothing should happen - let timeout = wait barrier 3000 - Assert.False(timeout, "Barrier was reached too early") - dispose wh - - let ok = wait barrier 10000 - if not ok then Assert.Fail("Async computation was not completed in given time") + |> Async.StartAsTask + + task { + started.Wait() + // Wait a moment then dispose waithandle - nothing should happen + do! Task.Delay 500 + Assert.False(test.IsCompleted, "Test completed too early") + dispose wh + do! test + } [] member _.``RunSynchronously.NoThreadJumpsAndTimeout``() = @@ -467,22 +467,24 @@ type AsyncModule() = [] member _.``error on one workflow should cancel all others``() = - let counter = - async { - let mutable counter = 0 - let job i = async { - if i = 55 then failwith "boom" - else - do! Async.Sleep 1000 - counter <- counter + 1 - } - - let! _ = Async.Parallel [ for i in 1 .. 100 -> job i ] |> Async.Catch - do! Async.Sleep 5000 - return counter - } |> Async.RunSynchronously + task { + use failOnlyOne = new Semaphore(0, 1) + let mutable cancelled = 0 + let mutable started = 0 + + let job i = async { + Interlocked.Increment &started |> ignore + use! holder = Async.OnCancel (fun () -> Interlocked.Increment &cancelled |> ignore) + do! failOnlyOne |> Async.AwaitWaitHandle |> Async.Ignore + failwith "boom" + } - Assert.AreEqual(0, counter) + let test = Async.Parallel [ for i in 1 .. 100 -> job i ] |> Async.Catch |> Async.Ignore |> Async.StartAsTask + do! Task.Delay 100 + failOnlyOne.Release() |> ignore + do! test + Assert.Equal(started - 1, cancelled) + } [] member _.``AwaitWaitHandle.ExceptionsAfterTimeout``() = @@ -641,7 +643,6 @@ type AsyncModule() = member _.``Parallel with maxDegreeOfParallelism`` () = let mutable i = 1 let action j = async { - do! Async.Sleep 1 Assert.Equal(j, i) i <- i + 1 } diff --git a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/AsyncType.fs b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/AsyncType.fs index 950432ccc8e..1b15be8fa98 100644 --- a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/AsyncType.fs +++ b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/AsyncType.fs @@ -54,16 +54,20 @@ type AsyncType() = [] member _.AsyncRunSynchronouslyReusesThreadPoolThread() = - let action = async { async { () } |> Async.RunSynchronously } - let computation = - [| for i in 1 .. 1000 -> action |] - |> Async.Parallel + let action _ = + async { + return + async { return Thread.CurrentThread.ManagedThreadId } + |> Async.RunSynchronously + } // This test needs approximately 1000 ThreadPool threads // if Async.RunSynchronously doesn't reuse them. - // In such case TimeoutException is raised - // since ThreadPool cannot provide 1000 threads in 1 second - // (the number of threads in ThreadPool is adjusted slowly). - Async.RunSynchronously(computation, timeout = 1000) |> ignore + let usedThreads = + Seq.init 1000 action + |> Async.Parallel + |> Async.RunSynchronously + |> Set.ofArray + Assert.True(usedThreads.Count < 256, $"RunSynchronously used {usedThreads.Count} threads.") [] [] @@ -231,7 +235,8 @@ type AsyncType() = use t = Async.StartAsTask a let mutable exceptionThrown = false try - waitASec t + // waitASec t + t.Wait() with e -> exceptionThrown <- true Assert.True (t.IsFaulted) @@ -269,7 +274,7 @@ type AsyncType() = // printfn "%A" t.Status let mutable exceptionThrown = false try - waitASec t + t.Wait() with e -> exceptionThrown <- true Assert.True (exceptionThrown) Assert.True(t.IsCanceled) @@ -302,56 +307,50 @@ type AsyncType() = use t = Async.StartImmediateAsTask a let mutable exceptionThrown = false try - waitASec t + t.Wait() with e -> exceptionThrown <- true Assert.True (t.IsFaulted) Assert.True(exceptionThrown) -#if IGNORED [] - [] member _.CancellationPropagatesToImmediateTask () = let a = async { - while true do () + while true do + do! Async.Sleep 100 } use t = Async.StartImmediateAsTask a Async.CancelDefaultToken () let mutable exceptionThrown = false try - waitASec t + t.Wait() with e -> exceptionThrown <- true Assert.True (exceptionThrown) Assert.True(t.IsCanceled) -#endif -#if IGNORED [] - [] member _.CancellationPropagatesToGroupImmediate () = let ewh = new ManualResetEvent(false) - let cancelled = ref false + let mutable cancelled = false let a = async { - use! holder = Async.OnCancel (fun _ -> cancelled := true) + use! holder = Async.OnCancel (fun _ -> cancelled <- true) ewh.Set() |> Assert.True - while true do () + while true do + do! Async.Sleep 100 } let cts = new CancellationTokenSource() let token = cts.Token use t = Async.StartImmediateAsTask(a, cancellationToken=token) -// printfn "%A" t.Status ewh.WaitOne() |> Assert.True cts.Cancel() -// printfn "%A" t.Status let mutable exceptionThrown = false try - waitASec t + t.Wait() with e -> exceptionThrown <- true Assert.True (exceptionThrown) Assert.True(t.IsCanceled) - Assert.True(!cancelled) -#endif + Assert.True(cancelled) [] member _.TaskAsyncValue () = @@ -411,8 +410,7 @@ type AsyncType() = } Async.RunSynchronously(a) |> Assert.True - // test is flaky: https://github.com/dotnet/fsharp/issues/11586 - //[] + [] member _.TaskAsyncValueCancellation () = use ewh = new ManualResetEvent(false) let cts = new CancellationTokenSource() @@ -430,9 +428,11 @@ type AsyncType() = :? TaskCanceledException -> ewh.Set() |> ignore // this is ok } - Async.Start a + let t1 = Async.StartAsTask a cts.Cancel() ewh.WaitOne(10000) |> ignore + // Don't leave unobserved background tasks, because they can crash the test run. + t1.Wait() [] member _.NonGenericTaskAsyncValue () = @@ -473,9 +473,10 @@ type AsyncType() = :? TaskCanceledException -> ewh.Set() |> ignore // this is ok } - Async.Start a + let t1 = Async.StartAsTask a cts.Cancel() ewh.WaitOne(10000) |> ignore + t1.Wait() [] member _.CancellationExceptionThrown () = diff --git a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/Cancellation.fs b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/Cancellation.fs index 4e04f64bc1f..cecfaec7590 100644 --- a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/Cancellation.fs +++ b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/Cancellation.fs @@ -5,7 +5,9 @@ namespace FSharp.Core.UnitTests.Control open System open FSharp.Core.UnitTests.LibraryTestFx open Xunit +open FSharp.Test open System.Threading +open System.Threading.Tasks type CancellationType() = @@ -229,6 +231,7 @@ type CancellationType() = } asyncs |> Async.Parallel |> Async.RunSynchronously |> ignore + // See https://github.com/dotnet/fsharp/issues/3254 [] member this.AwaitTaskCancellationAfterAsyncTokenCancellation() = let StartCatchCancellation cancellationToken (work) = @@ -262,11 +265,11 @@ type CancellationType() = let cts = new CancellationTokenSource() let tcs = System.Threading.Tasks.TaskCompletionSource<_>() - let t = + let test() = async { do! tcs.Task |> Async.AwaitTask } - |> StartAsTaskProperCancel None (Some cts.Token) + |> StartAsTaskProperCancel None (Some cts.Token) :> Task // First cancel the token, then set the task as cancelled. async { @@ -274,15 +277,31 @@ type CancellationType() = cts.Cancel() do! Async.Sleep 100 tcs.TrySetException (TimeoutException "Task timed out after token.") - |> ignore + |> ignore } |> Async.Start - try - let res = t.Wait(2000) - let msg = sprintf "Excepted TimeoutException wrapped in an AggregateException, but got %A" res - printfn "failure msg: %s" msg - Assert.Fail (msg) - with :? AggregateException as agg -> () + task { + let! agg = Assert.ThrowsAsync(test) + let inner = agg.InnerException + Assert.True(inner :? TimeoutException, $"Excepted TimeoutException wrapped in an AggregateException, but got %A{inner}") + } + + // Simpler regression test for https://github.com/dotnet/fsharp/issues/3254 + [] + member this.AwaitTaskCancellationAfterAsyncTokenCancellation2() = + let tcs = new TaskCompletionSource() + let cts = new CancellationTokenSource() + let _ = cts.Token.Register(fun () -> tcs.SetResult 42) + Assert.ThrowsAsync( fun () -> + Async.StartAsTask( + async { + cts.CancelAfter 100 + let! result = tcs.Task |> Async.AwaitTask + return result + }, + cancellationToken = cts.Token + ) + ) [] member this.Equality() = diff --git a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/MailboxProcessorType.fs b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/MailboxProcessorType.fs index 904bc7dc622..f3964aaa78c 100644 --- a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/MailboxProcessorType.fs +++ b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/MailboxProcessorType.fs @@ -125,7 +125,7 @@ type MailboxProcessorType() = use mre2 = new ManualResetEventSlim(false) // https://github.com/dotnet/fsharp/issues/3337 - let cts = new CancellationTokenSource () + use cts = new CancellationTokenSource () let addMsg msg = match result with @@ -204,25 +204,24 @@ type MailboxProcessorType() = [] member this.``Receive Races with Post``() = - let receiveEv = new ManualResetEvent(false) - let postEv = new ManualResetEvent(false) - let finishedEv = new ManualResetEvent(false) + let receiveEv = new AutoResetEvent(false) + let postEv = new AutoResetEvent(false) + let finishedEv = new AutoResetEvent(false) + use cts = new CancellationTokenSource() let mb = MailboxProcessor.Start ( fun inbox -> async { while true do - let w = receiveEv.WaitOne() - receiveEv.Reset() |> ignore + receiveEv.WaitOne() |> ignore let! (msg) = inbox.Receive () finishedEv.Set() |> ignore }) let post = async { - while true do - let r = postEv.WaitOne() - postEv.Reset() |> ignore + while not cts.IsCancellationRequested do + postEv.WaitOne() |> ignore mb.Post(fun () -> ()) - } |> Async.Start + } |> Async.StartAsTask for i in 0 .. 100000 do if i % 2 = 0 then receiveEv.Set() |> ignore @@ -232,19 +231,23 @@ type MailboxProcessorType() = receiveEv.Set() |> ignore finishedEv.WaitOne() |> ignore - finishedEv.Reset() |> ignore + + cts.Cancel() + // Let the post task finish. + postEv.Set() |> ignore + post.Wait() [] member this.``Receive Races with Post on timeout``() = - let receiveEv = new ManualResetEvent(false) - let postEv = new ManualResetEvent(false) - let finishedEv = new ManualResetEvent(false) + let receiveEv = new AutoResetEvent(false) + let postEv = new AutoResetEvent(false) + let finishedEv = new AutoResetEvent(false) + use cts = new CancellationTokenSource() let mb = MailboxProcessor.Start ( fun inbox -> async { while true do - let w = receiveEv.WaitOne() - receiveEv.Reset() |> ignore + receiveEv.WaitOne() |> ignore let! (msg) = inbox.Receive (5000) finishedEv.Set() |> ignore }) @@ -252,12 +255,11 @@ type MailboxProcessorType() = let isErrored = mb.Error |> Async.AwaitEvent |> Async.StartAsTask let post = - async { - while true do - let r = postEv.WaitOne() - postEv.Reset() |> ignore + backgroundTask { + while not cts.IsCancellationRequested do + postEv.WaitOne() |> ignore mb.Post(fun () -> ()) - } |> Async.Start + } for i in 0 .. 10000 do if i % 2 = 0 then @@ -271,32 +273,35 @@ type MailboxProcessorType() = if isErrored.IsCompleted then raise <| Exception("Mailbox should not fail!", isErrored.Result) - finishedEv.Reset() |> ignore + cts.Cancel() + // Let the post task finish. + postEv.Set() |> ignore + post.Wait() [] member this.``TryReceive Races with Post on timeout``() = - let receiveEv = new ManualResetEvent(false) - let postEv = new ManualResetEvent(false) - let finishedEv = new ManualResetEvent(false) + let receiveEv = new AutoResetEvent(false) + let postEv = new AutoResetEvent(false) + let finishedEv = new AutoResetEvent(false) + use cts = new CancellationTokenSource() let mb = MailboxProcessor.Start ( fun inbox -> async { while true do - let w = receiveEv.WaitOne() - receiveEv.Reset() |> ignore + receiveEv.WaitOne() |> ignore let! (msg) = inbox.TryReceive (5000) finishedEv.Set() |> ignore - }) + } + ) let isErrored = mb.Error |> Async.AwaitEvent |> Async.StartAsTask let post = - async { - while true do - let r = postEv.WaitOne() - postEv.Reset() |> ignore + backgroundTask { + while not cts.IsCancellationRequested do + postEv.WaitOne() |> ignore mb.Post(fun () -> ()) - } |> Async.Start + } for i in 0 .. 10000 do if i % 2 = 0 then @@ -310,7 +315,9 @@ type MailboxProcessorType() = if isErrored.IsCompleted then raise <| Exception("Mailbox should not fail!", isErrored.Result) - finishedEv.Reset() |> ignore + cts.Cancel() + postEv.Set() |> ignore + post.Wait() [] member this.``After dispose is called, mailbox should stop receiving and processing messages``() = task { @@ -397,6 +404,7 @@ type MailboxProcessorType() = Assert.Equal(expectedMessagesCount, actualMessagesCount) Assert.Equal(0, actualSkipMessagesCount) Assert.Equal(0, mb.CurrentQueueLength) + } [] @@ -496,3 +504,56 @@ type MailboxProcessorType() = // If StartImmediate worked correctly, the information should be identical since // the threads should be the same. Assert.Equal(callingThreadInfo, mailboxThreadInfo) + +module MailboxProcessorType = + + [] + let TryScan () = + let tcs = TaskCompletionSource<_>() + use mailbox = + new MailboxProcessor(fun inbox -> async { + do! + inbox.TryScan( function + | Reset -> async { tcs.SetResult "Reset processed" } |> Some + | _ -> None) + |> Async.Ignore + }) + mailbox.Start() + + for i in 1 .. 100 do + mailbox.Post(Increment i) + mailbox.Post Reset + + Assert.Equal("Reset processed", tcs.Task.Result) + Assert.Equal(100, mailbox.CurrentQueueLength) + + [] + let ``TryScan with timeout`` () = + let tcs = TaskCompletionSource<_>() + use mailbox = + new MailboxProcessor(fun inbox -> + let rec loop i = async { + match! + inbox.TryScan( function + | Reset -> async { tcs.SetResult i } |> Some + | _ -> None) + with + | None -> do! loop (i + 1) + | _ -> () + } + loop 1 + ) + mailbox.DefaultTimeout <- 10 + mailbox.Start() + + let iteration = + task { + for i in 1 .. 100 do + mailbox.Post(Increment 1) + do! Task.Delay 10 + mailbox.Post Reset + + return! tcs.Task + } + + Assert.True(iteration.Result > 1, "TryScan did not timeout") diff --git a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/Tasks.fs b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/Tasks.fs index 5d533b880c3..8097c2d10f5 100644 --- a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/Tasks.fs +++ b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/Tasks.fs @@ -236,15 +236,16 @@ type Basics() = [] member _.testNonBlocking() = printfn "Running testNonBlocking..." - let sw = Stopwatch() - sw.Start() + let allowContinue = new SemaphoreSlim(0) + let finished = new ManualResetEventSlim() let t = task { - do! Task.Yield() + do! allowContinue.WaitAsync() Thread.Sleep(100) + finished.Set() } - sw.Stop() - require (sw.ElapsedMilliseconds < 50L) "sleep blocked caller" + allowContinue.Release() |> ignore + require (not finished.IsSet) "sleep blocked caller" t.Wait() [] @@ -908,58 +909,60 @@ type Basics() = [] member _.testExceptionThrownInFinally() = printfn "running testExceptionThrownInFinally" - for i in 1 .. 5 do - let mutable ranInitial = false - let mutable ranNext = false + for i in 1 .. 5 do + use stepOutside = new SemaphoreSlim(0) + use ranInitial = new ManualResetEventSlim() + use ranNext = new ManualResetEventSlim() let mutable ranFinally = 0 let t = task { try - ranInitial <- true + ranInitial.Set() do! Task.Yield() Thread.Sleep(100) // shouldn't be blocking so we should get through to requires before this finishes - ranNext <- true + ranNext.Set() finally ranFinally <- ranFinally + 1 failtest "finally exn!" } - require ranInitial "didn't run initial" - require (not ranNext) "ran next too early" + require ranInitial.IsSet "didn't run initial" + require (not ranNext.IsSet) "ran next too early" try t.Wait() require false "shouldn't get here" with | _ -> () - require ranNext "didn't run next" + require ranNext.IsSet "didn't run next" require (ranFinally = 1) "didn't run finally exactly once" [] member _.test2ndExceptionThrownInFinally() = printfn "running test2ndExceptionThrownInFinally" for i in 1 .. 5 do - let mutable ranInitial = false - let mutable ranNext = false + use ranInitial = new ManualResetEventSlim() + use continueTask = new SemaphoreSlim(0) + use ranNext = new ManualResetEventSlim() let mutable ranFinally = 0 let t = task { try - ranInitial <- true + ranInitial.Set() + do! continueTask.WaitAsync() + ranNext.Set() do! Task.Yield() - Thread.Sleep(100) // shouldn't be blocking so we should get through to requires before this finishes - ranNext <- true failtest "uhoh" finally ranFinally <- ranFinally + 1 failtest "2nd exn!" } - require ranInitial "didn't run initial" - require (not ranNext) "ran next too early" + ranInitial.Wait() + continueTask.Release() |> ignore try t.Wait() require false "shouldn't get here" with | _ -> () - require ranNext "didn't run next" + require ranNext.IsSet "didn't run next" require (ranFinally = 1) "didn't run finally exactly once" [] diff --git a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/TasksDynamic.fs b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/TasksDynamic.fs index c811aecaa5c..7f844e99d96 100644 --- a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/TasksDynamic.fs +++ b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/TasksDynamic.fs @@ -357,15 +357,16 @@ type Basics() = [] member _.testNonBlocking() = printfn "Running testNonBlocking..." - let sw = Stopwatch() - sw.Start() + let allowContinue = new SemaphoreSlim(0) + let finished = new ManualResetEventSlim() let t = taskDynamic { - do! Task.Yield() + do! allowContinue.WaitAsync() Thread.Sleep(100) + finished.Set() } - sw.Stop() - require (sw.ElapsedMilliseconds < 50L) "sleep blocked caller" + allowContinue.Release() |> ignore + require (not finished.IsSet) "sleep blocked caller" t.Wait() [] @@ -982,58 +983,60 @@ type Basics() = [] member _.testExceptionThrownInFinally() = printfn "running testExceptionThrownInFinally" - for i in 1 .. 5 do - let mutable ranInitial = false - let mutable ranNext = false + for i in 1 .. 5 do + use stepOutside = new SemaphoreSlim(0) + use ranInitial = new ManualResetEventSlim() + use ranNext = new ManualResetEventSlim() let mutable ranFinally = 0 let t = taskDynamic { try - ranInitial <- true + ranInitial.Set() do! Task.Yield() Thread.Sleep(100) // shouldn't be blocking so we should get through to requires before this finishes - ranNext <- true + ranNext.Set() finally ranFinally <- ranFinally + 1 failtest "finally exn!" } - require ranInitial "didn't run initial" - require (not ranNext) "ran next too early" + require ranInitial.IsSet "didn't run initial" + require (not ranNext.IsSet) "ran next too early" try t.Wait() require false "shouldn't get here" with | _ -> () - require ranNext "didn't run next" + require ranNext.IsSet "didn't run next" require (ranFinally = 1) "didn't run finally exactly once" [] member _.test2ndExceptionThrownInFinally() = printfn "running test2ndExceptionThrownInFinally" for i in 1 .. 5 do - let mutable ranInitial = false - let mutable ranNext = false + use ranInitial = new ManualResetEventSlim() + use continueTask = new SemaphoreSlim(0) + use ranNext = new ManualResetEventSlim() let mutable ranFinally = 0 let t = taskDynamic { try - ranInitial <- true + ranInitial.Set() + do! continueTask.WaitAsync() + ranNext.Set() do! Task.Yield() - Thread.Sleep(100) // shouldn't be blocking so we should get through to requires before this finishes - ranNext <- true failtest "uhoh" finally ranFinally <- ranFinally + 1 failtest "2nd exn!" } - require ranInitial "didn't run initial" - require (not ranNext) "ran next too early" + ranInitial.Wait() + continueTask.Release() |> ignore try t.Wait() require false "shouldn't get here" with | _ -> () - require ranNext "didn't run next" + require ranNext.IsSet "didn't run next" require (ranFinally = 1) "didn't run finally exactly once" [] diff --git a/tests/FSharp.Test.Utilities/Compiler.fs b/tests/FSharp.Test.Utilities/Compiler.fs index f535bc21c5a..5e5629b089f 100644 --- a/tests/FSharp.Test.Utilities/Compiler.fs +++ b/tests/FSharp.Test.Utilities/Compiler.fs @@ -170,10 +170,13 @@ module rec Compiler = Message: string SubCategory: string } + // This type is used either for the output of the compiler (typically in CompilationResult coming from 'compile') + // or for the output of the code generated by the compiler (in CompilationResult coming from 'run') type ExecutionOutput = - { ExitCode: int + { ExitCode: int option StdOut: string - StdErr: string } + StdErr: string + Exn: exn option } type RunOutput = | EvalOutput of Result @@ -699,7 +702,7 @@ module rec Compiler = let private compileFSharpCompilation compilation ignoreWarnings (cUnit: CompilationUnit) : CompilationResult = use redirect = new RedirectConsole() - let ((err: FSharpDiagnostic[], rc: int, outputFilePath: string), deps) = + let ((err: FSharpDiagnostic[], exn, outputFilePath: string), deps) = CompilerAssert.CompileRaw(compilation, ignoreWarnings) // Create and stash the console output @@ -711,7 +714,7 @@ module rec Compiler = Adjust = 0 PerFileErrors = diagnostics Diagnostics = diagnostics |> List.map snd - Output = Some (RunOutput.ExecutionOutput { ExitCode = rc; StdOut = redirect.Output(); StdErr = redirect.ErrorOutput() }) + Output = Some (RunOutput.ExecutionOutput { ExitCode = None; StdOut = redirect.Output(); StdErr = redirect.ErrorOutput(); Exn = exn }) Compilation = cUnit } @@ -978,14 +981,13 @@ module rec Compiler = | SourceCodeFileKind.Fsx _ -> true | _ -> false | _ -> false - let exitCode, output, errors = CompilerAssert.ExecuteAndReturnResult (p, isFsx, s.Dependencies, false) + let exitCode, output, errors, exn = CompilerAssert.ExecuteAndReturnResult (p, isFsx, s.Dependencies, false) printfn "---------output-------\n%s\n-------" output printfn "---------errors-------\n%s\n-------" errors - let executionResult = { s with Output = Some (ExecutionOutput { ExitCode = exitCode; StdOut = output; StdErr = errors }) } - if exitCode = 0 then - CompilationResult.Success executionResult - else - CompilationResult.Failure executionResult + let executionResult = { s with Output = Some (ExecutionOutput { ExitCode = exitCode; StdOut = output; StdErr = errors; Exn = exn }) } + match exn with + | None -> CompilationResult.Success executionResult + | Some _ -> CompilationResult.Failure executionResult let compileAndRun = compile >> run @@ -1080,27 +1082,25 @@ module rec Compiler = opts.ToArray() let errors, stdOut = CompilerAssert.RunScriptWithOptionsAndReturnResult options source - let executionOutputwithStdOut: RunOutput option = - ExecutionOutput { StdOut = stdOut; ExitCode = 0; StdErr = "" } - |> Some - let result = + let mkResult output = { OutputPath = None Dependencies = [] Adjust = 0 Diagnostics = [] PerFileErrors= [] - Output = executionOutputwithStdOut + Output = Some output Compilation = cUnit } - - if errors.Count > 0 then - let output = ExecutionOutput { - ExitCode = -1 - StdOut = String.Empty - StdErr = ((errors |> String.concat "\n").Replace("\r\n","\n")) } - CompilationResult.Failure { result with Output = Some output } + + if errors.Count = 0 then + let output = + ExecutionOutput { ExitCode = None; StdOut = stdOut; StdErr = ""; Exn = None } + CompilationResult.Success (mkResult output) else - CompilationResult.Success result - + let err = (errors |> String.concat "\n").Replace("\r\n","\n") + let output = + ExecutionOutput {ExitCode = None; StdOut = String.Empty; StdErr = err; Exn = None } + CompilationResult.Failure (mkResult output) + finally disposals |> Seq.iter (fun x -> x.Dispose()) @@ -1190,7 +1190,7 @@ Actual: | Some p -> match ILChecker.verifyILAndReturnActual [] p expected with | true, _, _ -> result - | false, errorMsg, _actualIL -> CompilationResult.Failure( {s with Output = Some (ExecutionOutput { StdOut = errorMsg; ExitCode = 0; StdErr = "" })} ) + | false, errorMsg, _actualIL -> CompilationResult.Failure( {s with Output = Some (ExecutionOutput {ExitCode = None; StdOut = errorMsg; StdErr = ""; Exn = None })} ) | CompilationResult.Failure f -> failwith $"Result should be \"Success\" in order to get IL. Failure: {Environment.NewLine}{f}" @@ -1706,7 +1706,7 @@ Actual: | None -> failwith "Execution output is missing, cannot check exit code." | Some o -> match o with - | ExecutionOutput e -> Assert.Equal(expectedExitCode, e.ExitCode) + | ExecutionOutput {ExitCode = Some exitCode} -> Assert.Equal(expectedExitCode, exitCode) | _ -> failwith "Cannot check exit code on this run result." result diff --git a/tests/FSharp.Test.Utilities/CompilerAssert.fs b/tests/FSharp.Test.Utilities/CompilerAssert.fs index fc2875d8955..37a8e25e164 100644 --- a/tests/FSharp.Test.Utilities/CompilerAssert.fs +++ b/tests/FSharp.Test.Utilities/CompilerAssert.fs @@ -322,7 +322,7 @@ module rec CompilerAssertHelpers = else entryPoint let args = mkDefaultArgs entryPoint - captureConsoleOutputs (fun () -> entryPoint.Invoke(Unchecked.defaultof, args) |> ignore) + captureConsoleOutputs (fun () -> entryPoint.Invoke(Unchecked.defaultof, args)) #if NETCOREAPP let executeBuiltApp assembly deps isFsx = @@ -409,8 +409,8 @@ module rec CompilerAssertHelpers = // Generate a response file, purely for diagnostic reasons. File.WriteAllLines(Path.ChangeExtension(outputFilePath, ".rsp"), args) - let errors, rc = checker.Compile args |> Async.RunImmediate - errors, rc, outputFilePath + let errors, ex = checker.Compile args |> Async.RunImmediate + errors, ex, outputFilePath let compileDisposable (outputDirectory:DirectoryInfo) isExe options targetFramework nameOpt (sources:SourceCodeFileKind list) = let disposeFile path = @@ -537,7 +537,7 @@ module rec CompilerAssertHelpers = let tmp = Path.Combine(outputPath.FullName, Path.ChangeExtension(fileName, ".dll")) disposals.Add({ new IDisposable with member _.Dispose() = File.Delete tmp }) cmpl.EmitAsFile tmp - (([||], 0, tmp), []), false) + (([||], None, tmp), []), false) let compilationRefs = compiledRefs @@ -559,7 +559,7 @@ module rec CompilerAssertHelpers = compilationRefs, deps - let compileCompilationAux outputDirectory (disposals: ResizeArray) ignoreWarnings (cmpl: Compilation) : (FSharpDiagnostic[] * int * string) * string list = + let compileCompilationAux outputDirectory (disposals: ResizeArray) ignoreWarnings (cmpl: Compilation) : (FSharpDiagnostic[] * exn option * string) * string list = let compilationRefs, deps = evaluateReferences outputDirectory disposals ignoreWarnings cmpl let isExe, sources, options, targetFramework, name = @@ -604,7 +604,7 @@ module rec CompilerAssertHelpers = outputDirectory.Create() compileCompilationAux outputDirectory (ResizeArray()) ignoreWarnings cmpl - let captureConsoleOutputs (func: unit -> unit) = + let captureConsoleOutputs (func: unit -> obj) = let out = Console.Out let err = Console.Error @@ -614,29 +614,30 @@ module rec CompilerAssertHelpers = use outWriter = new StringWriter (stdout) use errWriter = new StringWriter (stderr) - let succeeded, exn = + let rc, exn = try try Console.SetOut outWriter Console.SetError errWriter - func () - true, None + let rc = func() + match rc with + | :? int as rc -> Some rc, None + | _ -> None, None with e -> let errorMessage = if e.InnerException <> null then e.InnerException.ToString() else e.ToString() stderr.Append errorMessage |> ignore - false, Some e + None, Some e finally Console.SetOut out Console.SetError err outWriter.Close() errWriter.Close() - succeeded, stdout.ToString(), stderr.ToString(), exn + rc, stdout.ToString(), stderr.ToString(), exn - let executeBuiltAppAndReturnResult (outputFilePath: string) (deps: string list) isFsx : (int * string * string) = - let succeeded, stdout, stderr, _ = executeBuiltApp outputFilePath deps isFsx - let exitCode = if succeeded then 0 else -1 - exitCode, stdout, stderr + let executeBuiltAppAndReturnResult (outputFilePath: string) (deps: string list) isFsx : (int option * string * string * exn option) = + let rc, stdout, stderr, exn = executeBuiltApp outputFilePath deps isFsx + rc, stdout, stderr, exn let executeBuiltAppNewProcessAndReturnResult (outputFilePath: string) : (int * string * string) = #if !NETCOREAPP @@ -663,7 +664,7 @@ module rec CompilerAssertHelpers = member _.Dispose() = try File.Delete runtimeconfigPath with | _ -> () } #endif let timeout = 30000 - let exitCode, output, errors = Commands.executeProcess (Some fileName) arguments (Path.GetDirectoryName(outputFilePath)) timeout + let exitCode, output, errors = Commands.executeProcess fileName arguments (Path.GetDirectoryName(outputFilePath)) timeout (exitCode, output |> String.concat "\n", errors |> String.concat "\n") open CompilerAssertHelpers @@ -677,7 +678,7 @@ type CompilerAssert private () = if errors.Length > 0 then Assert.Fail (sprintf "Compile had warnings and/or errors: %A" errors) - executeBuiltApp outputExe [] false |> ignore + executeBuiltApp outputExe [] false |> ignore ) static let compileLibraryAndVerifyILWithOptions options (source: SourceCodeFileKind) (f: ILVerifier -> unit) = @@ -739,11 +740,13 @@ Updated automatically, please check diffs in your pull request, changes must be returnCompilation cmpl (defaultArg ignoreWarnings false) static member ExecuteAndReturnResult (outputFilePath: string, isFsx: bool, deps: string list, newProcess: bool) = - // If we execute in-process (true by default), then the only way of getting STDOUT is to redirect it to SB, and STDERR is from catching an exception. if not newProcess then - executeBuiltAppAndReturnResult outputFilePath deps isFsx + let entryPointReturnCode, deps, isFsx, exn = executeBuiltAppAndReturnResult outputFilePath deps isFsx + entryPointReturnCode, deps, isFsx, exn else - executeBuiltAppNewProcessAndReturnResult outputFilePath + let processExitCode, deps, isFsx = executeBuiltAppNewProcessAndReturnResult outputFilePath + Some processExitCode, deps, isFsx, None + static member Execute(cmpl: Compilation, ?ignoreWarnings, ?beforeExecute, ?newProcess, ?onOutput) = @@ -767,7 +770,7 @@ Updated automatically, please check diffs in your pull request, changes must be Assert.Fail errors onOutput output else - let _succeeded, _stdout, _stderr, exn = executeBuiltApp outputFilePath deps false + let _rc, _stdout, _stderr, exn = executeBuiltApp outputFilePath deps false exn |> Option.iter raise) static member ExecutionHasOutput(cmpl: Compilation, expectedOutput: string) = diff --git a/tests/FSharp.Test.Utilities/ILChecker.fs b/tests/FSharp.Test.Utilities/ILChecker.fs index 4474ef01c10..de0fbd8050b 100644 --- a/tests/FSharp.Test.Utilities/ILChecker.fs +++ b/tests/FSharp.Test.Utilities/ILChecker.fs @@ -16,7 +16,7 @@ module ILChecker = let private exec exe args = let arguments = args |> String.concat " " let timeout = 30000 - let exitCode, _output, errors = Commands.executeProcess (Some exe) arguments "" timeout + let exitCode, _output, errors = Commands.executeProcess exe arguments "" timeout let errors = errors |> String.concat Environment.NewLine errors, exitCode diff --git a/tests/FSharp.Test.Utilities/Peverifier.fs b/tests/FSharp.Test.Utilities/Peverifier.fs index 35db5b208fb..f3ccc7de2b1 100644 --- a/tests/FSharp.Test.Utilities/Peverifier.fs +++ b/tests/FSharp.Test.Utilities/Peverifier.fs @@ -25,7 +25,7 @@ module PEVerifier = let private exec exe args = let arguments = args |> String.concat " " let timeout = 30000 - let exitCode, _output, errors = Commands.executeProcess (Some exe) arguments "" timeout + let exitCode, _output, errors = Commands.executeProcess exe arguments "" timeout let errors = errors |> String.concat Environment.NewLine errors, exitCode diff --git a/tests/FSharp.Test.Utilities/ProjectGeneration.fs b/tests/FSharp.Test.Utilities/ProjectGeneration.fs index 78feb049435..a75784240dd 100644 --- a/tests/FSharp.Test.Utilities/ProjectGeneration.fs +++ b/tests/FSharp.Test.Utilities/ProjectGeneration.fs @@ -1360,9 +1360,8 @@ type ProjectWorkflowBuilder yield! projectOptions.OtherOptions yield! projectOptions.SourceFiles |] - let! _diagnostics, exitCode = checker.Compile(arguments) - if exitCode <> 0 then - exn $"Compilation failed with exit code {exitCode}" |> raise + let! _diagnostics, ex = checker.Compile(arguments) + if ex.IsSome then raise ex.Value return ctx } diff --git a/tests/FSharp.Test.Utilities/TestFramework.fs b/tests/FSharp.Test.Utilities/TestFramework.fs index 6e1611beb5c..dfde63f2352 100644 --- a/tests/FSharp.Test.Utilities/TestFramework.fs +++ b/tests/FSharp.Test.Utilities/TestFramework.fs @@ -63,69 +63,66 @@ module Commands = // Execute the process pathToExe passing the arguments: arguments with the working directory: workingDir timeout after timeout milliseconds -1 = wait forever // returns exit code, stdio and stderr as string arrays let executeProcess pathToExe arguments workingDir (timeout:int) = - match pathToExe with - | Some path -> - let commandLine = ResizeArray() - let errorsList = ResizeArray() - let outputList = ResizeArray() - let errorslock = obj() - let outputlock = obj() - let outputDataReceived (message: string) = - if not (isNull message) then - lock outputlock (fun () -> outputList.Add(message)) - - let errorDataReceived (message: string) = - if not (isNull message) then - lock errorslock (fun () -> errorsList.Add(message)) - - commandLine.Add $"cd {workingDir}" - commandLine.Add $"{path} {arguments} /bl" - - let psi = ProcessStartInfo() - psi.FileName <- path - psi.WorkingDirectory <- workingDir - psi.RedirectStandardOutput <- true - psi.RedirectStandardError <- true - psi.Arguments <- arguments - psi.CreateNoWindow <- true - // When running tests, we want to roll forward to minor versions (including previews). - psi.EnvironmentVariables["DOTNET_ROLL_FORWARD"] <- "LatestMajor" - psi.EnvironmentVariables["DOTNET_ROLL_FORWARD_TO_PRERELEASE"] <- "1" - psi.EnvironmentVariables.Remove("MSBuildSDKsPath") // Host can sometimes add this, and it can break things - psi.UseShellExecute <- false - - use p = new Process() - p.StartInfo <- psi - - p.OutputDataReceived.Add(fun a -> outputDataReceived a.Data) - p.ErrorDataReceived.Add(fun a -> errorDataReceived a.Data) - - if p.Start() then - p.BeginOutputReadLine() - p.BeginErrorReadLine() - if not(p.WaitForExit(timeout)) then - // Timed out resolving throw a diagnostic. - raise (new TimeoutException(sprintf "Timeout executing command '%s' '%s'" (psi.FileName) (psi.Arguments))) - else - p.WaitForExit() - #if DEBUG - let workingDir' = - if workingDir = "" - then - // Assign working dir to prevent default to C:\Windows\System32 - let executionLocation = Assembly.GetExecutingAssembly().Location - Path.GetDirectoryName executionLocation - else - workingDir - - lock gate (fun () -> - File.WriteAllLines(Path.Combine(workingDir', "commandline.txt"), commandLine) - File.WriteAllLines(Path.Combine(workingDir', "StandardOutput.txt"), outputList) - File.WriteAllLines(Path.Combine(workingDir', "StandardError.txt"), errorsList) - ) - #endif - p.ExitCode, outputList.ToArray(), errorsList.ToArray() - | None -> -1, Array.empty, Array.empty + let commandLine = ResizeArray() + let errorsList = ResizeArray() + let outputList = ResizeArray() + let errorslock = obj() + let outputlock = obj() + let outputDataReceived (message: string) = + if not (isNull message) then + lock outputlock (fun () -> outputList.Add(message)) + + let errorDataReceived (message: string) = + if not (isNull message) then + lock errorslock (fun () -> errorsList.Add(message)) + + commandLine.Add $"cd {workingDir}" + commandLine.Add $"{pathToExe} {arguments} /bl" + + let psi = ProcessStartInfo() + psi.FileName <- pathToExe + psi.WorkingDirectory <- workingDir + psi.RedirectStandardOutput <- true + psi.RedirectStandardError <- true + psi.Arguments <- arguments + psi.CreateNoWindow <- true + // When running tests, we want to roll forward to minor versions (including previews). + psi.EnvironmentVariables["DOTNET_ROLL_FORWARD"] <- "LatestMajor" + psi.EnvironmentVariables["DOTNET_ROLL_FORWARD_TO_PRERELEASE"] <- "1" + psi.EnvironmentVariables.Remove("MSBuildSDKsPath") // Host can sometimes add this, and it can break things + psi.UseShellExecute <- false + + use p = new Process() + p.StartInfo <- psi + + p.OutputDataReceived.Add(fun a -> outputDataReceived a.Data) + p.ErrorDataReceived.Add(fun a -> errorDataReceived a.Data) + + if p.Start() then + p.BeginOutputReadLine() + p.BeginErrorReadLine() + if not(p.WaitForExit(timeout)) then + // Timed out resolving throw a diagnostic. + raise (new TimeoutException(sprintf "Timeout executing command '%s' '%s'" (psi.FileName) (psi.Arguments))) + else + p.WaitForExit() +#if DEBUG + let workingDir' = + if workingDir = "" + then + // Assign working dir to prevent default to C:\Windows\System32 + let executionLocation = Assembly.GetExecutingAssembly().Location + Path.GetDirectoryName executionLocation + else + workingDir + + lock gate (fun () -> + File.WriteAllLines(Path.Combine(workingDir', "commandline.txt"), commandLine) + File.WriteAllLines(Path.Combine(workingDir', "StandardOutput.txt"), outputList) + File.WriteAllLines(Path.Combine(workingDir', "StandardError.txt"), errorsList) + ) +#endif + p.ExitCode, outputList.ToArray(), errorsList.ToArray() let getfullpath workDir (path:string) = let rooted = diff --git a/tests/FSharp.Test.Utilities/Utilities.fs b/tests/FSharp.Test.Utilities/Utilities.fs index 6ed885d4e44..1a6d0ff60f8 100644 --- a/tests/FSharp.Test.Utilities/Utilities.fs +++ b/tests/FSharp.Test.Utilities/Utilities.fs @@ -245,7 +245,7 @@ let main argv = 0""" File.WriteAllText(directoryBuildTargetsFileName, directoryBuildTargets) let timeout = 120000 - let exitCode, dotnetoutput, dotneterrors = Commands.executeProcess (Some config.DotNetExe) "build" projectDirectory timeout + let exitCode, dotnetoutput, dotneterrors = Commands.executeProcess config.DotNetExe "build" projectDirectory timeout if exitCode <> 0 || errors.Length > 0 then errors <- dotneterrors diff --git a/tests/fsharp/Compiler/Libraries/Core/Async/AsyncTests.fs b/tests/fsharp/Compiler/Libraries/Core/Async/AsyncTests.fs index 708e7e58e2e..3b83b97db7a 100644 --- a/tests/fsharp/Compiler/Libraries/Core/Async/AsyncTests.fs +++ b/tests/fsharp/Compiler/Libraries/Core/Async/AsyncTests.fs @@ -8,7 +8,7 @@ open FSharp.Test module AsyncTests = // Regression for FSHARP1.0:5969 // Async.StartChild: error when wait async is executed more than once - [] + [] let ``Execute Async multiple times``() = CompilerAssert.CompileExeAndRun """ @@ -24,13 +24,12 @@ let a = async { return result } |> Async.RunSynchronously -exit 0 """ // Regression for FSHARP1.0:5970 // Async.StartChild: race in implementation of ResultCell in FSharp.Core - [] + [] let ``Joining StartChild``() = CompilerAssert.CompileExeAndRun """ @@ -54,12 +53,10 @@ let r = with _ -> (0,0) -exit 0 - """ // Regression test for FSHARP1.0:6086 - [] + [] let ``Mailbox Async dot not StackOverflow``() = CompilerAssert.CompileExeAndRun """ @@ -128,12 +125,11 @@ for meet in meets do printfn "%d" meet printfn "Total: %d in %O" (Seq.sum meets) (watch.Elapsed) -exit 0 """ // Regression for FSHARP1.0:5971 - [] + [] let ``StartChild do not throw ObjectDisposedException``() = CompilerAssert.CompileExeAndRun """ @@ -142,10 +138,9 @@ module M let b = async {return 5} |> Async.StartChild printfn "%A" (b |> Async.RunSynchronously |> Async.RunSynchronously) -exit 0 """ - [] + [] let ``StartChild test Trampoline HijackLimit``() = CompilerAssert.CompileExeAndRun """ @@ -164,5 +159,4 @@ let r = () } |> Async.RunSynchronously -exit 0 """ diff --git a/tests/fsharp/core/controlMailbox/test.fsx b/tests/fsharp/core/controlMailbox/test.fsx index 98d6a7d2f31..5aa65035ecd 100644 --- a/tests/fsharp/core/controlMailbox/test.fsx +++ b/tests/fsharp/core/controlMailbox/test.fsx @@ -6,9 +6,7 @@ module Core_controlMailBox #nowarn "40" // recursive references -#if NETCOREAPP open System.Threading.Tasks -#endif let biggerThanTrampoliningLimit = 10000 @@ -49,22 +47,27 @@ let checkQuiet s x1 x2 = (test s false; log (sprintf "expected: %A, got %A" x2 x1)) -let check s x1 x2 = +let check s x1 x2 = if x1 = x2 then test s true else (test s false; log (sprintf "expected: %A, got %A" x2 x1)) +let checkAsync s (x1: Task<_>) x2 = check s x1.Result x2 + open Microsoft.FSharp.Control -open Microsoft.FSharp.Control.WebExtensions module MailboxProcessorBasicTests = + let test() = check "c32398u6: MailboxProcessor null" - (let mb1 = new MailboxProcessor(fun inbox -> async { return () }) - mb1.Start(); - 100) - 100 + ( + let mb1 = new MailboxProcessor(fun inbox -> async { return () }) + mb1.Start() + 100 + ) + + 100 check "c32398u7: MailboxProcessor Receive/PostAndReply" @@ -197,9 +200,10 @@ module MailboxProcessorBasicTests = 200 for n in [0; 1; 100; 1000; 100000 ] do - check + checkAsync (sprintf "c32398u: MailboxProcessor Post/Receive, n=%d" n) - (let received = ref 0 + (task { + let received = ref 0 let mb1 = new MailboxProcessor(fun inbox -> async { for i in 0 .. n-1 do let! _ = inbox.Receive() @@ -208,48 +212,37 @@ module MailboxProcessorBasicTests = for i in 0 .. n-1 do mb1.Post(i) while !received < n do - if !received % 100 = 0 then - printfn "received = %d" !received -#if NETCOREAPP - Task.Delay(1).Wait() -#else - System.Threading.Thread.Sleep(1) -#endif - !received) + do! Task.Yield() + return !received}) n for timeout in [0; 10] do for n in [0; 1; 100] do - check + checkAsync (sprintf "c32398u: MailboxProcessor Post/TryReceive, n=%d, timeout=%d" n timeout) - (let received = ref 0 + (task { + let received = ref 0 let mb1 = new MailboxProcessor(fun inbox -> async { while !received < n do - let! msgOpt = inbox.TryReceive(timeout=timeout) - match msgOpt with - | None -> - do if !received % 100 = 0 then - printfn "timeout!, received = %d" !received - | Some _ -> do incr received }) + match! inbox.TryReceive(timeout=timeout) with + | Some _ -> incr received + | _ -> () + }) + + mb1.Post(0) + mb1.Start(); for i in 0 .. n-1 do -#if NETCOREAPP - Task.Delay(1).Wait(); -#else - System.Threading.Thread.Sleep(1) -#endif mb1.Post(i) + do! Task.Yield() while !received < n do - if !received % 100 = 0 then - printfn "main thread: received = %d" !received -#if NETCOREAPP - Task.Delay(1).Wait(); -#else - System.Threading.Thread.Sleep(1) -#endif - !received) + do! Task.Yield() + return !received}) n + +(* Disabled for timing issues. Some replacement TryScan tests were added to FSharp.Core.UnitTests. + for i in 1..10 do for sleep in [0;1;10] do for timeout in [10;1;0] do @@ -284,8 +277,11 @@ module MailboxProcessorBasicTests = !timedOut) (Some true) - check "cf72361: MailboxProcessor TryScan wo/timeout" - (let timedOut = ref None +*) + + checkAsync "cf72361: MailboxProcessor TryScan wo/timeout" + (task { + let timedOut = ref None let mb = new MailboxProcessor(fun inbox -> async { let! result = inbox.TryScan((fun i -> if i then async { return () } |> Some else None)) @@ -298,65 +294,58 @@ module MailboxProcessorBasicTests = w.Start() while w.ElapsedMilliseconds < 100L do mb.Post(false) -#if NETCOREAPP - Task.Delay(0).Wait(); -#else - System.Threading.Thread.Sleep(0) -#endif + do! Task.Yield() let r = !timedOut mb.Post(true) - r) + return r}) None module MailboxProcessorErrorEventTests = exception Err of int let test() = // Make sure the event doesn't get raised if no error - check + checkAsync "c32398u9330: MailboxProcessor Error (0)" - (let mb1 = new MailboxProcessor(fun inbox -> async { return () }) - let res = ref 100 - mb1.Error.Add(fun _ -> res := 0) + (task { + let mb1 = new MailboxProcessor(fun inbox -> async { return () }) + mb1.Error.Add(fun _ -> failwith "unexpected error event") mb1.Start(); -#if NETCOREAPP - Task.Delay(200).Wait(); -#else - System.Threading.Thread.Sleep(200) -#endif - !res) + do! Task.Delay(200) + return 100}) 100 // Make sure the event does get raised if error - check + check "c32398u9331: MailboxProcessor Error (1)" (let mb1 = new MailboxProcessor(fun inbox -> async { failwith "fail" }) - let res = ref 0 - mb1.Error.Add(fun _ -> res := 100) + use res = new System.Threading.ManualResetEventSlim(false) + mb1.Error.Add(fun _ -> res.Set()) mb1.Start(); -#if NETCOREAPP - Task.Delay(200).Wait(); -#else - System.Threading.Thread.Sleep(200) -#endif - !res) - 100 + res.Wait() + true) + true // Make sure the event does get raised after message receive - check + checkAsync "c32398u9332: MailboxProcessor Error (2)" - (let mb1 = new MailboxProcessor(fun inbox -> - async { let! msg = inbox.Receive() - raise (Err msg) }) - let res = ref 0 - mb1.Error.Add(function Err n -> res := n | _ -> check "rwe90r - unexpected error" 0 1) - mb1.Start(); - mb1.Post 100 -#if NETCOREAPP - Task.Delay(200).Wait(); -#else - System.Threading.Thread.Sleep(200) -#endif - !res) + ( + let errorNumber = TaskCompletionSource<_>() + + let mb1 = new MailboxProcessor( fun inbox -> async { + let! msg = inbox.Receive() + raise (Err msg) + }) + + mb1.Error.Add(function + | Err n -> errorNumber.SetResult n + | _ -> + check "rwe90r - unexpected error" 0 1 ) + + mb1.Start(); + mb1.Post 100 + + errorNumber.Task + ) 100 type msg = Increment of int | Fetch of AsyncReplyChannel | Reset @@ -472,13 +461,10 @@ let test7() = let timeoutboxes str = new MailboxProcessor<'b>(fun inbox -> - async { for i in 1 .. 10 do -#if NETCOREAPP - Task.Delay(200).Wait() -#else - do System.Threading.Thread.Sleep 200 -#endif - }) + async { + for i in 1 .. 10 do + do! Async.Sleep 200 + }) // Timeout let timeout_tpar() = @@ -553,17 +539,9 @@ let timeout_para_def() = test "default timeout & PostAndAsyncReply" false with _ -> test "default timeout & PostAndAsyncReply" true -// Useful class: put "checkpoints" in the code. -// Check they are called in the right order. -type Path(str) = - let mutable current = 0 - member p.Check n = check (str + " #" + string (current+1)) n (current+1) - current <- n - - - module LotsOfMessages = let test () = + task { let N = 200000 let count = ref N @@ -586,12 +564,9 @@ module LotsOfMessages = check "celrv09ervkn" (queueLength >= logger.CurrentQueueLength) true queueLength <- logger.CurrentQueueLength -#if NETCOREAPP - Task.Delay(10).Wait() -#else - System.Threading.Thread.Sleep(10) -#endif + do! Task.Delay(10) check "celrv09ervknf3ew" logger.CurrentQueueLength 0 + } let RunAll() = MailboxProcessorBasicTests.test() @@ -608,11 +583,11 @@ let RunAll() = timeout_tpar_def() // ToDo: 7/31/2008: Disabled because of probable timing issue. QA needs to re-enable post-CTP. // Tracked by bug FSharp 1.0:2891 - //test15() + // test15() // ToDo: 7/31/2008: Disabled because of probable timing issue. QA needs to re-enable post-CTP. // Tracked by bug FSharp 1.0:2891 - //test15b() - LotsOfMessages.test() + // test15b() + LotsOfMessages.test().Wait() #if TESTS_AS_APP let RUN() = RunAll(); failures @@ -621,6 +596,9 @@ RunAll() let aa = if not failures.IsEmpty then stdout.WriteLine "Test Failed" + stdout.WriteLine() + stdout.WriteLine "failures:" + failures |> List.iter stdout.WriteLine exit 1 else stdout.WriteLine "Test Passed" diff --git a/tests/fsharp/typecheck/sigs/neg06.bsl b/tests/fsharp/typecheck/sigs/neg06.bsl index d55e3e948d2..4e28da2b6d7 100644 --- a/tests/fsharp/typecheck/sigs/neg06.bsl +++ b/tests/fsharp/typecheck/sigs/neg06.bsl @@ -10,7 +10,7 @@ neg06.fs(24,6,24,30): typecheck error FS0944: Abbreviated types cannot be given neg06.fs(27,6,27,33): typecheck error FS0942: Delegate types are always sealed -neg06.fs(31,9,31,29): typecheck error FS0945: Cannot inherit a sealed type +neg06.fs(31,17,31,27): typecheck error FS0945: Cannot inherit a sealed type neg06.fs(37,6,37,29): typecheck error FS0954: This type definition involves an immediate cyclic reference through a struct field or inheritance relation diff --git a/tests/fsharp/typecheck/sigs/neg10.bsl b/tests/fsharp/typecheck/sigs/neg10.bsl index 60e9056de56..31bcdb1882e 100644 --- a/tests/fsharp/typecheck/sigs/neg10.bsl +++ b/tests/fsharp/typecheck/sigs/neg10.bsl @@ -1,9 +1,9 @@ neg10.fsi(9,6,9,7): typecheck error FS0249: Two type definitions named 'x' occur in namespace 'N' in two parts of this assembly -neg10.fs(11,17,11,27): typecheck error FS0946: Cannot inherit from interface type. Use interface ... with instead. +neg10.fs(11,25,11,27): typecheck error FS0946: Cannot inherit from interface type. Use interface ... with instead. -neg10.fs(13,17,13,26): typecheck error FS0945: Cannot inherit a sealed type +neg10.fs(13,25,13,26): typecheck error FS0945: Cannot inherit a sealed type neg10.fs(15,22,15,32): typecheck error FS0887: The type 'C1' is not an interface type diff --git a/tests/fsharp/typecheck/sigs/neg104.vsbsl b/tests/fsharp/typecheck/sigs/neg104.vsbsl index 8a6059aa128..165b4348e35 100644 --- a/tests/fsharp/typecheck/sigs/neg104.vsbsl +++ b/tests/fsharp/typecheck/sigs/neg104.vsbsl @@ -27,4 +27,4 @@ neg104.fs(20,9,20,15): typecheck error FS0025: Incomplete pattern matches on thi neg104.fs(23,9,23,15): typecheck error FS0025: Incomplete pattern matches on this expression. -neg104.fs(35,9,35,18): typecheck error FS0748: This construct may only be used within computation expressions. To return a value from an ordinary function simply write the expression without 'return'. +neg104.fs(35,9,35,15): typecheck error FS0748: This construct may only be used within computation expressions. To return a value from an ordinary function simply write the expression without 'return'. diff --git a/tests/fsharp/typecheck/sigs/neg107.bsl b/tests/fsharp/typecheck/sigs/neg107.bsl index 30b24d25c59..580233b4775 100644 --- a/tests/fsharp/typecheck/sigs/neg107.bsl +++ b/tests/fsharp/typecheck/sigs/neg107.bsl @@ -33,11 +33,11 @@ neg107.fsx(28,55,28,66): typecheck error FS0425: The type of a first-class funct neg107.fsx(30,49,30,54): typecheck error FS0406: The byref-typed variable 'a' is used in an invalid way. Byrefs cannot be captured by closures or passed to inner functions. -neg107.fsx(30,57,30,65): typecheck error FS0406: The byref-typed variable 'a' is used in an invalid way. Byrefs cannot be captured by closures or passed to inner functions. +neg107.fsx(30,64,30,65): typecheck error FS0406: The byref-typed variable 'a' is used in an invalid way. Byrefs cannot be captured by closures or passed to inner functions. neg107.fsx(31,70,31,75): typecheck error FS0406: The byref-typed variable 'a' is used in an invalid way. Byrefs cannot be captured by closures or passed to inner functions. -neg107.fsx(31,78,31,86): typecheck error FS0406: The byref-typed variable 'a' is used in an invalid way. Byrefs cannot be captured by closures or passed to inner functions. +neg107.fsx(31,85,31,86): typecheck error FS0406: The byref-typed variable 'a' is used in an invalid way. Byrefs cannot be captured by closures or passed to inner functions. neg107.fsx(32,13,32,30): typecheck error FS3301: The function or method has an invalid return type 'Async>'. This is not permitted by the rules of Common IL. @@ -49,13 +49,13 @@ neg107.fsx(32,48,32,53): typecheck error FS0406: The byref-typed variable 'a' is neg107.fsx(32,48,32,53): typecheck error FS0412: A type instantiation involves a byref type. This is not permitted by the rules of Common IL. -neg107.fsx(32,56,32,64): typecheck error FS0412: A type instantiation involves a byref type. This is not permitted by the rules of Common IL. +neg107.fsx(32,63,32,64): typecheck error FS0412: A type instantiation involves a byref type. This is not permitted by the rules of Common IL. -neg107.fsx(32,56,32,64): typecheck error FS0406: The byref-typed variable 'a' is used in an invalid way. Byrefs cannot be captured by closures or passed to inner functions. +neg107.fsx(32,63,32,64): typecheck error FS0406: The byref-typed variable 'a' is used in an invalid way. Byrefs cannot be captured by closures or passed to inner functions. -neg107.fsx(32,56,32,64): typecheck error FS0412: A type instantiation involves a byref type. This is not permitted by the rules of Common IL. +neg107.fsx(32,63,32,64): typecheck error FS0412: A type instantiation involves a byref type. This is not permitted by the rules of Common IL. -neg107.fsx(32,56,32,64): typecheck error FS0425: The type of a first-class function cannot contain byrefs +neg107.fsx(32,63,32,64): typecheck error FS0425: The type of a first-class function cannot contain byrefs neg107.fsx(32,48,32,53): typecheck error FS0425: The type of a first-class function cannot contain byrefs @@ -69,13 +69,13 @@ neg107.fsx(33,56,33,61): typecheck error FS0406: The byref-typed variable 'a' is neg107.fsx(33,56,33,61): typecheck error FS0412: A type instantiation involves a byref type. This is not permitted by the rules of Common IL. -neg107.fsx(33,64,33,72): typecheck error FS0412: A type instantiation involves a byref type. This is not permitted by the rules of Common IL. +neg107.fsx(33,71,33,72): typecheck error FS0412: A type instantiation involves a byref type. This is not permitted by the rules of Common IL. -neg107.fsx(33,64,33,72): typecheck error FS0406: The byref-typed variable 'a' is used in an invalid way. Byrefs cannot be captured by closures or passed to inner functions. +neg107.fsx(33,71,33,72): typecheck error FS0406: The byref-typed variable 'a' is used in an invalid way. Byrefs cannot be captured by closures or passed to inner functions. -neg107.fsx(33,64,33,72): typecheck error FS0412: A type instantiation involves a byref type. This is not permitted by the rules of Common IL. +neg107.fsx(33,71,33,72): typecheck error FS0412: A type instantiation involves a byref type. This is not permitted by the rules of Common IL. -neg107.fsx(33,64,33,72): typecheck error FS0425: The type of a first-class function cannot contain byrefs +neg107.fsx(33,71,33,72): typecheck error FS0425: The type of a first-class function cannot contain byrefs neg107.fsx(33,56,33,61): typecheck error FS0425: The type of a first-class function cannot contain byrefs diff --git a/tests/fsharp/typecheck/sigs/neg107.vsbsl b/tests/fsharp/typecheck/sigs/neg107.vsbsl index 30b24d25c59..580233b4775 100644 --- a/tests/fsharp/typecheck/sigs/neg107.vsbsl +++ b/tests/fsharp/typecheck/sigs/neg107.vsbsl @@ -33,11 +33,11 @@ neg107.fsx(28,55,28,66): typecheck error FS0425: The type of a first-class funct neg107.fsx(30,49,30,54): typecheck error FS0406: The byref-typed variable 'a' is used in an invalid way. Byrefs cannot be captured by closures or passed to inner functions. -neg107.fsx(30,57,30,65): typecheck error FS0406: The byref-typed variable 'a' is used in an invalid way. Byrefs cannot be captured by closures or passed to inner functions. +neg107.fsx(30,64,30,65): typecheck error FS0406: The byref-typed variable 'a' is used in an invalid way. Byrefs cannot be captured by closures or passed to inner functions. neg107.fsx(31,70,31,75): typecheck error FS0406: The byref-typed variable 'a' is used in an invalid way. Byrefs cannot be captured by closures or passed to inner functions. -neg107.fsx(31,78,31,86): typecheck error FS0406: The byref-typed variable 'a' is used in an invalid way. Byrefs cannot be captured by closures or passed to inner functions. +neg107.fsx(31,85,31,86): typecheck error FS0406: The byref-typed variable 'a' is used in an invalid way. Byrefs cannot be captured by closures or passed to inner functions. neg107.fsx(32,13,32,30): typecheck error FS3301: The function or method has an invalid return type 'Async>'. This is not permitted by the rules of Common IL. @@ -49,13 +49,13 @@ neg107.fsx(32,48,32,53): typecheck error FS0406: The byref-typed variable 'a' is neg107.fsx(32,48,32,53): typecheck error FS0412: A type instantiation involves a byref type. This is not permitted by the rules of Common IL. -neg107.fsx(32,56,32,64): typecheck error FS0412: A type instantiation involves a byref type. This is not permitted by the rules of Common IL. +neg107.fsx(32,63,32,64): typecheck error FS0412: A type instantiation involves a byref type. This is not permitted by the rules of Common IL. -neg107.fsx(32,56,32,64): typecheck error FS0406: The byref-typed variable 'a' is used in an invalid way. Byrefs cannot be captured by closures or passed to inner functions. +neg107.fsx(32,63,32,64): typecheck error FS0406: The byref-typed variable 'a' is used in an invalid way. Byrefs cannot be captured by closures or passed to inner functions. -neg107.fsx(32,56,32,64): typecheck error FS0412: A type instantiation involves a byref type. This is not permitted by the rules of Common IL. +neg107.fsx(32,63,32,64): typecheck error FS0412: A type instantiation involves a byref type. This is not permitted by the rules of Common IL. -neg107.fsx(32,56,32,64): typecheck error FS0425: The type of a first-class function cannot contain byrefs +neg107.fsx(32,63,32,64): typecheck error FS0425: The type of a first-class function cannot contain byrefs neg107.fsx(32,48,32,53): typecheck error FS0425: The type of a first-class function cannot contain byrefs @@ -69,13 +69,13 @@ neg107.fsx(33,56,33,61): typecheck error FS0406: The byref-typed variable 'a' is neg107.fsx(33,56,33,61): typecheck error FS0412: A type instantiation involves a byref type. This is not permitted by the rules of Common IL. -neg107.fsx(33,64,33,72): typecheck error FS0412: A type instantiation involves a byref type. This is not permitted by the rules of Common IL. +neg107.fsx(33,71,33,72): typecheck error FS0412: A type instantiation involves a byref type. This is not permitted by the rules of Common IL. -neg107.fsx(33,64,33,72): typecheck error FS0406: The byref-typed variable 'a' is used in an invalid way. Byrefs cannot be captured by closures or passed to inner functions. +neg107.fsx(33,71,33,72): typecheck error FS0406: The byref-typed variable 'a' is used in an invalid way. Byrefs cannot be captured by closures or passed to inner functions. -neg107.fsx(33,64,33,72): typecheck error FS0412: A type instantiation involves a byref type. This is not permitted by the rules of Common IL. +neg107.fsx(33,71,33,72): typecheck error FS0412: A type instantiation involves a byref type. This is not permitted by the rules of Common IL. -neg107.fsx(33,64,33,72): typecheck error FS0425: The type of a first-class function cannot contain byrefs +neg107.fsx(33,71,33,72): typecheck error FS0425: The type of a first-class function cannot contain byrefs neg107.fsx(33,56,33,61): typecheck error FS0425: The type of a first-class function cannot contain byrefs diff --git a/tests/fsharp/typecheck/sigs/neg20.bsl b/tests/fsharp/typecheck/sigs/neg20.bsl index ea20ab65acf..5229dcaacf6 100644 --- a/tests/fsharp/typecheck/sigs/neg20.bsl +++ b/tests/fsharp/typecheck/sigs/neg20.bsl @@ -67,7 +67,7 @@ but given a 'B list' The type 'A' does not match the type 'B' -neg20.fs(80,23,80,39): typecheck error FS0193: Type constraint mismatch. The type +neg20.fs(80,30,80,39): typecheck error FS0193: Type constraint mismatch. The type 'C list' is not compatible with type 'B seq' diff --git a/tests/fsharp/typecheck/sigs/neg59.bsl b/tests/fsharp/typecheck/sigs/neg59.bsl index 624750b9352..77a9c8caf46 100644 --- a/tests/fsharp/typecheck/sigs/neg59.bsl +++ b/tests/fsharp/typecheck/sigs/neg59.bsl @@ -33,14 +33,14 @@ neg59.fs(89,15,89,18): typecheck error FS3141: 'try/finally' expressions may not neg59.fs(95,15,95,18): typecheck error FS3141: 'try/finally' expressions may not be used in queries -neg59.fs(102,15,102,64): typecheck error FS3142: 'use' expressions may not be used in queries +neg59.fs(102,15,102,18): typecheck error FS3142: 'use' expressions may not be used in queries -neg59.fs(108,15,108,64): typecheck error FS3142: 'use' expressions may not be used in queries +neg59.fs(108,15,108,18): typecheck error FS3142: 'use' expressions may not be used in queries neg59.fs(113,15,113,25): typecheck error FS3140: 'while' expressions may not be used in queries neg59.fs(118,15,118,25): typecheck error FS3140: 'while' expressions may not be used in queries -neg59.fs(124,17,124,25): typecheck error FS3144: 'return' and 'return!' may not be used in queries +neg59.fs(124,17,124,23): typecheck error FS3144: 'return' and 'return!' may not be used in queries -neg59.fs(128,17,128,26): typecheck error FS3144: 'return' and 'return!' may not be used in queries +neg59.fs(128,17,128,24): typecheck error FS3144: 'return' and 'return!' may not be used in queries diff --git a/tests/fsharp/typecheck/sigs/neg61.bsl b/tests/fsharp/typecheck/sigs/neg61.bsl index 91291a6cb94..d7011cef5ef 100644 --- a/tests/fsharp/typecheck/sigs/neg61.bsl +++ b/tests/fsharp/typecheck/sigs/neg61.bsl @@ -57,15 +57,15 @@ neg61.fs(79,13,79,16): typecheck error FS3146: 'try/with' expressions may not be neg61.fs(86,13,86,16): typecheck error FS3141: 'try/finally' expressions may not be used in queries -neg61.fs(92,13,92,70): typecheck error FS3142: 'use' expressions may not be used in queries +neg61.fs(92,13,92,16): typecheck error FS3142: 'use' expressions may not be used in queries neg61.fs(97,13,97,17): typecheck error FS3143: 'let!', 'use!' and 'do!' expressions may not be used in queries neg61.fs(102,13,102,16): typecheck error FS3143: 'let!', 'use!' and 'do!' expressions may not be used in queries -neg61.fs(107,13,107,21): typecheck error FS3144: 'return' and 'return!' may not be used in queries +neg61.fs(107,13,107,19): typecheck error FS3144: 'return' and 'return!' may not be used in queries -neg61.fs(111,13,111,24): typecheck error FS3144: 'return' and 'return!' may not be used in queries +neg61.fs(111,13,111,20): typecheck error FS3144: 'return' and 'return!' may not be used in queries neg61.fs(114,13,114,21): typecheck error FS3145: This is not a known query operator. Query operators are identifiers such as 'select', 'where', 'sortBy', 'thenBy', 'groupBy', 'groupValBy', 'join', 'groupJoin', 'sumBy' and 'averageBy', defined using corresponding methods on the 'QueryBuilder' type. diff --git a/tests/fsharp/typecheck/sigs/version50/neg20.bsl b/tests/fsharp/typecheck/sigs/version50/neg20.bsl index 169c18e8573..394f7777b2a 100644 --- a/tests/fsharp/typecheck/sigs/version50/neg20.bsl +++ b/tests/fsharp/typecheck/sigs/version50/neg20.bsl @@ -98,7 +98,7 @@ but given a 'B list' The type 'A' does not match the type 'B' -neg20.fs(80,23,80,39): typecheck error FS0193: Type constraint mismatch. The type +neg20.fs(80,30,80,39): typecheck error FS0193: Type constraint mismatch. The type 'C list' is not compatible with type 'B seq' diff --git a/tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/ComputationExpressions/E_MissingReturn.fs b/tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/ComputationExpressions/E_MissingReturn.fs index a0bb521f1af..5010e70386b 100644 --- a/tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/ComputationExpressions/E_MissingReturn.fs +++ b/tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/ComputationExpressions/E_MissingReturn.fs @@ -1,6 +1,6 @@ // #Regression #Conformance #DataExpressions #ComputationExpressions // Regression test for FSHARP1.0:6149 -//This control construct may only be used if the computation expression builder defines a 'Return' method$ +//This control construct may only be used if the computation expression builder defines a 'Return' method$ type R = S of string diff --git a/tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/ComputationExpressions/E_MissingReturnFrom.fs b/tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/ComputationExpressions/E_MissingReturnFrom.fs index 24f20ffb9ac..f8185a9b7fa 100644 --- a/tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/ComputationExpressions/E_MissingReturnFrom.fs +++ b/tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/ComputationExpressions/E_MissingReturnFrom.fs @@ -1,6 +1,6 @@ // #Regression #Conformance #DataExpressions #ComputationExpressions // Regression test for FSHARP1.0:6149 -//This control construct may only be used if the computation expression builder defines a 'ReturnFrom' method$ +//This control construct may only be used if the computation expression builder defines a 'ReturnFrom' method$ type R = S of string diff --git a/tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/ComputationExpressions/E_MissingUsing.fs b/tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/ComputationExpressions/E_MissingUsing.fs index 90018a3a6a5..e83604cfdf9 100644 --- a/tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/ComputationExpressions/E_MissingUsing.fs +++ b/tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/ComputationExpressions/E_MissingUsing.fs @@ -1,6 +1,6 @@ // #Regression #Conformance #DataExpressions #ComputationExpressions // Regression test for FSHARP1.0:6149 -//This control construct may only be used if the computation expression builder defines a 'Using' method$ +//This control construct may only be used if the computation expression builder defines a 'Using' method$ type R = S of string diff --git a/tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/ComputationExpressions/E_MissingYield.fs b/tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/ComputationExpressions/E_MissingYield.fs index b731412bfa6..7251faf3978 100644 --- a/tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/ComputationExpressions/E_MissingYield.fs +++ b/tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/ComputationExpressions/E_MissingYield.fs @@ -1,6 +1,6 @@ // #Regression #Conformance #DataExpressions #ComputationExpressions // Regression test for FSHARP1.0:6149 -//This control construct may only be used if the computation expression builder defines a 'Yield' method$ +//This control construct may only be used if the computation expression builder defines a 'Yield' method$ type R = S of string diff --git a/tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/ComputationExpressions/E_MissingYieldFrom.fs b/tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/ComputationExpressions/E_MissingYieldFrom.fs index 63ada5cd6be..3777c375f2b 100644 --- a/tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/ComputationExpressions/E_MissingYieldFrom.fs +++ b/tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/ComputationExpressions/E_MissingYieldFrom.fs @@ -1,6 +1,6 @@ // #Regression #Conformance #DataExpressions #ComputationExpressions // Regression test for FSHARP1.0:6149 -//This control construct may only be used if the computation expression builder defines a 'YieldFrom' method$ +//This control construct may only be used if the computation expression builder defines a 'YieldFrom' method$ type R = S of string diff --git a/tests/fsharpqa/Source/Conformance/ObjectOrientedTypeDefinitions/StructTypes/E_StructInheritance01b.fs b/tests/fsharpqa/Source/Conformance/ObjectOrientedTypeDefinitions/StructTypes/E_StructInheritance01b.fs index c8771146df5..38184a2ac82 100644 --- a/tests/fsharpqa/Source/Conformance/ObjectOrientedTypeDefinitions/StructTypes/E_StructInheritance01b.fs +++ b/tests/fsharpqa/Source/Conformance/ObjectOrientedTypeDefinitions/StructTypes/E_StructInheritance01b.fs @@ -2,7 +2,7 @@ // Verify error when trying to inherit from a struct type // Regression test for FSHARP1.0:2803 //FS0191: Cannot inherit from interface type -//Cannot inherit a sealed type +//Cannot inherit a sealed type type StructType = struct diff --git a/tests/fsharpqa/Source/Conformance/ObjectOrientedTypeDefinitions/TypeKindInference/infer_interface002e.fs b/tests/fsharpqa/Source/Conformance/ObjectOrientedTypeDefinitions/TypeKindInference/infer_interface002e.fs index 4f9a24e00a8..e5998a72c51 100644 --- a/tests/fsharpqa/Source/Conformance/ObjectOrientedTypeDefinitions/TypeKindInference/infer_interface002e.fs +++ b/tests/fsharpqa/Source/Conformance/ObjectOrientedTypeDefinitions/TypeKindInference/infer_interface002e.fs @@ -2,10 +2,10 @@ // attribute must match inferred type //The kind of the type specified by its attributes does not match the kind implied by its definition //Structs, interfaces, enums and delegates cannot inherit from other types -//Cannot inherit from interface type\. Use interface \.\.\. with instead +//Cannot inherit from interface type\. Use interface \.\.\. with instead //The kind of the type specified by its attributes does not match the kind implied by its definition //Structs, interfaces, enums and delegates cannot inherit from other types -//Cannot inherit from interface type\. Use interface \.\.\. with instead +//Cannot inherit from interface type\. Use interface \.\.\. with instead // An interface type TK_I_003 = interface diff --git a/tests/service/data/SyntaxTree/Binding/InlineKeywordInBinding.fs.bsl b/tests/service/data/SyntaxTree/Binding/InlineKeywordInBinding.fs.bsl index cc2a547ae79..65a3ffd51e4 100644 --- a/tests/service/data/SyntaxTree/Binding/InlineKeywordInBinding.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/InlineKeywordInBinding.fs.bsl @@ -44,11 +44,12 @@ ImplFile { LeadingKeyword = Let (3,4--3,7) InlineKeyword = Some (3,8--3,14) EqualsRange = Some (3,21--3,22) })], - Const (Unit, (4,4--4,6)), (3,4--4,6), { InKeyword = None }), - (2,11--2,16), NoneAtLet, { LeadingKeyword = Let (2,0--2,3) - InlineKeyword = Some (2,4--2,10) - EqualsRange = Some (2,17--2,18) })], - (2,0--4,6))], PreXmlDocEmpty, [], None, (2,0--5,0), - { LeadingKeyword = None })], (true, true), - { ConditionalDirectives = [] - CodeComments = [] }, set [])) + Const (Unit, (4,4--4,6)), (3,4--4,6), + { LetOrUseKeyword = (3,4--3,7) + InKeyword = None }), (2,11--2,16), NoneAtLet, + { LeadingKeyword = Let (2,0--2,3) + InlineKeyword = Some (2,4--2,10) + EqualsRange = Some (2,17--2,18) })], (2,0--4,6))], + PreXmlDocEmpty, [], None, (2,0--5,0), { LeadingKeyword = None })], + (true, true), { ConditionalDirectives = [] + CodeComments = [] }, set [])) diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs.bsl index 9302de5258a..a93634d8308 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs.bsl @@ -19,8 +19,9 @@ ImplFile Yes (3,4--3,13), { LeadingKeyword = Let (3,4--3,7) InlineKeyword = None EqualsRange = Some (3,10--3,11) })], - Const (Unit, (4,4--4,6)), (3,4--4,6), { InKeyword = None }), - (2,0--4,6)), (2,0--4,6))], PreXmlDocEmpty, [], None, (2,0--5,0), - { LeadingKeyword = None })], (true, true), - { ConditionalDirectives = [] - CodeComments = [] }, set [])) + Const (Unit, (4,4--4,6)), (3,4--4,6), + { LetOrUseKeyword = (3,4--3,7) + InKeyword = None }), (2,0--4,6)), (2,0--4,6))], + PreXmlDocEmpty, [], None, (2,0--5,0), { LeadingKeyword = None })], + (true, true), { ConditionalDirectives = [] + CodeComments = [] }, set [])) diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs.bsl index d86d4475a48..3a6b60728d1 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs.bsl @@ -30,8 +30,9 @@ ImplFile { LeadingKeyword = Let (3,4--3,7) InlineKeyword = None EqualsRange = Some (3,15--3,16) })], - Const (Unit, (4,4--4,6)), (3,4--4,6), { InKeyword = None }), - (2,0--4,6)), (2,0--4,6))], PreXmlDocEmpty, [], None, (2,0--5,0), - { LeadingKeyword = None })], (true, true), - { ConditionalDirectives = [] - CodeComments = [] }, set [])) + Const (Unit, (4,4--4,6)), (3,4--4,6), + { LetOrUseKeyword = (3,4--3,7) + InKeyword = None }), (2,0--4,6)), (2,0--4,6))], + PreXmlDocEmpty, [], None, (2,0--5,0), { LeadingKeyword = None })], + (true, true), { ConditionalDirectives = [] + CodeComments = [] }, set [])) diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs.bsl index 2d118d1cd46..f42eb45a8cd 100644 --- a/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs.bsl +++ b/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs.bsl @@ -34,11 +34,12 @@ ImplFile NoneAtLet, { LeadingKeyword = Let (3,4--3,7) InlineKeyword = None EqualsRange = Some (3,12--3,13) })], - Const (Unit, (4,4--4,6)), (3,4--4,6), { InKeyword = None }), - (2,4--2,5), NoneAtLet, { LeadingKeyword = Let (2,0--2,3) - InlineKeyword = None - EqualsRange = Some (2,6--2,7) })], - (2,0--4,6))], PreXmlDocEmpty, [], None, (2,0--5,0), - { LeadingKeyword = None })], (true, true), - { ConditionalDirectives = [] - CodeComments = [] }, set [])) + Const (Unit, (4,4--4,6)), (3,4--4,6), + { LetOrUseKeyword = (3,4--3,7) + InKeyword = None }), (2,4--2,5), NoneAtLet, + { LeadingKeyword = Let (2,0--2,3) + InlineKeyword = None + EqualsRange = Some (2,6--2,7) })], (2,0--4,6))], + PreXmlDocEmpty, [], None, (2,0--5,0), { LeadingKeyword = None })], + (true, true), { ConditionalDirectives = [] + CodeComments = [] }, set [])) diff --git a/tests/service/data/SyntaxTree/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs.bsl b/tests/service/data/SyntaxTree/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs.bsl index 6c740a1a4c9..45e4567b06e 100644 --- a/tests/service/data/SyntaxTree/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs.bsl +++ b/tests/service/data/SyntaxTree/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs.bsl @@ -38,10 +38,12 @@ ImplFile (5,4--5,24), { AndBangKeyword = (5,4--5,8) EqualsRange = (5,13--5,14) InKeyword = None })], - YieldOrReturn ((false, true), Ident bar, (6,4--6,14)), - (3,4--6,14), { LetOrUseBangKeyword = (3,4--3,8) - EqualsRange = Some (3,13--3,14) }), - (2,6--7,1)), (2,0--7,1)), (2,0--7,1))], PreXmlDocEmpty, [], - None, (2,0--7,1), { LeadingKeyword = None })], (true, true), + YieldOrReturn + ((false, true), Ident bar, (6,4--6,14), + { YieldOrReturnKeyword = (6,4--6,10) }), (3,4--6,14), + { LetOrUseBangKeyword = (3,4--3,8) + EqualsRange = Some (3,13--3,14) }), (2,6--7,1)), + (2,0--7,1)), (2,0--7,1))], PreXmlDocEmpty, [], None, (2,0--7,1), + { LeadingKeyword = None })], (true, true), { ConditionalDirectives = [] CodeComments = [] }, set [])) diff --git a/tests/service/data/SyntaxTree/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs.bsl b/tests/service/data/SyntaxTree/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs.bsl index 97af43342fa..44bbe24da45 100644 --- a/tests/service/data/SyntaxTree/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs.bsl +++ b/tests/service/data/SyntaxTree/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs.bsl @@ -28,10 +28,12 @@ ImplFile (5,4--5,24), { AndBangKeyword = (5,4--5,8) EqualsRange = (5,13--5,14) InKeyword = None })], - YieldOrReturn ((false, true), Ident bar, (7,4--7,14)), - (3,4--7,14), { LetOrUseBangKeyword = (3,4--3,8) - EqualsRange = Some (3,13--3,14) }), - (2,6--8,1)), (2,0--8,1)), (2,0--8,1))], PreXmlDocEmpty, [], - None, (2,0--8,1), { LeadingKeyword = None })], (true, true), + YieldOrReturn + ((false, true), Ident bar, (7,4--7,14), + { YieldOrReturnKeyword = (7,4--7,10) }), (3,4--7,14), + { LetOrUseBangKeyword = (3,4--3,8) + EqualsRange = Some (3,13--3,14) }), (2,6--8,1)), + (2,0--8,1)), (2,0--8,1))], PreXmlDocEmpty, [], None, (2,0--8,1), + { LeadingKeyword = None })], (true, true), { ConditionalDirectives = [] CodeComments = [] }, set [])) diff --git a/tests/service/data/SyntaxTree/Expression/List - Comprehension 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/List - Comprehension 01.fs.bsl index 6cfe5fcabbc..42c1356db1a 100644 --- a/tests/service/data/SyntaxTree/Expression/List - Comprehension 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/List - Comprehension 01.fs.bsl @@ -12,8 +12,9 @@ ImplFile Named (SynIdent (x, None), false, None, (3,6--3,7)), ArrayOrList (false, [], (3,11--3,13)), YieldOrReturn - ((true, false), Const (Unit, (3,17--3,19)), (3,14--3,19)), - (3,2--3,19)), (3,0--3,21)), (3,0--3,21))], + ((true, false), Const (Unit, (3,17--3,19)), (3,14--3,19), + { YieldOrReturnKeyword = (3,14--3,16) }), (3,2--3,19)), + (3,0--3,21)), (3,0--3,21))], PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None, (1,0--3,21), { LeadingKeyword = Module (1,0--1,6) })], (true, true), { ConditionalDirectives = [] diff --git a/tests/service/data/SyntaxTree/Expression/List - Comprehension 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/List - Comprehension 02.fs.bsl index 2645ff40cab..f6f9f43f1b4 100644 --- a/tests/service/data/SyntaxTree/Expression/List - Comprehension 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/List - Comprehension 02.fs.bsl @@ -15,7 +15,8 @@ ImplFile ((true, false), ArbitraryAfterError ("typedSequentialExprBlockR1", (3,16--3,16)), - (3,14--3,16)), (3,2--3,16)), (3,0--3,18)), (3,0--3,18))], + (3,14--3,16), { YieldOrReturnKeyword = (3,14--3,16) }), + (3,2--3,16)), (3,0--3,18)), (3,0--3,18))], PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None, (1,0--3,18), { LeadingKeyword = Module (1,0--1,6) })], (true, true), { ConditionalDirectives = [] diff --git a/tests/service/data/SyntaxTree/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl index dbba6b1816e..c83b80f7a06 100644 --- a/tests/service/data/SyntaxTree/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl @@ -54,8 +54,10 @@ ImplFile [Some (OriginalNotation "+")]), None, (5,6--5,7)), Ident x, (5,4--5,7)), Ident y, (5,4--5,9)), (4,4--5,9), - { InKeyword = Some (4,14--4,16) }), (3,4--5,9), - { InKeyword = Some (3,14--3,16) }), (2,4--2,8), NoneAtLet, + { LetOrUseKeyword = (4,4--4,7) + InKeyword = Some (4,14--4,16) }), (3,4--5,9), + { LetOrUseKeyword = (3,4--3,7) + InKeyword = Some (3,14--3,16) }), (2,4--2,8), NoneAtLet, { LeadingKeyword = Let (2,0--2,3) InlineKeyword = None EqualsRange = Some (2,9--2,10) })], (2,0--5,9))], diff --git a/tests/service/data/SyntaxTree/Expression/Rarrow 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Rarrow 01.fs.bsl index 0e9b8672a91..4eaa58d4d99 100644 --- a/tests/service/data/SyntaxTree/Expression/Rarrow 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Rarrow 01.fs.bsl @@ -5,8 +5,8 @@ ImplFile ([Module], false, NamedModule, [Expr (YieldOrReturn - ((true, true), Const (Int32 1, (3,3--3,4)), (3,0--3,4)), - (3,0--3,4))], + ((true, true), Const (Int32 1, (3,3--3,4)), (3,0--3,4), + { YieldOrReturnKeyword = (3,0--3,2) }), (3,0--3,4))], PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None, (1,0--3,4), { LeadingKeyword = Module (1,0--1,6) })], (true, true), { ConditionalDirectives = [] diff --git a/tests/service/data/SyntaxTree/Expression/Rarrow 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Rarrow 02.fs.bsl index dc5826d4efb..bd231785149 100644 --- a/tests/service/data/SyntaxTree/Expression/Rarrow 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Rarrow 02.fs.bsl @@ -7,7 +7,7 @@ ImplFile (YieldOrReturn ((true, true), ArbitraryAfterError ("typedSequentialExprBlockR1", (3,2--3,2)), - (3,0--3,2)), (3,0--3,2))], + (3,0--3,2), { YieldOrReturnKeyword = (3,0--3,2) }), (3,0--3,2))], PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None, (1,0--3,2), { LeadingKeyword = Module (1,0--1,6) })], (true, true), { ConditionalDirectives = [] diff --git a/tests/service/data/SyntaxTree/Expression/Rarrow 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Rarrow 03.fs.bsl index 8f7af982117..43399ddf3bb 100644 --- a/tests/service/data/SyntaxTree/Expression/Rarrow 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Rarrow 03.fs.bsl @@ -9,8 +9,9 @@ ImplFile YieldOrReturn ((true, true), ArbitraryAfterError - ("typedSequentialExprBlockR1", (3,5--3,5)), (3,3--3,5)), - (3,0--3,5)), (3,0--3,5))], + ("typedSequentialExprBlockR1", (3,5--3,5)), (3,3--3,5), + { YieldOrReturnKeyword = (3,3--3,5) }), (3,0--3,5), + { YieldOrReturnKeyword = (3,0--3,2) }), (3,0--3,5))], PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None, (1,0--3,5), { LeadingKeyword = Module (1,0--1,6) })], (true, true), { ConditionalDirectives = [] diff --git a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs.bsl index 71fb22235eb..ca9d1e7bdac 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs.bsl @@ -25,10 +25,11 @@ ImplFile EqualsRange = (4,11--4,12) InKeyword = None })], YieldOrReturn - ((false, true), Const (Unit, (5,11--5,13)), (5,4--5,13)), - (3,4--5,13), { LetOrUseBangKeyword = (3,4--3,8) - EqualsRange = Some (3,11--3,12) }), - (2,5--6,1)), (2,0--6,1)), (2,0--6,1))], PreXmlDocEmpty, [], - None, (2,0--6,1), { LeadingKeyword = None })], (true, true), + ((false, true), Const (Unit, (5,11--5,13)), (5,4--5,13), + { YieldOrReturnKeyword = (5,4--5,10) }), (3,4--5,13), + { LetOrUseBangKeyword = (3,4--3,8) + EqualsRange = Some (3,11--3,12) }), (2,5--6,1)), + (2,0--6,1)), (2,0--6,1))], PreXmlDocEmpty, [], None, (2,0--6,1), + { LeadingKeyword = None })], (true, true), { ConditionalDirectives = [] CodeComments = [] }, set [])) diff --git a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl index 01902bfb572..98ab25b6cc1 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl @@ -19,7 +19,8 @@ ImplFile InlineKeyword = None EqualsRange = Some (2,6--2,7) })], Const (Unit, (2,13--2,15)), (2,0--2,15), - { InKeyword = Some (2,10--2,12) }), (2,0--2,15))], + { LetOrUseKeyword = (2,0--2,3) + InKeyword = Some (2,10--2,12) }), (2,0--2,15))], PreXmlDocEmpty, [], None, (2,0--2,15), { LeadingKeyword = None })], (true, true), { ConditionalDirectives = [] CodeComments = [] }, set [])) diff --git a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs.bsl index 35abd078400..894f2d99b19 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs.bsl @@ -20,8 +20,9 @@ ImplFile Yes (3,0--3,9), { LeadingKeyword = Let (3,0--3,3) InlineKeyword = None EqualsRange = Some (3,6--3,7) })], - Const (Unit, (4,0--4,2)), (3,0--4,2), { InKeyword = None }), - (2,0--4,2)), (2,0--4,2))], PreXmlDocEmpty, [], None, (2,0--5,0), - { LeadingKeyword = None })], (true, true), - { ConditionalDirectives = [] - CodeComments = [] }, set [])) + Const (Unit, (4,0--4,2)), (3,0--4,2), + { LetOrUseKeyword = (3,0--3,3) + InKeyword = None }), (2,0--4,2)), (2,0--4,2))], + PreXmlDocEmpty, [], None, (2,0--5,0), { LeadingKeyword = None })], + (true, true), { ConditionalDirectives = [] + CodeComments = [] }, set [])) diff --git a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs.bsl index c6a4f878c3c..b0a278cf6fd 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs.bsl @@ -40,7 +40,8 @@ ImplFile SynLongIdent ([e1; Value], [(4,10--4,11)], [None; None]), None, (4,8--4,16))], [(4,6--4,7)], (4,0--4,16)), - (3,0--4,16), { InKeyword = None }), (2,0--4,16)), + (3,0--4,16), { LetOrUseKeyword = (3,0--3,3) + InKeyword = None }), (2,0--4,16)), (2,0--4,16))], PreXmlDocEmpty, [], None, (2,0--5,0), { LeadingKeyword = None })], (true, true), { ConditionalDirectives = [] diff --git a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs.bsl index daf50fb841a..094aae021fd 100644 --- a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs.bsl @@ -35,7 +35,8 @@ ImplFile InlineKeyword = None EqualsRange = Some (4,10--4,11) })], Const (Unit, (5,4--5,6)), (3,4--5,6), - { InKeyword = Some (4,15--4,17) }), (2,0--5,6)), (2,0--5,6))], + { LetOrUseKeyword = (3,4--3,11) + InKeyword = Some (4,15--4,17) }), (2,0--5,6)), (2,0--5,6))], PreXmlDocEmpty, [], None, (2,0--6,0), { LeadingKeyword = None })], (true, true), { ConditionalDirectives = [] CodeComments = [] }, set [])) diff --git a/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 04.fs.bsl index 322b6cdcfaf..198c292e9e8 100644 --- a/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 04.fs.bsl @@ -19,7 +19,8 @@ ImplFile InlineKeyword = None EqualsRange = Some (5,6--5,7) })], ArbitraryAfterError ("seqExpr", (5,10--5,10)), (5,0--5,10), - { InKeyword = None }), [], (3,0--5,10), Yes (3,0--3,3), + { LetOrUseKeyword = (5,0--5,3) + InKeyword = None }), [], (3,0--5,10), Yes (3,0--3,3), Yes (5,10--5,10), { TryKeyword = (3,0--3,3) TryToWithRange = (3,0--5,10) WithKeyword = (5,10--5,10) diff --git a/tests/service/data/SyntaxTree/Expression/WhileBang 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/WhileBang 01.fs.bsl index 21848845316..c0240c60f92 100644 --- a/tests/service/data/SyntaxTree/Expression/WhileBang 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/WhileBang 01.fs.bsl @@ -12,8 +12,9 @@ ImplFile (false, YieldOrReturn ((false, true), Const (Bool true, (3,22--3,26)), - (3,15--3,26)), (3,13--3,28)), (3,7--3,28)), - Const (Int32 2, (4,4--4,5)), (3,0--4,5)), (3,0--4,5)); + (3,15--3,26), { YieldOrReturnKeyword = (3,15--3,21) }), + (3,13--3,28)), (3,7--3,28)), Const (Int32 2, (4,4--4,5)), + (3,0--4,5)), (3,0--4,5)); Expr (Const (Int32 3, (6,0--6,1)), (6,0--6,1))], PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None, (1,0--6,1), { LeadingKeyword = Module (1,0--1,6) })], (true, true), diff --git a/tests/service/data/SyntaxTree/Expression/WhileBang 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/WhileBang 02.fs.bsl index e99b3701f0f..bab3048383f 100644 --- a/tests/service/data/SyntaxTree/Expression/WhileBang 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/WhileBang 02.fs.bsl @@ -12,8 +12,9 @@ ImplFile (false, YieldOrReturn ((false, true), Const (Bool true, (3,22--3,26)), - (3,15--3,26)), (3,13--3,28)), (3,7--3,28)), - Const (Int32 2, (4,4--4,5)), (3,0--5,4)), (3,0--5,4)); + (3,15--3,26), { YieldOrReturnKeyword = (3,15--3,21) }), + (3,13--3,28)), (3,7--3,28)), Const (Int32 2, (4,4--4,5)), + (3,0--5,4)), (3,0--5,4)); Expr (Const (Int32 3, (7,0--7,1)), (7,0--7,1))], PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None, (1,0--7,1), { LeadingKeyword = Module (1,0--1,6) })], (true, true), diff --git a/tests/service/data/SyntaxTree/Expression/WhileBang 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/WhileBang 03.fs.bsl index 4abd391541a..d77bef2fcf9 100644 --- a/tests/service/data/SyntaxTree/Expression/WhileBang 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/WhileBang 03.fs.bsl @@ -19,7 +19,9 @@ ImplFile (false, YieldOrReturn ((false, true), Const (Bool true, (4,26--4,30)), - (4,19--4,30)), (4,17--4,32)), (4,11--4,32)), + (4,19--4,30), + { YieldOrReturnKeyword = (4,19--4,25) }), + (4,17--4,32)), (4,11--4,32)), ArbitraryAfterError ("whileBody1", (6,0--6,1)), (4,4--4,35)), (3,4--3,5), Yes (3,0--4,35), { LeadingKeyword = Let (3,0--3,3) InlineKeyword = None diff --git a/tests/service/data/SyntaxTree/Expression/WhileBang 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/WhileBang 04.fs.bsl index 964f4237a8a..f38da3f88b9 100644 --- a/tests/service/data/SyntaxTree/Expression/WhileBang 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/WhileBang 04.fs.bsl @@ -19,7 +19,9 @@ ImplFile (false, YieldOrReturn ((false, true), Const (Bool true, (4,26--4,30)), - (4,19--4,30)), (4,17--4,32)), (4,11--4,32)), + (4,19--4,30), + { YieldOrReturnKeyword = (4,19--4,25) }), + (4,17--4,32)), (4,11--4,32)), ArbitraryAfterError ("whileBody1", (5,0--5,0)), (4,4--4,35)), (3,4--3,5), Yes (3,0--4,35), { LeadingKeyword = Let (3,0--3,3) InlineKeyword = None diff --git a/tests/service/data/SyntaxTree/Expression/WhileBang 05.fs.bsl b/tests/service/data/SyntaxTree/Expression/WhileBang 05.fs.bsl index c76eafad3e9..2dd4399dcd8 100644 --- a/tests/service/data/SyntaxTree/Expression/WhileBang 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/WhileBang 05.fs.bsl @@ -19,7 +19,9 @@ ImplFile (false, YieldOrReturn ((false, true), Const (Bool true, (4,26--4,30)), - (4,19--4,30)), (4,17--4,32)), (4,11--4,32)), + (4,19--4,30), + { YieldOrReturnKeyword = (4,19--4,25) }), + (4,17--4,32)), (4,11--4,32)), Const (Int32 2, (5,8--5,9)), (4,4--5,9)), (3,4--3,5), Yes (3,0--5,9), { LeadingKeyword = Let (3,0--3,3) InlineKeyword = None diff --git a/tests/service/data/SyntaxTree/Expression/WhileBang 06.fs.bsl b/tests/service/data/SyntaxTree/Expression/WhileBang 06.fs.bsl index 86e0325ecf1..50bcb0fd33b 100644 --- a/tests/service/data/SyntaxTree/Expression/WhileBang 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/WhileBang 06.fs.bsl @@ -19,7 +19,9 @@ ImplFile (false, YieldOrReturn ((false, true), Const (Bool true, (4,26--4,30)), - (4,19--4,30)), (4,17--4,32)), (4,11--4,32)), + (4,19--4,30), + { YieldOrReturnKeyword = (4,19--4,25) }), + (4,17--4,32)), (4,11--4,32)), Const (Int32 2, (5,4--5,5)), (4,4--5,5)), (3,4--3,5), Yes (3,0--5,5), { LeadingKeyword = Let (3,0--3,3) InlineKeyword = None diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/UseKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/UseKeyword.fs.bsl index 734d01d3539..332ab19b6cc 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/UseKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/UseKeyword.fs.bsl @@ -22,8 +22,9 @@ ImplFile { LeadingKeyword = Use (3,4--3,7) InlineKeyword = None EqualsRange = Some (3,10--3,11) })], - Const (Unit, (4,4--4,6)), (3,4--4,6), { InKeyword = None }), - (2,0--4,6)), (2,0--4,6))], PreXmlDocEmpty, [], None, (2,0--5,0), - { LeadingKeyword = None })], (true, true), - { ConditionalDirectives = [] - CodeComments = [] }, set [])) + Const (Unit, (4,4--4,6)), (3,4--4,6), + { LetOrUseKeyword = (3,4--3,7) + InKeyword = None }), (2,0--4,6)), (2,0--4,6))], + PreXmlDocEmpty, [], None, (2,0--5,0), { LeadingKeyword = None })], + (true, true), { ConditionalDirectives = [] + CodeComments = [] }, set [])) diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/UseRecKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/UseRecKeyword.fs.bsl index 071d34cad2f..b7cda816786 100644 --- a/tests/service/data/SyntaxTree/LeadingKeyword/UseRecKeyword.fs.bsl +++ b/tests/service/data/SyntaxTree/LeadingKeyword/UseRecKeyword.fs.bsl @@ -22,8 +22,9 @@ ImplFile { LeadingKeyword = UseRec ((3,4--3,7), (3,8--3,11)) InlineKeyword = None EqualsRange = Some (3,14--3,15) })], - Const (Unit, (4,4--4,6)), (3,4--4,6), { InKeyword = None }), - (2,0--4,6)), (2,0--4,6))], PreXmlDocEmpty, [], None, (2,0--5,0), - { LeadingKeyword = None })], (true, true), - { ConditionalDirectives = [] - CodeComments = [] }, set [])) + Const (Unit, (4,4--4,6)), (3,4--4,6), + { LetOrUseKeyword = (3,4--3,11) + InKeyword = None }), (2,0--4,6)), (2,0--4,6))], + PreXmlDocEmpty, [], None, (2,0--5,0), { LeadingKeyword = None })], + (true, true), { ConditionalDirectives = [] + CodeComments = [] }, set [])) diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfMultipleSynMatchClause.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfMultipleSynMatchClause.fs.bsl index 0dea35e32dd..1d2cce79147 100644 --- a/tests/service/data/SyntaxTree/MatchClause/RangeOfMultipleSynMatchClause.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfMultipleSynMatchClause.fs.bsl @@ -25,7 +25,8 @@ ImplFile EqualsRange = Some (3,16--3,17) })], App (NonAtomic, false, Ident Some, Ident content, (4,4--4,16)), - (3,4--4,16), { InKeyword = None }), + (3,4--4,16), { LetOrUseKeyword = (3,4--3,7) + InKeyword = None }), [SynMatchClause (Named (SynIdent (ex, None), false, None, (6,2--6,4)), None, Sequential diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClause.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClause.fs.bsl index 81dc7bcb3b8..fa8f833ed4a 100644 --- a/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClause.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClause.fs.bsl @@ -25,7 +25,8 @@ ImplFile EqualsRange = Some (3,16--3,17) })], App (NonAtomic, false, Ident Some, Ident content, (4,4--4,16)), - (3,4--4,16), { InKeyword = None }), + (3,4--4,16), { LetOrUseKeyword = (3,4--3,7) + InKeyword = None }), [SynMatchClause (Named (SynIdent (ex, None), false, None, (5,5--5,7)), None, Sequential diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl index e2f461a46e9..8c781c10e7a 100644 --- a/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl @@ -25,7 +25,8 @@ ImplFile EqualsRange = Some (3,16--3,17) })], App (NonAtomic, false, Ident Some, Ident content, (4,4--4,16)), - (3,4--4,16), { InKeyword = None }), + (3,4--4,16), { LetOrUseKeyword = (3,4--3,7) + InKeyword = None }), [SynMatchClause (Named (SynIdent (ex, None), false, None, (6,2--6,4)), None, Const (Unit, (7,4--7,6)), (6,2--7,6), Yes, diff --git a/tests/service/data/SyntaxTree/Member/Inherit 01.fs.bsl b/tests/service/data/SyntaxTree/Member/Inherit 01.fs.bsl index 463e5fae508..052b66e5e46 100644 --- a/tests/service/data/SyntaxTree/Member/Inherit 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Inherit 01.fs.bsl @@ -13,7 +13,8 @@ ImplFile (Unspecified, [Inherit (LongIdent (SynLongIdent ([I], [], [None])), None, - (4,4--4,13))], (4,4--4,13)), [], None, (3,5--4,13), + (4,4--4,13), { InheritKeyword = (4,4--4,11) })], + (4,4--4,13)), [], None, (3,5--4,13), { LeadingKeyword = Type (3,0--3,4) EqualsRange = Some (3,7--3,8) WithKeyword = None })], (3,0--4,13))], diff --git a/tests/service/data/SyntaxTree/Member/Inherit 03.fs.bsl b/tests/service/data/SyntaxTree/Member/Inherit 03.fs.bsl index 97ca5055419..c41c36b56fa 100644 --- a/tests/service/data/SyntaxTree/Member/Inherit 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Inherit 03.fs.bsl @@ -13,7 +13,8 @@ ImplFile (Unspecified, [Inherit (LongIdent (SynLongIdent ([], [], [])), None, - (4,4--4,11))], (4,4--4,11)), [], None, (3,5--4,11), + (4,4--4,11), { InheritKeyword = (4,4--4,11) })], + (4,4--4,11)), [], None, (3,5--4,11), { LeadingKeyword = Type (3,0--3,4) EqualsRange = Some (3,7--3,8) WithKeyword = None })], (3,0--4,11))], diff --git a/tests/service/data/SyntaxTree/Member/Inherit 04.fs.bsl b/tests/service/data/SyntaxTree/Member/Inherit 04.fs.bsl index b2f8c3a069d..1021e79be66 100644 --- a/tests/service/data/SyntaxTree/Member/Inherit 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Inherit 04.fs.bsl @@ -13,7 +13,8 @@ ImplFile (Unspecified, [Inherit (LongIdent (SynLongIdent ([], [], [])), None, - (4,4--4,11))], (4,4--4,11)), [], None, (3,5--4,11), + (4,4--4,11), { InheritKeyword = (4,4--4,11) })], + (4,4--4,11)), [], None, (3,5--4,11), { LeadingKeyword = Type (3,0--3,4) EqualsRange = Some (3,7--3,8) WithKeyword = None })], (3,0--4,11)); diff --git a/tests/service/data/SyntaxTree/Member/Inherit 05.fs.bsl b/tests/service/data/SyntaxTree/Member/Inherit 05.fs.bsl index 1cd03dfcbf5..5db0de3b349 100644 --- a/tests/service/data/SyntaxTree/Member/Inherit 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Inherit 05.fs.bsl @@ -13,7 +13,7 @@ ImplFile (Unspecified, [Inherit (LongIdent (SynLongIdent ([], [], [])), None, - (4,4--4,11)); + (4,4--4,11), { InheritKeyword = (4,4--4,11) }); Member (SynBinding (None, Normal, false, false, [], diff --git a/tests/service/data/SyntaxTree/Member/Inherit 08.fs.bsl b/tests/service/data/SyntaxTree/Member/Inherit 08.fs.bsl index 748d1fd87e8..8b091e3d8b8 100644 --- a/tests/service/data/SyntaxTree/Member/Inherit 08.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Inherit 08.fs.bsl @@ -13,7 +13,7 @@ ImplFile (Unspecified, [Inherit (LongIdent (SynLongIdent ([], [], [])), None, - (4,4--4,11)); + (4,4--4,11), { InheritKeyword = (4,4--4,11) }); Member (SynBinding (None, Normal, false, false, [], diff --git a/tests/service/data/SyntaxTree/ParsedHashDirective/TripleQuoteStringAsParsedHashDirectiveArgument.fs.bsl b/tests/service/data/SyntaxTree/ParsedHashDirective/TripleQuoteStringAsParsedHashDirectiveArgument.fs.bsl index 511d5bb167f..7450b5cc375 100644 --- a/tests/service/data/SyntaxTree/ParsedHashDirective/TripleQuoteStringAsParsedHashDirectiveArgument.fs.bsl +++ b/tests/service/data/SyntaxTree/ParsedHashDirective/TripleQuoteStringAsParsedHashDirectiveArgument.fs.bsl @@ -5,9 +5,6 @@ ImplFile [], [SynModuleOrNamespace ([TripleQuoteStringAsParsedHashDirectiveArgument], false, AnonModule, - [HashDirective - (ParsedHashDirective ("WARN_DIRECTIVE_DUMMY", [], (2,0--2,16)), - (2,0--2,16))], PreXmlDocEmpty, [], None, (2,0--2,16), - { LeadingKeyword = None })], (true, true), - { ConditionalDirectives = [] - CodeComments = [] }, set [])) + [], PreXmlDocEmpty, [], None, (3,0--3,0), { LeadingKeyword = None })], + (true, true), { ConditionalDirectives = [] + CodeComments = [] }, set [])) diff --git a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 05.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 05.fs.bsl index 7816c5b5ced..e1cb9b61220 100644 --- a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 05.fs.bsl @@ -30,7 +30,8 @@ ImplFile InlineKeyword = None EqualsRange = None })], ArbitraryAfterError ("seqExpr", (4,10--4,10)), - (4,4--4,10), { InKeyword = None }), (4,4--4,10)), + (4,4--4,10), { LetOrUseKeyword = (4,4--4,7) + InKeyword = None }), (4,4--4,10)), (3,0--4,10)), (3,0--4,10))], PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None, (1,0--4,10), { LeadingKeyword = Module (1,0--1,6) })], (true, true), diff --git a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 06.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 06.fs.bsl index 00fa285df54..89fb7d8fc92 100644 --- a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 06.fs.bsl @@ -26,8 +26,9 @@ ImplFile { LeadingKeyword = Let (4,4--4,7) InlineKeyword = None EqualsRange = Some (4,11--4,12) })], - Const (Unit, (6,4--6,6)), (4,4--6,6), { InKeyword = None }), - (3,0--6,6)), (3,0--6,6))], + Const (Unit, (6,4--6,6)), (4,4--6,6), + { LetOrUseKeyword = (4,4--4,7) + InKeyword = None }), (3,0--6,6)), (3,0--6,6))], PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None, (1,0--6,6), { LeadingKeyword = Module (1,0--1,6) })], (true, true), { ConditionalDirectives = [] diff --git a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 09.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 09.fs.bsl index 0192145c5d1..992884f48e4 100644 --- a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 09.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 09.fs.bsl @@ -25,7 +25,8 @@ ImplFile { LeadingKeyword = Let (4,4--4,7) InlineKeyword = None EqualsRange = None })], Const (Unit, (6,4--6,6)), - (4,4--6,6), { InKeyword = None }), (3,0--6,6)), (3,0--6,6))], + (4,4--6,6), { LetOrUseKeyword = (4,4--4,7) + InKeyword = None }), (3,0--6,6)), (3,0--6,6))], PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None, (1,0--6,6), { LeadingKeyword = Module (1,0--1,6) })], (true, true), { ConditionalDirectives = [] diff --git a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 10.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 10.fs.bsl index 77af407dfcc..2bb13894406 100644 --- a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 10.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 10.fs.bsl @@ -24,8 +24,9 @@ ImplFile { LeadingKeyword = Let (4,4--4,7) InlineKeyword = None EqualsRange = Some (4,13--4,14) })], - Const (Unit, (6,4--6,6)), (4,4--6,6), { InKeyword = None }), - (3,0--6,6)), (3,0--6,6))], + Const (Unit, (6,4--6,6)), (4,4--6,6), + { LetOrUseKeyword = (4,4--4,7) + InKeyword = None }), (3,0--6,6)), (3,0--6,6))], PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None, (1,0--6,6), { LeadingKeyword = Module (1,0--1,6) })], (true, true), { ConditionalDirectives = [] diff --git a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 11.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 11.fs.bsl index 2fad3aceb3e..7a866bade1d 100644 --- a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 11.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 11.fs.bsl @@ -30,8 +30,9 @@ ImplFile { LeadingKeyword = Let (4,4--4,7) InlineKeyword = None EqualsRange = Some (4,15--4,16) })], - Const (Unit, (6,4--6,6)), (4,4--6,6), { InKeyword = None }), - (3,0--6,6)), (3,0--6,6))], + Const (Unit, (6,4--6,6)), (4,4--6,6), + { LetOrUseKeyword = (4,4--4,7) + InKeyword = None }), (3,0--6,6)), (3,0--6,6))], PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None, (1,0--6,6), { LeadingKeyword = Module (1,0--1,6) })], (true, true), { ConditionalDirectives = [] diff --git a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 12.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 12.fs.bsl index f016150d2de..2e2affa1dc3 100644 --- a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 12.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 12.fs.bsl @@ -38,8 +38,9 @@ ImplFile { LeadingKeyword = Let (4,4--4,7) InlineKeyword = None EqualsRange = Some (4,18--4,19) })], - Const (Unit, (6,4--6,6)), (4,4--6,6), { InKeyword = None }), - (3,0--6,6)), (3,0--6,6))], + Const (Unit, (6,4--6,6)), (4,4--6,6), + { LetOrUseKeyword = (4,4--4,7) + InKeyword = None }), (3,0--6,6)), (3,0--6,6))], PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None, (1,0--6,6), { LeadingKeyword = Module (1,0--1,6) })], (true, true), { ConditionalDirectives = [] diff --git a/tests/service/data/SyntaxTree/String/InterpolatedStringOffsideInNestedLet.fs.bsl b/tests/service/data/SyntaxTree/String/InterpolatedStringOffsideInNestedLet.fs.bsl index 9515e542eab..41b05f881ce 100644 --- a/tests/service/data/SyntaxTree/String/InterpolatedStringOffsideInNestedLet.fs.bsl +++ b/tests/service/data/SyntaxTree/String/InterpolatedStringOffsideInNestedLet.fs.bsl @@ -31,7 +31,8 @@ ImplFile { LeadingKeyword = Let (2,4--2,7) InlineKeyword = None EqualsRange = Some (2,10--2,11) })], Ident b, - (2,4--5,5), { InKeyword = None }), (1,4--1,5), NoneAtLet, + (2,4--5,5), { LetOrUseKeyword = (2,4--2,7) + InKeyword = None }), (1,4--1,5), NoneAtLet, { LeadingKeyword = Let (1,0--1,3) InlineKeyword = None EqualsRange = Some (1,6--1,7) })], (1,0--5,5))], diff --git a/tests/service/data/TestTP/ProvidedTypes.fs b/tests/service/data/TestTP/ProvidedTypes.fs index 747455e271f..b66037bc4e9 100644 --- a/tests/service/data/TestTP/ProvidedTypes.fs +++ b/tests/service/data/TestTP/ProvidedTypes.fs @@ -6876,8 +6876,6 @@ module internal AssemblyReader = namespace ProviderImplementation.ProvidedTypes - #nowarn "1182" - // // The on-disk assemblies are read by AssemblyReader. // @@ -8269,7 +8267,6 @@ namespace ProviderImplementation.ProvidedTypes #nowarn "8796" - #nowarn "1182" open System open System.Diagnostics @@ -9492,7 +9489,6 @@ namespace ProviderImplementation.ProvidedTypes namespace ProviderImplementation.ProvidedTypes - #nowarn "1182" module BinaryWriter = open System @@ -13496,7 +13492,6 @@ namespace ProviderImplementation.ProvidedTypes namespace ProviderImplementation.ProvidedTypes - #nowarn "1182" open System open System.Diagnostics open System.IO @@ -15715,7 +15710,6 @@ namespace ProviderImplementation.ProvidedTypes namespace ProviderImplementation.ProvidedTypes - #nowarn "1182" open System open System.Diagnostics open System.IO diff --git a/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.cs.xlf b/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.cs.xlf index d43dc577c61..b969107b017 100644 --- a/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.cs.xlf +++ b/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.cs.xlf @@ -744,7 +744,7 @@ You can modify the contents of an array element by using the left arrow assignment operator. - Můžete upravit obsah elementu pole pomocí operátoru přiřazení s šipkou doleva. + You can modify the contents of an array element by using the left arrow assignment operator. @@ -1009,7 +1009,7 @@ A Discriminated Union can also be used to represent the rank of a playing card. - Rozlišované sjednocení může také představovat hodnotu hrací karty. + A Discriminated Union can also be used to represent the rank of a playing card. @@ -1029,7 +1029,7 @@ It's common to use both Records and Discriminated Unions when representing data. - Při vyjadřování dat se běžně používají záznamy i rozlišovaná sjednocení. + It's common to use both Records and Discriminated Unions when representing data. @@ -1089,7 +1089,7 @@ Discriminated Unions also support recursive definitions. - Rozlišovaná sjednocení podporují i rekurzivní definice. + Discriminated Unions also support recursive definitions. diff --git a/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.de.xlf b/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.de.xlf index a8a789025d7..e2023a345a0 100644 --- a/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.de.xlf +++ b/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.de.xlf @@ -744,7 +744,7 @@ You can modify the contents of an array element by using the left arrow assignment operator. - Sie können die Inhalte eines Arrayelements mithilfe des Zuweisungsoperators "Pfeil nach links" ändern. + You can modify the contents of an array element by using the left arrow assignment operator. @@ -1009,7 +1009,7 @@ A Discriminated Union can also be used to represent the rank of a playing card. - Eine diskriminierte Union kann auch verwendet werden, um den Rang einer Spielkarte darzustellen. + A Discriminated Union can also be used to represent the rank of a playing card. @@ -1029,7 +1029,7 @@ It's common to use both Records and Discriminated Unions when representing data. - Beim Darstellen von Daten werden häufig sowohl Datensätze als auch diskriminierte Unions verwendet. + It's common to use both Records and Discriminated Unions when representing data. @@ -1089,7 +1089,7 @@ Discriminated Unions also support recursive definitions. - Diskriminierte Unions unterstützen auch rekursive Definitionen. + Discriminated Unions also support recursive definitions. diff --git a/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.es.xlf b/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.es.xlf index 3041197dd6c..ce9964fbe25 100644 --- a/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.es.xlf +++ b/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.es.xlf @@ -744,7 +744,7 @@ You can modify the contents of an array element by using the left arrow assignment operator. - Puede modificar el contenido de un elemento de matriz mediante el operador de asignación de flecha izquierda. + You can modify the contents of an array element by using the left arrow assignment operator. @@ -1009,7 +1009,7 @@ A Discriminated Union can also be used to represent the rank of a playing card. - También se puede usar una unión discriminada para representar el rango de una carta. + A Discriminated Union can also be used to represent the rank of a playing card. @@ -1029,7 +1029,7 @@ It's common to use both Records and Discriminated Unions when representing data. - Es habitual utilizar tanto registros como uniones discriminadas cuando se representan datos. + It's common to use both Records and Discriminated Unions when representing data. @@ -1089,7 +1089,7 @@ Discriminated Unions also support recursive definitions. - Las uniones discriminadas admiten también definiciones recursivas. + Discriminated Unions also support recursive definitions. diff --git a/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.fr.xlf b/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.fr.xlf index 79b126ad3f4..3c515e263e8 100644 --- a/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.fr.xlf +++ b/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.fr.xlf @@ -744,7 +744,7 @@ You can modify the contents of an array element by using the left arrow assignment operator. - Vous pouvez modifier le contenu d'un élément de tableau à l'aide de l'opérateur d'assignation flèche gauche. + You can modify the contents of an array element by using the left arrow assignment operator. @@ -1009,7 +1009,7 @@ A Discriminated Union can also be used to represent the rank of a playing card. - Une union discriminée peut également servir à représenter le rang d'une carte à jouer. + A Discriminated Union can also be used to represent the rank of a playing card. @@ -1029,7 +1029,7 @@ It's common to use both Records and Discriminated Unions when representing data. - Il est fréquent d'utiliser à la fois des enregistrements et des unions discriminées pour représenter des données. + It's common to use both Records and Discriminated Unions when representing data. @@ -1089,7 +1089,7 @@ Discriminated Unions also support recursive definitions. - Les unions discriminées prennent également en charge les définitions récursives. + Discriminated Unions also support recursive definitions. diff --git a/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.it.xlf b/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.it.xlf index 5b17d36350e..79c43274cc4 100644 --- a/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.it.xlf +++ b/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.it.xlf @@ -744,7 +744,7 @@ You can modify the contents of an array element by using the left arrow assignment operator. - È possibile modificare il contenuto di un elemento di matrice usando l'operatore di assegnazione freccia sinistra. + You can modify the contents of an array element by using the left arrow assignment operator. @@ -1009,7 +1009,7 @@ A Discriminated Union can also be used to represent the rank of a playing card. - È possibile usare un'unione discriminata anche per rappresentare il valore di una carta da gioco. + A Discriminated Union can also be used to represent the rank of a playing card. @@ -1029,7 +1029,7 @@ It's common to use both Records and Discriminated Unions when representing data. - Per la rappresentazione dei dati si usano in genere record e unioni discriminate. + It's common to use both Records and Discriminated Unions when representing data. @@ -1089,7 +1089,7 @@ Discriminated Unions also support recursive definitions. - Le unioni discriminate supportano anche definizioni ricorsive. + Discriminated Unions also support recursive definitions. diff --git a/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.ja.xlf b/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.ja.xlf index 3275255ba6a..33ba6422ea1 100644 --- a/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.ja.xlf +++ b/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.ja.xlf @@ -744,7 +744,7 @@ You can modify the contents of an array element by using the left arrow assignment operator. - 左矢印代入演算子を使用して、配列要素の内容を変更できます。 + You can modify the contents of an array element by using the left arrow assignment operator. @@ -1009,7 +1009,7 @@ A Discriminated Union can also be used to represent the rank of a playing card. - 判別共用体はトランプのランクを表すためにも使用できます。 + A Discriminated Union can also be used to represent the rank of a playing card. @@ -1029,7 +1029,7 @@ It's common to use both Records and Discriminated Unions when representing data. - データを表すときには、レコードと判別共用体の両方を使用するのが一般的です。 + It's common to use both Records and Discriminated Unions when representing data. @@ -1089,7 +1089,7 @@ Discriminated Unions also support recursive definitions. - 判別共用体は再帰的な定義もサポートしています。 + Discriminated Unions also support recursive definitions. diff --git a/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.ko.xlf b/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.ko.xlf index f6668949ef9..c5f198ffa1b 100644 --- a/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.ko.xlf +++ b/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.ko.xlf @@ -744,7 +744,7 @@ You can modify the contents of an array element by using the left arrow assignment operator. - 왼쪽 화살표 대입 연산자를 사용하여 배열 요소의 내용을 수정할 수 있습니다. + You can modify the contents of an array element by using the left arrow assignment operator. @@ -1009,7 +1009,7 @@ A Discriminated Union can also be used to represent the rank of a playing card. - 구분된 공용 구조체를 사용하여 플레잉 카드의 순위를 나타낼 수도 있습니다. + A Discriminated Union can also be used to represent the rank of a playing card. @@ -1029,7 +1029,7 @@ It's common to use both Records and Discriminated Unions when representing data. - 일반적으로 레코드와 구분된 공용 구조체를 모두 사용하여 데이터를 나타냅니다. + It's common to use both Records and Discriminated Unions when representing data. @@ -1089,7 +1089,7 @@ Discriminated Unions also support recursive definitions. - 구분된 공용 구조체는 재귀 정의도 지원합니다. + Discriminated Unions also support recursive definitions. diff --git a/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.pl.xlf b/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.pl.xlf index 80135046c87..5bdcd939c42 100644 --- a/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.pl.xlf +++ b/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.pl.xlf @@ -744,7 +744,7 @@ You can modify the contents of an array element by using the left arrow assignment operator. - Możesz zmodyfikować zawartość elementu tablicy za pomocą operatora przypisania „strzałka w lewo”. + You can modify the contents of an array element by using the left arrow assignment operator. @@ -1009,7 +1009,7 @@ A Discriminated Union can also be used to represent the rank of a playing card. - Unii rozłącznej można również użyć do reprezentowania wartości karty do gry. + A Discriminated Union can also be used to represent the rank of a playing card. @@ -1029,7 +1029,7 @@ It's common to use both Records and Discriminated Unions when representing data. - Często używa się rekordów i unii rozłącznych w przypadku reprezentowania danych. + It's common to use both Records and Discriminated Unions when representing data. @@ -1089,7 +1089,7 @@ Discriminated Unions also support recursive definitions. - Unie rozłączne obsługują również definicje rekursywne. + Discriminated Unions also support recursive definitions. diff --git a/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.pt-BR.xlf b/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.pt-BR.xlf index 433113974ba..736952384fc 100644 --- a/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.pt-BR.xlf +++ b/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.pt-BR.xlf @@ -744,7 +744,7 @@ You can modify the contents of an array element by using the left arrow assignment operator. - Você pode modificar o conteúdo de um elemento de matriz usando o operador de atribuição de seta para a esquerda. + You can modify the contents of an array element by using the left arrow assignment operator. @@ -1009,7 +1009,7 @@ A Discriminated Union can also be used to represent the rank of a playing card. - Uma União Discriminada também pode ser usada para representar a classificação de uma carta de baralho. + A Discriminated Union can also be used to represent the rank of a playing card. @@ -1029,7 +1029,7 @@ It's common to use both Records and Discriminated Unions when representing data. - É comum usar Registros e Uniões Discriminadas ao representar dados. + It's common to use both Records and Discriminated Unions when representing data. @@ -1089,7 +1089,7 @@ Discriminated Unions also support recursive definitions. - Uniões Discriminadas também dão suporte a definições recursivas. + Discriminated Unions also support recursive definitions. diff --git a/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.ru.xlf b/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.ru.xlf index 21d0c088dd7..85b57d7d25a 100644 --- a/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.ru.xlf +++ b/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.ru.xlf @@ -744,7 +744,7 @@ You can modify the contents of an array element by using the left arrow assignment operator. - Изменить содержимое элемента массива можно с помощью оператора присваивания в виде стрелки влево. + You can modify the contents of an array element by using the left arrow assignment operator. @@ -1009,7 +1009,7 @@ A Discriminated Union can also be used to represent the rank of a playing card. - Размеченное объединение также может использоваться для представления ранга игральной карты. + A Discriminated Union can also be used to represent the rank of a playing card. @@ -1029,7 +1029,7 @@ It's common to use both Records and Discriminated Unions when representing data. - Как правило, при представлении данных используются как записи, так и размеченные объединения. + It's common to use both Records and Discriminated Unions when representing data. @@ -1089,7 +1089,7 @@ Discriminated Unions also support recursive definitions. - Размеченные объединения также поддерживают рекурсивные определения. + Discriminated Unions also support recursive definitions. diff --git a/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.tr.xlf b/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.tr.xlf index e16ddac1fd6..31a61d248a3 100644 --- a/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.tr.xlf +++ b/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.tr.xlf @@ -744,7 +744,7 @@ You can modify the contents of an array element by using the left arrow assignment operator. - Bir dizi öğesinin içeriğini sol ok atama işlecini kullanarak değiştirebilirsiniz. + You can modify the contents of an array element by using the left arrow assignment operator. @@ -1009,7 +1009,7 @@ A Discriminated Union can also be used to represent the rank of a playing card. - Bir iskambil kartının sırasını göstermek için bir Ayırt Edici Birleşim de kullanılabilir. + A Discriminated Union can also be used to represent the rank of a playing card. @@ -1029,7 +1029,7 @@ It's common to use both Records and Discriminated Unions when representing data. - Verileri temsil ederken Kayıtları ve Ayırt Edici Birleşimleri birlikte kullanmak yaygındır. + It's common to use both Records and Discriminated Unions when representing data. @@ -1089,7 +1089,7 @@ Discriminated Unions also support recursive definitions. - Ayırt Edici Birleşimler ayrıca özyinelemeli tanımları da destekler. + Discriminated Unions also support recursive definitions. diff --git a/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.zh-Hans.xlf b/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.zh-Hans.xlf index 070f72756fa..3520e8975c5 100644 --- a/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.zh-Hans.xlf +++ b/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.zh-Hans.xlf @@ -744,7 +744,7 @@ You can modify the contents of an array element by using the left arrow assignment operator. - 可使用左箭头赋值运算符来修改数组元素的内容。 + You can modify the contents of an array element by using the left arrow assignment operator. @@ -1009,7 +1009,7 @@ A Discriminated Union can also be used to represent the rank of a playing card. - 可区分联合还可用来表示纸牌的设置级别。 + A Discriminated Union can also be used to represent the rank of a playing card. @@ -1029,7 +1029,7 @@ It's common to use both Records and Discriminated Unions when representing data. - 表示数据时同时使用记录和可区分联合是很常见的。 + It's common to use both Records and Discriminated Unions when representing data. @@ -1089,7 +1089,7 @@ Discriminated Unions also support recursive definitions. - 可区分联合还支持递归定义。 + Discriminated Unions also support recursive definitions. diff --git a/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.zh-Hant.xlf b/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.zh-Hant.xlf index 9dc5b4cb19b..ceef6ffcd83 100644 --- a/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.zh-Hant.xlf +++ b/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.zh-Hant.xlf @@ -744,7 +744,7 @@ You can modify the contents of an array element by using the left arrow assignment operator. - 您可以使用向左鍵指派運算子來修改陣列元素的內容。 + You can modify the contents of an array element by using the left arrow assignment operator. @@ -1009,7 +1009,7 @@ A Discriminated Union can also be used to represent the rank of a playing card. - 差異聯集也可用以代表一張撲克牌的順位。 + A Discriminated Union can also be used to represent the rank of a playing card. @@ -1029,7 +1029,7 @@ It's common to use both Records and Discriminated Unions when representing data. - 代表資料時，通常會使用記錄與差異聯集。 + It's common to use both Records and Discriminated Unions when representing data. @@ -1089,7 +1089,7 @@ Discriminated Unions also support recursive definitions. - 差異聯集也支援遞迴定義。 + Discriminated Unions also support recursive definitions. diff --git a/vsintegration/src/FSharp.Editor/CodeFixes/RemoveReturnOrYield.fs b/vsintegration/src/FSharp.Editor/CodeFixes/RemoveReturnOrYield.fs index cbc22219a12..ec376552709 100644 --- a/vsintegration/src/FSharp.Editor/CodeFixes/RemoveReturnOrYield.fs +++ b/vsintegration/src/FSharp.Editor/CodeFixes/RemoveReturnOrYield.fs @@ -30,7 +30,11 @@ type internal RemoveReturnOrYieldCodeFixProvider [] () = parseResults.TryRangeOfExprInYieldOrReturn errorRange.Start |> ValueOption.ofOption |> ValueOption.map (fun exprRange -> RoslynHelpers.FSharpRangeToTextSpan(sourceText, exprRange)) - |> ValueOption.map (fun exprSpan -> [ TextChange(context.Span, sourceText.GetSubText(exprSpan).ToString()) ]) + |> ValueOption.map (fun exprSpan -> + [ + // meaning: keyword + spacing before the expression + TextChange(TextSpan(context.Span.Start, exprSpan.Start - context.Span.Start), "") + ]) |> ValueOption.map (fun changes -> let title = let text = sourceText.GetSubText(context.Span).ToString() diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.cs.xlf b/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.cs.xlf index 918eaa00dd1..03000fae564 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.cs.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.cs.xlf @@ -79,7 +79,7 @@ Cannot save '{0}' as it is not open in the editor. - Soubor {0} se nedá uložit, protože není otevřený v editoru. + Cannot save '{0}' as it is not open in the editor. diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.de.xlf b/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.de.xlf index 2e55caa77b9..6fad4701b9b 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.de.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.de.xlf @@ -79,7 +79,7 @@ Cannot save '{0}' as it is not open in the editor. - {0} kann nicht gespeichert werden, da sie nicht im Editor geöffnet ist. + Cannot save '{0}' as it is not open in the editor. diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.es.xlf b/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.es.xlf index 653231ad5ac..be43129d5dd 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.es.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.es.xlf @@ -79,7 +79,7 @@ Cannot save '{0}' as it is not open in the editor. - No se puede guardar '{0}' mientras no esté abierto en el editor. + Cannot save '{0}' as it is not open in the editor. diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.fr.xlf b/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.fr.xlf index e9adf9f0495..d39840bf98d 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.fr.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.fr.xlf @@ -79,7 +79,7 @@ Cannot save '{0}' as it is not open in the editor. - Impossible d'enregistrer '{0}', car il n'est pas ouvert dans l'éditeur. + Cannot save '{0}' as it is not open in the editor. diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.it.xlf b/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.it.xlf index 898ffd57a94..a670ee0b5eb 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.it.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.it.xlf @@ -79,7 +79,7 @@ Cannot save '{0}' as it is not open in the editor. - Non è possibile salvare '{0}' perché non è aperto nell'editor. + Cannot save '{0}' as it is not open in the editor. diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.ja.xlf b/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.ja.xlf index 083d889314f..71c72fab37b 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.ja.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.ja.xlf @@ -79,7 +79,7 @@ Cannot save '{0}' as it is not open in the editor. - '{0}' はエディターで開かれていないため、保存できません。 + Cannot save '{0}' as it is not open in the editor. diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.ko.xlf b/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.ko.xlf index 55f3e53d51b..fe6c1427f3a 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.ko.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.ko.xlf @@ -79,7 +79,7 @@ Cannot save '{0}' as it is not open in the editor. - '{0}'은(는) 편집기에 열려 있지 않으므로 저장할 수 없습니다. + Cannot save '{0}' as it is not open in the editor. diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.pl.xlf b/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.pl.xlf index 18625d46839..c04569fb685 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.pl.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.pl.xlf @@ -79,7 +79,7 @@ Cannot save '{0}' as it is not open in the editor. - Nie można zapisać pliku „{0}”, ponieważ nie jest on otwarty w edytorze. + Cannot save '{0}' as it is not open in the editor. diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.pt-BR.xlf b/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.pt-BR.xlf index 9fa73a42708..3675c79cfac 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.pt-BR.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.pt-BR.xlf @@ -79,7 +79,7 @@ Cannot save '{0}' as it is not open in the editor. - Não é possível salvar '{0}' porque não está aberto no editor. + Cannot save '{0}' as it is not open in the editor. diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.ru.xlf b/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.ru.xlf index 72a92f4a0da..05086731665 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.ru.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.ru.xlf @@ -79,7 +79,7 @@ Cannot save '{0}' as it is not open in the editor. - Не удается сохранить "{0}": файл не открыт в редакторе. + Cannot save '{0}' as it is not open in the editor. diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.tr.xlf b/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.tr.xlf index 54aaf598233..0951ab5fd9c 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.tr.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.tr.xlf @@ -79,7 +79,7 @@ Cannot save '{0}' as it is not open in the editor. - '{0}' düzenleyicide açık olmadığından kaydedilemedi. + Cannot save '{0}' as it is not open in the editor. diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.zh-Hans.xlf b/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.zh-Hans.xlf index ab86371cb21..43915ea3d1b 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.zh-Hans.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.zh-Hans.xlf @@ -79,7 +79,7 @@ Cannot save '{0}' as it is not open in the editor. - 无法保存“{0}”，因为它未在编辑器中打开。 + Cannot save '{0}' as it is not open in the editor. diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.zh-Hant.xlf b/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.zh-Hant.xlf index c0d9d60d48c..e1e78242403 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.zh-Hant.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.Base/xlf/Microsoft.VisualStudio.Package.Project.zh-Hant.xlf @@ -79,7 +79,7 @@ Cannot save '{0}' as it is not open in the editor. - 因為 '{0}' 不是在編輯器中開啟的，所以無法儲存。 + Cannot save '{0}' as it is not open in the editor. diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.cs.xlf b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.cs.xlf index d21bda7ce61..25314d551e8 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.cs.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.cs.xlf @@ -159,7 +159,7 @@ Select a service contract to view its operations. - Pro zobrazení operací služby vyberte její kontrakt. + Pro zobrazení operací služby vyberte její kontrakt. This is the message displayed when user selects non-contract nodes. diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.de.xlf b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.de.xlf index 8708f62ecc4..26a027b9373 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.de.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.de.xlf @@ -159,7 +159,7 @@ Select a service contract to view its operations. - Wählen Sie einen Dienstvertrag aus, um seine Abläufe anzuzeigen. + Wählen Sie einen Dienstvertrag aus, um seine Abläufe anzuzeigen. This is the message displayed when user selects non-contract nodes. diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.es.xlf b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.es.xlf index 38b3575e7b2..f3cc2f9d02f 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.es.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.es.xlf @@ -159,7 +159,7 @@ Select a service contract to view its operations. - Seleccione un contrato de servicio para ver sus operaciones. + Seleccione un contrato de servicio para ver sus operaciones. This is the message displayed when user selects non-contract nodes. diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.fr.xlf b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.fr.xlf index 114ba9c1282..45939fa9731 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.fr.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.fr.xlf @@ -159,7 +159,7 @@ Select a service contract to view its operations. - Sélectionnez un contrat de service pour afficher ses opérations. + Sélectionnez un contrat de service pour afficher ses opérations. This is the message displayed when user selects non-contract nodes. diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.it.xlf b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.it.xlf index 21ad2a8ed21..0c089a12fad 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.it.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.it.xlf @@ -159,7 +159,7 @@ Select a service contract to view its operations. - Selezionare un contratto di servizio per visualizzarne le operazioni. + Selezionare un contratto di servizio per visualizzarne le operazioni. This is the message displayed when user selects non-contract nodes. diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.ja.xlf b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.ja.xlf index c9eb3786c4e..a8cf12c61fc 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.ja.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.ja.xlf @@ -159,7 +159,7 @@ Select a service contract to view its operations. - サービス コントラクトを選択して操作を表示します。 + サービス コントラクトを選択して操作を表示します。 This is the message displayed when user selects non-contract nodes. diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.ko.xlf b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.ko.xlf index 4034e9c1db5..1e50815dd99 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.ko.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.ko.xlf @@ -159,7 +159,7 @@ Select a service contract to view its operations. - 서비스 계약을 선택하여 해당 작업을 확인하세요. + 서비스 계약을 선택하여 해당 작업을 확인하세요. This is the message displayed when user selects non-contract nodes. diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.pl.xlf b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.pl.xlf index 617b27ff745..3bba978e142 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.pl.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.pl.xlf @@ -159,7 +159,7 @@ Select a service contract to view its operations. - Wybierz kontrakt usługi, aby wyświetlić jego operacje. + Wybierz kontrakt usługi, aby wyświetlić jego operacje. This is the message displayed when user selects non-contract nodes. diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.pt-BR.xlf b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.pt-BR.xlf index 3192d1ed7d5..a4409c25843 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.pt-BR.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.pt-BR.xlf @@ -159,7 +159,7 @@ Select a service contract to view its operations. - Selecione um contrato de serviço para exibir as operações. + Selecione um contrato de serviço para exibir as operações. This is the message displayed when user selects non-contract nodes. diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.ru.xlf b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.ru.xlf index 0452ba7258a..59ca2f46eed 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.ru.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.ru.xlf @@ -159,7 +159,7 @@ Select a service contract to view its operations. - Чтобы просмотреть операции службы, выберете контракт службы. + Чтобы просмотреть операции службы, выберете контракт службы. This is the message displayed when user selects non-contract nodes. diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.tr.xlf b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.tr.xlf index 26d060af8d0..e701e4334aa 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.tr.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.tr.xlf @@ -159,7 +159,7 @@ Select a service contract to view its operations. - İşlemlerini görüntülemek için bir hizmet sözleşmesi seçin. + İşlemlerini görüntülemek için bir hizmet sözleşmesi seçin. This is the message displayed when user selects non-contract nodes. diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.zh-Hans.xlf b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.zh-Hans.xlf index cbdbf10daa2..a0d96560d7e 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.zh-Hans.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.zh-Hans.xlf @@ -159,7 +159,7 @@ Select a service contract to view its operations. - 选择服务协定可查看其操作。 + 选择服务协定可查看其操作。 This is the message displayed when user selects non-contract nodes. diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.zh-Hant.xlf b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.zh-Hant.xlf index 7c896bf2e6c..bfc580c97b4 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.zh-Hant.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/WCF.zh-Hant.xlf @@ -159,7 +159,7 @@ Select a service contract to view its operations. - 選取要檢視其作業的服務合約。 + 選取要檢視其作業的服務合約。 This is the message displayed when user selects non-contract nodes. diff --git a/vsintegration/tests/FSharp.Editor.Tests/CodeFixes/RemoveReturnOrYieldTests.fs b/vsintegration/tests/FSharp.Editor.Tests/CodeFixes/RemoveReturnOrYieldTests.fs index 23d5908d557..a93bd4f6a3a 100644 --- a/vsintegration/tests/FSharp.Editor.Tests/CodeFixes/RemoveReturnOrYieldTests.fs +++ b/vsintegration/tests/FSharp.Editor.Tests/CodeFixes/RemoveReturnOrYieldTests.fs @@ -102,3 +102,50 @@ let answer question = let actual = codeFix |> tryFix code Auto Assert.Equal(expected, actual) + +[] +let ``Handles spaces`` () = + let code = + """ +let answer question = + yield 42 +""" + + let expected = + Some + { + Message = "Remove 'yield'" + FixedCode = + """ +let answer question = + 42 +""" + } + + let actual = codeFix |> tryFix code Auto + + Assert.Equal(expected, actual) + +[] +let ``Handles new lines`` () = + let code = + """ +let answer question = + return! + 42 +""" + + let expected = + Some + { + Message = "Remove 'return!'" + FixedCode = + """ +let answer question = + 42 +""" + } + + let actual = codeFix |> tryFix code Auto + + Assert.Equal(expected, actual) From 1f895a3e62a2b79b56022004000d859d6e7e56ba Mon Sep 17 00:00:00 2001 From: Martin521 <29605222+Martin521@users.noreply.github.com> Date: Wed, 16 Oct 2024 15:14:09 +0000 Subject: [PATCH 27/35] turned warning about consecutive #nowarn into Informational --- src/Compiler/SyntaxTree/WarnScopes.fs | 11 ++++++----- .../CompilerDirectives/Nowarn.fs | 16 ++++++++++------ 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/Compiler/SyntaxTree/WarnScopes.fs b/src/Compiler/SyntaxTree/WarnScopes.fs index e5f07168b21..6ffe8bdcc2b 100644 --- a/src/Compiler/SyntaxTree/WarnScopes.fs +++ b/src/Compiler/SyntaxTree/WarnScopes.fs @@ -132,10 +132,10 @@ module internal WarnScopes = match getScopes idx warnScopes with | WarnScope.OpenOn m' :: t -> warnScopes.Add(idx, WarnScope.On(mkScope m' m) :: t) - | WarnScope.OpenOff m' :: _ -> + | WarnScope.OpenOff m' :: _ + | WarnScope.On m' :: _ -> if langVersion.SupportsFeature LanguageFeature.ScopedNowarn then - warning (Error(FSComp.SR.lexWarnDirectivesMustMatch ("#nowarn", m'.StartLine), m)) - + informationalWarning (Error(FSComp.SR.lexWarnDirectivesMustMatch ("#nowarn", m'.StartLine), m)) warnScopes | scopes -> warnScopes.Add(idx, WarnScope.OpenOff(mkScope m m) :: scopes) | WarnDirective.Warnon(n, m) -> @@ -143,8 +143,9 @@ module internal WarnScopes = match getScopes idx warnScopes with | WarnScope.OpenOff m' :: t -> warnScopes.Add(idx, WarnScope.Off(mkScope m' m) :: t) - | WarnScope.OpenOn m' :: _ -> - warning (Error(FSComp.SR.lexWarnDirectivesMustMatch ("#warnon", m'.StartLine), m)) + | WarnScope.OpenOn m' :: _ + | WarnScope.Off m' :: _ -> + warning (Error(FSComp.SR.lexWarnDirectivesMustMatch ("#warnon", m'.EndLine), m)) warnScopes | scopes -> warnScopes.Add(idx, WarnScope.OpenOn(mkScope m m) :: scopes) |> WarnScopeMap diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Nowarn.fs b/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Nowarn.fs index 432b3c5c203..2a6e177a9dc 100644 --- a/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Nowarn.fs +++ b/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Nowarn.fs @@ -48,7 +48,8 @@ module Nowarn = "type T5 = T" ] - let private testData = [ + let private testData = + [ vp, [], [fs [intro; make20]], [Warning 20, 2] vp, [], [fs [intro; nowarn 20; make20]], [] vp, [], [fs [intro; "#nowarn 20;;"; make20]], [] @@ -85,19 +86,22 @@ module Nowarn = vp, [], [fsx [intro; make25; nowarn 25; make25; warnon 25; make25]], [Warning 25, 2; Warning 25, 6] v9, [], [fsx [intro; make25; nowarn 25; make25; warnon 25; make25]], [Error 3350, 5] vp, [], [fs [intro; "let x ="; nowarn 20; " 1"; warnon 20; " 2"; " 3"; "4"]], [Warning 20, 6; Warning 20, 8] - vp, [], [fs [intro; nowarn 20; nowarn 20; warnon 20; make20]], [Warning 3875, 3; Warning 20, 5] - v9, [], [fs [intro; nowarn 20; nowarn 20; warnon 20; make20]], [Error 3350, 4] + vp, [], [fs [intro; nowarn 20; nowarn 20; warnon 20; make20]], [Information 3875, 3; Warning 20, 5] + vp, [], [fs [intro; nowarn 20; warnon 20; warnon 20; make20]], [Warning 3875, 4; Warning 20, 5] vp, [], [fs [intro; "#nowarn \"\"\"20\"\"\" "; make20]], [] ] - - let testMemberData = - testData |> List.mapi (fun i (v, fl, sources, diags) -> [| + |> List.mapi (fun i (v, fl, sources, diags) -> [| box (i + 1) box v box fl box (List.toArray sources) box (List.toArray diags) |]) + let testMemberData = + match System.Int32.TryParse(System.Environment.GetEnvironmentVariable("NowarnSingleTest")) with + | true, n when n > 0 && n <= testData.Length -> [testData[n-1]] + | _ -> testData + let private testFailed (expected: (ErrorType * int) list) (actual: ErrorInfo list) = expected.Length <> actual.Length || (List.zip expected actual |> List.exists(fun((error, line), d) -> error <> d.Error || line <> d.Range.StartLine)) From aca968fd6db3354b10fe5159f80627b50beafc57 Mon Sep 17 00:00:00 2001 From: Martin521 <29605222+Martin521@users.noreply.github.com> Date: Thu, 17 Oct 2024 14:33:59 +0000 Subject: [PATCH 28/35] some fixes and added test --- .github/CODEOWNERS | 3 ++- eng/DotNetBuild.props | 2 +- eng/SourceBuildPrebuiltBaseline.xml | 2 +- src/Compiler/Driver/ParseAndCheckInputs.fs | 2 +- src/Compiler/SyntaxTree/WarnScopes.fs | 1 + .../CompilerDirectives/Nowarn.fs | 3 ++- tests/service/data/TestTP/ProvidedTypes.fs | 6 ++++++ 7 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 16d61e579a1..b40e4b69c5b 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,2 +1,3 @@ * @dotnet/fsharp-team-msft -/eng/SourceBuild* @dotnet/source-build-internal +/eng/DotNetBuild.props @dotnet/product-construction +/eng/SourceBuild* @dotnet/source-build diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props index c7bc688ba3e..6891541838a 100644 --- a/eng/DotNetBuild.props +++ b/eng/DotNetBuild.props @@ -1,4 +1,4 @@ - + diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 4416e9693af..18f3b782d76 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -1,4 +1,4 @@ - + diff --git a/src/Compiler/Driver/ParseAndCheckInputs.fs b/src/Compiler/Driver/ParseAndCheckInputs.fs index a09b3d6949e..1e64ce71fb0 100644 --- a/src/Compiler/Driver/ParseAndCheckInputs.fs +++ b/src/Compiler/Driver/ParseAndCheckInputs.fs @@ -1025,7 +1025,7 @@ let CheckLegacyWarnDirectivePlacement (langVersion: LanguageVersion, WarnScopeMa for line in warnLines do if line > mm.StartLine && line <= mm.EndLine then let m = withStartEnd (mkPos line 0) (mkPos (line + 1) 0) mm - warning(Error(FSComp.SR.buildDirectivesInModulesAreIgnored(), m)) + warning (Error(FSComp.SR.buildDirectivesInModulesAreIgnored (), m)) /// Build the initial type checking environment let GetInitialTcEnv (assemblyName: string, initm: range, tcConfig: TcConfig, tcImports: TcImports, tcGlobals) = diff --git a/src/Compiler/SyntaxTree/WarnScopes.fs b/src/Compiler/SyntaxTree/WarnScopes.fs index 6ffe8bdcc2b..c5b1cfaaf26 100644 --- a/src/Compiler/SyntaxTree/WarnScopes.fs +++ b/src/Compiler/SyntaxTree/WarnScopes.fs @@ -136,6 +136,7 @@ module internal WarnScopes = | WarnScope.On m' :: _ -> if langVersion.SupportsFeature LanguageFeature.ScopedNowarn then informationalWarning (Error(FSComp.SR.lexWarnDirectivesMustMatch ("#nowarn", m'.StartLine), m)) + warnScopes | scopes -> warnScopes.Add(idx, WarnScope.OpenOff(mkScope m m) :: scopes) | WarnDirective.Warnon(n, m) -> diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Nowarn.fs b/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Nowarn.fs index 2a6e177a9dc..c2ec463fd0d 100644 --- a/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Nowarn.fs +++ b/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Nowarn.fs @@ -88,6 +88,7 @@ module Nowarn = vp, [], [fs [intro; "let x ="; nowarn 20; " 1"; warnon 20; " 2"; " 3"; "4"]], [Warning 20, 6; Warning 20, 8] vp, [], [fs [intro; nowarn 20; nowarn 20; warnon 20; make20]], [Information 3875, 3; Warning 20, 5] vp, [], [fs [intro; nowarn 20; warnon 20; warnon 20; make20]], [Warning 3875, 4; Warning 20, 5] + vp, ["--warnon:3875"], [fs [intro; nowarn 20; nowarn 20; warnon 20; make20]], [Warning 3875, 3; Warning 20, 5] vp, [], [fs [intro; "#nowarn \"\"\"20\"\"\" "; make20]], [] ] |> List.mapi (fun i (v, fl, sources, diags) -> [| @@ -120,7 +121,7 @@ module Nowarn = for source in sources do print $" source code %s{source.GetSourceFileName}:" let text = source.GetSourceText |> Option.defaultValue "" - let lines = text.Split(Environment.NewLine) |> Array.toList + let lines = text.Split(Environment.NewLine |> Seq.toArray) |> Array.toList for line in lines do print $" {line}" print $" expected diagnostics:" for (error, line) in expected do print $" {error} in line {line}" diff --git a/tests/service/data/TestTP/ProvidedTypes.fs b/tests/service/data/TestTP/ProvidedTypes.fs index b66037bc4e9..747455e271f 100644 --- a/tests/service/data/TestTP/ProvidedTypes.fs +++ b/tests/service/data/TestTP/ProvidedTypes.fs @@ -6876,6 +6876,8 @@ module internal AssemblyReader = namespace ProviderImplementation.ProvidedTypes + #nowarn "1182" + // // The on-disk assemblies are read by AssemblyReader. // @@ -8267,6 +8269,7 @@ namespace ProviderImplementation.ProvidedTypes #nowarn "8796" + #nowarn "1182" open System open System.Diagnostics @@ -9489,6 +9492,7 @@ namespace ProviderImplementation.ProvidedTypes namespace ProviderImplementation.ProvidedTypes + #nowarn "1182" module BinaryWriter = open System @@ -13492,6 +13496,7 @@ namespace ProviderImplementation.ProvidedTypes namespace ProviderImplementation.ProvidedTypes + #nowarn "1182" open System open System.Diagnostics open System.IO @@ -15710,6 +15715,7 @@ namespace ProviderImplementation.ProvidedTypes namespace ProviderImplementation.ProvidedTypes + #nowarn "1182" open System open System.Diagnostics open System.IO From 55f2fc639ddeb55466f66672ec8ccd96ce4d55eb Mon Sep 17 00:00:00 2001 From: Martin521 <29605222+Martin521@users.noreply.github.com> Date: Fri, 8 Nov 2024 09:31:26 +0000 Subject: [PATCH 29/35] interaction with #line and diverse improvements --- .config/dotnet-tools.json | 34 +- .fantomasignore | 1 + Directory.Build.props | 2 +- FSharp.Profiles.props | 4 +- INTERNAL.md | 41 +- README.md | 6 + azure-pipelines-PR.yml | 20 + buildtools/fslex/fslex.fsproj | 1 + buildtools/fsyacc/fsyacc.fsproj | 1 + .../.FSharp.Compiler.Service/9.0.200.md | 12 +- docs/release-notes/.FSharp.Core/9.0.200.md | 9 + docs/release-notes/.Language/preview.md | 3 + docs/release-notes/.VisualStudio/17.13.md | 8 + eng/DotNetBuild.props | 4 +- eng/Version.Details.xml | 24 +- eng/Versions.props | 10 +- eng/ilverify.ps1 | 158 ++++++ ...y_FSharp.Compiler.Service_Debug_net9.0.bsl | 90 ++++ ....Compiler.Service_Debug_netstandard2.0.bsl | 115 +++++ ...FSharp.Compiler.Service_Release_net9.0.bsl | 111 ++++ ...ompiler.Service_Release_netstandard2.0.bsl | 137 +++++ ...erify_FSharp.Core_Debug_netstandard2.0.bsl | 17 + ...erify_FSharp.Core_Debug_netstandard2.1.bsl | 17 + ...ify_FSharp.Core_Release_netstandard2.0.bsl | 12 + ...ify_FSharp.Core_Release_netstandard2.1.bsl | 12 + src/Compiler/Checking/CheckDeclarations.fs | 33 +- src/Compiler/Checking/CheckPatterns.fs | 22 +- src/Compiler/Checking/ConstraintSolver.fs | 3 +- .../CheckComputationExpressions.fs | 18 +- .../Checking/Expressions/CheckExpressions.fs | 51 +- .../Checking/Expressions/CheckExpressions.fsi | 8 + .../Expressions/CheckSequenceExpressions.fs | 24 +- src/Compiler/Checking/InfoReader.fs | 1 + src/Compiler/Checking/MethodOverrides.fs | 1 + src/Compiler/Checking/NameResolution.fs | 25 +- src/Compiler/Checking/NameResolution.fsi | 3 +- src/Compiler/Checking/NicePrint.fs | 4 +- .../Checking/PatternMatchCompilation.fs | 1 + src/Compiler/Checking/SignatureHash.fs | 326 +----------- src/Compiler/Checking/SignatureHash.fsi | 4 +- src/Compiler/Checking/TailCallChecks.fs | 1 + src/Compiler/Checking/TypeRelations.fs | 265 +++++----- src/Compiler/Checking/TypeRelations.fsi | 4 - src/Compiler/Checking/import.fs | 482 ++++++++++-------- src/Compiler/Checking/import.fsi | 25 + src/Compiler/Driver/CompilerConfig.fs | 45 +- src/Compiler/Driver/CompilerConfig.fsi | 11 +- src/Compiler/Driver/CompilerDiagnostics.fs | 4 +- src/Compiler/Driver/CompilerDiagnostics.fsi | 2 +- src/Compiler/Driver/CompilerImports.fs | 3 +- src/Compiler/Driver/CompilerOptions.fs | 40 +- .../GraphChecking/FileContentMapping.fs | 5 +- .../Driver/GraphChecking/GraphProcessing.fs | 1 + src/Compiler/Driver/ParseAndCheckInputs.fs | 151 +++--- src/Compiler/Driver/ParseAndCheckInputs.fsi | 3 - src/Compiler/Driver/ScriptClosure.fs | 1 - src/Compiler/Driver/fsc.fs | 44 +- src/Compiler/FSComp.txt | 10 +- src/Compiler/FSharp.Compiler.Service.fsproj | 9 +- src/Compiler/Facilities/DiagnosticOptions.fs | 24 +- src/Compiler/Facilities/DiagnosticOptions.fsi | 23 +- src/Compiler/Facilities/LanguageFeatures.fs | 10 + src/Compiler/Facilities/LanguageFeatures.fsi | 3 + src/Compiler/Facilities/prim-lexing.fs | 4 +- src/Compiler/Interactive/fsi.fs | 42 +- .../Optimize/LowerComputedCollections.fs | 1 + src/Compiler/Service/FSharpCheckerResults.fs | 6 +- .../Service/FSharpParseFileResults.fs | 2 +- src/Compiler/Service/FSharpSource.fsi | 2 +- src/Compiler/Service/IncrementalBuild.fs | 9 +- .../Service/ServiceInterfaceStubGenerator.fs | 2 +- src/Compiler/Service/ServiceParseTreeWalk.fs | 5 +- src/Compiler/Service/ServiceParsedInputOps.fs | 11 +- src/Compiler/Service/TransparentCompiler.fs | 2 - src/Compiler/Service/service.fs | 8 - src/Compiler/Symbols/FSharpDiagnostic.fs | 10 +- src/Compiler/SyntaxTree/LexFilter.fs | 4 +- src/Compiler/SyntaxTree/LexHelpers.fs | 5 +- src/Compiler/SyntaxTree/LexerStore.fs | 169 ++++++ src/Compiler/SyntaxTree/LexerStore.fsi | 52 ++ src/Compiler/SyntaxTree/ParseHelpers.fs | 192 +------ src/Compiler/SyntaxTree/ParseHelpers.fsi | 49 +- src/Compiler/SyntaxTree/SyntaxTree.fs | 19 +- src/Compiler/SyntaxTree/SyntaxTree.fsi | 20 +- src/Compiler/SyntaxTree/SyntaxTreeOps.fs | 10 + src/Compiler/SyntaxTree/SyntaxTreeOps.fsi | 2 + src/Compiler/SyntaxTree/SyntaxTrivia.fs | 15 +- src/Compiler/SyntaxTree/SyntaxTrivia.fsi | 18 +- src/Compiler/SyntaxTree/WarnScopes.fs | 381 +++++++++----- src/Compiler/SyntaxTree/WarnScopes.fsi | 16 +- src/Compiler/TypedTree/TcGlobals.fs | 14 +- src/Compiler/TypedTree/TcGlobals.fsi | 14 +- src/Compiler/Utilities/TypeHashing.fs | 346 +++++++++++++ src/Compiler/lex.fsl | 41 +- src/Compiler/pars.fsy | 51 +- src/Compiler/xlf/FSComp.txt.cs.xlf | 22 +- src/Compiler/xlf/FSComp.txt.de.xlf | 22 +- src/Compiler/xlf/FSComp.txt.es.xlf | 22 +- src/Compiler/xlf/FSComp.txt.fr.xlf | 22 +- src/Compiler/xlf/FSComp.txt.it.xlf | 22 +- src/Compiler/xlf/FSComp.txt.ja.xlf | 22 +- src/Compiler/xlf/FSComp.txt.ko.xlf | 22 +- src/Compiler/xlf/FSComp.txt.pl.xlf | 22 +- src/Compiler/xlf/FSComp.txt.pt-BR.xlf | 22 +- src/Compiler/xlf/FSComp.txt.ru.xlf | 22 +- src/Compiler/xlf/FSComp.txt.tr.xlf | 22 +- src/Compiler/xlf/FSComp.txt.zh-Hans.xlf | 22 +- src/Compiler/xlf/FSComp.txt.zh-Hant.xlf | 22 +- src/Compiler/xlf/FSStrings.cs.xlf | 2 +- src/Compiler/xlf/FSStrings.de.xlf | 2 +- src/Compiler/xlf/FSStrings.es.xlf | 2 +- src/Compiler/xlf/FSStrings.fr.xlf | 2 +- src/Compiler/xlf/FSStrings.it.xlf | 2 +- src/Compiler/xlf/FSStrings.ja.xlf | 2 +- src/Compiler/xlf/FSStrings.ko.xlf | 2 +- src/Compiler/xlf/FSStrings.pl.xlf | 2 +- src/Compiler/xlf/FSStrings.pt-BR.xlf | 2 +- src/Compiler/xlf/FSStrings.ru.xlf | 2 +- src/Compiler/xlf/FSStrings.tr.xlf | 2 +- src/Compiler/xlf/FSStrings.zh-Hans.xlf | 2 +- src/Compiler/xlf/FSStrings.zh-Hant.xlf | 2 +- src/FSharp.Build/Fsc.fs | 8 + .../Microsoft.FSharp.NetSdk.props | 1 + src/FSharp.Build/Microsoft.FSharp.Targets | 1 + src/FSharp.Core/mailbox.fs | 7 +- src/fsi/fsimain.fs | 10 - .../CompilerDirectives/Line.fs | 61 ++- .../CompilerDirectives/NonStringArgs.fs | 30 +- .../CompilerDirectives/Nowarn.fs | 106 ++-- .../CompilerOptions/fsc/misc/utf8output.fs | 47 ++ .../PermittedLocations/PermittedLocations.fs | 59 ++- .../AutoPropsWithModifierBeforeGetSet.fs | 13 +- .../BindingExpressions/BindingExpressions.fs | 41 +- .../BindingExpressions/UpperBindingPattern.fs | 128 +++++ .../PatternMatching/Simple/Simple.fs | 13 + .../PatternMatching/Union/Union.fs | 46 +- .../Union/UpperUnionCasePattern.fs | 52 ++ .../ErrorMessages/ClassesTests.fs | 91 ++++ .../ErrorMessages/TailCallAttribute.fs | 28 + .../FSharp.Compiler.ComponentTests.fsproj | 6 +- .../Nullness/NullableReferenceTypesTests.fs | 17 + .../E_SequenceExpressions01.fs | 76 +++ .../SequenceExpressionTests.fs | 126 ++++- .../SequenceExpressions01.fs | 76 +++ .../Signatures/HashConstraintTests.fs | 1 - .../Signatures/MemberTests.fs | 1 - .../Signatures/ModuleOrNamespaceTests.fs | 1 - .../Signatures/NestedTypeTests.fs | 1 - .../Signatures/RecordTests.fs | 1 - .../Signatures/TypeTests.fs | 1 - .../AssemblyReaderShim.fs | 1 - .../CSharpProjectAnalysis.fs | 2 +- tests/FSharp.Compiler.Service.Tests/Common.fs | 4 +- .../EditorTests.fs | 2 +- .../ExprTests.fs | 2 +- ...ervice.SurfaceArea.netstandard20.debug.bsl | 80 +-- ...vice.SurfaceArea.netstandard20.release.bsl | 183 ++----- .../FSharp.Compiler.Service.Tests.fsproj | 3 - .../FileSystemTests.fs | 2 +- .../HashIfExpression.fs | 2 +- .../InteractiveCheckerTests.fs | 2 +- .../ModuleReaderCancellationTests.fs | 2 +- .../MultiProjectAnalysisTests.fs | 2 +- .../ParserTests.fs | 2 +- .../PatternMatchCompilationTests.fs | 8 +- .../PerfTests.fs | 2 +- .../ProjectAnalysisTests.fs | 17 +- .../RangeTests.fs | 2 +- .../ServiceUntypedParseTests.fs | 2 +- .../FSharp.Compiler.Service.Tests/Symbols.fs | 2 +- .../XmlDocTests.fs | 2 +- .../ArrayModule.fs | 4 +- .../ArrayModule2.fs | 2 +- .../ListModule.fs | 4 +- .../ListModule2.fs | 2 +- .../ObsoleteSeqFunctions.fs | 6 +- .../Microsoft.FSharp.Collections/SeqModule.fs | 34 +- .../SeqModule2.fs | 54 +- .../Microsoft.FSharp.Control/AsyncModule.fs | 50 +- .../Microsoft.FSharp.Control/AsyncType.fs | 2 + .../Microsoft.FSharp.Control/Cancellation.fs | 33 +- .../MailboxProcessorType.fs | 39 ++ .../FSharp.Core/PrimTypes.fs | 92 ++-- .../TestFrameworkHelpers.fs | 2 +- tests/FSharp.Test.Utilities/Assert.fs | 11 +- .../DirectoryAttribute.fs | 25 +- .../ProjectGeneration.fs | 111 ++-- .../BasicGrammarElements/CharConstants.fs | 1 + .../BasicGrammarElements/DecimalConstants.fs | 1 + .../BasicGrammarElements/IntegerConstants.fs | 1 + .../Core/Collections/IEnumerableTests.fs | 1 + .../Libraries/Core/Operators/RoundTests.fs | 1 + .../Libraries/Core/Operators/StringTests.fs | 1 + .../Libraries/Core/Reflection/SprintfTests.fs | 1 + .../Core/Unchecked/DefaultOfTests.fs | 1 + tests/fsharp/XunitHelpers.fs | 7 - tests/fsharp/tests.fs | 32 +- tests/service/FsUnit.fs | 6 - .../data/SyntaxTree/Member/Inherit 01.fs.bsl | 2 +- .../data/SyntaxTree/Member/Inherit 02.fs.bsl | 10 +- .../data/SyntaxTree/Member/Inherit 03.fs.bsl | 11 +- .../data/SyntaxTree/Member/Inherit 04.fs.bsl | 11 +- .../data/SyntaxTree/Member/Inherit 05.fs.bsl | 4 +- .../data/SyntaxTree/Member/Inherit 08.fs.bsl | 4 +- .../Classification/ClassificationService.fs | 1 + .../FSharp.Editor/CodeFixes/AddMissingSeq.fs | 77 +++ .../FSharp.Editor/Common/CancellableTasks.fs | 23 +- .../src/FSharp.Editor/Common/Constants.fs | 3 + .../src/FSharp.Editor/FSharp.Editor.fsproj | 1 + .../src/FSharp.Editor/FSharp.Editor.resx | 3 + .../Structure/BlockStructureService.fs | 3 + .../FSharp.Editor/xlf/FSharp.Editor.cs.xlf | 5 + .../FSharp.Editor/xlf/FSharp.Editor.de.xlf | 5 + .../FSharp.Editor/xlf/FSharp.Editor.es.xlf | 5 + .../FSharp.Editor/xlf/FSharp.Editor.fr.xlf | 5 + .../FSharp.Editor/xlf/FSharp.Editor.it.xlf | 5 + .../FSharp.Editor/xlf/FSharp.Editor.ja.xlf | 5 + .../FSharp.Editor/xlf/FSharp.Editor.ko.xlf | 5 + .../FSharp.Editor/xlf/FSharp.Editor.pl.xlf | 5 + .../FSharp.Editor/xlf/FSharp.Editor.pt-BR.xlf | 5 + .../FSharp.Editor/xlf/FSharp.Editor.ru.xlf | 5 + .../FSharp.Editor/xlf/FSharp.Editor.tr.xlf | 5 + .../xlf/FSharp.Editor.zh-Hans.xlf | 5 + .../xlf/FSharp.Editor.zh-Hant.xlf | 5 + .../CodeFixes/AddMissingSeqTests.fs | 239 +++++++++ .../FSharp.Editor.Tests.fsproj | 1 + .../Tests.LanguageService.Completion.fs | 26 +- 227 files changed, 4694 insertions(+), 2060 deletions(-) create mode 100644 docs/release-notes/.FSharp.Core/9.0.200.md create mode 100644 docs/release-notes/.VisualStudio/17.13.md create mode 100644 eng/ilverify.ps1 create mode 100644 eng/ilverify_FSharp.Compiler.Service_Debug_net9.0.bsl create mode 100644 eng/ilverify_FSharp.Compiler.Service_Debug_netstandard2.0.bsl create mode 100644 eng/ilverify_FSharp.Compiler.Service_Release_net9.0.bsl create mode 100644 eng/ilverify_FSharp.Compiler.Service_Release_netstandard2.0.bsl create mode 100644 eng/ilverify_FSharp.Core_Debug_netstandard2.0.bsl create mode 100644 eng/ilverify_FSharp.Core_Debug_netstandard2.1.bsl create mode 100644 eng/ilverify_FSharp.Core_Release_netstandard2.0.bsl create mode 100644 eng/ilverify_FSharp.Core_Release_netstandard2.1.bsl create mode 100644 src/Compiler/SyntaxTree/LexerStore.fs create mode 100644 src/Compiler/SyntaxTree/LexerStore.fsi create mode 100644 src/Compiler/Utilities/TypeHashing.fs create mode 100644 tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/misc/utf8output.fs create mode 100644 tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/BindingExpressions/UpperBindingPattern.fs create mode 100644 tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Union/UpperUnionCasePattern.fs create mode 100644 tests/FSharp.Compiler.ComponentTests/Language/SequenceExpressions/E_SequenceExpressions01.fs rename tests/FSharp.Compiler.ComponentTests/Language/{ => SequenceExpressions}/SequenceExpressionTests.fs (59%) create mode 100644 tests/FSharp.Compiler.ComponentTests/Language/SequenceExpressions/SequenceExpressions01.fs delete mode 100644 tests/service/FsUnit.fs create mode 100644 vsintegration/src/FSharp.Editor/CodeFixes/AddMissingSeq.fs create mode 100644 vsintegration/tests/FSharp.Editor.Tests/CodeFixes/AddMissingSeqTests.fs diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index b6cba414baa..5cf9775974e 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -1,48 +1,62 @@ { + "version": 1, "isRoot": true, "tools": { "dotnet-counters": { + "version": "8.0.547301", "commands": [ "dotnet-counters" ], - "version": "8.0.547301" + "rollForward": true }, "dotnet-dump": { + "version": "8.0.547301", "commands": [ "dotnet-dump" ], - "version": "8.0.547301" + "rollForward": true }, "dotnet-gcdump": { + "version": "8.0.547301", "commands": [ "dotnet-gcdump" ], - "version": "8.0.547301" + "rollForward": true }, "dotnet-sos": { + "version": "8.0.547301", "commands": [ "dotnet-sos" ], - "version": "8.0.547301" + "rollForward": true }, "dotnet-symbol": { + "version": "8.0.547301", "commands": [ "dotnet-symbol" ], - "version": "8.0.547301" + "rollForward": true }, "dotnet-trace": { + "version": "8.0.547301", "commands": [ "dotnet-trace" ], - "version": "8.0.547301" + "rollForward": true + }, + "dotnet-ilverify": { + "version": "9.0.0-rc.2.24473.5", + "commands": [ + "ilverify" + ], + "rollForward": true }, "fantomas": { + "version": "6.2.3", "commands": [ "fantomas" ], - "version": "6.2.3" + "rollForward": true } - }, - "version": 1 -} + } +} \ No newline at end of file diff --git a/.fantomasignore b/.fantomasignore index 20249273f54..d731fb6d9a5 100644 --- a/.fantomasignore +++ b/.fantomasignore @@ -116,6 +116,7 @@ src/Compiler/Utilities/HashMultiMap.fs src/Compiler/Facilities/AsyncMemoize.fsi src/Compiler/Facilities/AsyncMemoize.fs src/Compiler/AbstractIL/il.fs +src/Compiler/SyntaxTree/LexerStore.fs src/Compiler/Driver/GraphChecking/Graph.fsi src/Compiler/Driver/GraphChecking/Graph.fs diff --git a/Directory.Build.props b/Directory.Build.props index 8802ca237b5..c4f2bff9287 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -44,7 +44,7 @@ true - false + false diff --git a/FSharp.Profiles.props b/FSharp.Profiles.props index 1d9eafa8c2b..186875ad357 100644 --- a/FSharp.Profiles.props +++ b/FSharp.Profiles.props @@ -18,8 +18,8 @@ false - - $(OtherFlags) /langversion:preview + + preview diff --git a/INTERNAL.md b/INTERNAL.md index 180d8119e2e..6207180fd31 100644 --- a/INTERNAL.md +++ b/INTERNAL.md @@ -64,15 +64,48 @@ it's a good idea to check the previous link for any old or stalled insertions in Update the `insertTargetBranch` value at the bottom of `azure-pipelines.yml` in the appropriate release branch. E.g., when VS 17.3 snapped and switched to ask mode, [this PR](https://github.com/dotnet/fsharp/pull/13456/files) correctly updates the insertion target so that future builds from that F# branch will get auto-inserted to VS. ### When VS `main` is open for insertions for preview releases of VS: - -1. Create a new `release/dev*` branch (e.g., `release/dev17.4`) and initially set its HEAD commit to that of the previous release (e.g., `release/dev17.3` in this case). +0. Disable auto-merges from `main` to **current** release branch, please make a change for the following file and create a pull request: +https://github.com/dotnet/roslyn-tools/blob/6d7c182c46f8319d7922561e2c1586c7aadce19e/src/GitHubCreateMergePRs/config.xml#L52-L74 +> You should comment out the `main -> release/devXX.X` flow until step #4 is completed (``) +2. Create a new `release/dev*` branch (e.g., `release/dev17.4`) and initially set its HEAD commit to that of the previous release (e.g., `release/dev17.3` in this case). ```console git checkout -b release/dev17.4 git reset --hard upstream/release/dev17.3 git push --set-upstream upstream release/dev17.4 ``` -3. Set the new branch to receive auto-merges from `main`, and also set the old release branch to flow into the new one. [This PR](https://github.com/dotnet/roslyn-tools/pull/1245/files) is a good example of what to do when a new `release/dev17.4` branch is created that should receive merges from both `main` and the previous release branch, `release/dev17.3`. -4. Set the packages from the new branch to flow into the correct package feeds via the `darc` tool. To do this: +3. Update versions in both `main` and new release branch **they need to match, so release notes bot knows which changelog file to check** +4. Update target insertion branches in the `azure-pipelines.yml`: + 1. F# release branch + ```yaml + # Release branch for F# + # Should be 'current' release branch name, i.e. 'release/dev17.10' in dotnet/fsharp/refs/heads/main, 'release/dev17.10' in dotnet/fsharp/refs/heads/release/dev17.10 and 'release/dev17.9' in dotnet/fsharp/refs/heads/release/dev17.9 + # Should **never** be 'main' in dotnet/fsharp/refs/heads/main, since it will start inserting to VS twice. + - name: FSharpReleaseBranchName + value: release/dev17.13 + ``` + 2. VS insertion branch + ```yaml + # VS Insertion branch name (NOT the same as F# branch) + # Should be previous release branch or 'main' in 'main' and 'main' in release branch + # (since for all *new* release branches we insert into VS main and for all *previous* releases we insert into corresponding VS release), + # i.e. 'rel/d17.9' *or* 'main' in dotnet/fsharp/refs/heads/main and 'main' in F# dotnet/fsharp/refs/heads/release/dev17.10 (latest release branch) + - name: VSInsertionTargetBranchName + value: main + ``` + > [!NOTE] Note + > For the **old** release branch `VSInsertionTargetBranchName` should point to corresponding VS release target branch (e.g. should be `rel/d17.13` in the F# repo branch `release/dev17.13`) + > For both `main` and **new** release branch `VSInsertionTargetBranchName` should be `main`. + > + > `FSharpReleaseBranchName` should **always** be the most recent in `main` and corresponding release branch name in release branches. + + 3. Oneloc branch: + ```yaml + # Localization: we only run it for specific release branches + - ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/release/dev17.13') }}: + ``` +5. Set the new branch to receive auto-merges from `main`, and also set the old release branch to flow into the new one. [This PR](https://github.com/dotnet/roslyn-tools/pull/1245/files) is a good example of what to do when a new `release/dev17.4` branch is created that should receive merges from both `main` and the previous release branch, `release/dev17.3`. Old release branch should stop receiving updates from the `main`. + +6. Set the packages from the new branch to flow into the correct package feeds via the `darc` tool. To do this: 1. Ensure the latest `darc` tool is installed by running `eng/common/darc-init.ps1`. 2. (only needed once) Run the command `darc authenticate`. A text file will be opened with instructions on how to populate access tokens. 3. Check the current package/channel subscriptions by running `darc get-default-channels --source-repo fsharp`. For this example, notice that the latest subscription shows the F# branch `release/dev17.3` is getting added to the `VS 17.3` channel. diff --git a/README.md b/README.md index ee55e75dfad..0def09e17fe 100644 --- a/README.md +++ b/README.md @@ -57,6 +57,12 @@ After it's finished, open `FSharp.sln` in your editor of choice. Even if you find a single-character typo, we're happy to take the change! Although the codebase can feel daunting for beginners, we and other contributors are happy to help you along. +Not sure where to contribute? +Look at the [curated list of issues asking for help](https://github.com/dotnet/fsharp/issues?q=is%3Aissue%20state%3Aopen%20label%3A%22help%20wanted%22). If you want to tackle any of those, use the comments section of the chosen issue to indicate interest and feel free to ask for initial guidance. We are happy to help with resolving outstanding issues while making a successful PR addressing the issue. + +The issues in this repository can have big differences in the complexity for fixing them. +Are you getting started? We do have a label for [good first issues](https://github.com/dotnet/fsharp/issues?q=is%3Aissue%20state%3Aopen%20label%3A%22good%20first%20issue%22) as well. + ## Per-build NuGet packages ### 7.0.40x series diff --git a/azure-pipelines-PR.yml b/azure-pipelines-PR.yml index 9a5c59441e2..7ca3aae0bb3 100644 --- a/azure-pipelines-PR.yml +++ b/azure-pipelines-PR.yml @@ -808,3 +808,23 @@ stages: artifactName: 'Trim Test Logs Attempt $(System.JobAttempt) Logs $(_kind)' continueOnError: true condition: always() + - job: ILVerify + pool: + name: $(DncEngPublicBuildPool) + demands: ImageOverride -equals $(WindowsMachineQueueName) + steps: + - checkout: self + clean: true + - task: UseDotNet@2 + displayName: install SDK + inputs: + packageType: sdk + useGlobalJson: true + includePreviewVersions: true + workingDirectory: $(Build.SourcesDirectory) + installationPath: $(Agent.ToolsDirectory)/dotnet + - script: dotnet tool restore + displayName: Restore dotnet tools + - pwsh: .\eng\ilverify.ps1 + displayName: Run ILVerify + workingDirectory: $(Build.SourcesDirectory) diff --git a/buildtools/fslex/fslex.fsproj b/buildtools/fslex/fslex.fsproj index 5dfef2f0e31..b450de1668d 100644 --- a/buildtools/fslex/fslex.fsproj +++ b/buildtools/fslex/fslex.fsproj @@ -5,6 +5,7 @@ $(FSharpNetCoreProductTargetFramework) true LatestMajor + $(NoWarn);64;1182;1204 diff --git a/buildtools/fsyacc/fsyacc.fsproj b/buildtools/fsyacc/fsyacc.fsproj index 1ff8a110759..5f97b762e03 100644 --- a/buildtools/fsyacc/fsyacc.fsproj +++ b/buildtools/fsyacc/fsyacc.fsproj @@ -5,6 +5,7 @@ $(FSharpNetCoreProductTargetFramework) true LatestMajor + $(NoWarn);64;1182;1204 diff --git a/docs/release-notes/.FSharp.Compiler.Service/9.0.200.md b/docs/release-notes/.FSharp.Compiler.Service/9.0.200.md index a7d549b23bd..360572c6093 100644 --- a/docs/release-notes/.FSharp.Compiler.Service/9.0.200.md +++ b/docs/release-notes/.FSharp.Compiler.Service/9.0.200.md @@ -1,15 +1,22 @@ ### Fixed +* Fix missing TailCall warning in Sequential in use scope ([PR #17927](https://github.com/dotnet/fsharp/pull/17927)) * Fix false negatives for passing null to "obj" arguments. Only "obj | null" can now subsume any type ([PR #17757](https://github.com/dotnet/fsharp/pull/17757)) * Fix internal error when calling 'AddSingleton' and other overloads only differing in generic arity ([PR #17804](https://github.com/dotnet/fsharp/pull/17804)) * Fix extension methods support for non-reference system assemblies ([PR #17799](https://github.com/dotnet/fsharp/pull/17799)) -* Ensure `frameworkTcImportsCache` mutations are thread-safe. ([PR #17795](https://github.com/dotnet/fsharp/pull/17795)) +* Ensure `frameworkTcImportsCache` mutations are threadsafe. ([PR #17795](https://github.com/dotnet/fsharp/pull/17795)) +* Disallow abstract member with access modifiers in sig file. ([PR #17802](https://github.com/dotnet/fsharp/pull/17802)) * Fix concurrency issue in `ILPreTypeDefImpl` ([PR #17812](https://github.com/dotnet/fsharp/pull/17812)) * Fix nullness inference for member val and other OO scenarios ([PR #17845](https://github.com/dotnet/fsharp/pull/17845)) +* Fix internal error when analyzing incomplete inherit member ([PR #17905](https://github.com/dotnet/fsharp/pull/17905)) +* Fix missing nullness warning in case of method resolution multiple candidates ([PR #17917](https://github.com/dotnet/fsharp/pull/17918)) ### Added +* Deprecate places where `seq` can be omitted. ([Language suggestion #1033](https://github.com/fsharp/fslang-suggestions/issues/1033), [PR #17772](https://github.com/dotnet/fsharp/pull/17772)) * Support literal attribute on decimals ([PR #17769](https://github.com/dotnet/fsharp/pull/17769)) +* Added type conversions cache, only enabled for compiler runs, guarded by language version preview ([PR#17668](https://github.com/dotnet/fsharp/pull/17668)) +* Added project property ParallelCompilation which turns on graph based type checking, parallel ILXGen and parallel optimization. By default on for users of langversion=preview ([PR#17948](https://github.com/dotnet/fsharp/pull/17948)) ### Changed @@ -22,5 +29,8 @@ * Better ranges for CE `use` error reporting. ([PR #17811](https://github.com/dotnet/fsharp/pull/17811)) * Better ranges for `inherit` error reporting. ([PR #17879](https://github.com/dotnet/fsharp/pull/17879)) * Better ranges for `inherit` `struct` error reporting. ([PR #17886](https://github.com/dotnet/fsharp/pull/17886)) +* Warn on uppercase identifiers in patterns. ([PR #15816](https://github.com/dotnet/fsharp/pull/15816)) +* Better ranges for `inherit` objects error reporting. ([PR #17893](https://github.com/dotnet/fsharp/pull/17893)) +* Better ranges for #nowarn error reporting; bring back #nowarn warnings for --langVersion:80; add warnings under feature flag ([PR #17871](https://github.com/dotnet/fsharp/pull/17871)) ### Breaking Changes diff --git a/docs/release-notes/.FSharp.Core/9.0.200.md b/docs/release-notes/.FSharp.Core/9.0.200.md new file mode 100644 index 00000000000..9801210174b --- /dev/null +++ b/docs/release-notes/.FSharp.Core/9.0.200.md @@ -0,0 +1,9 @@ +### Fixed + +* Fix exception on Post after MailboxProcessor was disposed ([Issue #17849](https://github.com/dotnet/fsharp/issues/17849), [PR #17922](https://github.com/dotnet/fsharp/pull/17922)) + +### Added + +### Changed + +### Breaking Changes diff --git a/docs/release-notes/.Language/preview.md b/docs/release-notes/.Language/preview.md index 7c0e5c53ae6..491043dabab 100644 --- a/docs/release-notes/.Language/preview.md +++ b/docs/release-notes/.Language/preview.md @@ -1,8 +1,11 @@ ### Added * Better generic unmanaged structs handling. ([Language suggestion #692](https://github.com/fsharp/fslang-suggestions/issues/692), [PR #12154](https://github.com/dotnet/fsharp/pull/12154)) +* Deprecate places where `seq` can be omitted. ([Language suggestion #1033](https://github.com/fsharp/fslang-suggestions/issues/1033), [PR #17772](https://github.com/dotnet/fsharp/pull/17772)) +* Added type conversions cache, only enabled for compiler runs ([PR#17668](https://github.com/dotnet/fsharp/pull/17668)) * Introduction of the `#warnon` compiler directive, enabling scoped nowarn / warnon sections according to [RFC FS-1146](https://github.com/fsharp/fslang-design/pull/782/files). ([Language suggestion #278](https://github.com/fsharp/fslang-suggestions/issues/278), [PR #17507](https://github.com/dotnet/fsharp/pull/17507)) ### Fixed +* Warn on uppercase identifiers in patterns. ([PR #15816](https://github.com/dotnet/fsharp/pull/15816)) ### Changed diff --git a/docs/release-notes/.VisualStudio/17.13.md b/docs/release-notes/.VisualStudio/17.13.md new file mode 100644 index 00000000000..dae07600e1b --- /dev/null +++ b/docs/release-notes/.VisualStudio/17.13.md @@ -0,0 +1,8 @@ +### Fixed + +### Added +* Code fix for adding missing `seq`. ([PR #17772](https://github.com/dotnet/fsharp/pull/17772)) + +### Changed + +### Breaking Changes diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props index 6891541838a..d1681803391 100644 --- a/eng/DotNetBuild.props +++ b/eng/DotNetBuild.props @@ -30,7 +30,7 @@ --tfm $(SourceBuildBootstrapTfm) - false + false diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92075c52737..72e666ba74d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/source-build-reference-packages - f3889ab90d78377122a3e427fe9a74c03611a4bd + e781442b88c4d939f06a94f38f24a5dc18c383d4 @@ -52,25 +52,25 @@ 91b9734abbad751d575c002b30778c88d978993c - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 15f6d606bfc7cbb65587dd7bc1ec6e9ef283f7e3 + 9d7532585ce71e30ab55f0364d3cecccaf0775d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 15f6d606bfc7cbb65587dd7bc1ec6e9ef283f7e3 + 9d7532585ce71e30ab55f0364d3cecccaf0775d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 15f6d606bfc7cbb65587dd7bc1ec6e9ef283f7e3 + 9d7532585ce71e30ab55f0364d3cecccaf0775d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 15f6d606bfc7cbb65587dd7bc1ec6e9ef283f7e3 + 9d7532585ce71e30ab55f0364d3cecccaf0775d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 15f6d606bfc7cbb65587dd7bc1ec6e9ef283f7e3 + 9d7532585ce71e30ab55f0364d3cecccaf0775d1 diff --git a/eng/Versions.props b/eng/Versions.props index 4252f548c66..658ed0f5d9e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -196,10 +196,10 @@ 2.2.0 - 1.0.0-prerelease.23614.4 - 1.0.0-prerelease.23614.4 - 1.0.0-prerelease.23614.4 - 1.0.0-prerelease.23614.4 - 1.0.0-prerelease.23614.4 + 1.0.0-prerelease.24462.2 + 1.0.0-prerelease.24462.2 + 1.0.0-prerelease.24462.2 + 1.0.0-prerelease.24462.2 + 1.0.0-prerelease.24462.2 diff --git a/eng/ilverify.ps1 b/eng/ilverify.ps1 new file mode 100644 index 00000000000..3fd8f9eda64 --- /dev/null +++ b/eng/ilverify.ps1 @@ -0,0 +1,158 @@ +# Cross-platform PowerShell script to verify the integrity of the produced dlls, using dotnet-ilverify. + +# Set build script based on which OS we're running on - Windows (build.cmd), Linux or macOS (build.sh) + +Write-Host "Checking whether running on Windows: $IsWindows" + +[string] $repo_path = (Get-Item -Path $PSScriptRoot).Parent + +Write-Host "Repository path: $repo_path" + +[string] $script = if ($IsWindows) { Join-Path $repo_path "build.cmd" } else { Join-Path $repo_path "build.sh" } + +# Set configurations to build +[string[]] $configurations = @("Debug", "Release") + +# The following are not passing ilverify checks, so we ignore them for now +[string[]] $ignore_errors = @() # @("StackUnexpected", "UnmanagedPointer", "StackByRef", "ReturnPtrToStack", "ExpectedNumericType", "StackUnderflow") + +[string] $default_tfm = "netstandard2.0" + +[string] $artifacts_bin_path = Join-Path (Join-Path $repo_path "artifacts") "bin" + +# List projects to verify, with TFMs +$projects = @{ + "FSharp.Core" = @($default_tfm, "netstandard2.1") + "FSharp.Compiler.Service" = @($default_tfm, "net9.0") +} + +# Run build script for each configuration (NOTE: We don't build Proto) +foreach ($configuration in $configurations) { + Write-Host "Building $configuration configuration..." + & $script -c $configuration + if ($LASTEXITCODE -ne 0 -And $LASTEXITCODE -ne '') { + Write-Host "Build failed for $configuration configuration (last exit code: $LASTEXITCODE)." + exit 1 + } +} + +# Check if ilverify is installed and available from the tool list (using `dotnet tool list -g `), and install it globally if not found. +Write-Host "Checking if dotnet-ilverify is installed..." +$dotnet_ilverify = dotnet tool list -g | Select-String -SimpleMatch -CaseSensitive "dotnet-ilverify" + +if ([string]::IsNullOrWhiteSpace($dotnet_ilverify)) { + Write-Host " dotnet-ilverify is not installed. Installing..." + dotnet tool install dotnet-ilverify -g --prerelease +} else { + Write-Host " dotnet-ilverify is installed:`n $dotnet_ilverify" +} + +# Get the path to latest currently installed runtime +[string[]] $runtimes = @(dotnet --list-runtimes | Select-String -SimpleMatch -CaseSensitive -List "Microsoft.NETCore.App") +if ($runtimes -eq "") { + Write-Host "No runtime found. Exiting..." + exit 1 +} else { + Write-Host "Found the following runtimes: " + foreach ($runtime in $runtimes) { + Write-Host " $runtime" + } +} + +# Selecting the most recent runtime (e.g. last one in the list) +[string] $runtime = $runtimes[-1] +Write-Host " Selected runtime:`n $runtime" + +# Parse path to runtime from something like "Microsoft.NETCore.App 5.0.0 [C:\Program Files\dotnet\shared\Microsoft.NETCore.App\5.0.0]" to "C:\Program Files\dotnet\shared\Microsoft.NETCore.App\5.0.0" +[string] $runtime_path = $runtime -replace 'Microsoft.NETCore.App (?.+) \[(?.+)\]', '${RuntimePath}/${RuntimeVersion}' +Write-Host " Using the following path to runtime:`n $runtime_path" + +# Check whether path exists, if it doesn't something unexpected happens and needs investigation +if (-not (Test-Path $runtime_path)) { + Write-Host "Path to runtime not found. Exiting..." + exit 1 +} + +# For every artifact, every configuration and TFM, run a dotnet-ilverify with references from discovered runtime directory: +[bool] $failed = $false +foreach ($project in $projects.Keys) { + foreach ($tfm in $projects[$project]) { + foreach ($configuration in $configurations) { + $dll_path = "$artifacts_bin_path/$project/$configuration/$tfm/$project.dll" + if (-not (Test-Path $dll_path)) { + Write-Host "DLL not found: $dll_path" + exit 1 + } + Write-Host "Verifying $dll_path..." + # If there are any errors to ignore in the array, ignore them with `-g` flag + $ignore_errors_string = + if ($ignore_errors.Length -gt 0) { + $ignore_errors | ForEach-Object { + "-g $_" + } + } else { "" } + $ilverify_cmd = "dotnet ilverify --sanity-checks --tokens $dll_path -r '$runtime_path/*.dll' -r '$artifacts_bin_path/$project/$configuration/$tfm/FSharp.Core.dll' $ignore_errors_string" + Write-Host "Running ilverify command:`n $ilverify_cmd" + + # Append output to output array + $ilverify_output = @(Invoke-Expression "& $ilverify_cmd" -ErrorAction SilentlyContinue) + + # Normalize output, get rid of paths in log like + # [IL]: Error [StackUnexpected]: [/Users/u/code/fsharp3/artifacts/bin/FSharp.Compiler.Service/Release/net9.0/FSharp.Core.dll : Microsoft.FSharp.Collections.ArrayModule+Parallel::Choose([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>, !!0[])][offset 0x00000081][found Byte] Unexpected type on the stack. + # This is a quick and dirty way to do it, but it works for now. + $ilverify_output = $ilverify_output | ForEach-Object { + if ($_ -match "\[IL\]: Error \[") { + $parts = $_ -split " " + "$($parts[0]) $($parts[1]) $($parts[2]) $($parts[4..$parts.Length])" + } elseif ($_ -match "Error\(s\) Verifying") { + # do nothing + } else { + $_ + } + } + + $baseline_file = Join-Path $repo_path "eng" "ilverify_${project}_${configuration}_${tfm}.bsl" + + $baseline_actual_file = [System.IO.Path]::ChangeExtension($baseline_file, 'bsl.actual') + + if (-not (Test-Path $baseline_file)) { + Write-Host "Baseline file not found: $baseline_file" + $ilverify_output | Set-Content $baseline_actual_file + $failed = $true + continue + } + + # Read baseline file into string array + [string[]] $baseline = Get-Content $baseline_file + + if ($baseline.Length -eq 0) { + Write-Host "Baseline file is empty: $baseline_file" + $ilverify_output | Set-Content $baseline_actual_file + $failed = $true + continue + } + + # Compare contents of both arrays, error if they're not equal + + $cmp = Compare-Object $ilverify_output $baseline + + if (-not $cmp) { + Write-Host "ILverify output matches baseline." + } else { + Write-Host "ILverify output does not match baseline, differences:" + + $cmp | Format-Table | Out-String | Write-Host + $ilverify_output | Set-Content $baseline_actual_file + $failed = $true + continue + } + } + } +} + +if ($failed) { + Write-Host "ILverify failed." + exit 1 +} + +exit 0 diff --git a/eng/ilverify_FSharp.Compiler.Service_Debug_net9.0.bsl b/eng/ilverify_FSharp.Compiler.Service_Debug_net9.0.bsl new file mode 100644 index 00000000000..eac41ef3110 --- /dev/null +++ b/eng/ilverify_FSharp.Compiler.Service_Debug_net9.0.bsl @@ -0,0 +1,90 @@ +[IL]: Error [StackUnexpected]: : Internal.Utilities.Collections.HashMultiMap`2::.ctor(int32, [S.P.CoreLib]System.Collections.Generic.IEqualityComparer`1, [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1)][offset 0x00000060][found ref 'object'][expected ref '[S.P.CoreLib]System.Collections.Generic.IDictionary`2>'] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Internal.Utilities.Collections.HashMultiMap`2::.ctor(int32, [S.P.CoreLib]System.Collections.Generic.IEqualityComparer`1, [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1)][offset 0x00000035][found ref 'object'][expected ref '[S.P.CoreLib]System.Collections.Generic.IDictionary`2'] Unexpected type on the stack. +[IL]: Error [UnmanagedPointer]: : FSharp.Compiler.IO.SafeUnmanagedMemoryStream::.ctor(uint8*, int64, object)][offset 0x00000001] Unmanaged pointers are not a verifiable type. +[IL]: Error [UnmanagedPointer]: : FSharp.Compiler.IO.SafeUnmanagedMemoryStream::.ctor(uint8*, int64, int64, [S.P.CoreLib]System.IO.FileAccess, object)][offset 0x00000001] Unmanaged pointers are not a verifiable type. +[IL]: Error [UnmanagedPointer]: : FSharp.Compiler.IO.RawByteMemory::.ctor(uint8*, int32, object)][offset 0x00000009] Unmanaged pointers are not a verifiable type. +[IL]: Error [StackByRef]: : FSharp.Compiler.IO.RawByteMemory::get_Item(int32)][offset 0x0000001E][found Native Int] Expected ByRef on the stack. +[IL]: Error [StackByRef]: : FSharp.Compiler.IO.RawByteMemory::set_Item(int32, uint8)][offset 0x00000025][found Native Int] Expected ByRef on the stack. +[IL]: Error [ReturnPtrToStack]: : Internal.Utilities.Text.Lexing.LexBuffer`1::get_LexemeView()][offset 0x00000019] Return type is ByRef, TypedReference, ArgHandle, or ArgIterator. +[IL]: Error [StackUnexpected]: : Internal.Utilities.Text.Lexing.UnicodeTables::scanUntilSentinel([FSharp.Compiler.Service]Internal.Utilities.Text.Lexing.LexBuffer`1, int32)][offset 0x00000079][found Short] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.Xml.XmlDoc::processLines([FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1)][offset 0x00000031][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.FxResolver::getTfmNumber(string)][offset 0x0000000B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.FxResolver::tryGetRunningTfm()][offset 0x00000011][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.DependencyManager.AssemblyResolveHandler::.ctor([FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1)][offset 0x0000003E][found ref 'object'][expected ref '[S.P.CoreLib]System.IDisposable'] Unexpected type on the stack. +[IL]: Error [ReturnPtrToStack]: : FSharp.Compiler.CodeAnalysis.ItemKeyStore::ReadKeyString([System.Reflection.Metadata]System.Reflection.Metadata.BlobReader&)][offset 0x00000026] Return type is ByRef, TypedReference, ArgHandle, or ArgIterator. +[IL]: Error [ReturnPtrToStack]: : FSharp.Compiler.CodeAnalysis.ItemKeyStore::ReadFirstKeyString()][offset 0x00000070] Return type is ByRef, TypedReference, ArgHandle, or ArgIterator. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CodeAnalysis.ItemKeyStoreBuilder::writeRange([FSharp.Compiler.Service]FSharp.Compiler.Text.Range)][offset 0x00000011][found address of '[FSharp.Compiler.Service]FSharp.Compiler.Text.Range'][expected Native Int] Unexpected type on the stack. +[IL]: Error [ExpectedNumericType]: : FSharp.Compiler.EditorServices.SemanticClassificationKeyStoreBuilder::WriteAll([FSharp.Compiler.Service]FSharp.Compiler.EditorServices.SemanticClassificationItem[])][offset 0x0000001D][found address of '[FSharp.Compiler.Service]FSharp.Compiler.EditorServices.SemanticClassificationItem'] Expected numeric type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CodeAnalysis.FSharpChecker::.ctor([FSharp.Compiler.Service]FSharp.Compiler.CodeAnalysis.LegacyReferenceResolver, int32, bool, bool, [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,Microsoft.FSharp.Core.FSharpOption`1>>, bool, bool, bool, bool, [FSharp.Compiler.Service]FSharp.Compiler.CompilerConfig+ParallelReferenceResolution, bool, [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1>>>, bool, [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1)][offset 0x000000A2][found ref 'object'][expected ref '[FSharp.Compiler.Service]FSharp.Compiler.CodeAnalysis.IBackgroundCompiler'] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CodeAnalysis.Hosted.CompilerHelpers::fscCompile([FSharp.Compiler.Service]FSharp.Compiler.CodeAnalysis.LegacyReferenceResolver, string, string[])][offset 0x0000005C][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CodeAnalysis.Hosted.CompilerHelpers::fscCompile([FSharp.Compiler.Service]FSharp.Compiler.CodeAnalysis.LegacyReferenceResolver, string, string[])][offset 0x00000065][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CodeAnalysis.Hosted.CompilerHelpers::fscCompile([FSharp.Compiler.Service]FSharp.Compiler.CodeAnalysis.LegacyReferenceResolver, string, string[])][offset 0x00000082][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CodeAnalysis.Hosted.CompilerHelpers::fscCompile([FSharp.Compiler.Service]FSharp.Compiler.CodeAnalysis.LegacyReferenceResolver, string, string[])][offset 0x0000008B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.Interactive.Shell+MagicAssemblyResolution::ResolveAssemblyCore([FSharp.Compiler.Service]Internal.Utilities.Library.CompilationThreadToken, [FSharp.Compiler.Service]FSharp.Compiler.Text.Range, [FSharp.Compiler.Service]FSharp.Compiler.CompilerConfig+TcConfigBuilder, [FSharp.Compiler.Service]FSharp.Compiler.CompilerImports+TcImports, [FSharp.Compiler.Service]FSharp.Compiler.Interactive.Shell+FsiDynamicCompiler, [FSharp.Compiler.Service]FSharp.Compiler.Interactive.Shell+FsiConsoleOutput, string)][offset 0x00000015][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.Interactive.Shell+clo@3508-780::Invoke([S.P.CoreLib]System.Tuple`3)][offset 0x000001E5][found Char] Unexpected type on the stack. +[IL]: Error [UnmanagedPointer]: : FSharp.Compiler.Interactive.Shell+Utilities+pointerToNativeInt@110::Invoke(object)][offset 0x00000007] Unmanaged pointers are not a verifiable type. +[IL]: Error [StackUnexpected]: : .$FSharpCheckerResults+dataTipOfReferences@2205::Invoke([FSharp.Core]Microsoft.FSharp.Core.Unit)][offset 0x00000084][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$ServiceLexing+clo@921-492::Invoke([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,Microsoft.FSharp.Core.Unit>)][offset 0x00000032][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$ServiceLexing+clo@921-492::Invoke([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,Microsoft.FSharp.Core.Unit>)][offset 0x0000003B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$ServiceLexing+clo@921-492::Invoke([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,Microsoft.FSharp.Core.Unit>)][offset 0x00000082][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$ServiceLexing+clo@921-492::Invoke([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,Microsoft.FSharp.Core.Unit>)][offset 0x0000008B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$ServiceLexing+clo@921-492::Invoke([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,Microsoft.FSharp.Core.Unit>)][offset 0x00000094][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.StaticLinking+TypeForwarding::followTypeForwardForILTypeRef([FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.IL+ILTypeRef)][offset 0x00000010][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerOptions::getCompilerOption([FSharp.Compiler.Service]FSharp.Compiler.CompilerOptions+CompilerOption, [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1)][offset 0x000000E6][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerOptions::AddPathMapping([FSharp.Compiler.Service]FSharp.Compiler.CompilerConfig+TcConfigBuilder, string)][offset 0x0000000B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerOptions+parseOption@269::Invoke(string)][offset 0x0000000B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerOptions+getOptionArgList@307::Invoke([FSharp.Compiler.Service]FSharp.Compiler.CompilerOptions+CompilerOption, string)][offset 0x00000035][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerOptions+getOptionArgList@307::Invoke([FSharp.Compiler.Service]FSharp.Compiler.CompilerOptions+CompilerOption, string)][offset 0x0000003E][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerOptions+getSwitch@325::Invoke(string)][offset 0x0000000B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerOptions+attempt@373::Invoke([FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1)][offset 0x00000E9F][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.ParseAndCheckInputs+Pipe #1 stage #1 at line 1865@1865::Invoke(int32)][offset 0x00000030][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.ParseAndCheckInputs+Pipe #1 stage #1 at line 1865@1865::Invoke(int32)][offset 0x00000039][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerConfig+TcConfig::.ctor([FSharp.Compiler.Service]FSharp.Compiler.CompilerConfig+TcConfigBuilder, bool)][offset 0x0000062B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerConfig+TcConfig::.ctor([FSharp.Compiler.Service]FSharp.Compiler.CompilerConfig+TcConfigBuilder, bool)][offset 0x00000634][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.PatternMatchCompilation::isProblematicClause([FSharp.Compiler.Service]FSharp.Compiler.PatternMatchCompilation+MatchClause)][offset 0x00000065][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$FSharp.Compiler.PatternMatchCompilation::.cctor()][offset 0x00000015][found Boolean] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.TypeProviders::ValidateExpectedName([FSharp.Compiler.Service]FSharp.Compiler.Text.Range, string[], string, [FSharp.Compiler.Service]FSharp.Compiler.Tainted`1)][offset 0x000000AD][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.Lexhelp::stringBufferAsString([FSharp.Compiler.Service]FSharp.Compiler.IO.ByteBuffer)][offset 0x00000099][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.Syntax.PrettyNaming::SplitNamesForILPath(string)][offset 0x00000057][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.Syntax.PrettyNaming::SplitNamesForILPath(string)][offset 0x00000060][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$FSharp.Compiler.Syntax.PrettyNaming::.cctor()][offset 0x00001220][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$FSharp.Compiler.Syntax.PrettyNaming::.cctor()][offset 0x00001229][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryWriter::writeILMetadataAndCode(bool, [FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.IL+ILVersionInfo, [FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.IL+ILGlobals, bool, bool, bool, [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1, [S.P.CoreLib]System.Collections.Generic.IEnumerable`1, [FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.IL+ILModuleDef, int32, [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2)][offset 0x0000063F][found Boolean] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryWriter+bigness@3406::Invoke(int32)][offset 0x00000007][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILPdbWriter+PortablePdbGenerator::serializeDocumentName(string)][offset 0x00000090][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILPdbWriter+pushShadowedLocals@959::Invoke([FSharp.Core]Microsoft.FSharp.Core.Unit)][offset 0x00000232][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::seekReadUntaggedIdx([FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.BinaryConstants+TableName, [FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.ILBinaryReader+ILMetadataReader, [FSharp.Compiler.Service]FSharp.Compiler.IO.ReadOnlyByteMemory, int32&)][offset 0x0000000D][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::openMetadataReader(string, [FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.ILBinaryReader+BinaryFile, int32, [S.P.CoreLib]System.Tuple`8,bool,bool,bool,bool,bool,System.Tuple`5,bool,int32,int32,int32>>, [FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.ILBinaryReader+PEReader, [FSharp.Compiler.Service]FSharp.Compiler.IO.ReadOnlyByteMemory, [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1, bool)][offset 0x00000799][found Boolean] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader+rowKindSize@4422::Invoke([FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.ILBinaryReader+RowKind)][offset 0x00000128][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.IL::parseILVersion(string)][offset 0x0000000B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.IL::parseILVersion(string)][offset 0x00000021][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$FSharp.Compiler.DiagnosticsLogger::.cctor()][offset 0x000000CD][found Char] Unexpected type on the stack. +[IL]: Error [CallVirtOnValueType]: : FSharp.Compiler.Text.RangeModule+comparer@543::System.Collections.Generic.IEqualityComparer.GetHashCode([FSharp.Compiler.Service]FSharp.Compiler.Text.Range)][offset 0x00000002] Callvirt on a value type method. +[IL]: Error [StackUnexpected]: : Internal.Utilities.PathMapModule::applyDir([FSharp.Compiler.Service]Internal.Utilities.PathMap, string)][offset 0x00000037][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Internal.Utilities.PathMapModule::applyDir([FSharp.Compiler.Service]Internal.Utilities.PathMap, string)][offset 0x00000043][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$Internal.Utilities.XmlAdapters::.cctor()][offset 0x0000000A][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$Internal.Utilities.XmlAdapters::.cctor()][offset 0x00000013][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$Internal.Utilities.XmlAdapters::.cctor()][offset 0x0000001C][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$Internal.Utilities.XmlAdapters::.cctor()][offset 0x00000025][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$Internal.Utilities.XmlAdapters::.cctor()][offset 0x0000002E][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.IO.FileSystemUtils::trimQuotes(string)][offset 0x0000000B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.IO.FileSystemUtils::trimQuotes(string)][offset 0x00000014][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Internal.Utilities.Library.String::lowerCaseFirstChar(string)][offset 0x0000003F][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Internal.Utilities.Library.Array+loop@276-4::Invoke(int32)][offset 0x00000012][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Collections.ArrayModule+Parallel::Choose([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>, !!0[])][offset 0x000000A0][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Collections.ArrayModule+Parallel::Filter([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, !!0[])][offset 0x00000029][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Collections.ArrayModule+Parallel::Partition([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, !!0[])][offset 0x00000038][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Collections.ArrayModule+Parallel+Pipe #2 input at line 2241@2245-1::Invoke(int32, [System.Threading.Tasks.Parallel]System.Threading.Tasks.ParallelLoopState, int32)][offset 0x00000030][found Boolean] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Collections.ArrayModule+Parallel+Pipe #2 input at line 2571@2575-1::Invoke(int32, [System.Threading.Tasks.Parallel]System.Threading.Tasks.ParallelLoopState, int32)][offset 0x00000022][found Boolean] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.StringModule::Map([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, string)][offset 0x00000020][found Short] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.StringModule::Map([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, string)][offset 0x00000031][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.StringModule::MapIndexed([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>, string)][offset 0x00000029][found Short] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.StringModule::MapIndexed([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>, string)][offset 0x00000033][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.StringModule::Filter([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, string)][offset 0x00000075][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.Operators::castToString(!!0)][offset 0x00000001][found value 'T'][expected ref 'string'] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.LanguagePrimitives::retype(!!0)][offset 0x00000001][found value 'T'][expected value 'TResult'] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.LanguagePrimitives+HashCompare::GenericEqualityCharArray(char[], char[])][offset 0x0000001C][found Short] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.LanguagePrimitives+HashCompare::GenericEqualityCharArray(char[], char[])][offset 0x00000023][found Short] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.BasicInlinedOperations::castclassPrim(object)][offset 0x00000006][found ref 'T'][expected value 'T'] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.BasicInlinedOperations::notnullPrim(!!0)][offset 0x00000002][found Nullobjref 'NullReference'][expected value 'T'] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.BasicInlinedOperations::iscastPrim(object)][offset 0x00000006][found ref 'T'][expected value 'T'] Unexpected type on the stack. diff --git a/eng/ilverify_FSharp.Compiler.Service_Debug_netstandard2.0.bsl b/eng/ilverify_FSharp.Compiler.Service_Debug_netstandard2.0.bsl new file mode 100644 index 00000000000..35af722664f --- /dev/null +++ b/eng/ilverify_FSharp.Compiler.Service_Debug_netstandard2.0.bsl @@ -0,0 +1,115 @@ +[IL]: Error [StackUnexpected]: : Internal.Utilities.Collections.HashMultiMap`2::.ctor(int32, [S.P.CoreLib]System.Collections.Generic.IEqualityComparer`1, [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1)][offset 0x00000060][found ref 'object'][expected ref '[S.P.CoreLib]System.Collections.Generic.IDictionary`2>'] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Internal.Utilities.Collections.HashMultiMap`2::.ctor(int32, [S.P.CoreLib]System.Collections.Generic.IEqualityComparer`1, [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1)][offset 0x00000035][found ref 'object'][expected ref '[S.P.CoreLib]System.Collections.Generic.IDictionary`2'] Unexpected type on the stack. +[IL]: Error [UnmanagedPointer]: : FSharp.Compiler.IO.SafeUnmanagedMemoryStream::.ctor(uint8*, int64, object)][offset 0x00000001] Unmanaged pointers are not a verifiable type. +[IL]: Error [UnmanagedPointer]: : FSharp.Compiler.IO.SafeUnmanagedMemoryStream::.ctor(uint8*, int64, int64, [S.P.CoreLib]System.IO.FileAccess, object)][offset 0x00000001] Unmanaged pointers are not a verifiable type. +[IL]: Error [UnmanagedPointer]: : FSharp.Compiler.IO.RawByteMemory::.ctor(uint8*, int32, object)][offset 0x00000009] Unmanaged pointers are not a verifiable type. +[IL]: Error [StackByRef]: : FSharp.Compiler.IO.RawByteMemory::get_Item(int32)][offset 0x0000001E][found Native Int] Expected ByRef on the stack. +[IL]: Error [StackByRef]: : FSharp.Compiler.IO.RawByteMemory::set_Item(int32, uint8)][offset 0x00000025][found Native Int] Expected ByRef on the stack. +[IL]: Error [ReturnPtrToStack]: : Internal.Utilities.Text.Lexing.LexBuffer`1::get_LexemeView()][offset 0x00000019] Return type is ByRef, TypedReference, ArgHandle, or ArgIterator. +[IL]: Error [StackUnexpected]: : Internal.Utilities.Text.Lexing.UnicodeTables::scanUntilSentinel([FSharp.Compiler.Service]Internal.Utilities.Text.Lexing.LexBuffer`1, int32)][offset 0x00000079][found Short] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.Xml.XmlDoc::processLines([FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1)][offset 0x00000031][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.FxResolver::getTfmNumber(string)][offset 0x0000000B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.FxResolver::tryGetRunningTfm()][offset 0x00000011][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.DependencyManager.AssemblyResolveHandler::.ctor([FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1)][offset 0x0000003E][found ref 'object'][expected ref '[S.P.CoreLib]System.IDisposable'] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.DependencyManager.DependencyProvider::TryFindDependencyManagerInPath([S.P.CoreLib]System.Collections.Generic.IEnumerable`1, string, [FSharp.Compiler.Service]FSharp.Compiler.DependencyManager.ResolvingErrorReport, string)][offset 0x00000061][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.Symbols.FSharpEntity::TryGetFullDisplayName()][offset 0x00000035][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.Symbols.FSharpEntity::TryGetFullCompiledName()][offset 0x00000035][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.Symbols.FSharpMemberOrFunctionOrValue::TryGetFullCompiledOperatorNameIdents()][offset 0x0000008A][found Char] Unexpected type on the stack. +[IL]: Error [ReturnPtrToStack]: : FSharp.Compiler.CodeAnalysis.ItemKeyStore::ReadKeyString([System.Reflection.Metadata]System.Reflection.Metadata.BlobReader&)][offset 0x00000026] Return type is ByRef, TypedReference, ArgHandle, or ArgIterator. +[IL]: Error [ReturnPtrToStack]: : FSharp.Compiler.CodeAnalysis.ItemKeyStore::ReadFirstKeyString()][offset 0x00000070] Return type is ByRef, TypedReference, ArgHandle, or ArgIterator. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CodeAnalysis.ItemKeyStoreBuilder::writeRange([FSharp.Compiler.Service]FSharp.Compiler.Text.Range)][offset 0x00000011][found address of '[FSharp.Compiler.Service]FSharp.Compiler.Text.Range'][expected Native Int] Unexpected type on the stack. +[IL]: Error [ExpectedNumericType]: : FSharp.Compiler.EditorServices.SemanticClassificationKeyStoreBuilder::WriteAll([FSharp.Compiler.Service]FSharp.Compiler.EditorServices.SemanticClassificationItem[])][offset 0x0000001D][found address of '[FSharp.Compiler.Service]FSharp.Compiler.EditorServices.SemanticClassificationItem'] Expected numeric type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.EditorServices.Parent::FormatEntityFullName([FSharp.Compiler.Service]FSharp.Compiler.Symbols.FSharpEntity)][offset 0x00000069][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CodeAnalysis.FSharpChecker::.ctor([FSharp.Compiler.Service]FSharp.Compiler.CodeAnalysis.LegacyReferenceResolver, int32, bool, bool, [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,Microsoft.FSharp.Core.FSharpOption`1>>, bool, bool, bool, bool, [FSharp.Compiler.Service]FSharp.Compiler.CompilerConfig+ParallelReferenceResolution, bool, [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1>>>, bool, [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1)][offset 0x000000A2][found ref 'object'][expected ref '[FSharp.Compiler.Service]FSharp.Compiler.CodeAnalysis.IBackgroundCompiler'] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CodeAnalysis.FSharpChecker::TokenizeFile(string)][offset 0x0000000D][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CodeAnalysis.Hosted.CompilerHelpers::fscCompile([FSharp.Compiler.Service]FSharp.Compiler.CodeAnalysis.LegacyReferenceResolver, string, string[])][offset 0x0000005C][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CodeAnalysis.Hosted.CompilerHelpers::fscCompile([FSharp.Compiler.Service]FSharp.Compiler.CodeAnalysis.LegacyReferenceResolver, string, string[])][offset 0x00000065][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CodeAnalysis.Hosted.CompilerHelpers::fscCompile([FSharp.Compiler.Service]FSharp.Compiler.CodeAnalysis.LegacyReferenceResolver, string, string[])][offset 0x00000082][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CodeAnalysis.Hosted.CompilerHelpers::fscCompile([FSharp.Compiler.Service]FSharp.Compiler.CodeAnalysis.LegacyReferenceResolver, string, string[])][offset 0x0000008B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.Interactive.Shell+FsiStdinSyphon::GetLine(string, int32)][offset 0x00000039][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.Interactive.Shell+MagicAssemblyResolution::ResolveAssemblyCore([FSharp.Compiler.Service]Internal.Utilities.Library.CompilationThreadToken, [FSharp.Compiler.Service]FSharp.Compiler.Text.Range, [FSharp.Compiler.Service]FSharp.Compiler.CompilerConfig+TcConfigBuilder, [FSharp.Compiler.Service]FSharp.Compiler.CompilerImports+TcImports, [FSharp.Compiler.Service]FSharp.Compiler.Interactive.Shell+FsiDynamicCompiler, [FSharp.Compiler.Service]FSharp.Compiler.Interactive.Shell+FsiConsoleOutput, string)][offset 0x00000015][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.Interactive.Shell+clo@3508-780::Invoke([S.P.CoreLib]System.Tuple`3)][offset 0x000001E5][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.Interactive.Shell+FsiInteractionProcessor::CompletionsForPartialLID([FSharp.Compiler.Service]FSharp.Compiler.Interactive.Shell+FsiDynamicCompilerState, string)][offset 0x0000001B][found Char] Unexpected type on the stack. +[IL]: Error [UnmanagedPointer]: : FSharp.Compiler.Interactive.Shell+Utilities+pointerToNativeInt@110::Invoke(object)][offset 0x00000007] Unmanaged pointers are not a verifiable type. +[IL]: Error [StackUnexpected]: : .$FSharpCheckerResults+dataTipOfReferences@2205::Invoke([FSharp.Core]Microsoft.FSharp.Core.Unit)][offset 0x00000084][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.EditorServices.AssemblyContent+traverseMemberFunctionAndValues@176::Invoke([FSharp.Compiler.Service]FSharp.Compiler.Symbols.FSharpMemberOrFunctionOrValue)][offset 0x00000059][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.EditorServices.AssemblyContent+traverseEntity@218::GenerateNext([S.P.CoreLib]System.Collections.Generic.IEnumerable`1&)][offset 0x000000DA][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.EditorServices.ParsedInput+visitor@1423-6::VisitExpr([FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1, [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>, [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>, [FSharp.Compiler.Service]FSharp.Compiler.Syntax.SynExpr)][offset 0x00000605][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$ServiceLexing+clo@921-492::Invoke([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,Microsoft.FSharp.Core.Unit>)][offset 0x00000032][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$ServiceLexing+clo@921-492::Invoke([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,Microsoft.FSharp.Core.Unit>)][offset 0x0000003B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$ServiceLexing+clo@921-492::Invoke([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,Microsoft.FSharp.Core.Unit>)][offset 0x00000082][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$ServiceLexing+clo@921-492::Invoke([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,Microsoft.FSharp.Core.Unit>)][offset 0x0000008B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$ServiceLexing+clo@921-492::Invoke([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,Microsoft.FSharp.Core.Unit>)][offset 0x00000094][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$Symbols+fullName@2490-1::Invoke([FSharp.Core]Microsoft.FSharp.Core.Unit)][offset 0x00000015][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CreateILModule+MainModuleBuilder::ConvertProductVersionToILVersionInfo(string)][offset 0x00000011][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.StaticLinking+TypeForwarding::followTypeForwardForILTypeRef([FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.IL+ILTypeRef)][offset 0x00000010][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerOptions::getCompilerOption([FSharp.Compiler.Service]FSharp.Compiler.CompilerOptions+CompilerOption, [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1)][offset 0x000000E6][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerOptions::AddPathMapping([FSharp.Compiler.Service]FSharp.Compiler.CompilerConfig+TcConfigBuilder, string)][offset 0x0000000B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerOptions::subSystemVersionSwitch([FSharp.Compiler.Service]FSharp.Compiler.CompilerConfig+TcConfigBuilder, string)][offset 0x00000030][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerOptions+parseOption@269::Invoke(string)][offset 0x0000000B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerOptions+getOptionArgList@307::Invoke([FSharp.Compiler.Service]FSharp.Compiler.CompilerOptions+CompilerOption, string)][offset 0x00000035][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerOptions+getOptionArgList@307::Invoke([FSharp.Compiler.Service]FSharp.Compiler.CompilerOptions+CompilerOption, string)][offset 0x0000003E][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerOptions+getSwitch@325::Invoke(string)][offset 0x0000000B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerOptions+attempt@373::Invoke([FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1)][offset 0x00000E9F][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerOptions+processArg@333::Invoke([FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1)][offset 0x0000004D][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerOptions+ResponseFile+parseLine@239::Invoke(string)][offset 0x00000031][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.ParseAndCheckInputs+Pipe #1 stage #1 at line 1865@1865::Invoke(int32)][offset 0x00000030][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.ParseAndCheckInputs+Pipe #1 stage #1 at line 1865@1865::Invoke(int32)][offset 0x00000039][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerImports+line@560-1::Invoke(string)][offset 0x0000000B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerConfig+TcConfig::.ctor([FSharp.Compiler.Service]FSharp.Compiler.CompilerConfig+TcConfigBuilder, bool)][offset 0x0000062B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerConfig+TcConfig::.ctor([FSharp.Compiler.Service]FSharp.Compiler.CompilerConfig+TcConfigBuilder, bool)][offset 0x00000634][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.PatternMatchCompilation::isProblematicClause([FSharp.Compiler.Service]FSharp.Compiler.PatternMatchCompilation+MatchClause)][offset 0x00000065][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$FSharp.Compiler.PatternMatchCompilation::.cctor()][offset 0x00000015][found Boolean] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.NicePrint+TastDefinitionPrinting+meths@2092-3::Invoke([FSharp.Compiler.Service]FSharp.Compiler.Infos+MethInfo)][offset 0x000000BE][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.NicePrint+PrintUtilities::layoutXmlDoc([FSharp.Compiler.Service]FSharp.Compiler.TypedTreeOps+DisplayEnv, bool, [FSharp.Compiler.Service]FSharp.Compiler.Xml.XmlDoc, [FSharp.Compiler.Service]FSharp.Compiler.Text.Layout)][offset 0x00000033][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.TypeProviders::ValidateNamespaceName(string, [FSharp.Compiler.Service]FSharp.Compiler.Tainted`1, [FSharp.Compiler.Service]FSharp.Compiler.Text.Range, string)][offset 0x00000063][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.TypeProviders::ValidateExpectedName([FSharp.Compiler.Service]FSharp.Compiler.Text.Range, string[], string, [FSharp.Compiler.Service]FSharp.Compiler.Tainted`1)][offset 0x000000AD][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.Lexhelp::stringBufferAsString([FSharp.Compiler.Service]FSharp.Compiler.IO.ByteBuffer)][offset 0x00000099][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.Syntax.PrettyNaming::SplitNamesForILPath(string)][offset 0x00000057][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.Syntax.PrettyNaming::SplitNamesForILPath(string)][offset 0x00000060][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$FSharp.Compiler.Syntax.PrettyNaming::.cctor()][offset 0x00001220][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$FSharp.Compiler.Syntax.PrettyNaming::.cctor()][offset 0x00001229][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryWriter::writeILMetadataAndCode(bool, [FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.IL+ILVersionInfo, [FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.IL+ILGlobals, bool, bool, bool, [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1, [S.P.CoreLib]System.Collections.Generic.IEnumerable`1, [FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.IL+ILModuleDef, int32, [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2)][offset 0x0000063F][found Boolean] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryWriter+bigness@3406::Invoke(int32)][offset 0x00000007][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILPdbWriter+PortablePdbGenerator::serializeDocumentName(string)][offset 0x00000090][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILPdbWriter+pushShadowedLocals@959::Invoke([FSharp.Core]Microsoft.FSharp.Core.Unit)][offset 0x00000232][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::seekReadUntaggedIdx([FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.BinaryConstants+TableName, [FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.ILBinaryReader+ILMetadataReader, [FSharp.Compiler.Service]FSharp.Compiler.IO.ReadOnlyByteMemory, int32&)][offset 0x0000000D][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::openMetadataReader(string, [FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.ILBinaryReader+BinaryFile, int32, [S.P.CoreLib]System.Tuple`8,bool,bool,bool,bool,bool,System.Tuple`5,bool,int32,int32,int32>>, [FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.ILBinaryReader+PEReader, [FSharp.Compiler.Service]FSharp.Compiler.IO.ReadOnlyByteMemory, [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1, bool)][offset 0x00000799][found Boolean] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader+rowKindSize@4422::Invoke([FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.ILBinaryReader+RowKind)][offset 0x00000128][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.NativeRes+VersionHelper::TryParse(string, bool, uint16, bool, [S.P.CoreLib]System.Version&)][offset 0x0000003D][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.IL::parseILVersion(string)][offset 0x0000000B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.IL::parseILVersion(string)][offset 0x00000021][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.IL+parseNamed@5242::Invoke([FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1>, int32, int32)][offset 0x00000087][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Internal.Utilities.Collections.Utils::shortPath(string)][offset 0x00000015][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Internal.Utilities.FSharpEnvironment+probePathForDotnetHost@321::Invoke([FSharp.Core]Microsoft.FSharp.Core.Unit)][offset 0x00000028][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CodeAnalysis.SimulatedMSBuildReferenceResolver+Pipe #6 input at line 68@68::FSharp.Compiler.CodeAnalysis.ILegacyReferenceResolver.Resolve([FSharp.Compiler.Service]FSharp.Compiler.CodeAnalysis.LegacyResolutionEnvironment, [S.P.CoreLib]System.Tuple`2[], string, [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1, string, string, [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1, string, [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>>)][offset 0x0000034D][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$FSharp.Compiler.DiagnosticsLogger::.cctor()][offset 0x000000CD][found Char] Unexpected type on the stack. +[IL]: Error [CallVirtOnValueType]: : FSharp.Compiler.Text.RangeModule+comparer@543::System.Collections.Generic.IEqualityComparer.GetHashCode([FSharp.Compiler.Service]FSharp.Compiler.Text.Range)][offset 0x00000002] Callvirt on a value type method. +[IL]: Error [StackUnexpected]: : Internal.Utilities.PathMapModule::applyDir([FSharp.Compiler.Service]Internal.Utilities.PathMap, string)][offset 0x00000037][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Internal.Utilities.PathMapModule::applyDir([FSharp.Compiler.Service]Internal.Utilities.PathMap, string)][offset 0x00000043][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$Internal.Utilities.XmlAdapters::.cctor()][offset 0x0000000A][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$Internal.Utilities.XmlAdapters::.cctor()][offset 0x00000013][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$Internal.Utilities.XmlAdapters::.cctor()][offset 0x0000001C][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$Internal.Utilities.XmlAdapters::.cctor()][offset 0x00000025][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$Internal.Utilities.XmlAdapters::.cctor()][offset 0x0000002E][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.IO.FileSystemUtils::trimQuotes(string)][offset 0x0000000B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.IO.FileSystemUtils::trimQuotes(string)][offset 0x00000014][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Internal.Utilities.Library.String::lowerCaseFirstChar(string)][offset 0x0000003F][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Internal.Utilities.Library.Array+loop@276-4::Invoke(int32)][offset 0x00000012][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Collections.ArrayModule+Parallel::Choose([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>, !!0[])][offset 0x000000A0][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Collections.ArrayModule+Parallel::Filter([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, !!0[])][offset 0x00000029][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Collections.ArrayModule+Parallel::Partition([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, !!0[])][offset 0x00000038][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Collections.ArrayModule+Parallel+Pipe #2 input at line 2241@2245-1::Invoke(int32, [System.Threading.Tasks.Parallel]System.Threading.Tasks.ParallelLoopState, int32)][offset 0x00000030][found Boolean] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Collections.ArrayModule+Parallel+Pipe #2 input at line 2571@2575-1::Invoke(int32, [System.Threading.Tasks.Parallel]System.Threading.Tasks.ParallelLoopState, int32)][offset 0x00000022][found Boolean] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.StringModule::Map([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, string)][offset 0x00000020][found Short] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.StringModule::Map([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, string)][offset 0x00000031][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.StringModule::MapIndexed([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>, string)][offset 0x00000029][found Short] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.StringModule::MapIndexed([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>, string)][offset 0x00000033][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.StringModule::Filter([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, string)][offset 0x00000075][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.Operators::castToString(!!0)][offset 0x00000001][found value 'T'][expected ref 'string'] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.LanguagePrimitives::retype(!!0)][offset 0x00000001][found value 'T'][expected value 'TResult'] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.LanguagePrimitives+HashCompare::GenericEqualityCharArray(char[], char[])][offset 0x0000001C][found Short] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.LanguagePrimitives+HashCompare::GenericEqualityCharArray(char[], char[])][offset 0x00000023][found Short] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.BasicInlinedOperations::castclassPrim(object)][offset 0x00000006][found ref 'T'][expected value 'T'] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.BasicInlinedOperations::notnullPrim(!!0)][offset 0x00000002][found Nullobjref 'NullReference'][expected value 'T'] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.BasicInlinedOperations::iscastPrim(object)][offset 0x00000006][found ref 'T'][expected value 'T'] Unexpected type on the stack. diff --git a/eng/ilverify_FSharp.Compiler.Service_Release_net9.0.bsl b/eng/ilverify_FSharp.Compiler.Service_Release_net9.0.bsl new file mode 100644 index 00000000000..21b3fa658b2 --- /dev/null +++ b/eng/ilverify_FSharp.Compiler.Service_Release_net9.0.bsl @@ -0,0 +1,111 @@ +[IL]: Error [StackUnexpected]: : Internal.Utilities.Collections.HashMultiMap`2::.ctor(int32, [S.P.CoreLib]System.Collections.Generic.IEqualityComparer`1, [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1)][offset 0x00000060][found ref 'object'][expected ref '[S.P.CoreLib]System.Collections.Generic.IDictionary`2>'] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Internal.Utilities.Collections.HashMultiMap`2::.ctor(int32, [S.P.CoreLib]System.Collections.Generic.IEqualityComparer`1, [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1)][offset 0x00000035][found ref 'object'][expected ref '[S.P.CoreLib]System.Collections.Generic.IDictionary`2'] Unexpected type on the stack. +[IL]: Error [UnmanagedPointer]: : FSharp.Compiler.IO.SafeUnmanagedMemoryStream::.ctor(uint8*, int64, object)][offset 0x00000001] Unmanaged pointers are not a verifiable type. +[IL]: Error [UnmanagedPointer]: : FSharp.Compiler.IO.SafeUnmanagedMemoryStream::.ctor(uint8*, int64, int64, [S.P.CoreLib]System.IO.FileAccess, object)][offset 0x00000001] Unmanaged pointers are not a verifiable type. +[IL]: Error [UnmanagedPointer]: : FSharp.Compiler.IO.RawByteMemory::.ctor(uint8*, int32, object)][offset 0x00000009] Unmanaged pointers are not a verifiable type. +[IL]: Error [StackByRef]: : FSharp.Compiler.IO.RawByteMemory::get_Item(int32)][offset 0x0000001A][found Native Int] Expected ByRef on the stack. +[IL]: Error [StackByRef]: : FSharp.Compiler.IO.RawByteMemory::set_Item(int32, uint8)][offset 0x0000001B][found Native Int] Expected ByRef on the stack. +[IL]: Error [ReturnPtrToStack]: : Internal.Utilities.Text.Lexing.LexBuffer`1::get_LexemeView()][offset 0x00000017] Return type is ByRef, TypedReference, ArgHandle, or ArgIterator. +[IL]: Error [StackUnexpected]: : Internal.Utilities.Text.Lexing.UnicodeTables::scanUntilSentinel([FSharp.Compiler.Service]Internal.Utilities.Text.Lexing.LexBuffer`1, int32)][offset 0x0000008D][found Short] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.Xml.XmlDoc::processLines([FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1)][offset 0x0000002C][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.FxResolver::getTfmNumber(string)][offset 0x0000000B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.FxResolver::tryGetRunningTfm()][offset 0x00000011][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.DependencyManager.AssemblyResolveHandler::.ctor([FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1)][offset 0x0000002B][found ref 'object'][expected ref '[S.P.CoreLib]System.IDisposable'] Unexpected type on the stack. +[IL]: Error [ReturnPtrToStack]: : FSharp.Compiler.CodeAnalysis.ItemKeyStore::ReadKeyString([System.Reflection.Metadata]System.Reflection.Metadata.BlobReader&)][offset 0x00000023] Return type is ByRef, TypedReference, ArgHandle, or ArgIterator. +[IL]: Error [ReturnPtrToStack]: : FSharp.Compiler.CodeAnalysis.ItemKeyStore::ReadFirstKeyString()][offset 0x00000064] Return type is ByRef, TypedReference, ArgHandle, or ArgIterator. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CodeAnalysis.ItemKeyStoreBuilder::writeRange([FSharp.Compiler.Service]FSharp.Compiler.Text.Range)][offset 0x00000017][found address of '[FSharp.Compiler.Service]FSharp.Compiler.Text.Range'][expected Native Int] Unexpected type on the stack. +[IL]: Error [ExpectedNumericType]: : FSharp.Compiler.EditorServices.SemanticClassificationKeyStoreBuilder::WriteAll([FSharp.Compiler.Service]FSharp.Compiler.EditorServices.SemanticClassificationItem[])][offset 0x0000001C][found address of '[FSharp.Compiler.Service]FSharp.Compiler.EditorServices.SemanticClassificationItem'] Expected numeric type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CodeAnalysis.FSharpChecker::.ctor([FSharp.Compiler.Service]FSharp.Compiler.CodeAnalysis.LegacyReferenceResolver, int32, bool, bool, [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,Microsoft.FSharp.Core.FSharpOption`1>>, bool, bool, bool, bool, [FSharp.Compiler.Service]FSharp.Compiler.CompilerConfig+ParallelReferenceResolution, bool, [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1>>>, bool, [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1)][offset 0x000000A2][found ref 'object'][expected ref '[FSharp.Compiler.Service]FSharp.Compiler.CodeAnalysis.IBackgroundCompiler'] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CodeAnalysis.Hosted.CompilerHelpers::fscCompile([FSharp.Compiler.Service]FSharp.Compiler.CodeAnalysis.LegacyReferenceResolver, string, string[])][offset 0x0000005C][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CodeAnalysis.Hosted.CompilerHelpers::fscCompile([FSharp.Compiler.Service]FSharp.Compiler.CodeAnalysis.LegacyReferenceResolver, string, string[])][offset 0x00000065][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CodeAnalysis.Hosted.CompilerHelpers::fscCompile([FSharp.Compiler.Service]FSharp.Compiler.CodeAnalysis.LegacyReferenceResolver, string, string[])][offset 0x00000082][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CodeAnalysis.Hosted.CompilerHelpers::fscCompile([FSharp.Compiler.Service]FSharp.Compiler.CodeAnalysis.LegacyReferenceResolver, string, string[])][offset 0x0000008B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.Interactive.Shell+MagicAssemblyResolution::ResolveAssemblyCore([FSharp.Compiler.Service]Internal.Utilities.Library.CompilationThreadToken, [FSharp.Compiler.Service]FSharp.Compiler.Text.Range, [FSharp.Compiler.Service]FSharp.Compiler.CompilerConfig+TcConfigBuilder, [FSharp.Compiler.Service]FSharp.Compiler.CompilerImports+TcImports, [FSharp.Compiler.Service]FSharp.Compiler.Interactive.Shell+FsiDynamicCompiler, [FSharp.Compiler.Service]FSharp.Compiler.Interactive.Shell+FsiConsoleOutput, string)][offset 0x00000015][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.Interactive.Shell+clo@3508-835::Invoke([S.P.CoreLib]System.Tuple`3)][offset 0x000001C7][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$FSharpCheckerResults+GetReferenceResolutionStructuredToolTipText@2205::Invoke([FSharp.Core]Microsoft.FSharp.Core.Unit)][offset 0x00000076][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$ServiceLexing+clo@921-528::Invoke([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,Microsoft.FSharp.Core.Unit>)][offset 0x00000032][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$ServiceLexing+clo@921-528::Invoke([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,Microsoft.FSharp.Core.Unit>)][offset 0x0000003B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$ServiceLexing+clo@921-528::Invoke([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,Microsoft.FSharp.Core.Unit>)][offset 0x00000064][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$ServiceLexing+clo@921-528::Invoke([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,Microsoft.FSharp.Core.Unit>)][offset 0x0000006D][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$ServiceLexing+clo@921-528::Invoke([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,Microsoft.FSharp.Core.Unit>)][offset 0x00000076][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.Driver+ProcessCommandLineFlags@301-1::Invoke(string)][offset 0x0000000B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.Driver+ProcessCommandLineFlags@301-1::Invoke(string)][offset 0x00000014][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.StaticLinking+TypeForwarding::followTypeForwardForILTypeRef([FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.IL+ILTypeRef)][offset 0x00000010][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerOptions::getCompilerOption([FSharp.Compiler.Service]FSharp.Compiler.CompilerOptions+CompilerOption, [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1)][offset 0x000000A7][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerOptions::parseOption@266(string)][offset 0x0000000B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerOptions::getOptionArgList@306([FSharp.Compiler.Service]FSharp.Compiler.CompilerOptions+CompilerOption, string)][offset 0x00000049][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerOptions::getOptionArgList@306([FSharp.Compiler.Service]FSharp.Compiler.CompilerOptions+CompilerOption, string)][offset 0x00000052][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerOptions::getSwitch@324(string)][offset 0x0000000B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerOptions::attempt@372([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1, [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1, [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1, string, string, string, string, [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1)][offset 0x00000A99][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerOptions::AddPathMapping([FSharp.Compiler.Service]FSharp.Compiler.CompilerConfig+TcConfigBuilder, string)][offset 0x0000000B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnderflow]: : FSharp.Compiler.CompilerOptions::DoWithColor([System.Console]System.ConsoleColor, [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2)][offset 0x0000005E] Stack underflow. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.ParseAndCheckInputs+CheckMultipleInputsUsingGraphMode@1865::Invoke(int32)][offset 0x00000031][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.ParseAndCheckInputs+CheckMultipleInputsUsingGraphMode@1865::Invoke(int32)][offset 0x0000003A][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerConfig+TcConfig::.ctor([FSharp.Compiler.Service]FSharp.Compiler.CompilerConfig+TcConfigBuilder, bool)][offset 0x0000059C][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerConfig+TcConfig::.ctor([FSharp.Compiler.Service]FSharp.Compiler.CompilerConfig+TcConfigBuilder, bool)][offset 0x000005A5][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.IlxGen::HashRangeSorted([S.P.CoreLib]System.Collections.Generic.IDictionary`2>)][offset 0x00000011][found ref '[FSharp.Compiler.Service]FSharp.Compiler.IlxGen+HashRangeSorted@1850-1'][expected ref '[FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,int32>'] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.IlxGen::HashRangeSorted([S.P.CoreLib]System.Collections.Generic.IDictionary`2>)][offset 0x00000012][found ref '[FSharp.Compiler.Service]FSharp.Compiler.IlxGen+HashRangeSorted@1850'][expected ref '[FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,T0>'] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.PatternMatchCompilation::isProblematicClause([FSharp.Compiler.Service]FSharp.Compiler.PatternMatchCompilation+MatchClause)][offset 0x00000040][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$FSharp.Compiler.PatternMatchCompilation::.cctor()][offset 0x0000000B][found Boolean] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.TypeProviders::ValidateExpectedName([FSharp.Compiler.Service]FSharp.Compiler.Text.Range, string[], string, [FSharp.Compiler.Service]FSharp.Compiler.Tainted`1)][offset 0x000000A8][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.Lexhelp::stringBufferAsString([FSharp.Compiler.Service]FSharp.Compiler.IO.ByteBuffer)][offset 0x0000008E][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.Syntax.PrettyNaming::SplitNamesForILPath(string)][offset 0x0000004B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.Syntax.PrettyNaming::SplitNamesForILPath(string)][offset 0x00000054][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$FSharp.Compiler.Syntax.PrettyNaming::.cctor()][offset 0x00001182][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$FSharp.Compiler.Syntax.PrettyNaming::.cctor()][offset 0x0000118B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryWriter::writeILMetadataAndCode(bool, [FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.IL+ILVersionInfo, [FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.IL+ILGlobals, bool, bool, bool, [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1, [S.P.CoreLib]System.Collections.Generic.IEnumerable`1, [FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.IL+ILModuleDef, int32, [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2)][offset 0x00000B21][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryWriter::writeILMetadataAndCode(bool, [FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.IL+ILVersionInfo, [FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.IL+ILGlobals, bool, bool, bool, [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1, [S.P.CoreLib]System.Collections.Generic.IEnumerable`1, [FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.IL+ILModuleDef, int32, [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2)][offset 0x000004E2][found Boolean] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILPdbWriter+PortablePdbGenerator::serializeDocumentName(string)][offset 0x00000071][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILPdbWriter+pushShadowedLocals@959::Invoke([FSharp.Core]Microsoft.FSharp.Core.Unit)][offset 0x000001C0][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::seekReadTypeDefRowUncached([FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1>, int32)][offset 0x00000080][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::seekReadTypeDefRowUncached([FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1>, int32)][offset 0x000000A1][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::seekReadMethodRow([FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.ILBinaryReader+ILMetadataReader, [FSharp.Compiler.Service]FSharp.Compiler.IO.ReadOnlyByteMemory, int32)][offset 0x00000071][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::seekReadInterfaceIdx([FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.ILBinaryReader+ILMetadataReader, [FSharp.Compiler.Service]FSharp.Compiler.IO.ReadOnlyByteMemory, int32)][offset 0x00000025][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::seekReadClassLayoutRow([FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.ILBinaryReader+ILMetadataReader, [FSharp.Compiler.Service]FSharp.Compiler.IO.ReadOnlyByteMemory, int32)][offset 0x00000066][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::seekReadFieldLayoutRow([FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.ILBinaryReader+ILMetadataReader, [FSharp.Compiler.Service]FSharp.Compiler.IO.ReadOnlyByteMemory, int32)][offset 0x00000045][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::seekReadEventMapRow([FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.ILBinaryReader+ILMetadataReader, [FSharp.Compiler.Service]FSharp.Compiler.IO.ReadOnlyByteMemory, int32)][offset 0x00000025][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::seekReadEventMapRow([FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.ILBinaryReader+ILMetadataReader, [FSharp.Compiler.Service]FSharp.Compiler.IO.ReadOnlyByteMemory, int32)][offset 0x00000045][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::seekReadPropertyMapRow([FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.ILBinaryReader+ILMetadataReader, [FSharp.Compiler.Service]FSharp.Compiler.IO.ReadOnlyByteMemory, int32)][offset 0x00000025][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::seekReadPropertyMapRow([FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.ILBinaryReader+ILMetadataReader, [FSharp.Compiler.Service]FSharp.Compiler.IO.ReadOnlyByteMemory, int32)][offset 0x00000045][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::seekReadMethodSemanticsRowUncached([FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1>, int32)][offset 0x00000040][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::seekReadMethodImplRow([FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.ILBinaryReader+ILMetadataReader, [FSharp.Compiler.Service]FSharp.Compiler.IO.ReadOnlyByteMemory, int32)][offset 0x00000025][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::seekReadImplMapRow([FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.ILBinaryReader+ILMetadataReader, [FSharp.Compiler.Service]FSharp.Compiler.IO.ReadOnlyByteMemory, int32)][offset 0x00000044][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::seekReadFieldRVARow([FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.ILBinaryReader+ILMetadataReader, [FSharp.Compiler.Service]FSharp.Compiler.IO.ReadOnlyByteMemory, int32)][offset 0x00000045][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::seekReadNestedRowUncached([FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1>, int32)][offset 0x00000038][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::seekReadNestedRowUncached([FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1>, int32)][offset 0x00000058][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::seekReadGenericParamConstraintIdx([FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.ILBinaryReader+ILMetadataReader, [FSharp.Compiler.Service]FSharp.Compiler.IO.ReadOnlyByteMemory, int32)][offset 0x00000025][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::rowKindSize$cont@4423(bool, bool, bool, bool[], bool, bool, bool, bool, bool, bool, bool, bool, bool, bool, bool, bool, bool, [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1, [FSharp.Core]Microsoft.FSharp.Core.Unit)][offset 0x000000E5][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::openMetadataReader(string, [FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.ILBinaryReader+BinaryFile, int32, [S.P.CoreLib]System.Tuple`8,bool,bool,bool,bool,bool,System.Tuple`5,bool,int32,int32,int32>>, [FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.ILBinaryReader+PEReader, [FSharp.Compiler.Service]FSharp.Compiler.IO.ReadOnlyByteMemory, [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1, bool)][offset 0x000006BF][found Boolean] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader+seekReadInterfaceImpls@2238-3::Invoke(int32)][offset 0x0000002F][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader+seekReadGenericParamConstraints@2303-2::Invoke(int32)][offset 0x0000002F][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader+enclIdx@2332-2::Invoke(int32)][offset 0x0000002F][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader+seekReadMethodImpls@3100-4::Invoke(int32)][offset 0x0000002F][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader+seekReadEvents@3180-3::Invoke(int32)][offset 0x0000002F][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader+seekReadProperties@3250-3::Invoke(int32)][offset 0x0000002F][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.IL::parseILVersion(string)][offset 0x0000000B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.IL::parseILVersion(string)][offset 0x00000021][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$FSharp.Compiler.DiagnosticsLogger::.cctor()][offset 0x000000B6][found Char] Unexpected type on the stack. +[IL]: Error [CallVirtOnValueType]: : FSharp.Compiler.Text.RangeModule+comparer@543::System.Collections.Generic.IEqualityComparer.GetHashCode([FSharp.Compiler.Service]FSharp.Compiler.Text.Range)][offset 0x00000002] Callvirt on a value type method. +[IL]: Error [StackUnexpected]: : Internal.Utilities.PathMapModule::applyDir([FSharp.Compiler.Service]Internal.Utilities.PathMap, string)][offset 0x00000035][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Internal.Utilities.PathMapModule::applyDir([FSharp.Compiler.Service]Internal.Utilities.PathMap, string)][offset 0x00000041][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$Internal.Utilities.XmlAdapters::.cctor()][offset 0x0000000A][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$Internal.Utilities.XmlAdapters::.cctor()][offset 0x00000013][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$Internal.Utilities.XmlAdapters::.cctor()][offset 0x0000001C][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$Internal.Utilities.XmlAdapters::.cctor()][offset 0x00000025][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$Internal.Utilities.XmlAdapters::.cctor()][offset 0x0000002E][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.IO.FileSystemUtils::trimQuotes(string)][offset 0x0000000B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.IO.FileSystemUtils::trimQuotes(string)][offset 0x00000014][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Internal.Utilities.Library.String::lowerCaseFirstChar(string)][offset 0x0000003A][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Internal.Utilities.Library.Array::loop@275-3(bool[], int32)][offset 0x00000008][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Collections.ArrayModule+Parallel::Choose([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>, !!0[])][offset 0x00000081][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Collections.ArrayModule+Parallel::Filter([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, !!0[])][offset 0x00000029][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Collections.ArrayModule+Parallel::Partition([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, !!0[])][offset 0x00000038][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Collections.ArrayModule+Parallel+Choose@2245-2::Invoke(int32, [System.Threading.Tasks.Parallel]System.Threading.Tasks.ParallelLoopState, int32)][offset 0x00000030][found Boolean] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Collections.ArrayModule+Parallel+countAndCollectTrueItems@2575-1::Invoke(int32, [System.Threading.Tasks.Parallel]System.Threading.Tasks.ParallelLoopState, int32)][offset 0x00000022][found Boolean] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.StringModule::Map([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, string)][offset 0x0000001E][found Short] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.StringModule::Map([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, string)][offset 0x0000002D][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.StringModule::MapIndexed([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>, string)][offset 0x00000029][found Short] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.StringModule::MapIndexed([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>, string)][offset 0x00000033][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.StringModule::Filter([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, string)][offset 0x0000006C][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.LanguagePrimitives+HashCompare::GenericEqualityCharArray(char[], char[])][offset 0x0000001C][found Short] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.LanguagePrimitives+HashCompare::GenericEqualityCharArray(char[], char[])][offset 0x00000023][found Short] Unexpected type on the stack. diff --git a/eng/ilverify_FSharp.Compiler.Service_Release_netstandard2.0.bsl b/eng/ilverify_FSharp.Compiler.Service_Release_netstandard2.0.bsl new file mode 100644 index 00000000000..94b00850f0a --- /dev/null +++ b/eng/ilverify_FSharp.Compiler.Service_Release_netstandard2.0.bsl @@ -0,0 +1,137 @@ +[IL]: Error [StackUnexpected]: : Internal.Utilities.Collections.HashMultiMap`2::.ctor(int32, [S.P.CoreLib]System.Collections.Generic.IEqualityComparer`1, [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1)][offset 0x00000060][found ref 'object'][expected ref '[S.P.CoreLib]System.Collections.Generic.IDictionary`2>'] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Internal.Utilities.Collections.HashMultiMap`2::.ctor(int32, [S.P.CoreLib]System.Collections.Generic.IEqualityComparer`1, [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1)][offset 0x00000035][found ref 'object'][expected ref '[S.P.CoreLib]System.Collections.Generic.IDictionary`2'] Unexpected type on the stack. +[IL]: Error [UnmanagedPointer]: : FSharp.Compiler.IO.SafeUnmanagedMemoryStream::.ctor(uint8*, int64, object)][offset 0x00000001] Unmanaged pointers are not a verifiable type. +[IL]: Error [UnmanagedPointer]: : FSharp.Compiler.IO.SafeUnmanagedMemoryStream::.ctor(uint8*, int64, int64, [S.P.CoreLib]System.IO.FileAccess, object)][offset 0x00000001] Unmanaged pointers are not a verifiable type. +[IL]: Error [UnmanagedPointer]: : FSharp.Compiler.IO.RawByteMemory::.ctor(uint8*, int32, object)][offset 0x00000009] Unmanaged pointers are not a verifiable type. +[IL]: Error [StackByRef]: : FSharp.Compiler.IO.RawByteMemory::get_Item(int32)][offset 0x0000001A][found Native Int] Expected ByRef on the stack. +[IL]: Error [StackByRef]: : FSharp.Compiler.IO.RawByteMemory::set_Item(int32, uint8)][offset 0x0000001B][found Native Int] Expected ByRef on the stack. +[IL]: Error [ReturnPtrToStack]: : Internal.Utilities.Text.Lexing.LexBuffer`1::get_LexemeView()][offset 0x00000017] Return type is ByRef, TypedReference, ArgHandle, or ArgIterator. +[IL]: Error [StackUnexpected]: : Internal.Utilities.Text.Lexing.UnicodeTables::scanUntilSentinel([FSharp.Compiler.Service]Internal.Utilities.Text.Lexing.LexBuffer`1, int32)][offset 0x0000008D][found Short] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.Xml.XmlDoc::processLines([FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1)][offset 0x0000002C][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.FxResolver::getTfmNumber(string)][offset 0x0000000B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.FxResolver::tryGetRunningTfm()][offset 0x00000011][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.DependencyManager.AssemblyResolveHandler::.ctor([FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1)][offset 0x0000002B][found ref 'object'][expected ref '[S.P.CoreLib]System.IDisposable'] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.DependencyManager.DependencyProvider::TryFindDependencyManagerInPath([S.P.CoreLib]System.Collections.Generic.IEnumerable`1, string, [FSharp.Compiler.Service]FSharp.Compiler.DependencyManager.ResolvingErrorReport, string)][offset 0x00000055][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.Symbols.FSharpEntity::TryGetFullDisplayName()][offset 0x00000024][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.Symbols.FSharpEntity::TryGetFullCompiledName()][offset 0x00000024][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.Symbols.FSharpMemberOrFunctionOrValue::TryGetFullCompiledOperatorNameIdents()][offset 0x00000060][found Char] Unexpected type on the stack. +[IL]: Error [ReturnPtrToStack]: : FSharp.Compiler.CodeAnalysis.ItemKeyStore::ReadKeyString([System.Reflection.Metadata]System.Reflection.Metadata.BlobReader&)][offset 0x00000023] Return type is ByRef, TypedReference, ArgHandle, or ArgIterator. +[IL]: Error [ReturnPtrToStack]: : FSharp.Compiler.CodeAnalysis.ItemKeyStore::ReadFirstKeyString()][offset 0x00000064] Return type is ByRef, TypedReference, ArgHandle, or ArgIterator. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CodeAnalysis.ItemKeyStoreBuilder::writeRange([FSharp.Compiler.Service]FSharp.Compiler.Text.Range)][offset 0x00000017][found address of '[FSharp.Compiler.Service]FSharp.Compiler.Text.Range'][expected Native Int] Unexpected type on the stack. +[IL]: Error [ExpectedNumericType]: : FSharp.Compiler.EditorServices.SemanticClassificationKeyStoreBuilder::WriteAll([FSharp.Compiler.Service]FSharp.Compiler.EditorServices.SemanticClassificationItem[])][offset 0x0000001C][found address of '[FSharp.Compiler.Service]FSharp.Compiler.EditorServices.SemanticClassificationItem'] Expected numeric type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.EditorServices.Parent::FormatEntityFullName([FSharp.Compiler.Service]FSharp.Compiler.Symbols.FSharpEntity)][offset 0x0000003F][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CodeAnalysis.FSharpChecker::.ctor([FSharp.Compiler.Service]FSharp.Compiler.CodeAnalysis.LegacyReferenceResolver, int32, bool, bool, [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,Microsoft.FSharp.Core.FSharpOption`1>>, bool, bool, bool, bool, [FSharp.Compiler.Service]FSharp.Compiler.CompilerConfig+ParallelReferenceResolution, bool, [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1>>>, bool, [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1)][offset 0x000000A2][found ref 'object'][expected ref '[FSharp.Compiler.Service]FSharp.Compiler.CodeAnalysis.IBackgroundCompiler'] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CodeAnalysis.FSharpChecker::TokenizeFile(string)][offset 0x0000000B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CodeAnalysis.Hosted.CompilerHelpers::fscCompile([FSharp.Compiler.Service]FSharp.Compiler.CodeAnalysis.LegacyReferenceResolver, string, string[])][offset 0x0000005C][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CodeAnalysis.Hosted.CompilerHelpers::fscCompile([FSharp.Compiler.Service]FSharp.Compiler.CodeAnalysis.LegacyReferenceResolver, string, string[])][offset 0x00000065][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CodeAnalysis.Hosted.CompilerHelpers::fscCompile([FSharp.Compiler.Service]FSharp.Compiler.CodeAnalysis.LegacyReferenceResolver, string, string[])][offset 0x00000082][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CodeAnalysis.Hosted.CompilerHelpers::fscCompile([FSharp.Compiler.Service]FSharp.Compiler.CodeAnalysis.LegacyReferenceResolver, string, string[])][offset 0x0000008B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.Interactive.Shell+FsiStdinSyphon::GetLine(string, int32)][offset 0x00000032][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.Interactive.Shell+MagicAssemblyResolution::ResolveAssemblyCore([FSharp.Compiler.Service]Internal.Utilities.Library.CompilationThreadToken, [FSharp.Compiler.Service]FSharp.Compiler.Text.Range, [FSharp.Compiler.Service]FSharp.Compiler.CompilerConfig+TcConfigBuilder, [FSharp.Compiler.Service]FSharp.Compiler.CompilerImports+TcImports, [FSharp.Compiler.Service]FSharp.Compiler.Interactive.Shell+FsiDynamicCompiler, [FSharp.Compiler.Service]FSharp.Compiler.Interactive.Shell+FsiConsoleOutput, string)][offset 0x00000015][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.Interactive.Shell+clo@3508-835::Invoke([S.P.CoreLib]System.Tuple`3)][offset 0x000001C7][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.Interactive.Shell+FsiInteractionProcessor::CompletionsForPartialLID([FSharp.Compiler.Service]FSharp.Compiler.Interactive.Shell+FsiDynamicCompilerState, string)][offset 0x00000024][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$FSharpCheckerResults+GetReferenceResolutionStructuredToolTipText@2205::Invoke([FSharp.Core]Microsoft.FSharp.Core.Unit)][offset 0x00000076][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.EditorServices.AssemblyContent+traverseMemberFunctionAndValues@176::Invoke([FSharp.Compiler.Service]FSharp.Compiler.Symbols.FSharpMemberOrFunctionOrValue)][offset 0x0000002B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.EditorServices.AssemblyContent+traverseEntity@218::GenerateNext([S.P.CoreLib]System.Collections.Generic.IEnumerable`1&)][offset 0x000000BB][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.EditorServices.ParsedInput+visitor@1423-11::VisitExpr([FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1, [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>, [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>, [FSharp.Compiler.Service]FSharp.Compiler.Syntax.SynExpr)][offset 0x00000618][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$ServiceLexing+clo@921-528::Invoke([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,Microsoft.FSharp.Core.Unit>)][offset 0x00000032][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$ServiceLexing+clo@921-528::Invoke([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,Microsoft.FSharp.Core.Unit>)][offset 0x0000003B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$ServiceLexing+clo@921-528::Invoke([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,Microsoft.FSharp.Core.Unit>)][offset 0x00000064][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$ServiceLexing+clo@921-528::Invoke([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,Microsoft.FSharp.Core.Unit>)][offset 0x0000006D][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$ServiceLexing+clo@921-528::Invoke([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,Microsoft.FSharp.Core.Unit>)][offset 0x00000076][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$Symbols+fullName@2490-3::Invoke([FSharp.Core]Microsoft.FSharp.Core.Unit)][offset 0x00000030][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.Driver+ProcessCommandLineFlags@301-1::Invoke(string)][offset 0x0000000B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.Driver+ProcessCommandLineFlags@301-1::Invoke(string)][offset 0x00000014][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CreateILModule+MainModuleBuilder::ConvertProductVersionToILVersionInfo(string)][offset 0x00000010][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.StaticLinking+TypeForwarding::followTypeForwardForILTypeRef([FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.IL+ILTypeRef)][offset 0x00000010][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerOptions::getCompilerOption([FSharp.Compiler.Service]FSharp.Compiler.CompilerOptions+CompilerOption, [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1)][offset 0x000000A7][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerOptions::parseOption@266(string)][offset 0x0000000B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerOptions::getOptionArgList@306([FSharp.Compiler.Service]FSharp.Compiler.CompilerOptions+CompilerOption, string)][offset 0x00000049][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerOptions::getOptionArgList@306([FSharp.Compiler.Service]FSharp.Compiler.CompilerOptions+CompilerOption, string)][offset 0x00000052][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerOptions::getSwitch@324(string)][offset 0x0000000B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerOptions::attempt@372([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1, [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1, [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1, string, string, string, string, [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1)][offset 0x00000A99][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerOptions::processArg@332([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1, [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1, [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1)][offset 0x0000003E][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerOptions::AddPathMapping([FSharp.Compiler.Service]FSharp.Compiler.CompilerConfig+TcConfigBuilder, string)][offset 0x0000000B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerOptions::subSystemVersionSwitch$cont@656([FSharp.Compiler.Service]FSharp.Compiler.CompilerConfig+TcConfigBuilder, string, [FSharp.Core]Microsoft.FSharp.Core.Unit)][offset 0x0000000B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnderflow]: : FSharp.Compiler.CompilerOptions::DoWithColor([System.Console]System.ConsoleColor, [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2)][offset 0x0000005E] Stack underflow. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerOptions+ResponseFile+parseLine@239::Invoke(string)][offset 0x00000026][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.ParseAndCheckInputs+CheckMultipleInputsUsingGraphMode@1865::Invoke(int32)][offset 0x00000031][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.ParseAndCheckInputs+CheckMultipleInputsUsingGraphMode@1865::Invoke(int32)][offset 0x0000003A][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerImports+TcConfig-TryResolveLibWithDirectories@558-1::Invoke([FSharp.Core]Microsoft.FSharp.Core.Unit)][offset 0x00000021][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerImports+TcConfig-TryResolveLibWithDirectories@558-1::Invoke([FSharp.Core]Microsoft.FSharp.Core.Unit)][offset 0x0000003B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerConfig+TcConfig::.ctor([FSharp.Compiler.Service]FSharp.Compiler.CompilerConfig+TcConfigBuilder, bool)][offset 0x0000059C][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CompilerConfig+TcConfig::.ctor([FSharp.Compiler.Service]FSharp.Compiler.CompilerConfig+TcConfigBuilder, bool)][offset 0x000005A5][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.IlxGen::HashRangeSorted([S.P.CoreLib]System.Collections.Generic.IDictionary`2>)][offset 0x00000011][found ref '[FSharp.Compiler.Service]FSharp.Compiler.IlxGen+HashRangeSorted@1850-1'][expected ref '[FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,int32>'] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.IlxGen::HashRangeSorted([S.P.CoreLib]System.Collections.Generic.IDictionary`2>)][offset 0x00000012][found ref '[FSharp.Compiler.Service]FSharp.Compiler.IlxGen+HashRangeSorted@1850'][expected ref '[FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,T0>'] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.PatternMatchCompilation::isProblematicClause([FSharp.Compiler.Service]FSharp.Compiler.PatternMatchCompilation+MatchClause)][offset 0x00000040][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$FSharp.Compiler.PatternMatchCompilation::.cctor()][offset 0x0000000B][found Boolean] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.NicePrint+TastDefinitionPrinting+meths@2092-3::Invoke([FSharp.Compiler.Service]FSharp.Compiler.Infos+MethInfo)][offset 0x000000B3][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.NicePrint+PrintUtilities::layoutXmlDoc([FSharp.Compiler.Service]FSharp.Compiler.TypedTreeOps+DisplayEnv, bool, [FSharp.Compiler.Service]FSharp.Compiler.Xml.XmlDoc, [FSharp.Compiler.Service]FSharp.Compiler.Text.Layout)][offset 0x00000034][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.TypeProviders::ValidateNamespaceName(string, [FSharp.Compiler.Service]FSharp.Compiler.Tainted`1, [FSharp.Compiler.Service]FSharp.Compiler.Text.Range, string)][offset 0x00000074][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.TypeProviders::ValidateExpectedName([FSharp.Compiler.Service]FSharp.Compiler.Text.Range, string[], string, [FSharp.Compiler.Service]FSharp.Compiler.Tainted`1)][offset 0x000000A8][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.Lexhelp::stringBufferAsString([FSharp.Compiler.Service]FSharp.Compiler.IO.ByteBuffer)][offset 0x0000008E][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.Syntax.PrettyNaming::SplitNamesForILPath(string)][offset 0x0000004B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.Syntax.PrettyNaming::SplitNamesForILPath(string)][offset 0x00000054][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$FSharp.Compiler.Syntax.PrettyNaming::.cctor()][offset 0x00001182][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$FSharp.Compiler.Syntax.PrettyNaming::.cctor()][offset 0x0000118B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryWriter::writeILMetadataAndCode(bool, [FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.IL+ILVersionInfo, [FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.IL+ILGlobals, bool, bool, bool, [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1, [S.P.CoreLib]System.Collections.Generic.IEnumerable`1, [FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.IL+ILModuleDef, int32, [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2)][offset 0x00000B21][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryWriter::writeILMetadataAndCode(bool, [FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.IL+ILVersionInfo, [FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.IL+ILGlobals, bool, bool, bool, [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1, [S.P.CoreLib]System.Collections.Generic.IEnumerable`1, [FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.IL+ILModuleDef, int32, [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2)][offset 0x000004E2][found Boolean] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILPdbWriter+PortablePdbGenerator::serializeDocumentName(string)][offset 0x00000071][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILPdbWriter+pushShadowedLocals@959::Invoke([FSharp.Core]Microsoft.FSharp.Core.Unit)][offset 0x000001C0][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::seekReadTypeDefRowUncached([FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1>, int32)][offset 0x00000080][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::seekReadTypeDefRowUncached([FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1>, int32)][offset 0x000000A1][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::seekReadMethodRow([FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.ILBinaryReader+ILMetadataReader, [FSharp.Compiler.Service]FSharp.Compiler.IO.ReadOnlyByteMemory, int32)][offset 0x00000071][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::seekReadInterfaceIdx([FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.ILBinaryReader+ILMetadataReader, [FSharp.Compiler.Service]FSharp.Compiler.IO.ReadOnlyByteMemory, int32)][offset 0x00000025][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::seekReadClassLayoutRow([FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.ILBinaryReader+ILMetadataReader, [FSharp.Compiler.Service]FSharp.Compiler.IO.ReadOnlyByteMemory, int32)][offset 0x00000066][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::seekReadFieldLayoutRow([FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.ILBinaryReader+ILMetadataReader, [FSharp.Compiler.Service]FSharp.Compiler.IO.ReadOnlyByteMemory, int32)][offset 0x00000045][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::seekReadEventMapRow([FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.ILBinaryReader+ILMetadataReader, [FSharp.Compiler.Service]FSharp.Compiler.IO.ReadOnlyByteMemory, int32)][offset 0x00000025][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::seekReadEventMapRow([FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.ILBinaryReader+ILMetadataReader, [FSharp.Compiler.Service]FSharp.Compiler.IO.ReadOnlyByteMemory, int32)][offset 0x00000045][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::seekReadPropertyMapRow([FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.ILBinaryReader+ILMetadataReader, [FSharp.Compiler.Service]FSharp.Compiler.IO.ReadOnlyByteMemory, int32)][offset 0x00000025][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::seekReadPropertyMapRow([FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.ILBinaryReader+ILMetadataReader, [FSharp.Compiler.Service]FSharp.Compiler.IO.ReadOnlyByteMemory, int32)][offset 0x00000045][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::seekReadMethodSemanticsRowUncached([FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1>, int32)][offset 0x00000040][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::seekReadMethodImplRow([FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.ILBinaryReader+ILMetadataReader, [FSharp.Compiler.Service]FSharp.Compiler.IO.ReadOnlyByteMemory, int32)][offset 0x00000025][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::seekReadImplMapRow([FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.ILBinaryReader+ILMetadataReader, [FSharp.Compiler.Service]FSharp.Compiler.IO.ReadOnlyByteMemory, int32)][offset 0x00000044][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::seekReadFieldRVARow([FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.ILBinaryReader+ILMetadataReader, [FSharp.Compiler.Service]FSharp.Compiler.IO.ReadOnlyByteMemory, int32)][offset 0x00000045][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::seekReadNestedRowUncached([FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1>, int32)][offset 0x00000038][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::seekReadNestedRowUncached([FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1>, int32)][offset 0x00000058][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::seekReadGenericParamConstraintIdx([FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.ILBinaryReader+ILMetadataReader, [FSharp.Compiler.Service]FSharp.Compiler.IO.ReadOnlyByteMemory, int32)][offset 0x00000025][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::rowKindSize$cont@4423(bool, bool, bool, bool[], bool, bool, bool, bool, bool, bool, bool, bool, bool, bool, bool, bool, bool, [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1, [FSharp.Core]Microsoft.FSharp.Core.Unit)][offset 0x000000E5][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader::openMetadataReader(string, [FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.ILBinaryReader+BinaryFile, int32, [S.P.CoreLib]System.Tuple`8,bool,bool,bool,bool,bool,System.Tuple`5,bool,int32,int32,int32>>, [FSharp.Compiler.Service]FSharp.Compiler.AbstractIL.ILBinaryReader+PEReader, [FSharp.Compiler.Service]FSharp.Compiler.IO.ReadOnlyByteMemory, [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1, bool)][offset 0x000006BF][found Boolean] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader+seekReadInterfaceImpls@2238-3::Invoke(int32)][offset 0x0000002F][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader+seekReadGenericParamConstraints@2303-2::Invoke(int32)][offset 0x0000002F][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader+enclIdx@2332-2::Invoke(int32)][offset 0x0000002F][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader+seekReadMethodImpls@3100-4::Invoke(int32)][offset 0x0000002F][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader+seekReadEvents@3180-3::Invoke(int32)][offset 0x0000002F][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.ILBinaryReader+seekReadProperties@3250-3::Invoke(int32)][offset 0x0000002F][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.NativeRes+VersionHelper::TryParse(string, bool, uint16, bool, [S.P.CoreLib]System.Version&)][offset 0x00000026][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.IL::parseILVersion(string)][offset 0x0000000B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.IL::parseILVersion(string)][offset 0x00000021][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.AbstractIL.IL::parseNamed@5241(uint8[], [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1>, int32, int32)][offset 0x0000007E][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Internal.Utilities.Collections.Utils::shortPath(string)][offset 0x00000016][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Internal.Utilities.FSharpEnvironment::probePathForDotnetHost@320([FSharp.Core]Microsoft.FSharp.Core.Unit)][offset 0x0000002A][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.CodeAnalysis.SimulatedMSBuildReferenceResolver+SimulatedMSBuildResolver@68::FSharp.Compiler.CodeAnalysis.ILegacyReferenceResolver.Resolve([FSharp.Compiler.Service]FSharp.Compiler.CodeAnalysis.LegacyResolutionEnvironment, [S.P.CoreLib]System.Tuple`2[], string, [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1, string, string, [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1, string, [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>>)][offset 0x000002F5][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$FSharp.Compiler.DiagnosticsLogger::.cctor()][offset 0x000000B6][found Char] Unexpected type on the stack. +[IL]: Error [CallVirtOnValueType]: : FSharp.Compiler.Text.RangeModule+comparer@543::System.Collections.Generic.IEqualityComparer.GetHashCode([FSharp.Compiler.Service]FSharp.Compiler.Text.Range)][offset 0x00000002] Callvirt on a value type method. +[IL]: Error [StackUnexpected]: : Internal.Utilities.PathMapModule::applyDir([FSharp.Compiler.Service]Internal.Utilities.PathMap, string)][offset 0x00000035][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Internal.Utilities.PathMapModule::applyDir([FSharp.Compiler.Service]Internal.Utilities.PathMap, string)][offset 0x00000041][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$Internal.Utilities.XmlAdapters::.cctor()][offset 0x0000000A][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$Internal.Utilities.XmlAdapters::.cctor()][offset 0x00000013][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$Internal.Utilities.XmlAdapters::.cctor()][offset 0x0000001C][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$Internal.Utilities.XmlAdapters::.cctor()][offset 0x00000025][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : .$Internal.Utilities.XmlAdapters::.cctor()][offset 0x0000002E][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.IO.FileSystemUtils::trimQuotes(string)][offset 0x0000000B][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : FSharp.Compiler.IO.FileSystemUtils::trimQuotes(string)][offset 0x00000014][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Internal.Utilities.Library.String::lowerCaseFirstChar(string)][offset 0x0000003A][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Internal.Utilities.Library.Array::loop@275-3(bool[], int32)][offset 0x00000008][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Collections.ArrayModule+Parallel::Choose([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>, !!0[])][offset 0x00000081][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Collections.ArrayModule+Parallel::Filter([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, !!0[])][offset 0x00000029][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Collections.ArrayModule+Parallel::Partition([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, !!0[])][offset 0x00000038][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Collections.ArrayModule+Parallel+Choose@2245-2::Invoke(int32, [System.Threading.Tasks.Parallel]System.Threading.Tasks.ParallelLoopState, int32)][offset 0x00000030][found Boolean] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Collections.ArrayModule+Parallel+countAndCollectTrueItems@2575-1::Invoke(int32, [System.Threading.Tasks.Parallel]System.Threading.Tasks.ParallelLoopState, int32)][offset 0x00000022][found Boolean] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.StringModule::Map([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, string)][offset 0x0000001E][found Short] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.StringModule::Map([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, string)][offset 0x0000002D][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.StringModule::MapIndexed([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>, string)][offset 0x00000029][found Short] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.StringModule::MapIndexed([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>, string)][offset 0x00000033][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.StringModule::Filter([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, string)][offset 0x0000006C][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.LanguagePrimitives+HashCompare::GenericEqualityCharArray(char[], char[])][offset 0x0000001C][found Short] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.LanguagePrimitives+HashCompare::GenericEqualityCharArray(char[], char[])][offset 0x00000023][found Short] Unexpected type on the stack. diff --git a/eng/ilverify_FSharp.Core_Debug_netstandard2.0.bsl b/eng/ilverify_FSharp.Core_Debug_netstandard2.0.bsl new file mode 100644 index 00000000000..2e94b26033c --- /dev/null +++ b/eng/ilverify_FSharp.Core_Debug_netstandard2.0.bsl @@ -0,0 +1,17 @@ +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Collections.ArrayModule+Parallel::Choose([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>, !!0[])][offset 0x000000A0][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Collections.ArrayModule+Parallel::Filter([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, !!0[])][offset 0x00000029][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Collections.ArrayModule+Parallel::Partition([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, !!0[])][offset 0x00000038][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Collections.ArrayModule+Parallel+Pipe #2 input at line 2241@2245-1::Invoke(int32, [System.Threading.Tasks.Parallel]System.Threading.Tasks.ParallelLoopState, int32)][offset 0x00000030][found Boolean] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Collections.ArrayModule+Parallel+Pipe #2 input at line 2571@2575-1::Invoke(int32, [System.Threading.Tasks.Parallel]System.Threading.Tasks.ParallelLoopState, int32)][offset 0x00000022][found Boolean] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.StringModule::Map([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, string)][offset 0x00000020][found Short] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.StringModule::Map([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, string)][offset 0x00000031][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.StringModule::MapIndexed([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>, string)][offset 0x00000029][found Short] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.StringModule::MapIndexed([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>, string)][offset 0x00000033][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.StringModule::Filter([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, string)][offset 0x00000075][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.Operators::castToString(!!0)][offset 0x00000001][found value 'T'][expected ref 'string'] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.LanguagePrimitives::retype(!!0)][offset 0x00000001][found value 'T'][expected value 'TResult'] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.LanguagePrimitives+HashCompare::GenericEqualityCharArray(char[], char[])][offset 0x0000001C][found Short] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.LanguagePrimitives+HashCompare::GenericEqualityCharArray(char[], char[])][offset 0x00000023][found Short] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.BasicInlinedOperations::castclassPrim(object)][offset 0x00000006][found ref 'T'][expected value 'T'] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.BasicInlinedOperations::notnullPrim(!!0)][offset 0x00000002][found Nullobjref 'NullReference'][expected value 'T'] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.BasicInlinedOperations::iscastPrim(object)][offset 0x00000006][found ref 'T'][expected value 'T'] Unexpected type on the stack. diff --git a/eng/ilverify_FSharp.Core_Debug_netstandard2.1.bsl b/eng/ilverify_FSharp.Core_Debug_netstandard2.1.bsl new file mode 100644 index 00000000000..2e94b26033c --- /dev/null +++ b/eng/ilverify_FSharp.Core_Debug_netstandard2.1.bsl @@ -0,0 +1,17 @@ +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Collections.ArrayModule+Parallel::Choose([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>, !!0[])][offset 0x000000A0][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Collections.ArrayModule+Parallel::Filter([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, !!0[])][offset 0x00000029][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Collections.ArrayModule+Parallel::Partition([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, !!0[])][offset 0x00000038][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Collections.ArrayModule+Parallel+Pipe #2 input at line 2241@2245-1::Invoke(int32, [System.Threading.Tasks.Parallel]System.Threading.Tasks.ParallelLoopState, int32)][offset 0x00000030][found Boolean] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Collections.ArrayModule+Parallel+Pipe #2 input at line 2571@2575-1::Invoke(int32, [System.Threading.Tasks.Parallel]System.Threading.Tasks.ParallelLoopState, int32)][offset 0x00000022][found Boolean] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.StringModule::Map([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, string)][offset 0x00000020][found Short] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.StringModule::Map([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, string)][offset 0x00000031][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.StringModule::MapIndexed([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>, string)][offset 0x00000029][found Short] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.StringModule::MapIndexed([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>, string)][offset 0x00000033][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.StringModule::Filter([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, string)][offset 0x00000075][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.Operators::castToString(!!0)][offset 0x00000001][found value 'T'][expected ref 'string'] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.LanguagePrimitives::retype(!!0)][offset 0x00000001][found value 'T'][expected value 'TResult'] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.LanguagePrimitives+HashCompare::GenericEqualityCharArray(char[], char[])][offset 0x0000001C][found Short] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.LanguagePrimitives+HashCompare::GenericEqualityCharArray(char[], char[])][offset 0x00000023][found Short] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.BasicInlinedOperations::castclassPrim(object)][offset 0x00000006][found ref 'T'][expected value 'T'] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.BasicInlinedOperations::notnullPrim(!!0)][offset 0x00000002][found Nullobjref 'NullReference'][expected value 'T'] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.BasicInlinedOperations::iscastPrim(object)][offset 0x00000006][found ref 'T'][expected value 'T'] Unexpected type on the stack. diff --git a/eng/ilverify_FSharp.Core_Release_netstandard2.0.bsl b/eng/ilverify_FSharp.Core_Release_netstandard2.0.bsl new file mode 100644 index 00000000000..4bc36bdc008 --- /dev/null +++ b/eng/ilverify_FSharp.Core_Release_netstandard2.0.bsl @@ -0,0 +1,12 @@ +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Collections.ArrayModule+Parallel::Choose([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>, !!0[])][offset 0x00000081][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Collections.ArrayModule+Parallel::Filter([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, !!0[])][offset 0x00000029][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Collections.ArrayModule+Parallel::Partition([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, !!0[])][offset 0x00000038][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Collections.ArrayModule+Parallel+Choose@2245-2::Invoke(int32, [System.Threading.Tasks.Parallel]System.Threading.Tasks.ParallelLoopState, int32)][offset 0x00000030][found Boolean] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Collections.ArrayModule+Parallel+countAndCollectTrueItems@2575-1::Invoke(int32, [System.Threading.Tasks.Parallel]System.Threading.Tasks.ParallelLoopState, int32)][offset 0x00000022][found Boolean] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.StringModule::Map([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, string)][offset 0x0000001E][found Short] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.StringModule::Map([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, string)][offset 0x0000002D][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.StringModule::MapIndexed([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>, string)][offset 0x00000029][found Short] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.StringModule::MapIndexed([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>, string)][offset 0x00000033][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.StringModule::Filter([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, string)][offset 0x0000006C][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.LanguagePrimitives+HashCompare::GenericEqualityCharArray(char[], char[])][offset 0x0000001C][found Short] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.LanguagePrimitives+HashCompare::GenericEqualityCharArray(char[], char[])][offset 0x00000023][found Short] Unexpected type on the stack. diff --git a/eng/ilverify_FSharp.Core_Release_netstandard2.1.bsl b/eng/ilverify_FSharp.Core_Release_netstandard2.1.bsl new file mode 100644 index 00000000000..4bc36bdc008 --- /dev/null +++ b/eng/ilverify_FSharp.Core_Release_netstandard2.1.bsl @@ -0,0 +1,12 @@ +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Collections.ArrayModule+Parallel::Choose([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>, !!0[])][offset 0x00000081][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Collections.ArrayModule+Parallel::Filter([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, !!0[])][offset 0x00000029][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Collections.ArrayModule+Parallel::Partition([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, !!0[])][offset 0x00000038][found Byte] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Collections.ArrayModule+Parallel+Choose@2245-2::Invoke(int32, [System.Threading.Tasks.Parallel]System.Threading.Tasks.ParallelLoopState, int32)][offset 0x00000030][found Boolean] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Collections.ArrayModule+Parallel+countAndCollectTrueItems@2575-1::Invoke(int32, [System.Threading.Tasks.Parallel]System.Threading.Tasks.ParallelLoopState, int32)][offset 0x00000022][found Boolean] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.StringModule::Map([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, string)][offset 0x0000001E][found Short] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.StringModule::Map([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, string)][offset 0x0000002D][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.StringModule::MapIndexed([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>, string)][offset 0x00000029][found Short] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.StringModule::MapIndexed([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>, string)][offset 0x00000033][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.StringModule::Filter([FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, string)][offset 0x0000006C][found Char] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.LanguagePrimitives+HashCompare::GenericEqualityCharArray(char[], char[])][offset 0x0000001C][found Short] Unexpected type on the stack. +[IL]: Error [StackUnexpected]: : Microsoft.FSharp.Core.LanguagePrimitives+HashCompare::GenericEqualityCharArray(char[], char[])][offset 0x00000023][found Short] Unexpected type on the stack. diff --git a/src/Compiler/Checking/CheckDeclarations.fs b/src/Compiler/Checking/CheckDeclarations.fs index c1ef25df4ba..f0e1bce15c6 100644 --- a/src/Compiler/Checking/CheckDeclarations.fs +++ b/src/Compiler/Checking/CheckDeclarations.fs @@ -1090,7 +1090,7 @@ module MutRecBindingChecking = [Phase2AIncrClassCtor (staticCtorInfo, Some incrCtorInfo)], innerState - | Some (SynMemberDefn.ImplicitInherit (ty, arg, _baseIdOpt, m)), _ -> + | Some (SynMemberDefn.ImplicitInherit (ty, arg, _baseIdOpt, m, _)), _ -> if tcref.TypeOrMeasureKind = TyparKind.Measure then error(Error(FSComp.SR.tcMeasureDeclarationsRequireStaticMembers(), m)) @@ -3324,7 +3324,6 @@ module EstablishTypeDefinitionCores = else None | SynTypeDefnSimpleRepr.General (kind, inherits, slotsigs, fields, isConcrete, _, _, _) -> let kind = InferTyconKind g (kind, attrs, slotsigs, fields, inSig, isConcrete, m) - match inheritedTys with | [] -> match kind with @@ -3335,9 +3334,9 @@ module EstablishTypeDefinitionCores = | [(ty, m)] -> let inheritRange = - match inherits with - | [] -> m - | (synType, _, _) :: _ -> synType.Range + match inherits with + | [] -> m + | (synType, _, _) :: _ -> synType.Range if not firstPass && not (match kind with SynTypeDefnKind.Class -> true | _ -> false) then errorR (Error(FSComp.SR.tcStructsInterfacesEnumsDelegatesMayNotInheritFromOtherTypes(), inheritRange)) CheckSuperType cenv ty inheritRange @@ -3345,11 +3344,15 @@ module EstablishTypeDefinitionCores = if firstPass then errorR(Error(FSComp.SR.tcCannotInheritFromVariableType(), inheritRange)) Some g.obj_ty_noNulls // a "super" that is a variable type causes grief later - else - + else Some ty - | _ -> - error(Error(FSComp.SR.tcTypesCannotInheritFromMultipleConcreteTypes(), m)) + | _ -> + match inherits with + | [] -> () + | _ :: inherits -> + for synType, _, _ in inherits do + errorR(Error(FSComp.SR.tcTypesCannotInheritFromMultipleConcreteTypes(), synType.Range)) + None | SynTypeDefnSimpleRepr.Enum _ -> Some(g.system_Enum_ty) @@ -4278,7 +4281,7 @@ module TcDeclarations = // multiple (binding or slotsig or field or interface or inherit). // i.e. not local-bindings, implicit ctor or implicit inherit (or tycon?). // atMostOne inherit. - let private CheckMembersForm ds = + let private CheckMembersForm ds m = match ds with | d :: ds when isImplicitCtor d -> // Implicit construction @@ -4290,7 +4293,7 @@ module TcDeclarations = // Skip over 'let' and 'do' bindings let _, ds = ds |> List.takeUntil (function SynMemberDefn.LetBindings _ -> false | _ -> true) - // Skip over 'let' and 'do' bindings + // Skip over member bindings, abstract slots, interfaces and auto properties let _, ds = ds |> List.takeUntil (allFalse [isMember;isAbstractSlot;isInterface;isAutoProperty]) match ds with @@ -4299,7 +4302,7 @@ module TcDeclarations = | SynMemberDefn.Interface (range=m) :: _ -> errorR(InternalError("List.takeUntil is wrong, have interface", m)) | SynMemberDefn.ImplicitCtor (range=m) :: _ -> errorR(InternalError("implicit class construction with two implicit constructions", m)) | SynMemberDefn.AutoProperty (range=m) :: _ -> errorR(InternalError("List.takeUntil is wrong, have auto property", m)) - | SynMemberDefn.ImplicitInherit (range=m) :: _ -> errorR(Error(FSComp.SR.tcTypeDefinitionsWithImplicitConstructionMustHaveOneInherit(), m)) + | SynMemberDefn.ImplicitInherit _ :: _ -> errorR(Error(FSComp.SR.tcTypeDefinitionsWithImplicitConstructionMustHaveOneInherit(), m)) | SynMemberDefn.LetBindings (range=m) :: _ -> errorR(Error(FSComp.SR.tcTypeDefinitionsWithImplicitConstructionMustHaveLocalBindingsBeforeMembers(), m)) | SynMemberDefn.Inherit (trivia= { InheritKeyword = m }) :: _ -> errorR(Error(FSComp.SR.tcInheritDeclarationMissingArguments(), m)) | SynMemberDefn.NestedType (range=m) :: _ -> errorR(Error(FSComp.SR.tcTypesCannotContainNestedTypes(), m)) @@ -4467,14 +4470,14 @@ module TcDeclarations = | SynTypeDefnRepr.ObjectModel(kind, members, m) -> let members = desugarGetSetMembers members - CheckMembersForm members + CheckMembersForm members synTyconInfo.Range let fields = members |> List.choose (function SynMemberDefn.ValField (fieldInfo = f) -> Some f | _ -> None) let implements2 = members |> List.choose (function SynMemberDefn.Interface (interfaceType=ty) -> Some(ty, ty.Range) | _ -> None) let inherits = members |> List.choose (function - | SynMemberDefn.Inherit (ty, idOpt, m, _) -> Some(ty, m, idOpt) - | SynMemberDefn.ImplicitInherit (ty, _, idOpt, m) -> Some(ty, m, idOpt) + | SynMemberDefn.Inherit (Some ty, idOpt, m, _) -> Some(ty, m, idOpt) + | SynMemberDefn.ImplicitInherit (ty, _, idOpt, m, _) -> Some(ty, m, idOpt) | _ -> None) //let nestedTycons = cspec |> List.choose (function SynMemberDefn.NestedType (x, _, _) -> Some x | _ -> None) diff --git a/src/Compiler/Checking/CheckPatterns.fs b/src/Compiler/Checking/CheckPatterns.fs index 54419016859..3f97cf81780 100644 --- a/src/Compiler/Checking/CheckPatterns.fs +++ b/src/Compiler/Checking/CheckPatterns.fs @@ -58,10 +58,12 @@ let UnifyRefTupleType contextInfo (cenv: cenv) denv m ty ps = AddCxTypeEqualsType contextInfo denv cenv.css m ty (TType_tuple (tupInfoRef, ptys)) ptys -let rec TryAdjustHiddenVarNameToCompGenName cenv env (id: Ident) altNameRefCellOpt = +let rec TryAdjustHiddenVarNameToCompGenName (cenv: cenv) env (id: Ident) altNameRefCellOpt = match altNameRefCellOpt with | Some ({contents = SynSimplePatAlternativeIdInfo.Undecided altId } as altNameRefCell) -> - match ResolvePatternLongIdent cenv.tcSink cenv.nameResolver AllIdsOK false id.idRange env.eAccessRights env.eNameResEnv TypeNameResolutionInfo.Default [id] ExtraDotAfterIdentifier.No with + let supportsWarnOnUpperIdentifiersInPatterns = cenv.g.langVersion.SupportsFeature(LanguageFeature.DontWarnOnUppercaseIdentifiersInBindingPatterns) + let warnOnUpperFlag = if supportsWarnOnUpperIdentifiersInPatterns then WarnOnUpperVariablePatterns else AllIdsOK + match ResolvePatternLongIdent cenv.tcSink cenv.nameResolver warnOnUpperFlag false id.idRange env.eAccessRights env.eNameResEnv TypeNameResolutionInfo.Default [id] ExtraDotAfterIdentifier.No with | Item.NewDef _ -> // The name is not in scope as a pattern identifier (e.g. union case), so do not use the alternate ID None @@ -356,6 +358,12 @@ and TcPatNamedAs warnOnUpper cenv env valReprInfo vFlags patEnv ty synInnerPat i and TcPatUnnamedAs warnOnUpper cenv env vFlags patEnv ty pat1 pat2 m = let pats = [pat1; pat2] + let warnOnUpper = + if cenv.g.langVersion.SupportsFeature(LanguageFeature.DontWarnOnUppercaseIdentifiersInBindingPatterns) then + AllIdsOK + else + warnOnUpper + let patsR, patEnvR = TcPatterns warnOnUpper cenv env vFlags patEnv (List.map (fun _ -> ty) pats) pats let phase2 values = TPat_conjs(List.map (fun f -> f values) patsR, m) phase2, patEnvR @@ -441,7 +449,7 @@ and TcPatArrayOrList warnOnUpper cenv env vFlags patEnv ty isArray args m = else List.foldBack (mkConsListPat g argTy) argsR (mkNilListPat g m argTy) phase2, acc -and TcRecordPat warnOnUpper cenv env vFlags patEnv ty fieldPats m = +and TcRecordPat warnOnUpper (cenv: cenv) env vFlags patEnv ty fieldPats m = let fieldPats = fieldPats |> List.map (fun (fieldId, _, fieldPat) -> fieldId, fieldPat) match BuildFieldMap cenv env false ty fieldPats m with | None -> (fun _ -> TPat_error m), patEnv @@ -458,7 +466,13 @@ and TcRecordPat warnOnUpper cenv env vFlags patEnv ty fieldPats m = let fieldPats, patEnvR = (patEnv, ftys) ||> List.mapFold (fun s (ty, fsp) -> match fldsmap.TryGetValue fsp.rfield_id.idText with - | true, v -> TcPat warnOnUpper cenv env None vFlags s ty v + | true, v -> + let warnOnUpper = + if cenv.g.langVersion.SupportsFeature(LanguageFeature.DontWarnOnUppercaseIdentifiersInBindingPatterns) then + AllIdsOK + else + warnOnUpper + TcPat warnOnUpper cenv env None vFlags s ty v | _ -> (fun _ -> TPat_wild m), s) let phase2 values = diff --git a/src/Compiler/Checking/ConstraintSolver.fs b/src/Compiler/Checking/ConstraintSolver.fs index 6c79c33be97..6d59c68c7e8 100644 --- a/src/Compiler/Checking/ConstraintSolver.fs +++ b/src/Compiler/Checking/ConstraintSolver.fs @@ -1035,7 +1035,6 @@ and SolveTypMeetsTyparConstraints (csenv: ConstraintSolverEnv) ndeep m2 trace ty and shouldWarnUselessNullCheck (csenv:ConstraintSolverEnv) = csenv.g.checkNullness && - csenv.IsSpeculativeForMethodOverloading = false && csenv.SolverState.WarnWhenUsingWithoutNullOnAWithNullTarget.IsSome // nullness1: actual @@ -1102,7 +1101,7 @@ and SolveNullnessSubsumesNullness (csenv: ConstraintSolverEnv) m2 (trace: Option | NullnessInfo.WithNull, NullnessInfo.WithoutNull -> CompleteD | NullnessInfo.WithoutNull, NullnessInfo.WithNull -> - if csenv.g.checkNullness && not csenv.IsSpeculativeForMethodOverloading then + if csenv.g.checkNullness then WarnD(ConstraintSolverNullnessWarningWithTypes(csenv.DisplayEnv, ty1, ty2, n1, n2, csenv.m, m2)) else CompleteD diff --git a/src/Compiler/Checking/Expressions/CheckComputationExpressions.fs b/src/Compiler/Checking/Expressions/CheckComputationExpressions.fs index 645897a6793..22b603d211a 100644 --- a/src/Compiler/Checking/Expressions/CheckComputationExpressions.fs +++ b/src/Compiler/Checking/Expressions/CheckComputationExpressions.fs @@ -982,7 +982,7 @@ let rec TryTranslateComputationExpression use _holder = TemporarilySuspendReportingTypecheckResultsToSink cenv.tcSink let _, _, vspecs, envinner, _ = - TcMatchPattern cenv (NewInferenceType cenv.g) env ceenv.tpenv firstSourcePat None + TcMatchPattern cenv (NewInferenceType cenv.g) env ceenv.tpenv firstSourcePat None TcTrueMatchClause.No vspecs, envinner) @@ -991,7 +991,7 @@ let rec TryTranslateComputationExpression use _holder = TemporarilySuspendReportingTypecheckResultsToSink cenv.tcSink let _, _, vspecs, envinner, _ = - TcMatchPattern cenv (NewInferenceType cenv.g) env ceenv.tpenv secondSourcePat None + TcMatchPattern cenv (NewInferenceType cenv.g) env ceenv.tpenv secondSourcePat None TcTrueMatchClause.No vspecs, envinner) @@ -1002,7 +1002,7 @@ let rec TryTranslateComputationExpression use _holder = TemporarilySuspendReportingTypecheckResultsToSink cenv.tcSink let _, _, vspecs, envinner, _ = - TcMatchPattern cenv (NewInferenceType cenv.g) env ceenv.tpenv pat3 None + TcMatchPattern cenv (NewInferenceType cenv.g) env ceenv.tpenv pat3 None TcTrueMatchClause.No vspecs, envinner) | None -> varSpace @@ -1231,7 +1231,7 @@ let rec TryTranslateComputationExpression use _holder = TemporarilySuspendReportingTypecheckResultsToSink cenv.tcSink let _, _, vspecs, envinner, _ = - TcMatchPattern cenv (NewInferenceType cenv.g) env ceenv.tpenv pat None + TcMatchPattern cenv (NewInferenceType cenv.g) env ceenv.tpenv pat None TcTrueMatchClause.No vspecs, envinner) @@ -1789,7 +1789,7 @@ let rec TryTranslateComputationExpression use _holder = TemporarilySuspendReportingTypecheckResultsToSink cenv.tcSink let _, _, vspecs, envinner, _ = - TcMatchPattern cenv (NewInferenceType cenv.g) env ceenv.tpenv pat None + TcMatchPattern cenv (NewInferenceType cenv.g) env ceenv.tpenv pat None TcTrueMatchClause.No vspecs, envinner | _ -> @@ -1873,7 +1873,7 @@ let rec TryTranslateComputationExpression use _holder = TemporarilySuspendReportingTypecheckResultsToSink cenv.tcSink let _, _, vspecs, envinner, _ = - TcMatchPattern cenv (NewInferenceType cenv.g) env ceenv.tpenv pat None + TcMatchPattern cenv (NewInferenceType cenv.g) env ceenv.tpenv pat None TcTrueMatchClause.No vspecs, envinner) @@ -2066,7 +2066,7 @@ let rec TryTranslateComputationExpression use _holder = TemporarilySuspendReportingTypecheckResultsToSink cenv.tcSink let _, _, vspecs, envinner, _ = - TcMatchPattern cenv (NewInferenceType cenv.g) env ceenv.tpenv consumePat None + TcMatchPattern cenv (NewInferenceType cenv.g) env ceenv.tpenv consumePat None TcTrueMatchClause.No vspecs, envinner) @@ -2111,7 +2111,7 @@ let rec TryTranslateComputationExpression use _holder = TemporarilySuspendReportingTypecheckResultsToSink cenv.tcSink let _, _, vspecs, envinner, _ = - TcMatchPattern cenv (NewInferenceType cenv.g) env ceenv.tpenv consumePat None + TcMatchPattern cenv (NewInferenceType cenv.g) env ceenv.tpenv consumePat None TcTrueMatchClause.No vspecs, envinner) @@ -2239,7 +2239,7 @@ let rec TryTranslateComputationExpression use _holder = TemporarilySuspendReportingTypecheckResultsToSink cenv.tcSink let _, _, vspecs, envinner, _ = - TcMatchPattern cenv (NewInferenceType cenv.g) env ceenv.tpenv consumePat None + TcMatchPattern cenv (NewInferenceType cenv.g) env ceenv.tpenv consumePat None TcTrueMatchClause.No vspecs, envinner) diff --git a/src/Compiler/Checking/Expressions/CheckExpressions.fs b/src/Compiler/Checking/Expressions/CheckExpressions.fs index 30375d047f4..c6b1372843d 100644 --- a/src/Compiler/Checking/Expressions/CheckExpressions.fs +++ b/src/Compiler/Checking/Expressions/CheckExpressions.fs @@ -43,6 +43,7 @@ open FSharp.Compiler.TypedTreeBasics open FSharp.Compiler.TypedTreeOps open FSharp.Compiler.TypeHierarchy open FSharp.Compiler.TypeRelations +open Import #if !NO_TYPEPROVIDERS open FSharp.Compiler.TypeProviders @@ -1016,6 +1017,12 @@ type TcCanFail = | IgnoreMemberResoutionError | IgnoreAllErrors | ReportAllErrors + +[] +[] +type TcTrueMatchClause = + | Yes + | No let TcAddNullnessToType (warn: bool) (cenv: cenv) (env: TcEnv) nullness innerTyC m = let g = cenv.g @@ -2515,8 +2522,12 @@ module BindingNormalization = match memberFlagsOpt with | None -> let extraDot = if synLongId.ThereIsAnExtraDotAtTheEnd then ExtraDotAfterIdentifier.Yes else ExtraDotAfterIdentifier.No - - match ResolvePatternLongIdent cenv.tcSink nameResolver AllIdsOK true m ad env.NameEnv TypeNameResolutionInfo.Default longId extraDot with + let warnOnUpper = + if not args.IsEmpty then + WarnOnUpperUnionCaseLabel + else AllIdsOK + + match ResolvePatternLongIdent cenv.tcSink nameResolver warnOnUpper true m ad env.NameEnv TypeNameResolutionInfo.Default longId extraDot with | Item.NewDef id -> if id.idText = opNameCons then NormalizedBindingPat(pat, rhsExpr, valSynData, typars) @@ -5891,6 +5902,17 @@ and TcExprUndelayed (cenv: cenv) (overallTy: OverallTy) env tpenv (synExpr: SynE TcForEachExpr cenv overallTy env tpenv (seqExprOnly, isFromSource, pat, synEnumExpr, synBodyExpr, m, spFor, spIn, m) | SynExpr.ComputationExpr (hasSeqBuilder, comp, m) -> + let isIndexRange = match comp with | SynExpr.IndexRange _ -> true | _ -> false + let deprecatedPlacesWhereSeqCanBeOmitted = + cenv.g.langVersion.SupportsFeature LanguageFeature.DeprecatePlacesWhereSeqCanBeOmitted + if + deprecatedPlacesWhereSeqCanBeOmitted + && isIndexRange + && not hasSeqBuilder + && not cenv.g.compilingFSharpCore + then + warning (Error(FSComp.SR.chkDeprecatePlacesWhereSeqCanBeOmitted (), m)) + let env = ExitFamilyRegion env cenv.TcSequenceExpressionEntry cenv env overallTy tpenv (hasSeqBuilder, comp) m @@ -6411,10 +6433,8 @@ and TcExprILAssembly (cenv: cenv) overallTy env tpenv (ilInstrs, synTyArgs, synA and TcIteratedLambdas (cenv: cenv) isFirst (env: TcEnv) overallTy takenNames tpenv e = let g = cenv.g match e with - | SynExpr.Lambda (isMember, isSubsequent, synSimplePats, bodyExpr, _, m, _) when isMember || isFirst || isSubsequent -> - + | SynExpr.Lambda (isMember, isSubsequent, synSimplePats, bodyExpr, _parsedData, m, _trivia) when isMember || isFirst || isSubsequent -> let domainTy, resultTy = UnifyFunctionType None cenv env.DisplayEnv m overallTy.Commit - let vs, (TcPatLinearEnv (tpenv, names, takenNames)) = cenv.TcSimplePats cenv isMember CheckCxs domainTy env (TcPatLinearEnv (tpenv, Map.empty, takenNames)) synSimplePats @@ -8060,7 +8080,7 @@ and TcForEachExpr cenv overallTy env tpenv (seqExprOnly, isFromSource, synPat, s let pat, _, vspecs, envinner, tpenv = let env = { env with eIsControlFlow = false } - TcMatchPattern cenv enumElemTy env tpenv synPat None + TcMatchPattern cenv enumElemTy env tpenv synPat None TcTrueMatchClause.No let elemVar, pat = // nice: don't introduce awful temporary for r.h.s. in the 99% case where we know what we're binding it to @@ -10590,10 +10610,15 @@ and TcAndPatternCompileMatchClauses mExpr mMatch actionOnFailure cenv inputExprO let matchVal, expr = CompilePatternForMatchClauses cenv env mExpr mMatch true actionOnFailure inputExprOpt inputTy resultTy.Commit clauses matchVal, expr, tpenv -and TcMatchPattern cenv inputTy env tpenv (synPat: SynPat) (synWhenExprOpt: SynExpr option) = +and TcMatchPattern (cenv: cenv) inputTy env tpenv (synPat: SynPat) (synWhenExprOpt: SynExpr option) (tcTrueMatchClause: TcTrueMatchClause) = let g = cenv.g let m = synPat.Range - let patf', (TcPatLinearEnv (tpenv, names, _)) = cenv.TcPat WarnOnUpperCase cenv env None (TcPatValFlags (ValInline.Optional, permitInferTypars, noArgOrRetAttribs, false, None, false)) (TcPatLinearEnv (tpenv, Map.empty, Set.empty)) inputTy synPat + let warnOnUpperFlag = + match tcTrueMatchClause with + | TcTrueMatchClause.Yes -> WarnOnUpperUnionCaseLabel + | TcTrueMatchClause.No -> WarnOnUpperVariablePatterns + + let patf', (TcPatLinearEnv (tpenv, names, _)) = cenv.TcPat warnOnUpperFlag cenv env None (TcPatValFlags (ValInline.Optional, permitInferTypars, noArgOrRetAttribs, false, None, false)) (TcPatLinearEnv (tpenv, Map.empty, Set.empty)) inputTy synPat let envinner, values, vspecMap = MakeAndPublishSimpleValsForMergedScope cenv env m names let whenExprOpt, tpenv = @@ -10614,9 +10639,15 @@ and TcMatchClauses cenv inputTy (resultTy: OverallTy) env tpenv clauses = resultList,tpEnv and TcMatchClause cenv inputTy (resultTy: OverallTy) env isFirst tpenv synMatchClause = - let (SynMatchClause(synPat, synWhenExprOpt, synResultExpr, patm, spTgt, _)) = synMatchClause + let (SynMatchClause(synPat, synWhenExprOpt, synResultExpr, patm, spTgt, trivia)) = synMatchClause - let pat, whenExprOpt, vspecs, envinner, tpenv = TcMatchPattern cenv inputTy env tpenv synPat synWhenExprOpt + let isTrueMatchClause = + if synMatchClause.IsTrueMatchClause then + TcTrueMatchClause.Yes + else + TcTrueMatchClause.No + + let pat, whenExprOpt, vspecs, envinner, tpenv = TcMatchPattern cenv inputTy env tpenv synPat synWhenExprOpt isTrueMatchClause let resultEnv = if isFirst then envinner diff --git a/src/Compiler/Checking/Expressions/CheckExpressions.fsi b/src/Compiler/Checking/Expressions/CheckExpressions.fsi index cccb19f8abf..0e4e17a8f83 100644 --- a/src/Compiler/Checking/Expressions/CheckExpressions.fsi +++ b/src/Compiler/Checking/Expressions/CheckExpressions.fsi @@ -351,6 +351,13 @@ type TcCanFail = | IgnoreAllErrors | ReportAllErrors +/// Represents a pattern that is used in a true match clause e.g. | pat -> expr +[] +[] +type TcTrueMatchClause = + | Yes + | No + /// Represents a recursive binding after it has been both checked and generalized, but /// before initialization recursion has been rewritten type PreInitializationGraphEliminationBinding = @@ -703,6 +710,7 @@ val TcMatchPattern: tpenv: UnscopedTyparEnv -> synPat: SynPat -> synWhenExprOpt: SynExpr option -> + tcTrueMatchClause: TcTrueMatchClause -> Pattern * Expr option * Val list * TcEnv * UnscopedTyparEnv [] diff --git a/src/Compiler/Checking/Expressions/CheckSequenceExpressions.fs b/src/Compiler/Checking/Expressions/CheckSequenceExpressions.fs index 3154d3e1e74..6f483cc2e53 100644 --- a/src/Compiler/Checking/Expressions/CheckSequenceExpressions.fs +++ b/src/Compiler/Checking/Expressions/CheckSequenceExpressions.fs @@ -59,7 +59,7 @@ let TcSequenceExpression (cenv: TcFileState) env tpenv comp (overallTy: OverallT ConvertArbitraryExprToEnumerable cenv arbitraryTy env pseudoEnumExpr let patR, _, vspecs, envinner, tpenv = - TcMatchPattern cenv enumElemTy env tpenv pat None + TcMatchPattern cenv enumElemTy env tpenv pat None TcTrueMatchClause.No let innerExpr, tpenv = let envinner = { envinner with eIsControlFlow = true } @@ -241,7 +241,7 @@ let TcSequenceExpression (cenv: TcFileState) env tpenv comp (overallTy: OverallT let inputExprTy = NewInferenceType g let pat', _, vspecs, envinner, tpenv = - TcMatchPattern cenv bindPatTy env tpenv pat None + TcMatchPattern cenv bindPatTy env tpenv pat None TcTrueMatchClause.No UnifyTypes cenv env m inputExprTy bindPatTy @@ -270,9 +270,15 @@ let TcSequenceExpression (cenv: TcFileState) env tpenv comp (overallTy: OverallT let tclauses, tpenv = (tpenv, clauses) - ||> List.mapFold (fun tpenv (SynMatchClause(pat, cond, innerComp, _, sp, _)) -> + ||> List.mapFold (fun tpenv (SynMatchClause(pat, cond, innerComp, _, sp, trivia) as clause) -> + let isTrueMatchClause = + if clause.IsTrueMatchClause then + TcTrueMatchClause.Yes + else + TcTrueMatchClause.No + let patR, condR, vspecs, envinner, tpenv = - TcMatchPattern cenv inputTy env tpenv pat cond + TcMatchPattern cenv inputTy env tpenv pat cond isTrueMatchClause let envinner = match sp with @@ -313,9 +319,15 @@ let TcSequenceExpression (cenv: TcFileState) env tpenv comp (overallTy: OverallT // Compile the pattern twice, once as a filter with all succeeding targets returning "1", and once as a proper catch block. let clauses, tpenv = (tpenv, withList) - ||> List.mapFold (fun tpenv (SynMatchClause(pat, cond, innerComp, m, sp, _)) -> + ||> List.mapFold (fun tpenv (SynMatchClause(pat, cond, innerComp, m, sp, trivia) as clause) -> + let isTrueMatchClause = + if clause.IsTrueMatchClause then + TcTrueMatchClause.Yes + else + TcTrueMatchClause.No + let patR, condR, vspecs, envinner, tpenv = - TcMatchPattern cenv g.exn_ty env tpenv pat cond + TcMatchPattern cenv g.exn_ty env tpenv pat cond isTrueMatchClause let envinner = match sp with diff --git a/src/Compiler/Checking/InfoReader.fs b/src/Compiler/Checking/InfoReader.fs index 24a2d5bbf6e..77fb623efb0 100644 --- a/src/Compiler/Checking/InfoReader.fs +++ b/src/Compiler/Checking/InfoReader.fs @@ -24,6 +24,7 @@ open FSharp.Compiler.TypedTreeOps open FSharp.Compiler.TypedTreeBasics open FSharp.Compiler.TypeHierarchy open FSharp.Compiler.TypeRelations +open Import /// Use the given function to select some of the member values from the members of an F# type let SelectImmediateMemberVals g optFilter f withExplicitImpl (tcref: TyconRef) = diff --git a/src/Compiler/Checking/MethodOverrides.fs b/src/Compiler/Checking/MethodOverrides.fs index b9eaa2c6687..18b3f23190f 100644 --- a/src/Compiler/Checking/MethodOverrides.fs +++ b/src/Compiler/Checking/MethodOverrides.fs @@ -107,6 +107,7 @@ exception TypeIsImplicitlyAbstract of range exception OverrideDoesntOverride of DisplayEnv * OverrideInfo * MethInfo option * TcGlobals * Import.ImportMap * range module DispatchSlotChecking = + open Import /// Print the signature of an override to a buffer as part of an error message let PrintOverrideToBuffer denv os (Override(_, _, id, methTypars, memberToParentInst, argTys, retTy, _, _, _)) = diff --git a/src/Compiler/Checking/NameResolution.fs b/src/Compiler/Checking/NameResolution.fs index 010e9e0cd8d..5b0c9842f77 100644 --- a/src/Compiler/Checking/NameResolution.fs +++ b/src/Compiler/Checking/NameResolution.fs @@ -3369,7 +3369,10 @@ let rec ResolvePatternLongIdentInModuleOrNamespace (ncenv: NameResolver) nenv nu exception UpperCaseIdentifierInPattern of range /// Indicates if a warning should be given for the use of upper-case identifiers in patterns -type WarnOnUpperFlag = WarnOnUpperCase | AllIdsOK +type WarnOnUpperFlag = + | WarnOnUpperUnionCaseLabel + | WarnOnUpperVariablePatterns + | AllIdsOK // Long ID in a pattern let rec ResolvePatternLongIdentPrim sink (ncenv: NameResolver) fullyQualified warnOnUpper newDef m ad nenv numTyArgsOpt (id: Ident) (rest: Ident list) extraDotAtTheEnd = @@ -3389,13 +3392,21 @@ let rec ResolvePatternLongIdentPrim sink (ncenv: NameResolver) fullyQualified wa | true, res when not newDef -> ResolveUnqualifiedItem ncenv nenv m res | _ -> // Single identifiers in patterns - variable bindings - if - not newDef - && warnOnUpper = WarnOnUpperCase - && id.idText.Length >= 3 - && System.Char.ToLowerInvariant id.idText[0] <> id.idText[0] + let supportsDontWarnOnUppercaseIdentifiers = ncenv.g.langVersion.SupportsFeature(LanguageFeature.DontWarnOnUppercaseIdentifiersInBindingPatterns) + let isUpperCaseIdentifier = (not newDef && System.Char.ToLowerInvariant id.idText[0] <> id.idText[0]) + if (supportsDontWarnOnUppercaseIdentifiers && isUpperCaseIdentifier) then - warning(UpperCaseIdentifierInPattern m) + match warnOnUpper with + | WarnOnUpperUnionCaseLabel -> warning(UpperCaseIdentifierInPattern m) + | WarnOnUpperVariablePatterns + | AllIdsOK -> () + else + // HACK: This is an historical hack that seems to related the use country and language codes, which are very common in codebases + if isUpperCaseIdentifier && id.idText.Length >= 3 then + match warnOnUpper with + | WarnOnUpperUnionCaseLabel + | WarnOnUpperVariablePatterns -> warning(UpperCaseIdentifierInPattern m) + | AllIdsOK -> () // If there's an extra dot, we check whether the single identifier is a union, module or namespace and report it to the sink for the sake of tooling match extraDotAtTheEnd with diff --git a/src/Compiler/Checking/NameResolution.fsi b/src/Compiler/Checking/NameResolution.fsi index d3870b251c8..693c9ec16de 100755 --- a/src/Compiler/Checking/NameResolution.fsi +++ b/src/Compiler/Checking/NameResolution.fsi @@ -565,7 +565,8 @@ type LookupKind = /// Indicates if a warning should be given for the use of upper-case identifiers in patterns type WarnOnUpperFlag = - | WarnOnUpperCase + | WarnOnUpperUnionCaseLabel + | WarnOnUpperVariablePatterns | AllIdsOK /// Indicates whether we permit a direct reference to a type generator. Only set when resolving the diff --git a/src/Compiler/Checking/NicePrint.fs b/src/Compiler/Checking/NicePrint.fs index 09e8708b894..62262b54635 100644 --- a/src/Compiler/Checking/NicePrint.fs +++ b/src/Compiler/Checking/NicePrint.fs @@ -2045,7 +2045,7 @@ module TastDefinitionPrinting = (not vref.IsCompilerGenerated) && (denv.showObsoleteMembers || not (CheckFSharpAttributesForObsolete denv.g vref.Attribs)) && (denv.showHiddenMembers || not (CheckFSharpAttributesForHidden denv.g vref.Attribs)) - + let ctors = GetIntrinsicConstructorInfosOfType infoReader m ty |> List.filter (fun minfo -> IsMethInfoAccessible amap m ad minfo && not minfo.IsClassConstructor && shouldShow minfo.ArbitraryValRef) @@ -2057,7 +2057,7 @@ module TastDefinitionPrinting = tycon.ImmediateInterfacesOfFSharpTycon |> List.filter (fun (_, compgen, _) -> not compgen) |> List.map p13 - else + else GetImmediateInterfacesOfType SkipUnrefInterfaces.Yes g amap m ty let iimplsLs = diff --git a/src/Compiler/Checking/PatternMatchCompilation.fs b/src/Compiler/Checking/PatternMatchCompilation.fs index b45f23407ea..00b25756801 100644 --- a/src/Compiler/Checking/PatternMatchCompilation.fs +++ b/src/Compiler/Checking/PatternMatchCompilation.fs @@ -24,6 +24,7 @@ open FSharp.Compiler.TypedTreeOps open FSharp.Compiler.TypedTreeOps.DebugPrint open FSharp.Compiler.TypeRelations open type System.MemoryExtensions +open Import exception MatchIncomplete of bool * (string * bool) option * range exception RuleNeverMatched of range diff --git a/src/Compiler/Checking/SignatureHash.fs b/src/Compiler/Checking/SignatureHash.fs index 66aeb0912c7..a9bf8fce50e 100644 --- a/src/Compiler/Checking/SignatureHash.fs +++ b/src/Compiler/Checking/SignatureHash.fs @@ -1,340 +1,20 @@ module internal Fsharp.Compiler.SignatureHash -open Internal.Utilities.Library -open Internal.Utilities.Rational open FSharp.Compiler.AbstractIL.IL -open FSharp.Compiler.Syntax open FSharp.Compiler.TcGlobals -open FSharp.Compiler.Text open FSharp.Compiler.TypedTree open FSharp.Compiler.TypedTreeBasics open FSharp.Compiler.TypedTreeOps open FSharp.Compiler.CheckDeclarations -type ObserverVisibility = - | PublicOnly - | PublicAndInternal - -[] -module internal HashingPrimitives = - - type Hash = int - - let inline hashText (s: string) : Hash = hash s - let inline private combineHash acc y : Hash = (acc <<< 1) + y + 631 - let inline pipeToHash (value: Hash) (acc: Hash) = combineHash acc value - let inline addFullStructuralHash (value) (acc: Hash) = combineHash (acc) (hash value) - - let inline hashListOrderMatters ([] func) (items: #seq<'T>) : Hash = - let mutable acc = 0 - - for i in items do - let valHash = func i - // We are calling hashListOrderMatters for things like list of types, list of properties, list of fields etc. The ones which are visibility-hidden will return 0, and are omitted. - if valHash <> 0 then - acc <- combineHash acc valHash - - acc - - let inline hashListOrderIndependent ([] func) (items: #seq<'T>) : Hash = - let mutable acc = 0 - - for i in items do - let valHash = func i - acc <- acc ^^^ valHash - - acc - - let (@@) (h1: Hash) (h2: Hash) = combineHash h1 h2 - -[] -module internal HashUtilities = - - let private hashEntityRefName (xref: EntityRef) name = - let tag = - if xref.IsNamespace then - TextTag.Namespace - elif xref.IsModule then - TextTag.Module - elif xref.IsTypeAbbrev then - TextTag.Alias - elif xref.IsFSharpDelegateTycon then - TextTag.Delegate - elif xref.IsILEnumTycon || xref.IsFSharpEnumTycon then - TextTag.Enum - elif xref.IsStructOrEnumTycon then - TextTag.Struct - elif isInterfaceTyconRef xref then - TextTag.Interface - elif xref.IsUnionTycon then - TextTag.Union - elif xref.IsRecordTycon then - TextTag.Record - else - TextTag.Class - - (hash tag) @@ (hashText name) - - let hashTyconRefImpl (tcref: TyconRef) = - let demangled = tcref.DisplayNameWithStaticParameters - let tyconHash = hashEntityRefName tcref demangled - - tcref.CompilationPath.AccessPath - |> hashListOrderMatters (fst >> hashText) - |> pipeToHash tyconHash - -module HashIL = - - let hashILTypeRef (tref: ILTypeRef) = - tref.Enclosing - |> hashListOrderMatters hashText - |> addFullStructuralHash tref.Name - - let private hashILArrayShape (sh: ILArrayShape) = sh.Rank - - let rec hashILType (ty: ILType) : Hash = - match ty with - | ILType.Void -> hash ILType.Void - | ILType.Array(sh, t) -> hashILType t @@ hashILArrayShape sh - | ILType.Value t - | ILType.Boxed t -> hashILTypeRef t.TypeRef @@ (t.GenericArgs |> hashListOrderMatters (hashILType)) - | ILType.Ptr t - | ILType.Byref t -> hashILType t - | ILType.FunctionPointer t -> hashILCallingSignature t - | ILType.TypeVar n -> hash n - | ILType.Modified(_, _, t) -> hashILType t - - and hashILCallingSignature (signature: ILCallingSignature) = - let res = signature.ReturnType |> hashILType - signature.ArgTypes |> hashListOrderMatters (hashILType) |> pipeToHash res - -module HashAccessibility = - - let isHiddenToObserver (TAccess access) (observer: ObserverVisibility) = - let isInternalCompPath x = - match x with - | CompPath(ILScopeRef.Local, _, []) -> true - | _ -> false - - match access with - | [] -> false - | _ when List.forall isInternalCompPath access -> - match observer with - // The 'access' means internal, but our observer can see it (e.g. because of IVT attribute) - | PublicAndInternal -> false - | PublicOnly -> true - | _ -> true - -module rec HashTypes = - - /// Hash a reference to a type - let hashTyconRef tcref = hashTyconRefImpl tcref - - /// Hash the flags of a member - let hashMemberFlags (memFlags: SynMemberFlags) = hash memFlags - - /// Hash an attribute 'Type(arg1, ..., argN)' - let private hashAttrib (Attrib(tyconRef = tcref)) = hashTyconRefImpl tcref - - let hashAttributeList attrs = - attrs |> hashListOrderIndependent hashAttrib - - let private hashTyparRef (typar: Typar) = - hashText typar.DisplayName - |> addFullStructuralHash (typar.Rigidity) - |> addFullStructuralHash (typar.StaticReq) - - let private hashTyparRefWithInfo (typar: Typar) = - hashTyparRef typar @@ hashAttributeList typar.Attribs - - let private hashConstraint (g: TcGlobals) struct (tp, tpc) = - let tpHash = hashTyparRefWithInfo tp - - match tpc with - | TyparConstraint.CoercesTo(tgtTy, _) -> tpHash @@ 1 @@ hashTType g tgtTy - | TyparConstraint.MayResolveMember(traitInfo, _) -> tpHash @@ 2 @@ hashTraitWithInfo (* denv *) g traitInfo - | TyparConstraint.DefaultsTo(_, ty, _) -> tpHash @@ 3 @@ hashTType g ty - | TyparConstraint.IsEnum(ty, _) -> tpHash @@ 4 @@ hashTType g ty - | TyparConstraint.SupportsComparison _ -> tpHash @@ 5 - | TyparConstraint.SupportsEquality _ -> tpHash @@ 6 - | TyparConstraint.IsDelegate(aty, bty, _) -> tpHash @@ 7 @@ hashTType g aty @@ hashTType g bty - | TyparConstraint.SupportsNull _ -> tpHash @@ 8 - | TyparConstraint.IsNonNullableStruct _ -> tpHash @@ 9 - | TyparConstraint.IsUnmanaged _ -> tpHash @@ 10 - | TyparConstraint.IsReferenceType _ -> tpHash @@ 11 - | TyparConstraint.SimpleChoice(tys, _) -> tpHash @@ 12 @@ (tys |> hashListOrderIndependent (hashTType g)) - | TyparConstraint.RequiresDefaultConstructor _ -> tpHash @@ 13 - | TyparConstraint.NotSupportsNull(_) -> tpHash @@ 14 - | TyparConstraint.AllowsRefStruct _ -> tpHash @@ 15 - - /// Hash type parameter constraints - let private hashConstraints (g: TcGlobals) cxs = - cxs |> hashListOrderIndependent (hashConstraint g) - - let private hashTraitWithInfo (g: TcGlobals) traitInfo = - let nameHash = hashText traitInfo.MemberLogicalName - let memberHash = hashMemberFlags traitInfo.MemberFlags - - let returnTypeHash = - match traitInfo.CompiledReturnType with - | Some t -> hashTType g t - | _ -> -1 - - traitInfo.CompiledObjectAndArgumentTypes - |> hashListOrderIndependent (hashTType g) - |> pipeToHash (nameHash) - |> pipeToHash (returnTypeHash) - |> pipeToHash memberHash - - /// Hash a unit of measure expression - let private hashMeasure unt = - let measuresWithExponents = - ListMeasureVarOccsWithNonZeroExponents unt - |> List.sortBy (fun (tp: Typar, _) -> tp.DisplayName) - - measuresWithExponents - |> hashListOrderIndependent (fun (typar, exp: Rational) -> hashTyparRef typar @@ hash exp) - - /// Hash a type, taking precedence into account to insert brackets where needed - let hashTType (g: TcGlobals) ty = - - match stripTyparEqns ty |> (stripTyEqns g) with - | TType_ucase(UnionCaseRef(tc, _), args) - | TType_app(tc, args, _) -> args |> hashListOrderMatters (hashTType g) |> pipeToHash (hashTyconRef tc) - | TType_anon(anonInfo, tys) -> - tys - |> hashListOrderMatters (hashTType g) - |> pipeToHash (anonInfo.SortedNames |> hashListOrderMatters hashText) - |> addFullStructuralHash (evalAnonInfoIsStruct anonInfo) - | TType_tuple(tupInfo, t) -> - t - |> hashListOrderMatters (hashTType g) - |> addFullStructuralHash (evalTupInfoIsStruct tupInfo) - // Hash a first-class generic type. - | TType_forall(tps, tau) -> tps |> hashListOrderMatters (hashTyparRef) |> pipeToHash (hashTType g tau) - | TType_fun _ -> - let argTys, retTy = stripFunTy g ty - argTys |> hashListOrderMatters (hashTType g) |> pipeToHash (hashTType g retTy) - | TType_var(r, _) -> hashTyparRefWithInfo r - | TType_measure unt -> hashMeasure unt - - // Hash a single argument, including its name and type - let private hashArgInfo (g: TcGlobals) (ty, argInfo: ArgReprInfo) = - - let attributesHash = hashAttributeList argInfo.Attribs - - let nameHash = - match argInfo.Name with - | Some i -> hashText i.idText - | _ -> -1 - - let typeHash = hashTType g ty - - typeHash @@ nameHash @@ attributesHash - - let private hashCurriedArgInfos (g: TcGlobals) argInfos = - argInfos - |> hashListOrderMatters (fun l -> l |> hashListOrderMatters (hashArgInfo g)) - - /// Hash a single type used as the type of a member or value - let hashTopType (g: TcGlobals) argInfos retTy cxs = - let retTypeHash = hashTType g retTy - let cxsHash = hashConstraints g cxs - let argHash = hashCurriedArgInfos g argInfos - - retTypeHash @@ cxsHash @@ argHash - - let private hashTyparInclConstraints (g: TcGlobals) (typar: Typar) = - typar.Constraints - |> hashListOrderIndependent (fun tpc -> hashConstraint g (typar, tpc)) - |> pipeToHash (hashTyparRef typar) - - /// Hash type parameters - let hashTyparDecls (g: TcGlobals) (typars: Typars) = - typars |> hashListOrderMatters (hashTyparInclConstraints g) - - let private hashUncurriedSig (g: TcGlobals) typarInst argInfos retTy = - typarInst - |> hashListOrderMatters (fun (typar, ttype) -> hashTyparInclConstraints g typar @@ hashTType g ttype) - |> pipeToHash (hashTopType g argInfos retTy []) - - let private hashMemberSigCore (g: TcGlobals) memberToParentInst (typarInst, methTypars: Typars, argInfos, retTy) = - typarInst - |> hashListOrderMatters (fun (typar, ttype) -> hashTyparInclConstraints g typar @@ hashTType g ttype) - |> pipeToHash (hashTopType g argInfos retTy []) - |> pipeToHash ( - memberToParentInst - |> hashListOrderMatters (fun (typar, ty) -> hashTyparRef typar @@ hashTType g ty) - ) - |> pipeToHash (hashTyparDecls g methTypars) - - let hashMemberType (g: TcGlobals) vref typarInst argInfos retTy = - match PartitionValRefTypars g vref with - | Some(_, _, memberMethodTypars, memberToParentInst, _) -> - hashMemberSigCore g memberToParentInst (typarInst, memberMethodTypars, argInfos, retTy) - | None -> hashUncurriedSig g typarInst argInfos retTy - -module HashTastMemberOrVals = - open HashTypes - - let private hashMember (g: TcGlobals, observer) typarInst (v: Val) = - let vref = mkLocalValRef v - - if HashAccessibility.isHiddenToObserver vref.Accessibility observer then - 0 - else - let membInfo = Option.get vref.MemberInfo - let _tps, argInfos, retTy, _ = GetTypeOfMemberInFSharpForm g vref - - let memberFlagsHash = hashMemberFlags membInfo.MemberFlags - let parentTypeHash = hashTyconRef membInfo.ApparentEnclosingEntity - let memberTypeHash = hashMemberType g vref typarInst argInfos retTy - let flagsHash = hash v.val_flags.PickledBits - let nameHash = hashText v.DisplayNameCoreMangled - let attribsHash = hashAttributeList v.Attribs - - let combinedHash = - memberFlagsHash - @@ parentTypeHash - @@ memberTypeHash - @@ flagsHash - @@ nameHash - @@ attribsHash - - combinedHash - - let private hashNonMemberVal (g: TcGlobals, observer) (tps, v: Val, tau, cxs) = - if HashAccessibility.isHiddenToObserver v.Accessibility observer then - 0 - else - let valReprInfo = arityOfValForDisplay v - let nameHash = hashText v.DisplayNameCoreMangled - let typarHash = hashTyparDecls g tps - let argInfos, retTy = GetTopTauTypeInFSharpForm g valReprInfo.ArgInfos tau v.Range - let typeHash = hashTopType g argInfos retTy cxs - let flagsHash = hash v.val_flags.PickledBits - let attribsHash = hashAttributeList v.Attribs - - let combinedHash = nameHash @@ typarHash @@ typeHash @@ flagsHash @@ attribsHash - combinedHash - - let hashValOrMemberNoInst (g, obs) (vref: ValRef) = - match vref.MemberInfo with - | None -> - let tps, tau = vref.GeneralizedType - - let cxs = - tps - |> Seq.collect (fun tp -> tp.Constraints |> Seq.map (fun cx -> struct (tp, cx))) - - hashNonMemberVal (g, obs) (tps, vref.Deref, tau, cxs) - | Some _ -> hashMember (g, obs) emptyTyparInst vref.Deref +open Internal.Utilities.Library +open Internal.Utilities.TypeHashing +open Internal.Utilities.TypeHashing.HashTypes //------------------------------------------------------------------------- /// Printing TAST objects module TyconDefinitionHash = - open HashTypes let private hashRecdField (g: TcGlobals, observer) (fld: RecdField) = if HashAccessibility.isHiddenToObserver fld.Accessibility observer then diff --git a/src/Compiler/Checking/SignatureHash.fsi b/src/Compiler/Checking/SignatureHash.fsi index 90d25e8eabb..51f3fe17695 100644 --- a/src/Compiler/Checking/SignatureHash.fsi +++ b/src/Compiler/Checking/SignatureHash.fsi @@ -5,9 +5,7 @@ open FSharp.Compiler.TcGlobals open FSharp.Compiler.TypedTree open FSharp.Compiler.CheckDeclarations -type ObserverVisibility = - | PublicOnly - | PublicAndInternal +open Internal.Utilities.TypeHashing val calculateHashOfImpliedSignature: g: TcGlobals -> observer: ObserverVisibility -> expr: ModuleOrNamespaceContents -> int diff --git a/src/Compiler/Checking/TailCallChecks.fs b/src/Compiler/Checking/TailCallChecks.fs index d23b50716af..a7ea9ad802a 100644 --- a/src/Compiler/Checking/TailCallChecks.fs +++ b/src/Compiler/Checking/TailCallChecks.fs @@ -792,6 +792,7 @@ let CheckModuleBinding cenv (isRec: bool) (TBind _ as bind) = // warn for recursive calls in TryWith/TryFinally operations exprs |> Seq.iter (checkTailCall true) | Expr.Op(args = exprs) -> exprs |> Seq.iter (checkTailCall insideSubBindingOrTry) + | Expr.Sequential(expr2 = expr2) -> checkTailCall insideSubBindingOrTry expr2 | _ -> () checkTailCall false bodyExpr diff --git a/src/Compiler/Checking/TypeRelations.fs b/src/Compiler/Checking/TypeRelations.fs index 498fd3e3bb8..6c38b68d80a 100644 --- a/src/Compiler/Checking/TypeRelations.fs +++ b/src/Compiler/Checking/TypeRelations.fs @@ -6,7 +6,8 @@ module internal FSharp.Compiler.TypeRelations open FSharp.Compiler.Features open Internal.Utilities.Collections -open Internal.Utilities.Library +open Internal.Utilities.Library + open FSharp.Compiler.DiagnosticsLogger open FSharp.Compiler.TcGlobals open FSharp.Compiler.TypedTree @@ -14,38 +15,43 @@ open FSharp.Compiler.TypedTreeBasics open FSharp.Compiler.TypedTreeOps open FSharp.Compiler.TypeHierarchy +open Import + +#nowarn "3391" + /// Implements a :> b without coercion based on finalized (no type variable) types -// Note: This relation is approximate and not part of the language specification. +// Note: This relation is approximate and not part of the language specification. // -// Some appropriate uses: +// Some appropriate uses: // patcompile.fs: IsDiscrimSubsumedBy (approximate warning for redundancy of 'isinst' patterns) // tc.fs: TcRuntimeTypeTest (approximate warning for redundant runtime type tests) // tc.fs: TcExnDefnCore (error for bad exception abbreviation) // ilxgen.fs: GenCoerce (omit unnecessary castclass or isinst instruction) // -let rec TypeDefinitelySubsumesTypeNoCoercion ndeep g amap m ty1 ty2 = - if ndeep > 100 then error(InternalError("recursive class hierarchy (detected in TypeDefinitelySubsumesTypeNoCoercion), ty1 = " + (DebugPrint.showType ty1), m)) - if ty1 === ty2 then true - elif typeEquiv g ty1 ty2 then true - else - let ty1 = stripTyEqns g ty1 - let ty2 = stripTyEqns g ty2 - // F# reference types are subtypes of type 'obj' - (typeEquiv g ty1 g.obj_ty_ambivalent && isRefTy g ty2) || - // Follow the supertype chain - (isAppTy g ty2 && - isRefTy g ty2 && +let rec TypeDefinitelySubsumesTypeNoCoercion ndeep g amap m ty1 ty2 = + + if ndeep > 100 then + error(InternalError("Large class hierarchy (possibly recursive, detected in TypeDefinitelySubsumesTypeNoCoercion), ty1 = " + (DebugPrint.showType ty1), m)) - ((match GetSuperTypeOfType g amap m ty2 with - | None -> false - | Some ty -> TypeDefinitelySubsumesTypeNoCoercion (ndeep+1) g amap m ty1 ty) || + if ty1 === ty2 then true + elif typeEquiv g ty1 ty2 then true + else + let ty1 = stripTyEqns g ty1 + let ty2 = stripTyEqns g ty2 + // F# reference types are subtypes of type 'obj' + (typeEquiv g ty1 g.obj_ty_ambivalent && isRefTy g ty2) || + // Follow the supertype chain + (isAppTy g ty2 && + isRefTy g ty2 && - // Follow the interface hierarchy - (isInterfaceTy g ty1 && - ty2 |> GetImmediateInterfacesOfType SkipUnrefInterfaces.Yes g amap m - |> List.exists (TypeDefinitelySubsumesTypeNoCoercion (ndeep+1) g amap m ty1)))) + ((match GetSuperTypeOfType g amap m ty2 with + | None -> false + | Some ty -> TypeDefinitelySubsumesTypeNoCoercion (ndeep+1) g amap m ty1 ty) || -type CanCoerce = CanCoerce | NoCoerce + // Follow the interface hierarchy + (isInterfaceTy g ty1 && + ty2 |> GetImmediateInterfacesOfType SkipUnrefInterfaces.Yes g amap m + |> List.exists (TypeDefinitelySubsumesTypeNoCoercion (ndeep+1) g amap m ty1)))) let stripAll stripMeasures g ty = if stripMeasures then @@ -54,80 +60,111 @@ let stripAll stripMeasures g ty = ty |> stripTyEqns g /// The feasible equivalence relation. Part of the language spec. -let rec TypesFeasiblyEquivalent stripMeasures ndeep g amap m ty1 ty2 = +let rec TypesFeasiblyEquivalent stripMeasures ndeep g amap m ty1 ty2 = - if ndeep > 100 then error(InternalError("recursive class hierarchy (detected in TypeFeasiblySubsumesType), ty1 = " + (DebugPrint.showType ty1), m)); + if ndeep > 100 then + error(InternalError("Large class hierarchy (possibly recursive, detected in TypeFeasiblySubsumesType), ty1 = " + (DebugPrint.showType ty1), m)); let ty1 = stripAll stripMeasures g ty1 let ty2 = stripAll stripMeasures g ty2 match ty1, ty2 with - | TType_var _, _ + | TType_measure _, TType_measure _ + | TType_var _, _ | _, TType_var _ -> true | TType_app (tcref1, l1, _), TType_app (tcref2, l2, _) when tyconRefEq g tcref1 tcref2 -> List.lengthsEqAndForall2 (TypesFeasiblyEquivalent stripMeasures ndeep g amap m) l1 l2 - | TType_anon (anonInfo1, l1),TType_anon (anonInfo2, l2) -> + | TType_anon (anonInfo1, l1),TType_anon (anonInfo2, l2) -> (evalTupInfoIsStruct anonInfo1.TupInfo = evalTupInfoIsStruct anonInfo2.TupInfo) && (match anonInfo1.Assembly, anonInfo2.Assembly with ccu1, ccu2 -> ccuEq ccu1 ccu2) && (anonInfo1.SortedNames = anonInfo2.SortedNames) && List.lengthsEqAndForall2 (TypesFeasiblyEquivalent stripMeasures ndeep g amap m) l1 l2 - | TType_tuple (tupInfo1, l1), TType_tuple (tupInfo2, l2) -> + | TType_tuple (tupInfo1, l1), TType_tuple (tupInfo2, l2) -> evalTupInfoIsStruct tupInfo1 = evalTupInfoIsStruct tupInfo2 && - List.lengthsEqAndForall2 (TypesFeasiblyEquivalent stripMeasures ndeep g amap m) l1 l2 + List.lengthsEqAndForall2 (TypesFeasiblyEquivalent stripMeasures ndeep g amap m) l1 l2 - | TType_fun (domainTy1, rangeTy1, _), TType_fun (domainTy2, rangeTy2, _) -> + | TType_fun (domainTy1, rangeTy1, _), TType_fun (domainTy2, rangeTy2, _) -> TypesFeasiblyEquivalent stripMeasures ndeep g amap m domainTy1 domainTy2 && TypesFeasiblyEquivalent stripMeasures ndeep g amap m rangeTy1 rangeTy2 - | TType_measure _, TType_measure _ -> - true - - | _ -> + | _ -> false /// The feasible equivalence relation. Part of the language spec. -let rec TypesFeasiblyEquiv ndeep g amap m ty1 ty2 = +let TypesFeasiblyEquiv ndeep g amap m ty1 ty2 = TypesFeasiblyEquivalent false ndeep g amap m ty1 ty2 /// The feasible equivalence relation after stripping Measures. let TypesFeasiblyEquivStripMeasures g amap m ty1 ty2 = TypesFeasiblyEquivalent true 0 g amap m ty1 ty2 +let inline TryGetCachedTypeSubsumption (g: TcGlobals) (amap: ImportMap) key = + if g.compilationMode = CompilationMode.OneOff && g.langVersion.SupportsFeature LanguageFeature.UseTypeSubsumptionCache then + match amap.TypeSubsumptionCache.TryGetValue(key) with + | true, subsumes -> + ValueSome subsumes + | false, _ -> + ValueNone + else + ValueNone + +let inline UpdateCachedTypeSubsumption (g: TcGlobals) (amap: ImportMap) key subsumes : unit = + if g.compilationMode = CompilationMode.OneOff && g.langVersion.SupportsFeature LanguageFeature.UseTypeSubsumptionCache then + amap.TypeSubsumptionCache[key] <- subsumes + /// The feasible coercion relation. Part of the language spec. -let rec TypeFeasiblySubsumesType ndeep g amap m ty1 canCoerce ty2 = - if ndeep > 100 then error(InternalError("recursive class hierarchy (detected in TypeFeasiblySubsumesType), ty1 = " + (DebugPrint.showType ty1), m)) - let ty1 = stripTyEqns g ty1 - let ty2 = stripTyEqns g ty2 - match ty1, ty2 with - | TType_var _, _ | _, TType_var _ -> true +let rec TypeFeasiblySubsumesType ndeep (g: TcGlobals) (amap: ImportMap) m (ty1: TType) (canCoerce: CanCoerce) (ty2: TType) = - | TType_app (tc1, l1, _), TType_app (tc2, l2, _) when tyconRefEq g tc1 tc2 -> - List.lengthsEqAndForall2 (TypesFeasiblyEquiv ndeep g amap m) l1 l2 + if ndeep > 100 then + error(InternalError("Large class hierarchy (possibly recursive, detected in TypeFeasiblySubsumesType), ty1 = " + (DebugPrint.showType ty1), m)) - | TType_tuple _, TType_tuple _ - | TType_anon _, TType_anon _ - | TType_fun _, TType_fun _ -> - TypesFeasiblyEquiv ndeep g amap m ty1 ty2 + let ty1 = stripTyEqns g ty1 + let ty2 = stripTyEqns g ty2 - | TType_measure _, TType_measure _ -> - true + // Check if language feature supported + let key = TTypeCacheKey.FromStrippedTypes (ty1, ty2, canCoerce, g) + + match TryGetCachedTypeSubsumption g amap key with + | ValueSome subsumes -> + subsumes + | ValueNone -> + let subsumes = + match ty1, ty2 with + | TType_measure _, TType_measure _ + | TType_var _, _ | _, TType_var _ -> + true + + | TType_app (tc1, l1, _), TType_app (tc2, l2, _) when tyconRefEq g tc1 tc2 -> + List.lengthsEqAndForall2 (TypesFeasiblyEquiv ndeep g amap m) l1 l2 + + | TType_tuple _, TType_tuple _ + | TType_anon _, TType_anon _ + | TType_fun _, TType_fun _ -> + TypesFeasiblyEquiv ndeep g amap m ty1 ty2 + + | _ -> + // F# reference types are subtypes of type 'obj' + if isObjTyAnyNullness g ty1 && (canCoerce = CanCoerce || isRefTy g ty2) then + true + elif isAppTy g ty2 && (canCoerce = CanCoerce || isRefTy g ty2) && TypeFeasiblySubsumesTypeWithSupertypeCheck g amap m ndeep ty1 ty2 then + true + else + let interfaces = GetImmediateInterfacesOfType SkipUnrefInterfaces.Yes g amap m ty2 + // See if any interface in type hierarchy of ty2 is a supertype of ty1 + List.exists (TypeFeasiblySubsumesType (ndeep + 1) g amap m ty1 NoCoerce) interfaces + + UpdateCachedTypeSubsumption g amap key subsumes + + subsumes + +and TypeFeasiblySubsumesTypeWithSupertypeCheck g amap m ndeep ty1 ty2 = + match GetSuperTypeOfType g amap m ty2 with + | None -> false + | Some ty -> TypeFeasiblySubsumesType (ndeep + 1) g amap m ty1 NoCoerce ty - | _ -> - // F# reference types are subtypes of type 'obj' - (isObjTyAnyNullness g ty1 && (canCoerce = CanCoerce || isRefTy g ty2)) - || - (isAppTy g ty2 && - (canCoerce = CanCoerce || isRefTy g ty2) && - begin match GetSuperTypeOfType g amap m ty2 with - | None -> false - | Some ty -> TypeFeasiblySubsumesType (ndeep+1) g amap m ty1 NoCoerce ty - end || - ty2 |> GetImmediateInterfacesOfType SkipUnrefInterfaces.Yes g amap m - |> List.exists (TypeFeasiblySubsumesType (ndeep+1) g amap m ty1 NoCoerce)) - /// Choose solutions for Expr.TyChoose type "hidden" variables introduced /// by letrec nodes. Also used by the pattern match compiler to choose type /// variables when compiling patterns at generalized bindings. @@ -136,35 +173,35 @@ let rec TypeFeasiblySubsumesType ndeep g amap m ty1 canCoerce ty2 = let ChooseTyparSolutionAndRange (g: TcGlobals) amap (tp:Typar) = let m = tp.Range let (maxTy, isRefined), m = - let initialTy = - match tp.Kind with + let initialTy = + match tp.Kind with | TyparKind.Type -> g.obj_ty_noNulls | TyparKind.Measure -> TType_measure Measure.One // Loop through the constraints computing the lub (((initialTy, false), m), tp.Constraints) ||> List.fold (fun ((maxTy, isRefined), _) tpc -> - let join m x = + let join m x = if TypeFeasiblySubsumesType 0 g amap m x CanCoerce maxTy then maxTy, isRefined elif TypeFeasiblySubsumesType 0 g amap m maxTy CanCoerce x then x, true else errorR(Error(FSComp.SR.typrelCannotResolveImplicitGenericInstantiation((DebugPrint.showType x), (DebugPrint.showType maxTy)), m)); maxTy, isRefined - // Don't continue if an error occurred and we set the value eagerly + // Don't continue if an error occurred and we set the value eagerly if tp.IsSolved then (maxTy, isRefined), m else - match tpc with - | TyparConstraint.CoercesTo(x, m) -> + match tpc with + | TyparConstraint.CoercesTo(x, m) -> join m x, m | TyparConstraint.SimpleChoice(_, m) -> errorR(Error(FSComp.SR.typrelCannotResolveAmbiguityInPrintf(), m)) (maxTy, isRefined), m - | TyparConstraint.SupportsNull m -> + | TyparConstraint.SupportsNull m -> ((addNullnessToTy KnownWithNull maxTy), isRefined), m | TyparConstraint.SupportsComparison m -> join m g.mk_IComparable_ty, m | TyparConstraint.IsEnum(_, m) -> errorR(Error(FSComp.SR.typrelCannotResolveAmbiguityInEnum(), m)) (maxTy, isRefined), m - | TyparConstraint.IsDelegate(_, _, m) -> + | TyparConstraint.IsDelegate(_, _, m) -> errorR(Error(FSComp.SR.typrelCannotResolveAmbiguityInDelegate(), m)) (maxTy, isRefined), m - | TyparConstraint.IsNonNullableStruct m -> + | TyparConstraint.IsNonNullableStruct m -> join m g.int_ty, m | TyparConstraint.IsUnmanaged m -> errorR(Error(FSComp.SR.typrelCannotResolveAmbiguityInUnmanaged(), m)) @@ -175,7 +212,7 @@ let ChooseTyparSolutionAndRange (g: TcGlobals) amap (tp:Typar) = | TyparConstraint.RequiresDefaultConstructor m | TyparConstraint.IsReferenceType m | TyparConstraint.MayResolveMember(_, m) - | TyparConstraint.DefaultsTo(_,_, m) -> + | TyparConstraint.DefaultsTo(_,_, m) -> (maxTy, isRefined), m ) @@ -188,7 +225,7 @@ let ChooseTyparSolutionAndRange (g: TcGlobals) amap (tp:Typar) = maxTy, m -let ChooseTyparSolution g amap tp = +let ChooseTyparSolution g amap tp = let ty, _m = ChooseTyparSolutionAndRange g amap tp if tp.Rigidity = TyparRigidity.Anon && typeEquiv g ty (TType_measure Measure.One) then warning(Error(FSComp.SR.csCodeLessGeneric(), tp.Range)) @@ -198,14 +235,14 @@ let ChooseTyparSolution g amap tp = // For example // 'a = Expr<'b> // 'b = int -// In this case the solutions are +// In this case the solutions are // 'a = Expr // 'b = int // We ground out the solutions by repeatedly instantiating -let IterativelySubstituteTyparSolutions g tps solutions = +let IterativelySubstituteTyparSolutions g tps solutions = let tpenv = mkTyparInst tps solutions - let rec loop n curr = - let curr' = curr |> instTypes tpenv + let rec loop n curr = + let curr' = curr |> instTypes tpenv // We cut out at n > 40 just in case this loops. It shouldn't, since there should be no cycles in the // solution equations, and we've only ever seen one example where even n = 2 was required. // Perhaps it's possible in error recovery some strange situations could occur where cycles @@ -213,25 +250,25 @@ let IterativelySubstituteTyparSolutions g tps solutions = // // We don't give an error if we hit the limit since it's feasible that the solutions of unknowns // is not actually relevant to the rest of type checking or compilation. - if n > 40 || List.forall2 (typeEquiv g) curr curr' then - curr - else + if n > 40 || List.forall2 (typeEquiv g) curr curr' then + curr + else loop (n+1) curr' loop 0 solutions -let ChooseTyparSolutionsForFreeChoiceTypars g amap e = - match stripDebugPoints e with - | Expr.TyChoose (tps, e1, _m) -> - - /// Only make choices for variables that are actually used in the expression +let ChooseTyparSolutionsForFreeChoiceTypars g amap e = + match stripDebugPoints e with + | Expr.TyChoose (tps, e1, _m) -> + + /// Only make choices for variables that are actually used in the expression let ftvs = (freeInExpr CollectTyparsNoCaching e1).FreeTyvars.FreeTypars let tps = tps |> List.filter (Zset.memberOf ftvs) - + let solutions = tps |> List.map (ChooseTyparSolution g amap) |> IterativelySubstituteTyparSolutions g tps - + let tpenv = mkTyparInst tps solutions - + instExpr g tpenv e1 | _ -> e @@ -241,51 +278,51 @@ let ChooseTyparSolutionsForFreeChoiceTypars g amap e = /// PostTypeCheckSemanticChecks before we've eliminated these nodes. let tryDestLambdaWithValReprInfo g amap valReprInfo (lambdaExpr, ty) = let (ValReprInfo (tpNames, _, _)) = valReprInfo - let rec stripLambdaUpto n (e, ty) = - match stripDebugPoints e with - | Expr.Lambda (_, None, None, v, b, _, retTy) when n > 0 -> + let rec stripLambdaUpto n (e, ty) = + match stripDebugPoints e with + | Expr.Lambda (_, None, None, v, b, _, retTy) when n > 0 -> let vs', b', retTy' = stripLambdaUpto (n-1) (b, retTy) - (v :: vs', b', retTy') - | _ -> + (v :: vs', b', retTy') + | _ -> ([], e, ty) - let rec startStripLambdaUpto n (e, ty) = - match stripDebugPoints e with - | Expr.Lambda (_, ctorThisValOpt, baseValOpt, v, b, _, retTy) when n > 0 -> + let rec startStripLambdaUpto n (e, ty) = + match stripDebugPoints e with + | Expr.Lambda (_, ctorThisValOpt, baseValOpt, v, b, _, retTy) when n > 0 -> let vs', b', retTy' = stripLambdaUpto (n-1) (b, retTy) - (ctorThisValOpt, baseValOpt, (v :: vs'), b', retTy') - | Expr.TyChoose (_tps, _b, _) -> + (ctorThisValOpt, baseValOpt, (v :: vs'), b', retTy') + | Expr.TyChoose (_tps, _b, _) -> startStripLambdaUpto n (ChooseTyparSolutionsForFreeChoiceTypars g amap e, ty) - | _ -> + | _ -> (None, None, [], e, ty) let n = valReprInfo.NumCurriedArgs - let tps, bodyExpr, bodyTy = - match stripDebugPoints lambdaExpr with - | Expr.TyLambda (_, tps, b, _, retTy) when not (isNil tpNames) -> tps, b, retTy + let tps, bodyExpr, bodyTy = + match stripDebugPoints lambdaExpr with + | Expr.TyLambda (_, tps, b, _, retTy) when not (isNil tpNames) -> tps, b, retTy | _ -> [], lambdaExpr, ty let ctorThisValOpt, baseValOpt, vsl, body, retTy = startStripLambdaUpto n (bodyExpr, bodyTy) - if vsl.Length <> n then - None + if vsl.Length <> n then + None else Some (tps, ctorThisValOpt, baseValOpt, vsl, body, retTy) -let destLambdaWithValReprInfo g amap valReprInfo (lambdaExpr, ty) = - match tryDestLambdaWithValReprInfo g amap valReprInfo (lambdaExpr, ty) with +let destLambdaWithValReprInfo g amap valReprInfo (lambdaExpr, ty) = + match tryDestLambdaWithValReprInfo g amap valReprInfo (lambdaExpr, ty) with | None -> error(Error(FSComp.SR.typrelInvalidValue(), lambdaExpr.Range)) | Some res -> res - + let IteratedAdjustArityOfLambdaBody g arities vsl body = - (arities, vsl, ([], body)) |||> List.foldBack2 (fun arities vs (allvs, body) -> + (arities, vsl, ([], body)) |||> List.foldBack2 (fun arities vs (allvs, body) -> let vs, body = AdjustArityOfLambdaBody g arities vs body vs :: allvs, body) -/// Do IteratedAdjustArityOfLambdaBody for a series of iterated lambdas, producing one method. -/// The required iterated function arity (List.length valReprInfo) must be identical -/// to the iterated function arity of the input lambda (List.length vsl) +/// Do IteratedAdjustArityOfLambdaBody for a series of iterated lambdas, producing one method. +/// The required iterated function arity (List.length valReprInfo) must be identical +/// to the iterated function arity of the input lambda (List.length vsl) let IteratedAdjustLambdaToMatchValReprInfo g amap valReprInfo lambdaExpr = let lambdaExprTy = tyOfExpr g lambdaExpr @@ -294,7 +331,7 @@ let IteratedAdjustLambdaToMatchValReprInfo g amap valReprInfo lambdaExpr = let arities = valReprInfo.AritiesOfArgs - if arities.Length <> vsl.Length then + if arities.Length <> vsl.Length then errorR(InternalError(sprintf "IteratedAdjustLambdaToMatchValReprInfo, #arities = %d, #vsl = %d" arities.Length vsl.Length, body.Range)) let vsl, body = IteratedAdjustArityOfLambdaBody g arities vsl body @@ -303,6 +340,6 @@ let IteratedAdjustLambdaToMatchValReprInfo g amap valReprInfo lambdaExpr = /// "Single Feasible Type" inference /// Look for the unique supertype of ty2 for which ty2 :> ty1 might feasibly hold -let FindUniqueFeasibleSupertype g amap m ty1 ty2 = +let FindUniqueFeasibleSupertype g amap m ty1 ty2 = let supertypes = Option.toList (GetSuperTypeOfType g amap m ty2) @ (GetImmediateInterfacesOfType SkipUnrefInterfaces.Yes g amap m ty2) - supertypes |> List.tryFind (TypeFeasiblySubsumesType 0 g amap m ty1 NoCoerce) + supertypes |> List.tryFind (TypeFeasiblySubsumesType 0 g amap m ty1 NoCoerce) diff --git a/src/Compiler/Checking/TypeRelations.fsi b/src/Compiler/Checking/TypeRelations.fsi index b33852fae53..9419e617d70 100644 --- a/src/Compiler/Checking/TypeRelations.fsi +++ b/src/Compiler/Checking/TypeRelations.fsi @@ -9,10 +9,6 @@ open FSharp.Compiler.TcGlobals open FSharp.Compiler.Text open FSharp.Compiler.TypedTree -type CanCoerce = - | CanCoerce - | NoCoerce - /// Implements a :> b without coercion based on finalized (no type variable) types val TypeDefinitelySubsumesTypeNoCoercion: ndeep: int -> g: TcGlobals -> amap: ImportMap -> m: range -> ty1: TType -> ty2: TType -> bool diff --git a/src/Compiler/Checking/import.fs b/src/Compiler/Checking/import.fs index 1c1b0ed9ea1..a1deee1c8a1 100644 --- a/src/Compiler/Checking/import.fs +++ b/src/Compiler/Checking/import.fs @@ -8,7 +8,9 @@ open System.Collections.Generic open System.Collections.Immutable open Internal.Utilities.Library open Internal.Utilities.Library.Extras -open FSharp.Compiler +open Internal.Utilities.TypeHashing +open Internal.Utilities.TypeHashing.HashTypes +open FSharp.Compiler open FSharp.Compiler.AbstractIL.IL open FSharp.Compiler.CompilerGlobalState open FSharp.Compiler.DiagnosticsLogger @@ -24,9 +26,9 @@ open FSharp.Compiler.TcGlobals open FSharp.Compiler.TypeProviders #endif -/// Represents an interface to some of the functionality of TcImports, for loading assemblies +/// Represents an interface to some of the functionality of TcImports, for loading assemblies /// and accessing information about generated provided assemblies. -type AssemblyLoader = +type AssemblyLoader = /// Resolve an Abstract IL assembly reference to a Ccu abstract FindCcuFromAssemblyRef : CompilationThreadToken * range * ILAssemblyRef -> CcuResolutionResult @@ -43,48 +45,95 @@ type AssemblyLoader = /// Record a root for a [] type to help guide static linking & type relocation abstract RecordGeneratedTypeRoot : ProviderGeneratedType -> unit #endif - + +[] +type CanCoerce = + | CanCoerce + | NoCoerce + +type [] TTypeCacheKey = + + val ty1: TType + val ty2: TType + val canCoerce: CanCoerce + val tcGlobals: TcGlobals + + private new (ty1, ty2, canCoerce, tcGlobals) = + { ty1 = ty1; ty2 = ty2; canCoerce = canCoerce; tcGlobals = tcGlobals } + + static member FromStrippedTypes (ty1, ty2, canCoerce, tcGlobals) = + TTypeCacheKey(ty1, ty2, canCoerce, tcGlobals) + + interface System.IEquatable with + member this.Equals other = + if this.canCoerce <> other.canCoerce then + false + elif this.ty1 === other.ty1 && this.ty2 === other.ty2 then + true + else + stampEquals this.tcGlobals this.ty1 other.ty1 + && stampEquals this.tcGlobals this.ty2 other.ty2 + + override this.Equals other = + match other with + | :? TTypeCacheKey as p -> (this :> System.IEquatable).Equals p + | _ -> false + + override this.GetHashCode() : int = + let g = this.tcGlobals + + let ty1Hash = combineHash (hashStamp g this.ty1) (hashTType g this.ty1) + let ty2Hash = combineHash (hashStamp g this.ty2) (hashTType g this.ty2) + + let combined = combineHash (combineHash ty1Hash ty2Hash) (hash this.canCoerce) + + combined + //------------------------------------------------------------------------- // Import an IL types as F# types. -//------------------------------------------------------------------------- +//------------------------------------------------------------------------- -/// Represents a context used by the import routines that convert AbstractIL types and provided -/// types to F# internal compiler data structures. +/// Represents a context used by the import routines that convert AbstractIL types and provided +/// types to F# internal compiler data structures. /// /// Also caches the conversion of AbstractIL ILTypeRef nodes, based on hashes of these. /// /// There is normally only one ImportMap for any assembly compilation, though additional instances can be created -/// using tcImports.GetImportMap() if needed, and it is not harmful if multiple instances are used. The object -/// serves as an interface through to the tables stored in the primary TcImports structures defined in CompileOps.fs. +/// using tcImports.GetImportMap() if needed, and it is not harmful if multiple instances are used. The object +/// serves as an interface through to the tables stored in the primary TcImports structures defined in CompileOps.fs. [] type ImportMap(g: TcGlobals, assemblyLoader: AssemblyLoader) = let typeRefToTyconRefCache = ConcurrentDictionary() + let typeSubsumptionCache = ConcurrentDictionary(System.Environment.ProcessorCount, 1024) + member _.g = g member _.assemblyLoader = assemblyLoader member _.ILTypeRefToTyconRefCache = typeRefToTyconRefCache -let CanImportILScopeRef (env: ImportMap) m scoref = + member _.TypeSubsumptionCache = typeSubsumptionCache + +let CanImportILScopeRef (env: ImportMap) m scoref = let isResolved assemblyRef = // Explanation: This represents an unchecked invariant in the hosted compiler: that any operations // which import types (and resolve assemblies from the tcImports tables) happen on the compilation thread. - let ctok = AssumeCompilationThreadWithoutEvidence() - + let ctok = AssumeCompilationThreadWithoutEvidence() + match env.assemblyLoader.FindCcuFromAssemblyRef (ctok, m, assemblyRef) with | UnresolvedCcu _ -> false | ResolvedCcu _ -> true - match scoref with + match scoref with | ILScopeRef.Local | ILScopeRef.Module _ -> true | ILScopeRef.Assembly assemblyRef -> isResolved assemblyRef | ILScopeRef.PrimaryAssembly -> isResolved env.g.ilg.primaryAssemblyRef /// Import a reference to a type definition, given the AbstractIL data for the type reference -let ImportTypeRefData (env: ImportMap) m (scoref, path, typeName) = +let ImportTypeRefData (env: ImportMap) m (scoref, path, typeName) = let findCcu assemblyRef = // Explanation: This represents an unchecked invariant in the hosted compiler: that any operations @@ -93,8 +142,8 @@ let ImportTypeRefData (env: ImportMap) m (scoref, path, typeName) = env.assemblyLoader.FindCcuFromAssemblyRef (ctok, m, assemblyRef) - let ccu = - match scoref with + let ccu = + match scoref with | ILScopeRef.Local -> error(InternalError("ImportILTypeRef: unexpected local scope", m)) | ILScopeRef.Module _ -> error(InternalError("ImportILTypeRef: reference found to a type in an auxiliary module", m)) | ILScopeRef.Assembly assemblyRef -> findCcu assemblyRef @@ -102,14 +151,14 @@ let ImportTypeRefData (env: ImportMap) m (scoref, path, typeName) = // Do a dereference of a fake tcref for the type just to check it exists in the target assembly and to find // the corresponding Tycon. - let ccu = + let ccu = match ccu with | ResolvedCcu ccu->ccu - | UnresolvedCcu ccuName -> + | UnresolvedCcu ccuName -> error (Error(FSComp.SR.impTypeRequiredUnavailable(typeName, ccuName), m)) let fakeTyconRef = mkNonLocalTyconRef (mkNonLocalEntityRef ccu path) typeName - let tycon = - try + let tycon = + try fakeTyconRef.Deref with _ -> error (Error(FSComp.SR.impReferencedTypeCouldNotBeFoundInAssembly(String.concat "." (Array.append path [| typeName |]), ccu.AssemblyName), m)) @@ -119,33 +168,33 @@ let ImportTypeRefData (env: ImportMap) m (scoref, path, typeName) = | TProvidedTypeRepr info -> //printfn "ImportTypeRefData: validating type: typeLogicalName = %A" typeName ValidateProvidedTypeAfterStaticInstantiation(m, info.ProvidedType, path, typeName) - | _ -> + | _ -> () #endif - match tryRescopeEntity ccu tycon with + match tryRescopeEntity ccu tycon with | ValueNone -> error (Error(FSComp.SR.impImportedAssemblyUsesNotPublicType(String.concat "." (Array.toList path@[typeName])), m)) | ValueSome tcref -> tcref - + /// Import a reference to a type definition, given an AbstractIL ILTypeRef, without caching // // Note, the type names that flow to the point include the "mangled" type names used for static parameters for provided types. // For example, // Foo.Bar,"1.0" -// This is because ImportProvidedType goes via Abstract IL type references. -let ImportILTypeRefUncached (env: ImportMap) m (tref: ILTypeRef) = - let path, typeName = - match tref.Enclosing with - | [] -> +// This is because ImportProvidedType goes via Abstract IL type references. +let ImportILTypeRefUncached (env: ImportMap) m (tref: ILTypeRef) = + let path, typeName = + match tref.Enclosing with + | [] -> splitILTypeNameWithPossibleStaticArguments tref.Name - | h :: t -> + | h :: t -> let nsp, tname = splitILTypeNameWithPossibleStaticArguments h // Note, subsequent type names do not need to be split, only the first [| yield! nsp; yield tname; yield! t |], tref.Name ImportTypeRefData (env: ImportMap) m (tref.Scope, path, typeName) - + /// Import a reference to a type definition, given an AbstractIL ILTypeRef, with caching let ImportILTypeRef (env: ImportMap) m (tref: ILTypeRef) = match env.ILTypeRefToTyconRefCache.TryGetValue tref with @@ -160,10 +209,10 @@ let CanImportILTypeRef (env: ImportMap) m (tref: ILTypeRef) = env.ILTypeRefToTyconRefCache.ContainsKey(tref) || CanImportILScopeRef env m tref.Scope /// Import a type, given an AbstractIL ILTypeRef and an F# type instantiation. -/// -/// Prefer the F# abbreviation for some built-in types, e.g. 'string' rather than -/// 'System.String', since we prefer the F# abbreviation to the .NET equivalents. -let ImportTyconRefApp (env: ImportMap) tcref tyargs nullness = +/// +/// Prefer the F# abbreviation for some built-in types, e.g. 'string' rather than +/// 'System.String', since we prefer the F# abbreviation to the .NET equivalents. +let ImportTyconRefApp (env: ImportMap) tcref tyargs nullness = env.g.improveType tcref tyargs nullness @@ -179,7 +228,7 @@ module Nullness = let knownWithoutNull = NullnessInfo.WithoutNull |> Nullness.Known let knownNullable = NullnessInfo.WithNull |> Nullness.Known - let mapping byteValue = + let mapping byteValue = match byteValue with | 0uy -> knownAmbivalent | 1uy -> knownWithoutNull @@ -187,36 +236,36 @@ module Nullness = | _ -> dprintfn "%i was passed to Nullness mapping, this is not a valid value" byteValue knownAmbivalent - + let isByte (g:TcGlobals) (ilgType:ILType) = g.ilg.typ_Byte.BasicQualifiedName = ilgType.BasicQualifiedName - let tryParseAttributeDataToNullableByteFlags (g:TcGlobals) attrData = + let tryParseAttributeDataToNullableByteFlags (g:TcGlobals) attrData = match attrData with | None -> ValueNone | Some ([ILAttribElem.Byte 0uy],_) -> ValueSome arrayWithByte0 | Some ([ILAttribElem.Byte 1uy],_) -> ValueSome arrayWithByte1 | Some ([ILAttribElem.Byte 2uy],_) -> ValueSome arrayWithByte2 - | Some ([ILAttribElem.Array(byteType,listOfBytes)],_) when isByte g byteType -> + | Some ([ILAttribElem.Array(byteType,listOfBytes)],_) when isByte g byteType -> listOfBytes |> Array.ofList |> Array.choose(function | ILAttribElem.Byte b -> Some b | _ -> None) |> ValueSome - + | _ -> ValueNone [] type AttributesFromIL = AttributesFromIL of metadataIndex:int * attrs:ILAttributesStored - with + with member this.Read() = match this with| AttributesFromIL(idx,attrs) -> attrs.GetCustomAttrs(idx) - member this.GetNullable(g:TcGlobals) = + member this.GetNullable(g:TcGlobals) = match g.attrib_NullableAttribute_opt with | None -> ValueNone | Some n -> TryDecodeILAttribute n.TypeRef (this.Read()) |> tryParseAttributeDataToNullableByteFlags g - member this.GetNullableContext(g:TcGlobals) = + member this.GetNullableContext(g:TcGlobals) = match g.attrib_NullableContextAttribute_opt with | None -> ValueNone | Some n -> @@ -224,7 +273,7 @@ module Nullness = |> tryParseAttributeDataToNullableByteFlags g [] - type NullableContextSource = + type NullableContextSource = | FromClass of AttributesFromIL | FromMethodAndClass of methodAttrs:AttributesFromIL * classAttrs:AttributesFromIL @@ -233,17 +282,17 @@ module Nullness = { DirectAttributes: AttributesFromIL Fallback : NullableContextSource} with - member this.GetFlags(g:TcGlobals) = + member this.GetFlags(g:TcGlobals) = let fallback = this.Fallback this.DirectAttributes.GetNullable(g) - |> ValueOption.orElseWith(fun () -> + |> ValueOption.orElseWith(fun () -> match fallback with | FromClass attrs -> attrs.GetNullableContext(g) - | FromMethodAndClass(methodCtx,classCtx) -> + | FromMethodAndClass(methodCtx,classCtx) -> methodCtx.GetNullableContext(g) |> ValueOption.orElseWith (fun () -> classCtx.GetNullableContext(g))) |> ValueOption.defaultValue arrayWithByte0 - static member Empty = + static member Empty = let emptyFromIL = AttributesFromIL(0,Given(ILAttributes.Empty)) {DirectAttributes = emptyFromIL; Fallback = FromClass(emptyFromIL)} @@ -256,16 +305,16 @@ The array is passed trough all generic typars depth first , e.g. List we cannot tell - | 0 -> knownAmbivalent + | 0 -> knownAmbivalent // A scalar value from attributes, cover type and all it's potential typars | 1 -> this.Data[0] |> mapping // We have a bigger array, indexes map to typars in a depth-first fashion | n when n > this.Idx -> this.Data[this.Idx] |> mapping // This is an erroneous case, we need more nullnessinfo then the metadata contains - | _ -> + | _ -> // TODO nullness - once being confident that our bugs are solved and what remains are incoming metadata bugs, remove failwith and replace with dprintfn // Testing with .NET compilers other then Roslyn producing nullness metadata? failwithf "Length of Nullable metadata and needs of its processing do not match: %A" this @@ -273,13 +322,13 @@ For value types, a value is passed even though it is always 0 member this.Advance() = {Data = this.Data; Idx = this.Idx + 1} - let inline isSystemNullable (tspec:ILTypeSpec) = + let inline isSystemNullable (tspec:ILTypeSpec) = match tspec.Name,tspec.Enclosing with | "Nullable`1",["System"] -> true | "System.Nullable`1",[] -> true | _ -> false - let inline evaluateFirstOrderNullnessAndAdvance (ilt:ILType) (flags:NullableFlags) = + let inline evaluateFirstOrderNullnessAndAdvance (ilt:ILType) (flags:NullableFlags) = match ilt with | ILType.Value tspec when tspec.GenericArgs.IsEmpty -> KnownWithoutNull, flags // System.Nullable is special-cased in C# spec for nullness metadata. @@ -289,93 +338,93 @@ For value types, a value is passed even though it is always 0 | _ -> flags.GetNullness(), flags.Advance() /// Import an IL type as an F# type. -let rec ImportILType (env: ImportMap) m tinst ty = +let rec ImportILType (env: ImportMap) m tinst ty = match ty with - | ILType.Void -> + | ILType.Void -> env.g.unit_ty - | ILType.Array(bounds, ty) -> + | ILType.Array(bounds, ty) -> let n = bounds.Rank - let elemTy = ImportILType env m tinst ty + let elemTy = ImportILType env m tinst ty mkArrayTy env.g n Nullness.knownAmbivalent elemTy m | ILType.Boxed tspec | ILType.Value tspec -> - let tcref = ImportILTypeRef env m tspec.TypeRef - let inst = tspec.GenericArgs |> List.map (ImportILType env m tinst) + let tcref = ImportILTypeRef env m tspec.TypeRef + let inst = tspec.GenericArgs |> List.map (ImportILType env m tinst) ImportTyconRefApp env tcref inst Nullness.knownAmbivalent | ILType.Byref ty -> mkByrefTy env.g (ImportILType env m tinst ty) | ILType.Ptr ILType.Void when env.g.voidptr_tcr.CanDeref -> mkVoidPtrTy env.g | ILType.Ptr ty -> mkNativePtrTy env.g (ImportILType env m tinst ty) | ILType.FunctionPointer _ -> env.g.nativeint_ty (* failwith "cannot import this kind of type (ptr, fptr)" *) - | ILType.Modified(_, _, ty) -> - // All custom modifiers are ignored + | ILType.Modified(_, _, ty) -> + // All custom modifiers are ignored ImportILType env m tinst ty - | ILType.TypeVar u16 -> - let ty = - try + | ILType.TypeVar u16 -> + let ty = + try List.item (int u16) tinst - with _ -> + with _ -> error(Error(FSComp.SR.impNotEnoughTypeParamsInScopeWhileImporting(), m)) let tyWithNullness = addNullnessToTy Nullness.knownAmbivalent ty tyWithNullness /// Import an IL type as an F# type. -let rec ImportILTypeWithNullness (env: ImportMap) m tinst (nf:Nullness.NullableFlags) ty : struct(TType*Nullness.NullableFlags) = +let rec ImportILTypeWithNullness (env: ImportMap) m tinst (nf:Nullness.NullableFlags) ty : struct(TType*Nullness.NullableFlags) = match ty with - | ILType.Void -> + | ILType.Void -> env.g.unit_ty,nf - | ILType.Array(bounds, innerTy) -> + | ILType.Array(bounds, innerTy) -> let n = bounds.Rank let (arrayNullness,nf) = Nullness.evaluateFirstOrderNullnessAndAdvance ty nf let struct(elemTy,nf) = ImportILTypeWithNullness env m tinst nf innerTy mkArrayTy env.g n arrayNullness elemTy m, nf | ILType.Boxed tspec | ILType.Value tspec -> - let tcref = ImportILTypeRef env m tspec.TypeRef + let tcref = ImportILTypeRef env m tspec.TypeRef let (typeRefNullness,nf) = Nullness.evaluateFirstOrderNullnessAndAdvance ty nf let struct(inst,nullableFlagsLeft) = (nf,tspec.GenericArgs) ||> List.vMapFold (fun nf current -> ImportILTypeWithNullness env m tinst nf current ) ImportTyconRefApp env tcref inst typeRefNullness, nullableFlagsLeft - | ILType.Byref ty -> - let struct(ttype,nf) = ImportILTypeWithNullness env m tinst nf ty + | ILType.Byref ty -> + let struct(ttype,nf) = ImportILTypeWithNullness env m tinst nf ty mkByrefTy env.g ttype, nf | ILType.Ptr ILType.Void when env.g.voidptr_tcr.CanDeref -> mkVoidPtrTy env.g, nf - | ILType.Ptr ty -> - let struct(ttype,nf) = ImportILTypeWithNullness env m tinst nf ty + | ILType.Ptr ty -> + let struct(ttype,nf) = ImportILTypeWithNullness env m tinst nf ty mkNativePtrTy env.g ttype, nf | ILType.FunctionPointer _ -> env.g.nativeint_ty, nf (* failwith "cannot import this kind of type (ptr, fptr)" *) - | ILType.Modified(_, _, ty) -> - // All custom modifiers are ignored - ImportILTypeWithNullness env m tinst nf ty + | ILType.Modified(_, _, ty) -> + // All custom modifiers are ignored + ImportILTypeWithNullness env m tinst nf ty - | ILType.TypeVar u16 -> - let ttype = - try + | ILType.TypeVar u16 -> + let ttype = + try List.item (int u16) tinst - with _ -> + with _ -> error(Error(FSComp.SR.impNotEnoughTypeParamsInScopeWhileImporting(), m)) let (typeVarNullness,nf) = Nullness.evaluateFirstOrderNullnessAndAdvance ty nf addNullnessToTy typeVarNullness ttype, nf /// Determines if an IL type can be imported as an F# type -let rec CanImportILType (env: ImportMap) m ty = +let rec CanImportILType (env: ImportMap) m ty = match ty with | ILType.Void -> true | ILType.Array(_bounds, ety) -> CanImportILType env m ety | ILType.Boxed tspec | ILType.Value tspec -> - CanImportILTypeRef env m tspec.TypeRef - && tspec.GenericArgs |> List.forall (CanImportILType env m) + CanImportILTypeRef env m tspec.TypeRef + && tspec.GenericArgs |> List.forall (CanImportILType env m) | ILType.Byref ety -> CanImportILType env m ety | ILType.Ptr ety -> CanImportILType env m ety @@ -386,91 +435,91 @@ let rec CanImportILType (env: ImportMap) m ty = #if !NO_TYPEPROVIDERS /// Import a provided type reference as an F# type TyconRef -let ImportProvidedNamedType (env: ImportMap) (m: range) (st: Tainted) = +let ImportProvidedNamedType (env: ImportMap) (m: range) (st: Tainted) = // See if a reverse-mapping exists for a generated/relocated System.Type - match st.PUntaint((fun st -> st.TryGetTyconRef()), m) with + match st.PUntaint((fun st -> st.TryGetTyconRef()), m) with | Some x -> (x :?> TyconRef) - | None -> + | None -> let tref = GetILTypeRefOfProvidedType (st, m) ImportILTypeRef env m tref /// Import a provided type as an AbstractIL type -let rec ImportProvidedTypeAsILType (env: ImportMap) (m: range) (st: Tainted) = +let rec ImportProvidedTypeAsILType (env: ImportMap) (m: range) (st: Tainted) = if st.PUntaint ((fun x -> x.IsVoid), m) then ILType.Void elif st.PUntaint((fun st -> st.IsGenericParameter), m) then mkILTyvarTy (uint16 (st.PUntaint((fun st -> st.GenericParameterPosition), m))) - elif st.PUntaint((fun st -> st.IsArray), m) then + elif st.PUntaint((fun st -> st.IsArray), m) then let et = ImportProvidedTypeAsILType env m (st.PApply((fun st -> st.GetElementType()), m)) ILType.Array(ILArrayShape.FromRank (st.PUntaint((fun st -> st.GetArrayRank()), m)), et) - elif st.PUntaint((fun st -> st.IsByRef), m) then + elif st.PUntaint((fun st -> st.IsByRef), m) then let et = ImportProvidedTypeAsILType env m (st.PApply((fun st -> st.GetElementType()), m)) ILType.Byref et - elif st.PUntaint((fun st -> st.IsPointer), m) then + elif st.PUntaint((fun st -> st.IsPointer), m) then let et = ImportProvidedTypeAsILType env m (st.PApply((fun st -> st.GetElementType()), m)) ILType.Ptr et else - let gst, genericArgs = - if st.PUntaint((fun st -> st.IsGenericType), m) then - let args = st.PApplyArray((fun st -> st.GetGenericArguments()), "GetGenericArguments", m) |> Array.map (ImportProvidedTypeAsILType env m) |> List.ofArray + let gst, genericArgs = + if st.PUntaint((fun st -> st.IsGenericType), m) then + let args = st.PApplyArray((fun st -> st.GetGenericArguments()), "GetGenericArguments", m) |> Array.map (ImportProvidedTypeAsILType env m) |> List.ofArray let gst = st.PApply((fun st -> st.GetGenericTypeDefinition()), m) gst, args - else + else st, [] let tref = GetILTypeRefOfProvidedType (gst, m) let tcref = ImportProvidedNamedType env m gst let tps = tcref.Typars m - if tps.Length <> genericArgs.Length then + if tps.Length <> genericArgs.Length then error(Error(FSComp.SR.impInvalidNumberOfGenericArguments(tcref.CompiledName, tps.Length, genericArgs.Length), m)) // We're converting to an IL type, where generic arguments are erased let genericArgs = List.zip tps genericArgs |> List.filter (fun (tp, _) -> not tp.IsErased) |> List.map snd let tspec = mkILTySpec(tref, genericArgs) - if st.PUntaint((fun st -> st.IsValueType), m) then - ILType.Value tspec - else + if st.PUntaint((fun st -> st.IsValueType), m) then + ILType.Value tspec + else mkILBoxedType tspec /// Import a provided type as an F# type. -let rec ImportProvidedType (env: ImportMap) (m: range) (* (tinst: TypeInst) *) (st: Tainted) = +let rec ImportProvidedType (env: ImportMap) (m: range) (* (tinst: TypeInst) *) (st: Tainted) = - // Explanation: The two calls below represent am unchecked invariant of the hosted compiler: - // that type providers are only activated on the CompilationThread. This invariant is not currently checked + // Explanation: The two calls below represent am unchecked invariant of the hosted compiler: + // that type providers are only activated on the CompilationThread. This invariant is not currently checked // via CompilationThreadToken passing. We leave the two calls below as a reminder of this. // - // This function is one major source of type provider activations, but not the only one: almost + // This function is one major source of type provider activations, but not the only one: almost // any call in the 'TypeProviders' module is a potential type provider activation. let ctok = AssumeCompilationThreadWithoutEvidence () RequireCompilationThread ctok let g = env.g - if st.PUntaint((fun st -> st.IsArray), m) then + if st.PUntaint((fun st -> st.IsArray), m) then let elemTy = ImportProvidedType env m (* tinst *) (st.PApply((fun st -> st.GetElementType()), m)) // TODO Nullness - integration into type providers as a separate feature for later. let nullness = Nullness.knownAmbivalent mkArrayTy g (st.PUntaint((fun st -> st.GetArrayRank()), m)) nullness elemTy m - elif st.PUntaint((fun st -> st.IsByRef), m) then + elif st.PUntaint((fun st -> st.IsByRef), m) then let elemTy = ImportProvidedType env m (* tinst *) (st.PApply((fun st -> st.GetElementType()), m)) mkByrefTy g elemTy - elif st.PUntaint((fun st -> st.IsPointer), m) then + elif st.PUntaint((fun st -> st.IsPointer), m) then let elemTy = ImportProvidedType env m (* tinst *) (st.PApply((fun st -> st.GetElementType()), m)) - if isUnitTy g elemTy || isVoidTy g elemTy && g.voidptr_tcr.CanDeref then - mkVoidPtrTy g + if isUnitTy g elemTy || isVoidTy g elemTy && g.voidptr_tcr.CanDeref then + mkVoidPtrTy g else mkNativePtrTy g elemTy else // REVIEW: Extension type could try to be its own generic arg (or there could be a type loop) - let tcref, genericArgs = - if st.PUntaint((fun st -> st.IsGenericType), m) then + let tcref, genericArgs = + if st.PUntaint((fun st -> st.IsGenericType), m) then let tcref = ImportProvidedNamedType env m (st.PApply((fun st -> st.GetGenericTypeDefinition()), m)) - let args = st.PApplyArray((fun st -> st.GetGenericArguments()), "GetGenericArguments", m) |> Array.map (ImportProvidedType env m (* tinst *) ) |> List.ofArray + let args = st.PApplyArray((fun st -> st.GetGenericArguments()), "GetGenericArguments", m) |> Array.map (ImportProvidedType env m (* tinst *) ) |> List.ofArray tcref, args - else + else let tcref = ImportProvidedNamedType env m st - tcref, [] - + tcref, [] + let genericArgsLength = genericArgs.Length - /// Adjust for the known primitive numeric types that accept units of measure. + /// Adjust for the known primitive numeric types that accept units of measure. let tcref = if genericArgsLength = 1 then // real @@ -496,22 +545,22 @@ let rec ImportProvidedType (env: ImportMap) (m: range) (* (tinst: TypeInst) *) ( tcref let tps = tcref.Typars m - if tps.Length <> genericArgsLength then + if tps.Length <> genericArgsLength then error(Error(FSComp.SR.impInvalidNumberOfGenericArguments(tcref.CompiledName, tps.Length, genericArgsLength), m)) - let genericArgs = - (tps, genericArgs) ||> List.map2 (fun tp genericArg -> - if tp.Kind = TyparKind.Measure then - let rec conv ty = - match ty with + let genericArgs = + (tps, genericArgs) ||> List.map2 (fun tp genericArg -> + if tp.Kind = TyparKind.Measure then + let rec conv ty = + match ty with | TType_app (tcref, [ty1;ty2], _) when tyconRefEq g tcref g.measureproduct_tcr -> Measure.Prod (conv ty1, conv ty2) | TType_app (tcref, [ty1], _) when tyconRefEq g tcref g.measureinverse_tcr -> Measure.Inv (conv ty1) - | TType_app (tcref, [], _) when tyconRefEq g tcref g.measureone_tcr -> Measure.One + | TType_app (tcref, [], _) when tyconRefEq g tcref g.measureone_tcr -> Measure.One | TType_app (tcref, [], _) when tcref.TypeOrMeasureKind = TyparKind.Measure -> Measure.Const tcref - | TType_app (tcref, _, _) -> + | TType_app (tcref, _, _) -> errorR(Error(FSComp.SR.impInvalidMeasureArgument1(tcref.CompiledName, tp.Name), m)) Measure.One - | _ -> + | _ -> errorR(Error(FSComp.SR.impInvalidMeasureArgument2(tp.Name), m)) Measure.One @@ -525,82 +574,82 @@ let rec ImportProvidedType (env: ImportMap) (m: range) (* (tinst: TypeInst) *) ( ImportTyconRefApp env tcref genericArgs nullness /// Import a provided method reference as an Abstract IL method reference -let ImportProvidedMethodBaseAsILMethodRef (env: ImportMap) (m: range) (mbase: Tainted) = +let ImportProvidedMethodBaseAsILMethodRef (env: ImportMap) (m: range) (mbase: Tainted) = let tref = GetILTypeRefOfProvidedType (mbase.PApply((fun mbase -> nonNull mbase.DeclaringType), m), m) - let mbase = + let mbase = // Find the formal member corresponding to the called member - match mbase.OfType() with - | Some minfo when - minfo.PUntaint((fun minfo -> minfo.IsGenericMethod|| (nonNull minfo.DeclaringType).IsGenericType), m) -> + match mbase.OfType() with + | Some minfo when + minfo.PUntaint((fun minfo -> minfo.IsGenericMethod|| (nonNull minfo.DeclaringType).IsGenericType), m) -> let declaringType = minfo.PApply((fun minfo -> nonNull minfo.DeclaringType), m) - let declaringGenericTypeDefn = - if declaringType.PUntaint((fun t -> t.IsGenericType), m) then + let declaringGenericTypeDefn = + if declaringType.PUntaint((fun t -> t.IsGenericType), m) then declaringType.PApply((fun declaringType -> declaringType.GetGenericTypeDefinition()), m) - else + else declaringType - let methods = declaringGenericTypeDefn.PApplyArray((fun x -> x.GetMethods()), "GetMethods", m) + let methods = declaringGenericTypeDefn.PApplyArray((fun x -> x.GetMethods()), "GetMethods", m) let metadataToken = minfo.PUntaint((fun minfo -> minfo.MetadataToken), m) - let found = methods |> Array.tryFind (fun x -> x.PUntaint((fun x -> x.MetadataToken), m) = metadataToken) + let found = methods |> Array.tryFind (fun x -> x.PUntaint((fun x -> x.MetadataToken), m) = metadataToken) match found with | Some found -> found.Coerce(m) - | None -> + | None -> let methodName = minfo.PUntaint((fun minfo -> minfo.Name), m) let typeName = declaringGenericTypeDefn.PUntaint((fun declaringGenericTypeDefn -> declaringGenericTypeDefn.FullName), m) error(Error(FSComp.SR.etIncorrectProvidedMethod(DisplayNameOfTypeProvider(minfo.TypeProvider, m), methodName, metadataToken, typeName), m)) - | _ -> - match mbase.OfType() with - | Some cinfo when cinfo.PUntaint((fun x -> (nonNull x.DeclaringType).IsGenericType), m) -> + | _ -> + match mbase.OfType() with + | Some cinfo when cinfo.PUntaint((fun x -> (nonNull x.DeclaringType).IsGenericType), m) -> let declaringType = cinfo.PApply((fun x -> nonNull x.DeclaringType), m) let declaringGenericTypeDefn = declaringType.PApply((fun x -> x.GetGenericTypeDefinition()), m) // We have to find the uninstantiated formal signature corresponding to this instantiated constructor. // Annoyingly System.Reflection doesn't give us a MetadataToken to compare on, so we have to look by doing // the instantiation and comparing.. - let found = - let ctors = declaringGenericTypeDefn.PApplyArray((fun x -> x.GetConstructors()), "GetConstructors", m) + let found = + let ctors = declaringGenericTypeDefn.PApplyArray((fun x -> x.GetConstructors()), "GetConstructors", m) - let actualParamTys = + let actualParamTys = [ for p in cinfo.PApplyArray((fun x -> x.GetParameters()), "GetParameters", m) do ImportProvidedType env m (p.PApply((fun p -> p.ParameterType), m)) ] let actualGenericArgs = argsOfAppTy env.g (ImportProvidedType env m declaringType) - ctors |> Array.tryFind (fun ctor -> - let formalParamTysAfterInst = + ctors |> Array.tryFind (fun ctor -> + let formalParamTysAfterInst = [ for p in ctor.PApplyArray((fun x -> x.GetParameters()), "GetParameters", m) do let ilFormalTy = ImportProvidedTypeAsILType env m (p.PApply((fun p -> p.ParameterType), m)) // TODO Nullness - integration into type providers as a separate feature for later. yield ImportILType env m actualGenericArgs ilFormalTy ] (formalParamTysAfterInst, actualParamTys) ||> List.lengthsEqAndForall2 (typeEquiv env.g)) - + match found with | Some found -> found.Coerce(m) - | None -> + | None -> let typeName = declaringGenericTypeDefn.PUntaint((fun x -> x.FullName), m) error(Error(FSComp.SR.etIncorrectProvidedConstructor(DisplayNameOfTypeProvider(cinfo.TypeProvider, m), typeName), m)) | _ -> mbase - let retTy = - match mbase.OfType() with + let retTy = + match mbase.OfType() with | Some minfo -> minfo.PApply((fun minfo -> minfo.ReturnType), m) | None -> match mbase.OfType() with | Some _ -> mbase.PApply((fun _ -> ProvidedType.Void), m) | _ -> failwith "ImportProvidedMethodBaseAsILMethodRef - unexpected" - let genericArity = - if mbase.PUntaint((fun x -> x.IsGenericMethod), m) then + let genericArity = + if mbase.PUntaint((fun x -> x.IsGenericMethod), m) then mbase.PUntaint((fun x -> x.GetGenericArguments().Length), m) else 0 let callingConv = (if mbase.PUntaint((fun x -> x.IsStatic), m) then ILCallingConv.Static else ILCallingConv.Instance) - let ilParamTys = + let ilParamTys = [ for p in mbase.PApplyArray((fun x -> x.GetParameters()), "GetParameters", m) do yield ImportProvidedTypeAsILType env m (p.PApply((fun p -> p.ParameterType), m)) ] @@ -613,38 +662,38 @@ let ImportProvidedMethodBaseAsILMethodRef (env: ImportMap) (m: range) (mbase: Ta // Load an IL assembly into the compiler's internal data structures // Careful use is made of laziness here to ensure we don't read the entire IL // assembly on startup. -//-------------------------------------------------------------------------- +//-------------------------------------------------------------------------- /// Import a set of Abstract IL generic parameter specifications as a list of new -/// F# generic parameters. -/// +/// F# generic parameters. +/// /// Fixup the constraints so that any references to the generic parameters /// in the constraints now refer to the new generic parameters. -let ImportILGenericParameters amap m scoref tinst (nullableFallback:Nullness.NullableContextSource) (gps: ILGenericParameterDefs) = - match gps with +let ImportILGenericParameters amap m scoref tinst (nullableFallback:Nullness.NullableContextSource) (gps: ILGenericParameterDefs) = + match gps with | [] -> [] - | _ -> + | _ -> let amap : ImportMap = amap() - let tps = gps |> List.map (fun gp -> Construct.NewRigidTypar gp.Name m) + let tps = gps |> List.map (fun gp -> Construct.NewRigidTypar gp.Name m) let tptys = tps |> List.map mkTyparTy let importInst = tinst@tptys - (tps, gps) ||> List.iter2 (fun tp gp -> + (tps, gps) ||> List.iter2 (fun tp gp -> if gp.Variance = ILGenericVariance.ContraVariant then tp.MarkAsContravariant() - let constraints = - [ + let constraints = + [ if amap.g.langFeatureNullness && amap.g.checkNullness then - let nullness = + let nullness = { Nullness.DirectAttributes = Nullness.AttributesFromIL(gp.MetadataIndex,gp.CustomAttrsStored) Nullness.Fallback = nullableFallback } - + match nullness.GetFlags(amap.g) with | [|1uy|] -> TyparConstraint.NotSupportsNull(m) // In F#, 'SupportsNull' has the meaning of "must support null as a value". In C#, Nullable(2) is an allowance, not a requirement. //| [|2uy|] -> TyparConstraint.SupportsNull(m) - | _ -> () - + | _ -> () + if gp.CustomAttrs |> TryFindILAttribute amap.g.attrib_IsUnmanagedAttribute then TyparConstraint.IsUnmanaged(m) if gp.HasDefaultConstructorConstraint then @@ -656,29 +705,29 @@ let ImportILGenericParameters amap m scoref tinst (nullableFallback:Nullness.Nul if gp.HasAllowsRefStruct then TyparConstraint.AllowsRefStruct(m) for ilTy in gp.Constraints do - TyparConstraint.CoercesTo(ImportILType amap m importInst (rescopeILType scoref ilTy), m) ] + TyparConstraint.CoercesTo(ImportILType amap m importInst (rescopeILType scoref ilTy), m) ] tp.SetConstraints constraints) tps /// Given a list of items each keyed by an ordered list of keys, apply 'nodef' to the each group -/// with the same leading key. Apply 'tipf' to the elements where the keylist is empty, and return -/// the overall results. Used to bucket types, so System.Char and System.Collections.Generic.List +/// with the same leading key. Apply 'tipf' to the elements where the keylist is empty, and return +/// the overall results. Used to bucket types, so System.Char and System.Collections.Generic.List /// both get initially bucketed under 'System'. -let multisetDiscriminateAndMap nodef tipf (items: ('Key list * 'Value) list) = - // Find all the items with an empty key list and call 'tipf' - let tips = - [ for keylist, v in items do - match keylist with +let multisetDiscriminateAndMap nodef tipf (items: ('Key list * 'Value) list) = + // Find all the items with an empty key list and call 'tipf' + let tips = + [ for keylist, v in items do + match keylist with | [] -> yield tipf v | _ -> () ] // Find all the items with a non-empty key list. Bucket them together by // the first key. For each bucket, call 'nodef' on that head key and the bucket. - let nodes = + let nodes = let buckets = Dictionary<_, _>(10) for keylist, v in items do - match keylist with + match keylist with | [] -> () | key :: rest -> buckets[key] <- @@ -692,7 +741,7 @@ let multisetDiscriminateAndMap nodef tipf (items: ('Key list * 'Value) list) = /// Import an IL type definition as a new F# TAST Entity node. let rec ImportILTypeDef amap m scoref (cpath: CompilationPath) enc nm (tdef: ILTypeDef) = - let lazyModuleOrNamespaceTypeForNestedTypes = + let lazyModuleOrNamespaceTypeForNestedTypes = InterruptibleLazy(fun _ -> let cpath = cpath.NestedCompPath nm ModuleOrType ImportILTypeDefs amap m scoref cpath (enc@[tdef]) tdef.NestedTypes @@ -700,41 +749,41 @@ let rec ImportILTypeDef amap m scoref (cpath: CompilationPath) enc nm (tdef: ILT let nullableFallback = Nullness.FromClass(Nullness.AttributesFromIL(tdef.MetadataIndex,tdef.CustomAttrsStored)) - // Add the type itself. - Construct.NewILTycon - (Some cpath) - (nm, m) + // Add the type itself. + Construct.NewILTycon + (Some cpath) + (nm, m) // The read of the type parameters may fail to resolve types. We pick up a new range from the point where that read is forced // Make sure we reraise the original exception one occurs - see findOriginalException. (LazyWithContext.Create((fun m -> ImportILGenericParameters amap m scoref [] nullableFallback tdef.GenericParams), findOriginalException)) - (scoref, enc, tdef) + (scoref, enc, tdef) (MaybeLazy.Lazy lazyModuleOrNamespaceTypeForNestedTypes) - + /// Import a list of (possibly nested) IL types as a new ModuleOrNamespaceType node /// containing new entities, bucketing by namespace along the way. and ImportILTypeDefList amap m (cpath: CompilationPath) enc items = // Split into the ones with namespaces and without. Add the ones with namespaces in buckets. - // That is, discriminate based in the first element of the namespace list (e.g. "System") + // That is, discriminate based in the first element of the namespace list (e.g. "System") // and, for each bag, fold-in a lazy computation to add the types under that bag . // // nodef - called for each bucket, where 'n' is the head element of the namespace used // as a key in the discrimination, tgs is the remaining descriptors. We create an entity for 'n'. // - // tipf - called if there are no namespace items left to discriminate on. - let entities = - items - |> multisetDiscriminateAndMap + // tipf - called if there are no namespace items left to discriminate on. + let entities = + items + |> multisetDiscriminateAndMap (fun n tgs -> let modty = InterruptibleLazy(fun _ -> ImportILTypeDefList amap m (cpath.NestedCompPath n (Namespace true)) enc tgs) Construct.NewModuleOrNamespace (Some cpath) taccessPublic (mkSynId m n) XmlDoc.Empty [] (MaybeLazy.Lazy modty)) - (fun (n, info: InterruptibleLazy<_>) -> + (fun (n, info: InterruptibleLazy<_>) -> let (scoref2, lazyTypeDef: ILPreTypeDef) = info.Force() ImportILTypeDef amap m scoref2 cpath enc n (lazyTypeDef.GetTypeDef())) let kind = match enc with [] -> Namespace true | _ -> ModuleOrType Construct.NewModuleOrNamespaceType kind entities [] - + /// Import a table of IL types as a ModuleOrNamespaceType. /// and ImportILTypeDefs amap m scoref cpath enc (tdefs: ILTypeDefs) = @@ -748,49 +797,49 @@ and ImportILTypeDefs amap m scoref cpath enc (tdefs: ILTypeDefs) = /// /// Example: for a collection of types "System.Char", "System.Int32" and "Library.C" /// the return ModuleOrNamespaceType will contain namespace entities for "System" and "Library", which in turn contain -/// type definition entities for ["Char"; "Int32"] and ["C"] respectively. -let ImportILAssemblyMainTypeDefs amap m scoref modul = - modul.TypeDefs |> ImportILTypeDefs amap m scoref (CompPath(scoref, SyntaxAccess.Unknown, [])) [] +/// type definition entities for ["Char"; "Int32"] and ["C"] respectively. +let ImportILAssemblyMainTypeDefs amap m scoref modul = + modul.TypeDefs |> ImportILTypeDefs amap m scoref (CompPath(scoref, SyntaxAccess.Unknown, [])) [] -/// Import the "exported types" table for multi-module assemblies. -let ImportILAssemblyExportedType amap m auxModLoader (scoref: ILScopeRef) (exportedType: ILExportedTypeOrForwarder) = +/// Import the "exported types" table for multi-module assemblies. +let ImportILAssemblyExportedType amap m auxModLoader (scoref: ILScopeRef) (exportedType: ILExportedTypeOrForwarder) = // Forwarders are dealt with separately in the ref->def dereferencing logic in tast.fs as they effectively give rise to type equivalences - if exportedType.IsForwarder then + if exportedType.IsForwarder then [] else let ns, n = splitILTypeName exportedType.Name let info = InterruptibleLazy (fun _ -> - match - (try + match + (try let modul = auxModLoader exportedType.ScopeRef let ptd = mkILPreTypeDefComputed (ns, n, (fun () -> modul.TypeDefs.FindByName exportedType.Name)) Some ptd with :? KeyNotFoundException -> None) - with - | None -> + with + | None -> error(Error(FSComp.SR.impReferenceToDllRequiredByAssembly(exportedType.ScopeRef.QualifiedName, scoref.QualifiedName, exportedType.Name), m)) - | Some preTypeDef -> + | Some preTypeDef -> scoref, preTypeDef ) [ ImportILTypeDefList amap m (CompPath(scoref, SyntaxAccess.Unknown, [])) [] [(ns, (n, info))] ] -/// Import the "exported types" table for multi-module assemblies. -let ImportILAssemblyExportedTypes amap m auxModLoader scoref (exportedTypes: ILExportedTypesAndForwarders) = - [ for exportedType in exportedTypes.AsList() do +/// Import the "exported types" table for multi-module assemblies. +let ImportILAssemblyExportedTypes amap m auxModLoader scoref (exportedTypes: ILExportedTypesAndForwarders) = + [ for exportedType in exportedTypes.AsList() do yield! ImportILAssemblyExportedType amap m auxModLoader scoref exportedType ] -/// Import both the main type definitions and the "exported types" table, i.e. all the +/// Import both the main type definitions and the "exported types" table, i.e. all the /// types defined in an IL assembly. -let ImportILAssemblyTypeDefs (amap, m, auxModLoader, aref, mainmod: ILModuleDef) = +let ImportILAssemblyTypeDefs (amap, m, auxModLoader, aref, mainmod: ILModuleDef) = let scoref = ILScopeRef.Assembly aref let mtypsForExportedTypes = ImportILAssemblyExportedTypes amap m auxModLoader scoref mainmod.ManifestOfAssembly.ExportedTypes let mainmod = ImportILAssemblyMainTypeDefs amap m scoref mainmod CombineCcuContentFragments (mainmod :: mtypsForExportedTypes) /// Import the type forwarder table for an IL assembly -let ImportILAssemblyTypeForwarders (amap, m, exportedTypes: ILExportedTypesAndForwarders): CcuTypeForwarderTable = +let ImportILAssemblyTypeForwarders (amap, m, exportedTypes: ILExportedTypesAndForwarders): CcuTypeForwarderTable = let rec addToTree tree path item value = match path with | [] -> @@ -843,22 +892,22 @@ let ImportILAssemblyTypeForwarders (amap, m, exportedTypes: ILExportedTypesAndFo |> addNested exportedType exportedType.Nested [yield! ns; yield n] ) |> fun root -> { Root = root } - + /// Import an IL assembly as a new TAST CCU -let ImportILAssembly(amap: unit -> ImportMap, m, auxModuleLoader, xmlDocInfoLoader: IXmlDocumentationInfoLoader option, ilScopeRef, sourceDir, fileName, ilModule: ILModuleDef, invalidateCcu: IEvent) = +let ImportILAssembly(amap: unit -> ImportMap, m, auxModuleLoader, xmlDocInfoLoader: IXmlDocumentationInfoLoader option, ilScopeRef, sourceDir, fileName, ilModule: ILModuleDef, invalidateCcu: IEvent) = invalidateCcu |> ignore - let aref = - match ilScopeRef with - | ILScopeRef.Assembly aref -> aref + let aref = + match ilScopeRef with + | ILScopeRef.Assembly aref -> aref | _ -> error(InternalError("ImportILAssembly: cannot reference .NET netmodules directly, reference the containing assembly instead", m)) let nm = aref.Name let mty = ImportILAssemblyTypeDefs(amap, m, auxModuleLoader, aref, ilModule) - let forwarders = - match ilModule.Manifest with + let forwarders = + match ilModule.Manifest with | None -> CcuTypeForwarderTable.Empty | Some manifest -> ImportILAssemblyTypeForwarders(amap, m, manifest.ExportedTypes) - let ccuData: CcuData = + let ccuData: CcuData = { IsFSharp=false UsesFSharp20PlusQuotations=false #if !NO_TYPEPROVIDERS @@ -867,20 +916,20 @@ let ImportILAssembly(amap: unit -> ImportMap, m, auxModuleLoader, xmlDocInfoLoad ImportProvidedType = (fun ty -> ImportProvidedType (amap()) m ty) #endif QualifiedName= Some ilScopeRef.QualifiedName - Contents = Construct.NewCcuContents ilScopeRef m nm mty + Contents = Construct.NewCcuContents ilScopeRef m nm mty ILScopeRef = ilScopeRef Stamp = newStamp() - SourceCodeDirectory = sourceDir // note: not an accurate value, but IL assemblies don't give us this information in any attributes. + SourceCodeDirectory = sourceDir // note: not an accurate value, but IL assemblies don't give us this information in any attributes. FileName = fileName MemberSignatureEquality= (fun ty1 ty2 -> typeEquivAux EraseAll (amap()).g ty1 ty2) TryGetILModuleDef = (fun () -> Some ilModule) TypeForwarders = forwarders - XmlDocumentationInfo = + XmlDocumentationInfo = match xmlDocInfoLoader, fileName with | Some xmlDocInfoLoader, Some fileName -> xmlDocInfoLoader.TryLoad(fileName) | _ -> None } - + CcuThunk.Create(nm, ccuData) //------------------------------------------------------------------------- @@ -889,7 +938,7 @@ let ImportILAssembly(amap: unit -> ImportMap, m, auxModuleLoader, xmlDocInfoLoad /// Import an IL type as an F# type. importInst gives the context for interpreting type variables. let RescopeAndImportILTypeSkipNullness scoref amap m importInst ilTy = - ilTy |> rescopeILType scoref |> ImportILType amap m importInst + ilTy |> rescopeILType scoref |> ImportILType amap m importInst let RescopeAndImportILType scoref (amap:ImportMap) m importInst (nullnessSource:Nullness.NullableAttributesSource) ilTy = let g = amap.g @@ -905,4 +954,3 @@ let RescopeAndImportILType scoref (amap:ImportMap) m importInst (nullnessSource: let CanRescopeAndImportILType scoref amap m ilTy = ilTy |> rescopeILType scoref |> CanImportILType amap m - diff --git a/src/Compiler/Checking/import.fsi b/src/Compiler/Checking/import.fsi index fb1f191effc..001f9367989 100644 --- a/src/Compiler/Checking/import.fsi +++ b/src/Compiler/Checking/import.fsi @@ -10,6 +10,8 @@ open FSharp.Compiler.Text open FSharp.Compiler.Xml open FSharp.Compiler.TypedTree +open System.Collections.Concurrent + #if !NO_TYPEPROVIDERS open FSharp.Compiler.TypeProviders #endif @@ -35,6 +37,26 @@ type AssemblyLoader = abstract RecordGeneratedTypeRoot: ProviderGeneratedType -> unit #endif +[] +type CanCoerce = + | CanCoerce + | NoCoerce + +[] +type TTypeCacheKey = + interface System.IEquatable + private new: ty1: TType * ty2: TType * canCoerce: CanCoerce * tcGlobals: TcGlobals -> TTypeCacheKey + + static member FromStrippedTypes: + ty1: TType * ty2: TType * canCoerce: CanCoerce * tcGlobals: TcGlobals -> TTypeCacheKey + + val ty1: TType + val ty2: TType + val canCoerce: CanCoerce + val tcGlobals: TcGlobals + override Equals: other: obj -> bool + override GetHashCode: unit -> int + /// Represents a context used for converting AbstractIL .NET and provided types to F# internal compiler data structures. /// Also cache the conversion of AbstractIL ILTypeRef nodes, based on hashes of these. /// @@ -51,6 +73,9 @@ type ImportMap = /// The TcGlobals for the import context member g: TcGlobals + /// Type subsumption cache + member TypeSubsumptionCache: ConcurrentDictionary + module Nullness = [] diff --git a/src/Compiler/Driver/CompilerConfig.fs b/src/Compiler/Driver/CompilerConfig.fs index cd883c6f7c7..6a190bcfbc1 100644 --- a/src/Compiler/Driver/CompilerConfig.fs +++ b/src/Compiler/Driver/CompilerConfig.fs @@ -22,6 +22,7 @@ open FSharp.Compiler.DiagnosticsLogger open FSharp.Compiler.Features open FSharp.Compiler.IO open FSharp.Compiler.CodeAnalysis +open FSharp.Compiler.Syntax open FSharp.Compiler.Text open FSharp.Compiler.Text.Range open FSharp.Compiler.Xml @@ -91,24 +92,16 @@ let ResolveFileUsingPaths (paths, m, fileName) = let searchMessage = String.concat "\n " paths raise (FileNameNotResolved(fileName, searchMessage, m)) -let GetWarningNumber (m, warningNumber: string, prefixSupported) = - try - let warningNumber = - if warningNumber.StartsWithOrdinal "FS" then - if prefixSupported then - warningNumber.Substring 2 - else - raise (new ArgumentException()) - else - warningNumber +let GetWarningNumber (numberString) = + let trimPrefix (s: string) = + if s.StartsWithOrdinal "FS" then s[2..] else s - if Char.IsDigit(warningNumber[0]) then - Some(int32 warningNumber) - else - None - with _ -> - warning (Error(FSComp.SR.buildInvalidWarningNumber warningNumber, m)) - None + let tryParseInt (s: string) = + match Int32.TryParse s with + | true, n -> Some n + | false, _ -> None + + tryParseInt (trimPrefix numberString) let ComputeMakePathAbsolute implicitIncludeDir (path: string) = try @@ -528,7 +521,7 @@ type TcConfigBuilder = mutable optSettings: Optimizer.OptimizationSettings mutable emitTailcalls: bool mutable deterministic: bool - mutable concurrentBuild: bool + mutable parallelParsing: bool mutable parallelIlxGen: bool mutable emitMetadataAssembly: MetadataAssemblyGeneration mutable preferredUiLang: string option @@ -620,6 +613,8 @@ type TcConfigBuilder = mutable dumpSignatureData: bool mutable realsig: bool + + mutable compilationMode: TcGlobals.CompilationMode } // Directories to start probing in @@ -777,7 +772,7 @@ type TcConfigBuilder = } emitTailcalls = true deterministic = false - concurrentBuild = true + parallelParsing = true parallelIlxGen = FSharpExperimentalFeaturesEnabledAutomatically emitMetadataAssembly = MetadataAssemblyGeneration.None preferredUiLang = None @@ -834,6 +829,7 @@ type TcConfigBuilder = dumpSignatureData = false realsig = false strictIndentation = None + compilationMode = TcGlobals.CompilationMode.Unset } member tcConfigB.FxResolver = @@ -928,10 +924,10 @@ type TcConfigBuilder = tcConfigB.outputFile <- Some outfile outfile, pdbfile, assemblyName - member tcConfigB.TurnWarningOff(m, s: string) = + member tcConfigB.TurnWarningOff(m: range, s: string) = use _ = UseBuildPhase BuildPhase.Parameter - match GetWarningNumber(m, s, tcConfigB.langVersion.SupportsFeature(LanguageFeature.ParsedHashDirectiveArgumentNonQuotes)) with + match GetWarningNumber s with | None -> () | Some n -> // nowarn:62 turns on mlCompatibility, e.g. shows ML compat items in intellisense menus @@ -943,10 +939,10 @@ type TcConfigBuilder = WarnOff = ListSet.insert (=) n tcConfigB.diagnosticsOptions.WarnOff } - member tcConfigB.TurnWarningOn(m, s: string) = + member tcConfigB.TurnWarningOn(m: range, s: string) = use _ = UseBuildPhase BuildPhase.Parameter - match GetWarningNumber(m, s, tcConfigB.langVersion.SupportsFeature(LanguageFeature.ParsedHashDirectiveArgumentNonQuotes)) with + match GetWarningNumber s with | None -> () | Some n -> // warnon 62 turns on mlCompatibility, e.g. shows ML compat items in intellisense menus @@ -1339,7 +1335,7 @@ type TcConfig private (data: TcConfigBuilder, validate: bool) = member _.optSettings = data.optSettings member _.emitTailcalls = data.emitTailcalls member _.deterministic = data.deterministic - member _.concurrentBuild = data.concurrentBuild + member _.parallelParsing = data.parallelParsing member _.parallelIlxGen = data.parallelIlxGen member _.emitMetadataAssembly = data.emitMetadataAssembly member _.pathMap = data.pathMap @@ -1378,6 +1374,7 @@ type TcConfig private (data: TcConfigBuilder, validate: bool) = member _.typeCheckingConfig = data.typeCheckingConfig member _.dumpSignatureData = data.dumpSignatureData member _.realsig = data.realsig + member _.compilationMode = data.compilationMode static member Create(builder, validate) = use _ = UseBuildPhase BuildPhase.Parameter diff --git a/src/Compiler/Driver/CompilerConfig.fsi b/src/Compiler/Driver/CompilerConfig.fsi index 98c52f900e0..eb8439ec6c5 100644 --- a/src/Compiler/Driver/CompilerConfig.fsi +++ b/src/Compiler/Driver/CompilerConfig.fsi @@ -17,6 +17,7 @@ open FSharp.Compiler.Diagnostics open FSharp.Compiler.DiagnosticsLogger open FSharp.Compiler.Features open FSharp.Compiler.CodeAnalysis +open FSharp.Compiler.Syntax open FSharp.Compiler.Text open FSharp.Compiler.BuildGraph @@ -434,7 +435,7 @@ type TcConfigBuilder = mutable deterministic: bool - mutable concurrentBuild: bool + mutable parallelParsing: bool mutable parallelIlxGen: bool @@ -525,6 +526,8 @@ type TcConfigBuilder = mutable dumpSignatureData: bool mutable realsig: bool + + mutable compilationMode: TcGlobals.CompilationMode } static member CreateNew: @@ -768,7 +771,7 @@ type TcConfig = member deterministic: bool - member concurrentBuild: bool + member parallelParsing: bool member parallelIlxGen: bool @@ -904,6 +907,8 @@ type TcConfig = member realsig: bool + member compilationMode: TcGlobals.CompilationMode + /// Represents a computation to return a TcConfig. Normally this is just a constant immutable TcConfig, /// but for F# Interactive it may be based on an underlying mutable TcConfigBuilder. [] @@ -922,7 +927,7 @@ val TryResolveFileUsingPaths: paths: string seq * m: range * fileName: string -> val ResolveFileUsingPaths: paths: string seq * m: range * fileName: string -> string -val GetWarningNumber: m: range * warningNumber: string * prefixSupported: bool -> int option +val GetWarningNumber: string -> int option /// Get the name used for FSharp.Core val GetFSharpCoreLibraryName: unit -> string diff --git a/src/Compiler/Driver/CompilerDiagnostics.fs b/src/Compiler/Driver/CompilerDiagnostics.fs index 1e87efe00b6..e1f2bbf1ab2 100644 --- a/src/Compiler/Driver/CompilerDiagnostics.fs +++ b/src/Compiler/Driver/CompilerDiagnostics.fs @@ -410,7 +410,7 @@ type PhasedDiagnostic with (severity = FSharpDiagnosticSeverity.Info && level > 0) || (severity = FSharpDiagnosticSeverity.Warning && level >= x.WarningLevel) - member x.AdjustedSeverity(options, severity) = + member x.AdjustSeverity(options, severity) = let n = x.Number let localWarnon () = WarnScopes.IsWarnon options n x.Range @@ -2295,7 +2295,7 @@ type DiagnosticsLoggerFilteringByScopedPragmas(diagnosticOptions: FSharpDiagnost realErrorPresent <- true diagnosticsLogger.DiagnosticSink(diagnostic, severity) else - match diagnostic.AdjustedSeverity(diagnosticOptions, severity) with + match diagnostic.AdjustSeverity(diagnosticOptions, severity) with | FSharpDiagnosticSeverity.Hidden -> () | s -> diagnosticsLogger.DiagnosticSink(diagnostic, s) diff --git a/src/Compiler/Driver/CompilerDiagnostics.fsi b/src/Compiler/Driver/CompilerDiagnostics.fsi index 877daa0a66a..b1d4f95860a 100644 --- a/src/Compiler/Driver/CompilerDiagnostics.fsi +++ b/src/Compiler/Driver/CompilerDiagnostics.fsi @@ -63,7 +63,7 @@ type PhasedDiagnostic with member FormatCore: flattenErrors: bool * suggestNames: bool -> string /// Compute new severity according to the various diagnostics options - member AdjustedSeverity: FSharpDiagnosticOptions * FSharpDiagnosticSeverity -> FSharpDiagnosticSeverity + member AdjustSeverity: FSharpDiagnosticOptions * FSharpDiagnosticSeverity -> FSharpDiagnosticSeverity /// Output all of a diagnostic to a buffer, including range member Output: buf: StringBuilder * tcConfig: TcConfig * severity: FSharpDiagnosticSeverity -> unit diff --git a/src/Compiler/Driver/CompilerImports.fs b/src/Compiler/Driver/CompilerImports.fs index fb6a6526eab..c54ccc41c58 100644 --- a/src/Compiler/Driver/CompilerImports.fs +++ b/src/Compiler/Driver/CompilerImports.fs @@ -2614,7 +2614,8 @@ and [] TcImports tcConfig.noDebugAttributes, tcConfig.pathMap, tcConfig.langVersion, - tcConfig.realsig + tcConfig.realsig, + tcConfig.compilationMode ) #if DEBUG diff --git a/src/Compiler/Driver/CompilerOptions.fs b/src/Compiler/Driver/CompilerOptions.fs index 96c40724ef4..fa7319fd1c2 100644 --- a/src/Compiler/Driver/CompilerOptions.fs +++ b/src/Compiler/Driver/CompilerOptions.fs @@ -622,6 +622,26 @@ let splittingSwitch (tcConfigB: TcConfigBuilder) switch = let callVirtSwitch (tcConfigB: TcConfigBuilder) switch = tcConfigB.alwaysCallVirt <- switch = OptionSwitch.On +let callParallelCompilationSwitch (tcConfigB: TcConfigBuilder) switch = + tcConfigB.parallelIlxGen <- switch = OptionSwitch.On + + let (graphCheckingMode, optMode) = + match switch with + | OptionSwitch.On -> TypeCheckingMode.Graph, OptimizationProcessingMode.Parallel + | OptionSwitch.Off -> TypeCheckingMode.Sequential, OptimizationProcessingMode.Sequential + + if tcConfigB.typeCheckingConfig.Mode <> graphCheckingMode then + tcConfigB.typeCheckingConfig <- + { tcConfigB.typeCheckingConfig with + Mode = graphCheckingMode + } + + if tcConfigB.optSettings.processingMode <> optMode then + tcConfigB.optSettings <- + { tcConfigB.optSettings with + processingMode = optMode + } + let useHighEntropyVASwitch (tcConfigB: TcConfigBuilder) switch = tcConfigB.useHighEntropyVA <- switch = OptionSwitch.On @@ -832,7 +852,7 @@ let errorsAndWarningsFlags (tcConfigB: TcConfigBuilder) = CompilerOption( "nowarn", tagWarnList, - OptionStringList(fun n -> tcConfigB.TurnWarningOff(rangeCmdArgs, trimFS n)), + OptionStringList(fun n -> tcConfigB.TurnWarningOff(rangeCmdArgs, n)), None, Some(FSComp.SR.optsNowarn ()) ) @@ -840,7 +860,7 @@ let errorsAndWarningsFlags (tcConfigB: TcConfigBuilder) = CompilerOption( "warnon", tagWarnList, - OptionStringList(fun n -> tcConfigB.TurnWarningOn(rangeCmdArgs, trimFS n)), + OptionStringList(fun n -> tcConfigB.TurnWarningOn(rangeCmdArgs, n)), None, Some(FSComp.SR.optsWarnOn ()) ) @@ -1365,9 +1385,9 @@ let testFlag tcConfigB = | "DumpDebugInfo" -> tcConfigB.dumpDebugInfo <- true | "ShowLoadedAssemblies" -> tcConfigB.showLoadedAssemblies <- true | "ContinueAfterParseFailure" -> tcConfigB.continueAfterParseFailure <- true - | "ParallelOff" -> tcConfigB.concurrentBuild <- false - | "ParallelIlxGen" -> tcConfigB.parallelIlxGen <- true - | "GraphBasedChecking" -> + | "ParallelOff" -> tcConfigB.parallelParsing <- false + | "ParallelIlxGen" -> tcConfigB.parallelIlxGen <- true // Kept as --test:.. flag for temporary backwards compatibility during .NET10 period. + | "GraphBasedChecking" -> // Kept as --test:.. flag for temporary backwards compatibility during .NET10 period. tcConfigB.typeCheckingConfig <- { tcConfigB.typeCheckingConfig with Mode = TypeCheckingMode.Graph @@ -1378,7 +1398,7 @@ let testFlag tcConfigB = DumpGraph = true } | "DumpSignatureData" -> tcConfigB.dumpSignatureData <- true - | "ParallelOptimization" -> + | "ParallelOptimization" -> // Kept as --test:.. flag for temporary backwards compatibility during .NET10 period. tcConfigB.optSettings <- { tcConfigB.optSettings with processingMode = OptimizationProcessingMode.Parallel @@ -1692,6 +1712,14 @@ let internalFlags (tcConfigB: TcConfigBuilder) = None ) + CompilerOption( + "parallelcompilation", + tagNone, + OptionSwitch(callParallelCompilationSwitch tcConfigB), + Some(InternalCommandLineOption("--parallelcompilation", rangeCmdArgs)), + None + ) + testFlag tcConfigB ] @ diff --git a/src/Compiler/Driver/GraphChecking/FileContentMapping.fs b/src/Compiler/Driver/GraphChecking/FileContentMapping.fs index 938034623ba..7be965522f6 100644 --- a/src/Compiler/Driver/GraphChecking/FileContentMapping.fs +++ b/src/Compiler/Driver/GraphChecking/FileContentMapping.fs @@ -212,7 +212,7 @@ let visitSynMemberDefn (md: SynMemberDefn) : FileContentEntry list = yield! collectFromOption visitBinding memberDefnForGet yield! collectFromOption visitBinding memberDefnForSet | SynMemberDefn.ImplicitCtor(ctorArgs = pat) -> yield! visitPat pat - | SynMemberDefn.ImplicitInherit(inheritType, inheritArgs, _, _) -> + | SynMemberDefn.ImplicitInherit(inheritType, inheritArgs, _, _, _) -> yield! visitSynType inheritType yield! visitSynExpr inheritArgs | SynMemberDefn.LetBindings(bindings = bindings) -> yield! List.collect visitBinding bindings @@ -220,7 +220,8 @@ let visitSynMemberDefn (md: SynMemberDefn) : FileContentEntry list = | SynMemberDefn.Interface(interfaceType, _, members, _) -> yield! visitSynType interfaceType yield! collectFromOption (List.collect visitSynMemberDefn) members - | SynMemberDefn.Inherit(baseType = t) -> yield! visitSynType t + | SynMemberDefn.Inherit(baseType = Some baseType) -> yield! visitSynType baseType + | SynMemberDefn.Inherit(baseType = None) -> () | SynMemberDefn.ValField(fieldInfo, _) -> yield! visitSynField fieldInfo | SynMemberDefn.NestedType _ -> () | SynMemberDefn.AutoProperty(attributes = attributes; typeOpt = typeOpt; synExpr = synExpr) -> diff --git a/src/Compiler/Driver/GraphChecking/GraphProcessing.fs b/src/Compiler/Driver/GraphChecking/GraphProcessing.fs index 218c9d6b2ac..33dd1c42c46 100644 --- a/src/Compiler/Driver/GraphChecking/GraphProcessing.fs +++ b/src/Compiler/Driver/GraphChecking/GraphProcessing.fs @@ -252,6 +252,7 @@ let processGraphAsync<'Item, 'Result when 'Item: equality and 'Item: comparison> let rec queueNode node = Async.Start( async { + use! _catch = Async.OnCancel(completionSignal.TrySetCanceled >> ignore) let! res = processNode node |> Async.Catch match res with diff --git a/src/Compiler/Driver/ParseAndCheckInputs.fs b/src/Compiler/Driver/ParseAndCheckInputs.fs index 1e64ce71fb0..dabd128a45b 100644 --- a/src/Compiler/Driver/ParseAndCheckInputs.fs +++ b/src/Compiler/Driver/ParseAndCheckInputs.fs @@ -27,6 +27,7 @@ open FSharp.Compiler.Diagnostics open FSharp.Compiler.DiagnosticsLogger open FSharp.Compiler.Features open FSharp.Compiler.IO +open FSharp.Compiler.LexerStore open FSharp.Compiler.Lexhelp open FSharp.Compiler.NameResolution open FSharp.Compiler.ParseHelpers @@ -216,15 +217,58 @@ let PostParseModuleSpec (_i, defaultNamespace, isLastCompiland, fileName, intf) SynModuleOrNamespaceSig(lid, isRecursive, kind, decls, xmlDoc, attributes, None, range, trivia) -let private collectCodeComments (lexbuf: UnicodeLexing.Lexbuf) (tripleSlashComments: range list) = +let private collectCodeComments (lexbuf: UnicodeLexing.Lexbuf) = + let tripleSlashComments = XmlDocStore.ReportInvalidXmlDocPositions(lexbuf) + [ - yield! LexbufCommentStore.GetComments(lexbuf) + yield! CommentStore.GetComments(lexbuf) yield! (List.map CommentTrivia.LineComment tripleSlashComments) + yield! (WarnScopes.getCommentRanges lexbuf |> List.map CommentTrivia.LineComment) ] |> List.sortBy (function | CommentTrivia.LineComment r | CommentTrivia.BlockComment r -> r.StartLine, r.StartColumn) +let private getImplSubmoduleRanges (impls: ParsedImplFileFragment list) = + let getDecls (impl: ParsedImplFileFragment) = + match impl with + | ParsedImplFileFragment.AnonModule(decls, _) -> decls + | ParsedImplFileFragment.NamedModule(SynModuleOrNamespace(decls = decls)) -> decls + | ParsedImplFileFragment.NamespaceFragment(decls = decls) -> decls + + let getSubmoduleRange decl = + match decl with + | SynModuleDecl.NestedModule(range = m) -> Some m + | _ -> None + + impls |> List.collect getDecls |> List.choose getSubmoduleRange + +let private getSpecSubmoduleRanges (specs: ParsedSigFileFragment list) = + let getDecls (spec: ParsedSigFileFragment) = + match spec with + | ParsedSigFileFragment.AnonModule(decls, _) -> decls + | ParsedSigFileFragment.NamedModule(SynModuleOrNamespaceSig(decls = decls)) -> decls + | ParsedSigFileFragment.NamespaceFragment(decls = decls) -> decls + + let getSubmoduleRange decl = + match decl with + | SynModuleSigDecl.NestedModule(range = m) -> Some m + | _ -> None + + specs |> List.collect getDecls |> List.choose getSubmoduleRange + +let private processLexbufData lexbuf diagnosticOptions subModuleRanges : ParsedFileInputTrivia = + let conditionalDirectives = IfdefStore.GetTrivia(lexbuf) + let warnDirectiveRanges = WarnScopes.getDirectiveRanges (lexbuf) + let codeCommentRanges = collectCodeComments lexbuf + lexbuf |> WarnScopes.MergeInto diagnosticOptions subModuleRanges + + { + ConditionalDirectives = conditionalDirectives + // WarnDirectives = warnDirectiveRanges + CodeComments = codeCommentRanges + } + let PostParseModuleImpls ( defaultNamespace, @@ -232,9 +276,13 @@ let PostParseModuleImpls isLastCompiland, ParsedImplFile(hashDirectives, impls), lexbuf: UnicodeLexing.Lexbuf, - tripleSlashComments: range list, + diagnosticOptions: FSharpDiagnosticOptions, identifiers: Set ) = + + let trivia = + processLexbufData lexbuf diagnosticOptions (getImplSubmoduleRanges impls) + let othersWithSameName = impls |> List.rev @@ -253,15 +301,6 @@ let PostParseModuleImpls let qualName = QualFileNameOfImpls fileName impls let isScript = IsScript fileName - let conditionalDirectives = LexbufIfdefStore.GetTrivia(lexbuf) - let codeComments = collectCodeComments lexbuf tripleSlashComments - - let trivia: ParsedImplFileInputTrivia = - { - ConditionalDirectives = conditionalDirectives - CodeComments = codeComments - } - ParsedInput.ImplFile(ParsedImplFileInput(fileName, isScript, qualName, hashDirectives, impls, isLastCompiland, trivia, identifiers)) let PostParseModuleSpecs @@ -271,9 +310,13 @@ let PostParseModuleSpecs isLastCompiland, ParsedSigFile(hashDirectives, specs), lexbuf: UnicodeLexing.Lexbuf, - tripleSlashComments: range list, + diagnosticOptions: FSharpDiagnosticOptions, identifiers: Set ) = + + let trivia = + processLexbufData lexbuf diagnosticOptions (getSpecSubmoduleRanges specs) + let othersWithSameName = specs |> List.rev @@ -291,15 +334,6 @@ let PostParseModuleSpecs let qualName = QualFileNameOfSpecs fileName specs - let conditionalDirectives = LexbufIfdefStore.GetTrivia(lexbuf) - let codeComments = collectCodeComments lexbuf tripleSlashComments - - let trivia: ParsedSigFileInputTrivia = - { - ConditionalDirectives = conditionalDirectives - CodeComments = codeComments - } - ParsedInput.SigFile(ParsedSigFileInput(fileName, qualName, hashDirectives, specs, trivia, identifiers)) type ModuleNamesDict = Map> @@ -439,22 +473,10 @@ let ParseInput // Call the appropriate parser - for signature files or implementation files if FSharpImplFileSuffixes |> List.exists (FileSystemUtils.checkSuffix fileName) then let impl = Parser.implementationFile lexer lexbuf - - lexbuf |> WarnScopes.MergeInto diagnosticOptions - - let tripleSlashComments = - LexbufLocalXmlDocStore.ReportInvalidXmlDocPositions(lexbuf) - - PostParseModuleImpls(defaultNamespace, fileName, isLastCompiland, impl, lexbuf, tripleSlashComments, Set identStore) + PostParseModuleImpls(defaultNamespace, fileName, isLastCompiland, impl, lexbuf, diagnosticOptions, Set identStore) elif FSharpSigFileSuffixes |> List.exists (FileSystemUtils.checkSuffix fileName) then let intfs = Parser.signatureFile lexer lexbuf - - lexbuf |> WarnScopes.MergeInto diagnosticOptions - - let tripleSlashComments = - LexbufLocalXmlDocStore.ReportInvalidXmlDocPositions(lexbuf) - - PostParseModuleSpecs(defaultNamespace, fileName, isLastCompiland, intfs, lexbuf, tripleSlashComments, Set identStore) + PostParseModuleSpecs(defaultNamespace, fileName, isLastCompiland, intfs, lexbuf, diagnosticOptions, Set identStore) else if lexbuf.SupportsFeature LanguageFeature.MLCompatRevisions then error (Error(FSComp.SR.buildInvalidSourceFileExtensionUpdated fileName, rangeStartup)) else @@ -526,19 +548,7 @@ let ReportParsingStatistics res = let EmptyParsedInput (fileName, isLastCompiland) = if FSharpSigFileSuffixes |> List.exists (FileSystemUtils.checkSuffix fileName) then - ParsedInput.SigFile( - ParsedSigFileInput( - fileName, - QualFileNameOfImpls fileName [], - [], - [], - { - ConditionalDirectives = [] - CodeComments = [] - }, - Set.empty - ) - ) + ParsedInput.SigFile(ParsedSigFileInput(fileName, QualFileNameOfImpls fileName [], [], [], ParsedFileInputTrivia.Empty, Set.empty)) else ParsedInput.ImplFile( ParsedImplFileInput( @@ -548,10 +558,7 @@ let EmptyParsedInput (fileName, isLastCompiland) = [], [], isLastCompiland, - { - ConditionalDirectives = [] - CodeComments = [] - }, + ParsedFileInputTrivia.Empty, Set.empty ) ) @@ -804,7 +811,7 @@ let ParseInputFilesSequential (tcConfig: TcConfig, lexResourceManager, sourceFil /// Parse multiple input files from disk let ParseInputFiles (tcConfig: TcConfig, lexResourceManager, sourceFiles, diagnosticsLogger: DiagnosticsLogger, retryLocked) = try - if tcConfig.concurrentBuild then + if tcConfig.parallelParsing then ParseInputFilesInParallel(tcConfig, lexResourceManager, sourceFiles, diagnosticsLogger, retryLocked) else ParseInputFilesSequential(tcConfig, lexResourceManager, sourceFiles, diagnosticsLogger, retryLocked) @@ -991,42 +998,6 @@ let ApplyMetaCommandsFromInputToTcConfig (tcConfig: TcConfig, inp: ParsedInput, ProcessMetaCommandsFromInput (addReferenceDirective, addLoadedSource) (tcConfigB, inp, pathOfMetaCommandSource, ()) TcConfig.Create(tcConfigB, validate = false) -let CheckLegacyWarnDirectivePlacement (langVersion: LanguageVersion, WarnScopeMap warnScopes, inp: ParsedInput) = - if not (langVersion.SupportsFeature LanguageFeature.ScopedNowarn) then - - let sigSubmoduleRanges (SynModuleOrNamespaceSig(decls = decls)) = - decls - |> List.choose (function - | SynModuleSigDecl.NestedModule(range = m) -> Some m - | _ -> None) - - let implSubmoduleRanges (SynModuleOrNamespace(decls = decls)) = - decls - |> List.choose (function - | SynModuleDecl.NestedModule(range = m) -> Some m - | _ -> None) - - let subModuleRanges = - match inp with - | ParsedInput.SigFile sigFile -> sigFile.Contents |> List.collect sigSubmoduleRanges - | ParsedInput.ImplFile implFile -> implFile.Contents |> List.collect implSubmoduleRanges - - let getDirectiveLines warnScope = - match warnScope with - | WarnScope.Off m - | WarnScope.On m - | WarnScope.OpenOff m - | WarnScope.OpenOn m -> [ m.StartLine; m.EndLine ] - - let warnLines = - warnScopes.Values |> Seq.toList |> List.collect (List.collect getDirectiveLines) - - for mm in subModuleRanges do - for line in warnLines do - if line > mm.StartLine && line <= mm.EndLine then - let m = withStartEnd (mkPos line 0) (mkPos (line + 1) 0) mm - warning (Error(FSComp.SR.buildDirectivesInModulesAreIgnored (), m)) - /// Build the initial type checking environment let GetInitialTcEnv (assemblyName: string, initm: range, tcConfig: TcConfig, tcImports: TcImports, tcGlobals) = let initm = initm.StartRange diff --git a/src/Compiler/Driver/ParseAndCheckInputs.fsi b/src/Compiler/Driver/ParseAndCheckInputs.fsi index afdfb30936e..5f9ddd23a80 100644 --- a/src/Compiler/Driver/ParseAndCheckInputs.fsi +++ b/src/Compiler/Driver/ParseAndCheckInputs.fsi @@ -86,9 +86,6 @@ val ProcessMetaCommandsFromInput: /// Process all the #r, #I etc. in an input. val ApplyMetaCommandsFromInputToTcConfig: TcConfig * ParsedInput * string * DependencyProvider -> TcConfig -/// Report warnings about ignored warn directives. -val CheckLegacyWarnDirectivePlacement: LanguageVersion * WarnScopeMap * ParsedInput -> unit - /// Parse one input stream val ParseOneInputStream: tcConfig: TcConfig * diff --git a/src/Compiler/Driver/ScriptClosure.fs b/src/Compiler/Driver/ScriptClosure.fs index 958e928a30b..807e6efe787 100644 --- a/src/Compiler/Driver/ScriptClosure.fs +++ b/src/Compiler/Driver/ScriptClosure.fs @@ -448,7 +448,6 @@ module ScriptPreprocessClosure = use _ = UseDiagnosticsLogger diagnosticsLogger let pathOfMetaCommandSource = !! Path.GetDirectoryName(fileName) let preSources = tcConfig.GetAvailableLoadedSources() - CheckLegacyWarnDirectivePlacement(tcConfig.langVersion, tcConfig.diagnosticsOptions.WarnScopes, parseResult) let tcConfigResult = ApplyMetaCommandsFromInputToTcConfig(tcConfig, parseResult, pathOfMetaCommandSource, dependencyProvider) diff --git a/src/Compiler/Driver/fsc.fs b/src/Compiler/Driver/fsc.fs index 382e4d2c53c..f3c30775957 100644 --- a/src/Compiler/Driver/fsc.fs +++ b/src/Compiler/Driver/fsc.fs @@ -21,6 +21,7 @@ open System.Text open System.Threading open Internal.Utilities +open Internal.Utilities.TypeHashing open Internal.Utilities.Library open Internal.Utilities.Library.Extras @@ -76,7 +77,7 @@ type DiagnosticsLoggerUpToMaxErrors(tcConfigB: TcConfigBuilder, exiter: Exiter, override x.DiagnosticSink(diagnostic, severity) = let tcConfig = TcConfig.Create(tcConfigB, validate = false) - match diagnostic.AdjustedSeverity(tcConfigB.diagnosticsOptions, severity) with + match diagnostic.AdjustSeverity(tcConfigB.diagnosticsOptions, severity) with | FSharpDiagnosticSeverity.Error -> if errors >= tcConfig.maxErrors then x.HandleTooManyErrors(FSComp.SR.fscTooManyErrors ()) @@ -266,9 +267,6 @@ let SetProcessThreadLocals tcConfigB = | Some s -> Thread.CurrentThread.CurrentUICulture <- CultureInfo(s) | None -> () - if tcConfigB.utf8output then - Console.OutputEncoding <- Encoding.UTF8 - let ProcessCommandLineFlags (tcConfigB: TcConfigBuilder, lcidFromCodePage, argv) = let mutable inputFilesRef = [] @@ -283,7 +281,10 @@ let ProcessCommandLineFlags (tcConfigB: TcConfigBuilder, lcidFromCodePage, argv) // This is where flags are interpreted by the command line fsc.exe. ParseCompilerOptions(collect, GetCoreFscCompilerOptions tcConfigB, List.tail (PostProcessCompilerArgs abbrevArgs argv)) - tcConfigB.diagnosticsOptions.FSharp9CompatibleNowarn <- not <| tcConfigB.langVersion.SupportsFeature LanguageFeature.ScopedNowarn + tcConfigB.diagnosticsOptions <- + { tcConfigB.diagnosticsOptions with + WarnScopesFeatureIsSupported = tcConfigB.langVersion.SupportsFeature LanguageFeature.ScopedNowarn + } let inputFiles = List.rev inputFilesRef @@ -505,7 +506,8 @@ let main1 defaultCopyFSharpCore = defaultCopyFSharpCore, tryGetMetadataSnapshot = tryGetMetadataSnapshot, sdkDirOverride = None, - rangeForErrors = range0 + rangeForErrors = range0, + compilationMode = CompilationMode.OneOff ) tcConfigB.exiter <- exiter @@ -545,6 +547,17 @@ let main1 | Some parallelReferenceResolution -> tcConfigB.parallelReferenceResolution <- parallelReferenceResolution | None -> () + if tcConfigB.utf8output && Console.OutputEncoding <> Encoding.UTF8 then + let previousEncoding = Console.OutputEncoding + Console.OutputEncoding <- Encoding.UTF8 + + disposables.Register( + { new IDisposable with + member _.Dispose() = + Console.OutputEncoding <- previousEncoding + } + ) + // Display the banner text, if necessary if not bannerAlreadyPrinted then Console.Write(GetBannerText tcConfigB) @@ -643,9 +656,6 @@ let main1 if not tcConfig.continueAfterParseFailure then AbortOnError(diagnosticsLogger, exiter) - for input in inputs do - CheckLegacyWarnDirectivePlacement(tcConfig.langVersion, tcConfig.diagnosticsOptions.WarnScopes, fst input) - let tcConfig = (tcConfig, inputs) ||> List.fold (fun z (input, sourceFileDirectory) -> @@ -886,11 +896,7 @@ let main3 TryFindFSharpStringAttribute tcGlobals tcGlobals.attrib_InternalsVisibleToAttribute topAttrs.assemblyAttrs |> Option.isSome - let observer = - if hasIvt then - Fsharp.Compiler.SignatureHash.PublicAndInternal - else - Fsharp.Compiler.SignatureHash.PublicOnly + let observer = if hasIvt then PublicAndInternal else PublicOnly let optDataHash = optDataResources @@ -1233,16 +1239,6 @@ let CompileFromCommandLineArguments ) = use disposables = new DisposablesTracker() - let savedOut = Console.Out - - use _ = - { new IDisposable with - member _.Dispose() = - try - Console.SetOut(savedOut) - with _ -> - () - } main1 ( ctok, diff --git a/src/Compiler/FSComp.txt b/src/Compiler/FSComp.txt index 683a387aa3a..459cb122ea6 100644 --- a/src/Compiler/FSComp.txt +++ b/src/Compiler/FSComp.txt @@ -1783,8 +1783,12 @@ featureEmptyBodiedComputationExpressions,"Support for computation expressions wi featureAllowAccessModifiersToAutoPropertiesGettersAndSetters,"Allow access modifiers to auto properties getters and setters" 3871,tcAccessModifiersNotAllowedInSRTPConstraint,"Access modifiers cannot be applied to an SRTP constraint." featureAllowObjectExpressionWithoutOverrides,"Allow object expressions without overrides" +featureUseTypeSubsumptionCache,"Use type conversion cache during compilation" 3872,tcPartialActivePattern,"Multi-case partial active patterns are not supported. Consider using a single-case partial active pattern or a full active pattern." +featureDontWarnOnUppercaseIdentifiersInBindingPatterns,"Don't warn on uppercase identifiers in binding patterns" +3873,chkDeprecatePlacesWhereSeqCanBeOmitted,"This construct is deprecated. Sequence expressions should be of the form 'seq {{ ... }}'" +featureDeprecatePlacesWhereSeqCanBeOmitted,"Deprecate places where 'seq' can be omitted" featureScopedNowarn,"Support for scoped enabling / disabling of warnings by #warn and #nowarn directives, also inside modules" -3873,lexWarnDirectiveMustBeFirst,"#nowarn/#warnon directives must appear as the first non-whitespace characters on a line" -3874,lexWarnDirectiveMustHaveArgs,"Warn directives must have warning number(s) as argument(s)" -3875,lexWarnDirectivesMustMatch,"There is another %s for this warning already in line %d." \ No newline at end of file +3874,lexWarnDirectiveMustBeFirst,"#nowarn/#warnon directives must appear as the first non-whitespace characters on a line" +3875,lexWarnDirectiveMustHaveArgs,"Warn directives must have warning number(s) as argument(s)" +3876,lexWarnDirectivesMustMatch,"There is another %s for this warning already in line %d." \ No newline at end of file diff --git a/src/Compiler/FSharp.Compiler.Service.fsproj b/src/Compiler/FSharp.Compiler.Service.fsproj index feb938a2b36..1f074d6875a 100644 --- a/src/Compiler/FSharp.Compiler.Service.fsproj +++ b/src/Compiler/FSharp.Compiler.Service.fsproj @@ -10,6 +10,8 @@ $(NoWarn);75 $(NoWarn);1204 $(NoWarn);NU5125 + $(NoWarn);64;1182;1204 + $(OtherFlags) --warnaserror-:1182 FSharp.Compiler.Service true $(DefineConstants);COMPILER @@ -245,11 +247,11 @@ SyntaxTree\pplex.fsl - --module FSharp.Compiler.PPParser --open FSharp.Compiler.ParseHelpers --internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing --buffer-type-argument char + --module FSharp.Compiler.PPParser --open FSharp.Compiler.ParseHelpers --open FSharp.Compiler.LexerStore --internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing --buffer-type-argument char SyntaxTree\pppars.fsy - --module FSharp.Compiler.Lexer --open FSharp.Compiler.Lexhelp --open Internal.Utilities.Text.Lexing --open FSharp.Compiler.Parser --open FSharp.Compiler.Text --open FSharp.Compiler.ParseHelpers --internal --unicode --lexlib Internal.Utilities.Text.Lexing + --module FSharp.Compiler.Lexer --open FSharp.Compiler.Lexhelp --open Internal.Utilities.Text.Lexing --open FSharp.Compiler.Parser --open FSharp.Compiler.Text --open FSharp.Compiler.ParseHelpers --open FSharp.Compiler.LexerStore --internal --unicode --lexlib Internal.Utilities.Text.Lexing SyntaxTree\lex.fsl @@ -280,6 +282,8 @@ + + @@ -334,6 +338,7 @@ + diff --git a/src/Compiler/Facilities/DiagnosticOptions.fs b/src/Compiler/Facilities/DiagnosticOptions.fs index b62e95d3332..776a18ac0c0 100644 --- a/src/Compiler/Facilities/DiagnosticOptions.fs +++ b/src/Compiler/Facilities/DiagnosticOptions.fs @@ -7,20 +7,6 @@ namespace FSharp.Compiler.Diagnostics open FSharp.Compiler.Text -[] -type WarnScope = - | Off of range - | On of range - | OpenOff of range - | OpenOn of range - -type WarnScopeMap = WarnScopeMap of Map - -type LineMap = - | LineMap of Map - - static member Empty = LineMap Map.empty - [] type FSharpDiagnosticSeverity = | Hidden @@ -36,9 +22,8 @@ type FSharpDiagnosticOptions = WarnOn: int list WarnAsError: int list WarnAsWarn: int list - mutable FSharp9CompatibleNowarn: bool // set after setting compiler options - mutable LineMap: LineMap // set after lexing - mutable WarnScopes: WarnScopeMap // set after lexing + WarnScopesFeatureIsSupported: bool + mutable WarnScopeData: obj option } static member Default = @@ -49,9 +34,8 @@ type FSharpDiagnosticOptions = WarnOn = [] WarnAsError = [] WarnAsWarn = [] - FSharp9CompatibleNowarn = false - LineMap = LineMap.Empty - WarnScopes = WarnScopeMap Map.empty + WarnScopesFeatureIsSupported = true + WarnScopeData = None } member x.CheckXmlDocs = diff --git a/src/Compiler/Facilities/DiagnosticOptions.fsi b/src/Compiler/Facilities/DiagnosticOptions.fsi index 5a8f37fc20b..809a6de1608 100644 --- a/src/Compiler/Facilities/DiagnosticOptions.fsi +++ b/src/Compiler/Facilities/DiagnosticOptions.fsi @@ -8,24 +8,6 @@ namespace FSharp.Compiler.Diagnostics open FSharp.Compiler.Text -/// The range between #nowarn and #warnon, or #warnon and #nowarn, for a warning number. -/// Or between the directive and eof, for the "Open" cases. -[] -type WarnScope = - | Off of range - | On of range - | OpenOff of range - | OpenOn of range - -/// The collected WarnScope objects (collected during lexing) -type WarnScopeMap = WarnScopeMap of Map - -/// Information about the mapping implied by the #line directives -type LineMap = - | LineMap of Map - - static member Empty: LineMap - [] type FSharpDiagnosticSeverity = | Hidden @@ -40,9 +22,8 @@ type FSharpDiagnosticOptions = WarnOn: int list WarnAsError: int list WarnAsWarn: int list - mutable FSharp9CompatibleNowarn: bool - mutable LineMap: LineMap - mutable WarnScopes: WarnScopeMap } + WarnScopesFeatureIsSupported: bool + mutable WarnScopeData: obj option } static member Default: FSharpDiagnosticOptions diff --git a/src/Compiler/Facilities/LanguageFeatures.fs b/src/Compiler/Facilities/LanguageFeatures.fs index 25632458d08..312d9eb66ec 100644 --- a/src/Compiler/Facilities/LanguageFeatures.fs +++ b/src/Compiler/Facilities/LanguageFeatures.fs @@ -94,6 +94,9 @@ type LanguageFeature = | ParsedHashDirectiveArgumentNonQuotes | EmptyBodiedComputationExpressions | AllowObjectExpressionWithoutOverrides + | DontWarnOnUppercaseIdentifiersInBindingPatterns + | UseTypeSubsumptionCache + | DeprecatePlacesWhereSeqCanBeOmitted | ScopedNowarn /// LanguageVersion management @@ -216,10 +219,13 @@ type LanguageVersion(versionText) = LanguageFeature.EnforceAttributeTargets, languageVersion90 // F# preview + LanguageFeature.UseTypeSubsumptionCache, previewVersion LanguageFeature.UnmanagedConstraintCsharpInterop, previewVersion // not enabled because: https://github.com/dotnet/fsharp/issues/17509 LanguageFeature.FromEndSlicing, previewVersion // Unfinished features --- needs work LanguageFeature.AllowAccessModifiersToAutoPropertiesGettersAndSetters, previewVersion LanguageFeature.AllowObjectExpressionWithoutOverrides, previewVersion + LanguageFeature.DontWarnOnUppercaseIdentifiersInBindingPatterns, previewVersion + LanguageFeature.DeprecatePlacesWhereSeqCanBeOmitted, previewVersion LanguageFeature.ScopedNowarn, previewVersion ] @@ -377,6 +383,10 @@ type LanguageVersion(versionText) = | LanguageFeature.ParsedHashDirectiveArgumentNonQuotes -> FSComp.SR.featureParsedHashDirectiveArgumentNonString () | LanguageFeature.EmptyBodiedComputationExpressions -> FSComp.SR.featureEmptyBodiedComputationExpressions () | LanguageFeature.AllowObjectExpressionWithoutOverrides -> FSComp.SR.featureAllowObjectExpressionWithoutOverrides () + | LanguageFeature.DontWarnOnUppercaseIdentifiersInBindingPatterns -> + FSComp.SR.featureDontWarnOnUppercaseIdentifiersInBindingPatterns () + | LanguageFeature.UseTypeSubsumptionCache -> FSComp.SR.featureUseTypeSubsumptionCache () + | LanguageFeature.DeprecatePlacesWhereSeqCanBeOmitted -> FSComp.SR.featureDeprecatePlacesWhereSeqCanBeOmitted () | LanguageFeature.ScopedNowarn -> FSComp.SR.featureScopedNowarn () /// Get a version string associated with the given feature. diff --git a/src/Compiler/Facilities/LanguageFeatures.fsi b/src/Compiler/Facilities/LanguageFeatures.fsi index 03fb649b6e3..9573f8c1d25 100644 --- a/src/Compiler/Facilities/LanguageFeatures.fsi +++ b/src/Compiler/Facilities/LanguageFeatures.fsi @@ -85,6 +85,9 @@ type LanguageFeature = | ParsedHashDirectiveArgumentNonQuotes | EmptyBodiedComputationExpressions | AllowObjectExpressionWithoutOverrides + | DontWarnOnUppercaseIdentifiersInBindingPatterns + | UseTypeSubsumptionCache + | DeprecatePlacesWhereSeqCanBeOmitted | ScopedNowarn /// LanguageVersion management diff --git a/src/Compiler/Facilities/prim-lexing.fs b/src/Compiler/Facilities/prim-lexing.fs index d1b965f100f..c305052587c 100644 --- a/src/Compiler/Facilities/prim-lexing.fs +++ b/src/Compiler/Facilities/prim-lexing.fs @@ -238,13 +238,13 @@ type internal Position = Position(x.FileIndex, x.Line, x.OriginalLine, x.StartOfLineAbsoluteOffset, x.StartOfLineAbsoluteOffset - 1) member x.ApplyLineDirective(fileIdx, line) = - Position(fileIdx, line, x.OriginalLine, x.AbsoluteOffset, x.AbsoluteOffset) + Position(fileIdx, line, x.OriginalLine + 1, x.AbsoluteOffset, x.AbsoluteOffset) override p.ToString() = $"({p.Line},{p.Column})" static member Empty = Position() - static member FirstLine fileIdx = Position(fileIdx, 1, 0, 0, 0) + static member FirstLine fileIdx = Position(fileIdx, 1, 1, 0, 0) type internal LexBufferFiller<'Char> = LexBuffer<'Char> -> unit diff --git a/src/Compiler/Interactive/fsi.fs b/src/Compiler/Interactive/fsi.fs index a3d7f7c38d6..4669f2ae9aa 100644 --- a/src/Compiler/Interactive/fsi.fs +++ b/src/Compiler/Interactive/fsi.fs @@ -846,7 +846,7 @@ type internal FsiStdinSyphon(errorWriter: TextWriter) = /// Encapsulates functions used to write to outWriter and errorWriter type internal FsiConsoleOutput(tcConfigB, outWriter: TextWriter, errorWriter: TextWriter) = - let nullOut = new StreamWriter(Stream.Null) :> TextWriter + let nullOut = TextWriter.Null let fprintfnn (os: TextWriter) fmt = Printf.kfprintf @@ -898,7 +898,7 @@ type internal DiagnosticsLoggerThatStopsOnFirstError override _.DiagnosticSink(diagnostic, severity) = let tcConfig = TcConfig.Create(tcConfigB, validate = false) - match diagnostic.AdjustedSeverity(tcConfig.diagnosticsOptions, severity) with + match diagnostic.AdjustSeverity(tcConfig.diagnosticsOptions, severity) with | FSharpDiagnosticSeverity.Error -> fsiStdinSyphon.PrintDiagnostic(tcConfig, diagnostic) errorCount <- errorCount + 1 @@ -907,15 +907,8 @@ type internal DiagnosticsLoggerThatStopsOnFirstError exit 1 (* non-zero exit code *) // STOP ON FIRST ERROR (AVOIDS PARSER ERROR RECOVERY) raise StopProcessing - | FSharpDiagnosticSeverity.Warning -> - DoWithDiagnosticColor FSharpDiagnosticSeverity.Warning (fun () -> - fsiConsoleOutput.Error.WriteLine() - diagnostic.WriteWithContext(fsiConsoleOutput.Error, " ", fsiStdinSyphon.GetLine, tcConfig, severity) - fsiConsoleOutput.Error.WriteLine() - fsiConsoleOutput.Error.WriteLine() - fsiConsoleOutput.Error.Flush()) - | FSharpDiagnosticSeverity.Info -> - DoWithDiagnosticColor FSharpDiagnosticSeverity.Info (fun () -> + | (FSharpDiagnosticSeverity.Warning | FSharpDiagnosticSeverity.Info) as adjustedSeverity -> + DoWithDiagnosticColor adjustedSeverity (fun () -> fsiConsoleOutput.Error.WriteLine() diagnostic.WriteWithContext(fsiConsoleOutput.Error, " ", fsiStdinSyphon.GetLine, tcConfig, severity) fsiConsoleOutput.Error.WriteLine() @@ -1205,11 +1198,6 @@ type internal FsiCommandLineOptions(fsi: FsiEvaluationSessionHostConfig, argv: s if tcConfigB.clearResultsCache then dependencyProvider.ClearResultsCache(tcConfigB.compilerToolPaths, getOutputDir tcConfigB, reportError rangeCmdArgs) - if tcConfigB.utf8output then - let prev = Console.OutputEncoding - Console.OutputEncoding <- Encoding.UTF8 - System.AppDomain.CurrentDomain.ProcessExit.Add(fun _ -> Console.OutputEncoding <- prev) - do let firstArg = match sourceFiles with @@ -2487,10 +2475,7 @@ type internal FsiDynamicCompiler [], [ impl ], (isLastCompiland, isExe), - { - ConditionalDirectives = [] - CodeComments = [] - }, + ParsedFileInputTrivia.Empty, Set.empty ) ) @@ -3705,7 +3690,7 @@ type FsiInteractionProcessor Parser.interaction lexerWhichSavesLastToken tokenizer.LexBuffer) - WarnScopes.MergeInto diagnosticOptions tokenizer.LexBuffer + WarnScopes.MergeInto diagnosticOptions [] tokenizer.LexBuffer Some input with e -> @@ -4650,6 +4635,20 @@ type FsiEvaluationSession with e -> warning (e) + let restoreEncoding = + if tcConfigB.utf8output && Console.OutputEncoding <> Text.Encoding.UTF8 then + let previousEncoding = Console.OutputEncoding + Console.OutputEncoding <- Encoding.UTF8 + + Some( + { new IDisposable with + member _.Dispose() = + Console.OutputEncoding <- previousEncoding + } + ) + else + None + do updateBannerText () // resetting banner text after parsing options @@ -4793,6 +4792,7 @@ type FsiEvaluationSession member _.Dispose() = (tcImports :> IDisposable).Dispose() uninstallMagicAssemblyResolution.Dispose() + restoreEncoding |> Option.iter (fun x -> x.Dispose()) /// Load the dummy interaction, load the initial files, and, /// if interacting, start the background thread to read the standard input. diff --git a/src/Compiler/Optimize/LowerComputedCollections.fs b/src/Compiler/Optimize/LowerComputedCollections.fs index 98101af36fe..1f224ea499c 100644 --- a/src/Compiler/Optimize/LowerComputedCollections.fs +++ b/src/Compiler/Optimize/LowerComputedCollections.fs @@ -17,6 +17,7 @@ open FSharp.Compiler.TypedTree open FSharp.Compiler.TypedTreeBasics open FSharp.Compiler.TypedTreeOps open FSharp.Compiler.TypeHierarchy +open Import /// Build the 'test and dispose' part of a 'use' statement let BuildDisposableCleanup tcVal (g: TcGlobals) infoReader m (v: Val) = diff --git a/src/Compiler/Service/FSharpCheckerResults.fs b/src/Compiler/Service/FSharpCheckerResults.fs index 09fb2d33b8f..83b9dcb0cb0 100644 --- a/src/Compiler/Service/FSharpCheckerResults.fs +++ b/src/Compiler/Service/FSharpCheckerResults.fs @@ -15,6 +15,7 @@ open FSharp.Compiler.IO open FSharp.Compiler.NicePrint open Internal.Utilities.Library open Internal.Utilities.Library.Extras +open Internal.Utilities.TypeHashing open FSharp.Core.Printf open FSharp.Compiler open FSharp.Compiler.Syntax @@ -537,7 +538,7 @@ type internal TypeCheckInfo // check that type of value is the same or subtype of tcref // yes - allow access to protected members // no - strip ability to access protected members - if TypeRelations.TypeFeasiblySubsumesType 0 g amap m thisTy TypeRelations.CanCoerce ty then + if TypeRelations.TypeFeasiblySubsumesType 0 g amap m thisTy Import.CanCoerce ty then ad else AccessibleFrom(paths, None) @@ -3165,7 +3166,6 @@ module internal ParseAndCheckFile = | FSharpDiagnosticSeverity.Hidden -> () | None -> - CheckLegacyWarnDirectivePlacement(tcConfig.langVersion, tcConfig.diagnosticsOptions.WarnScopes, parsedMainInput) // For non-scripts, check for disallow #r and #load. ApplyMetaCommandsFromInputToTcConfig( tcConfig, @@ -3533,7 +3533,7 @@ type FSharpCheckFileResults |> SourceText.ofString) member internal _.CalculateSignatureHash() = - let visibility = Fsharp.Compiler.SignatureHash.PublicAndInternal + let visibility = PublicAndInternal match details with | None -> failwith "Typechecked details not available for CalculateSignatureHash() operation." diff --git a/src/Compiler/Service/FSharpParseFileResults.fs b/src/Compiler/Service/FSharpParseFileResults.fs index 7b273f71430..612057578f7 100644 --- a/src/Compiler/Service/FSharpParseFileResults.fs +++ b/src/Compiler/Service/FSharpParseFileResults.fs @@ -817,7 +817,7 @@ type FSharpParseFileResults(diagnostics: FSharpDiagnostic[], input: ParsedInput, | SynMemberDefn.Inherit(range = m) -> // can break on the "inherit" clause yield! checkRange m - | SynMemberDefn.ImplicitInherit(_, arg, _, m) -> + | SynMemberDefn.ImplicitInherit(_, arg, _, m, _) -> // can break on the "inherit" clause yield! checkRange m yield! walkExpr true arg diff --git a/src/Compiler/Service/FSharpSource.fsi b/src/Compiler/Service/FSharpSource.fsi index ca272a51fef..6bdabbdedf1 100644 --- a/src/Compiler/Service/FSharpSource.fsi +++ b/src/Compiler/Service/FSharpSource.fsi @@ -26,7 +26,7 @@ type internal FSharpSource = abstract TimeStamp: DateTime /// Gets the internal text container. Text may be on-disk, in a stream, or a source text. - abstract internal GetTextContainer: unit -> Async + abstract GetTextContainer: unit -> Async /// Creates a FSharpSource from disk. Only used internally. static member internal CreateFromFile: filePath: string -> FSharpSource diff --git a/src/Compiler/Service/IncrementalBuild.fs b/src/Compiler/Service/IncrementalBuild.fs index 3f7053821cb..60ac8ad778c 100644 --- a/src/Compiler/Service/IncrementalBuild.fs +++ b/src/Compiler/Service/IncrementalBuild.fs @@ -30,6 +30,7 @@ open FSharp.Compiler.NameResolution open FSharp.Compiler.ParseAndCheckInputs open FSharp.Compiler.ScriptClosure open FSharp.Compiler.Syntax +open FSharp.Compiler.SyntaxTrivia open FSharp.Compiler.TcGlobals open FSharp.Compiler.Text open FSharp.Compiler.Text.Range @@ -129,7 +130,7 @@ module IncrementalBuildSyntaxTree = [], [], isLastCompiland, - { ConditionalDirectives = []; CodeComments = [] }, + ParsedFileInputTrivia.Empty, Set.empty ) ), sourceRange, fileName, [||] @@ -263,7 +264,6 @@ type BoundModel private ( beforeFileChecked.Trigger fileName - CheckLegacyWarnDirectivePlacement(tcConfig.langVersion, tcConfig.diagnosticsOptions.WarnScopes, input) ApplyMetaCommandsFromInputToTcConfig (tcConfig, input, !! Path.GetDirectoryName(fileName), tcImports.DependencyProvider) |> ignore let sink = TcResultsSinkImpl(tcGlobals) let hadParseErrors = not (Array.isEmpty parseErrors) @@ -547,7 +547,7 @@ type FrameworkImportsCache(size) = lazyWork ) node - + /// This function strips the "System" assemblies from the tcConfig and returns a age-cached TcImports for them. member this.Get(tcConfig: TcConfig) = @@ -577,7 +577,8 @@ type FrameworkImportsCache(size) = tcGlobals.noDebugAttributes, tcGlobals.pathMap, tcConfig.langVersion, - tcConfig.realsig + tcConfig.realsig, + tcConfig.compilationMode ) else diff --git a/src/Compiler/Service/ServiceInterfaceStubGenerator.fs b/src/Compiler/Service/ServiceInterfaceStubGenerator.fs index f0ddc777b14..fb3e8dfbecc 100644 --- a/src/Compiler/Service/ServiceInterfaceStubGenerator.fs +++ b/src/Compiler/Service/ServiceInterfaceStubGenerator.fs @@ -825,7 +825,7 @@ module InterfaceStubGenerator = | SynMemberDefn.Open _ | SynMemberDefn.ImplicitCtor _ | SynMemberDefn.Inherit _ -> None - | SynMemberDefn.ImplicitInherit(_, expr, _, _) -> walkExpr expr + | SynMemberDefn.ImplicitInherit(_, expr, _, _, _) -> walkExpr expr and walkBinding (SynBinding(expr = expr)) = walkExpr expr diff --git a/src/Compiler/Service/ServiceParseTreeWalk.fs b/src/Compiler/Service/ServiceParseTreeWalk.fs index ca1a1c5e657..4c55c78a437 100644 --- a/src/Compiler/Service/ServiceParseTreeWalk.fs +++ b/src/Compiler/Service/ServiceParseTreeWalk.fs @@ -958,7 +958,7 @@ module SyntaxTraversal = | SynMemberDefn.ImplicitCtor(ctorArgs = pat) -> traverseSynSimplePats path pat - | SynMemberDefn.ImplicitInherit(synType, synExpr, _identOption, range) -> + | SynMemberDefn.ImplicitInherit(synType, synExpr, _identOption, range, _) -> [ dive () synType.Range (fun () -> match traverseInherit (synType, range) with @@ -996,7 +996,8 @@ module SyntaxTraversal = |> pick x | ok -> ok - | SynMemberDefn.Inherit(synType, _identOption, range, _) -> traverseInherit (synType, range) + | SynMemberDefn.Inherit(Some synType, _identOption, range, _) -> traverseInherit (synType, range) + | SynMemberDefn.Inherit(None, _, _, _) -> None | SynMemberDefn.ValField _ -> None | SynMemberDefn.NestedType(synTypeDefn, _synAccessOption, _range) -> traverseSynTypeDefn path synTypeDefn diff --git a/src/Compiler/Service/ServiceParsedInputOps.fs b/src/Compiler/Service/ServiceParsedInputOps.fs index cfbefd49ade..2ed457116b6 100644 --- a/src/Compiler/Service/ServiceParsedInputOps.fs +++ b/src/Compiler/Service/ServiceParsedInputOps.fs @@ -905,7 +905,7 @@ module ParsedInput = | SynMemberDefn.ImplicitCtor(attributes = Attributes attrs; ctorArgs = pat) -> List.tryPick walkAttribute attrs |> Option.orElseWith (fun _ -> walkPat pat) - | SynMemberDefn.ImplicitInherit(t, e, _, _) -> walkType t |> Option.orElseWith (fun () -> walkExpr e) + | SynMemberDefn.ImplicitInherit(t, e, _, _, _) -> walkType t |> Option.orElseWith (fun () -> walkExpr e) | SynMemberDefn.LetBindings(bindings, _, _, _) -> List.tryPick walkBinding bindings @@ -913,8 +913,8 @@ module ParsedInput = walkType t |> Option.orElseWith (fun () -> members |> Option.bind (List.tryPick walkMember)) - | SynMemberDefn.Inherit(baseType = t) -> walkType t - + | SynMemberDefn.Inherit(baseType = Some baseType) -> walkType baseType + | SynMemberDefn.Inherit(baseType = None) -> None | SynMemberDefn.ValField(fieldInfo = field) -> walkField field | SynMemberDefn.NestedType(tdef, _, _) -> walkTypeDefn tdef @@ -2233,14 +2233,15 @@ module ParsedInput = | SynMemberDefn.ImplicitCtor(attributes = Attributes attrs; ctorArgs = pat) -> List.iter walkAttribute attrs walkPat pat - | SynMemberDefn.ImplicitInherit(t, e, _, _) -> + | SynMemberDefn.ImplicitInherit(t, e, _, _, _) -> walkType t walkExpr e | SynMemberDefn.LetBindings(bindings, _, _, _) -> List.iter walkBinding bindings | SynMemberDefn.Interface(interfaceType = t; members = members) -> walkType t members |> Option.iter (List.iter walkMember) - | SynMemberDefn.Inherit(baseType = t) -> walkType t + | SynMemberDefn.Inherit(baseType = Some baseType) -> walkType baseType + | SynMemberDefn.Inherit(baseType = None) -> () | SynMemberDefn.ValField(fieldInfo = field) -> walkField field | SynMemberDefn.NestedType(tdef, _, _) -> walkTypeDefn tdef | SynMemberDefn.AutoProperty(attributes = Attributes attrs; typeOpt = t; synExpr = e) -> diff --git a/src/Compiler/Service/TransparentCompiler.fs b/src/Compiler/Service/TransparentCompiler.fs index f94b1399a63..efc2e510050 100644 --- a/src/Compiler/Service/TransparentCompiler.fs +++ b/src/Compiler/Service/TransparentCompiler.fs @@ -1302,8 +1302,6 @@ type internal TransparentCompiler //beforeFileChecked.Trigger fileName - CheckLegacyWarnDirectivePlacement(tcConfig.langVersion, tcConfig.diagnosticsOptions.WarnScopes, input) - ApplyMetaCommandsFromInputToTcConfig(tcConfig, input, Path.GetDirectoryName fileName |> (!!), tcImports.DependencyProvider) |> ignore diff --git a/src/Compiler/Service/service.fs b/src/Compiler/Service/service.fs index 5f6588bd770..3e42e03223c 100644 --- a/src/Compiler/Service/service.fs +++ b/src/Compiler/Service/service.fs @@ -100,14 +100,6 @@ module CompileHelpers = diagnostics.ToArray(), result - let setOutputStreams execute = - // Set the output streams, if requested - match execute with - | Some(writer, error) -> - Console.SetOut writer - Console.SetError error - | None -> () - [] // There is typically only one instance of this type in an IDE process. type FSharpChecker diff --git a/src/Compiler/Symbols/FSharpDiagnostic.fs b/src/Compiler/Symbols/FSharpDiagnostic.fs index d57c5ddabc7..31ec0536c3e 100644 --- a/src/Compiler/Symbols/FSharpDiagnostic.fs +++ b/src/Compiler/Symbols/FSharpDiagnostic.fs @@ -304,12 +304,12 @@ type internal CompilationDiagnosticLogger (debugName: string, options: FSharpDia | Some f -> f diagnostic | None -> diagnostic - match diagnostic.AdjustedSeverity(options, severity) with + match diagnostic.AdjustSeverity(options, severity) with | FSharpDiagnosticSeverity.Error -> diagnostics.Add(diagnostic, FSharpDiagnosticSeverity.Error) errorCount <- errorCount + 1 | FSharpDiagnosticSeverity.Hidden -> () - | s -> diagnostics.Add(diagnostic, s) + | sev -> diagnostics.Add(diagnostic, sev) override _.ErrorCount = errorCount @@ -318,14 +318,14 @@ type internal CompilationDiagnosticLogger (debugName: string, options: FSharpDia module DiagnosticHelpers = let ReportDiagnostic (options: FSharpDiagnosticOptions, allErrors, mainInputFileName, fileInfo, diagnostic: PhasedDiagnostic, severity, suggestNames, flatErrors, symbolEnv) = - match diagnostic.AdjustedSeverity(options, severity) with + match diagnostic.AdjustSeverity(options, severity) with | FSharpDiagnosticSeverity.Hidden -> [] - | sev -> + | adjustedSeverity -> // We use the first line of the file as a fallbackRange for reporting unexpected errors. // Not ideal, but it's hard to see what else to do. let fallbackRange = rangeN mainInputFileName 1 - let diagnostic = FSharpDiagnostic.CreateFromExceptionAndAdjustEof (diagnostic, sev, fallbackRange, fileInfo, suggestNames, flatErrors, symbolEnv) + let diagnostic = FSharpDiagnostic.CreateFromExceptionAndAdjustEof (diagnostic, adjustedSeverity, fallbackRange, fileInfo, suggestNames, flatErrors, symbolEnv) let fileName = diagnostic.Range.FileName if allErrors || fileName = mainInputFileName || fileName = TcGlobals.DummyFileNameForRangesWithoutASpecificLocation then [diagnostic] diff --git a/src/Compiler/SyntaxTree/LexFilter.fs b/src/Compiler/SyntaxTree/LexFilter.fs index 19f7be5d31b..20af46524b0 100644 --- a/src/Compiler/SyntaxTree/LexFilter.fs +++ b/src/Compiler/SyntaxTree/LexFilter.fs @@ -7,11 +7,11 @@ module internal FSharp.Compiler.LexFilter open System open System.Collections.Generic open Internal.Utilities.Text.Lexing -open FSharp.Compiler open Internal.Utilities.Library open FSharp.Compiler.AbstractIL.Diagnostics open FSharp.Compiler.DiagnosticsLogger open FSharp.Compiler.Features +open FSharp.Compiler.LexerStore open FSharp.Compiler.Lexhelp open FSharp.Compiler.ParseHelpers open FSharp.Compiler.Parser @@ -665,7 +665,7 @@ type LexFilterImpl ( let lastTokenEnd = state.EndPos let token = lexer lexbuf - LexbufLocalXmlDocStore.AddGrabPoint(lexbuf) + XmlDocStore.AddGrabPoint(lexbuf) // Now we've got the token, remember the lexbuf state, associating it with the token // and remembering it as the last observed lexbuf state for the wrapped lexer function. diff --git a/src/Compiler/SyntaxTree/LexHelpers.fs b/src/Compiler/SyntaxTree/LexHelpers.fs index 96b4a9a570b..f7f090a6b00 100644 --- a/src/Compiler/SyntaxTree/LexHelpers.fs +++ b/src/Compiler/SyntaxTree/LexHelpers.fs @@ -12,6 +12,7 @@ open Internal.Utilities.Text.Lexing open FSharp.Compiler.IO open FSharp.Compiler.DiagnosticsLogger open FSharp.Compiler.Features +open FSharp.Compiler.LexerStore open FSharp.Compiler.ParseHelpers open FSharp.Compiler.UnicodeLexing open FSharp.Compiler.Parser @@ -98,10 +99,8 @@ let mkLexargs } /// Register the lexbuf and call the given function -let reusingLexbufForParsing lexbuf f = +let reusingLexbufForParsing (lexbuf: Lexbuf) f = use _ = UseBuildPhase BuildPhase.Parse - LexbufLocalXmlDocStore.ClearXmlDoc lexbuf - LexbufCommentStore.ClearComments lexbuf try f () diff --git a/src/Compiler/SyntaxTree/LexerStore.fs b/src/Compiler/SyntaxTree/LexerStore.fs new file mode 100644 index 00000000000..711e9530cd9 --- /dev/null +++ b/src/Compiler/SyntaxTree/LexerStore.fs @@ -0,0 +1,169 @@ +// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. + +module internal FSharp.Compiler.LexerStore + +open FSharp.Compiler.SyntaxTreeOps +open FSharp.Compiler.SyntaxTrivia +open FSharp.Compiler.UnicodeLexing +open FSharp.Compiler.Text +open FSharp.Compiler.Text.Position +open FSharp.Compiler.Text.Range +open FSharp.Compiler.Xml + +//------------------------------------------------------------------------ +// Lexbuf.BufferLocalStore is used during lexing/parsing of a file for different purposes. +// All access happens through the functions and modules below. +//------------------------------------------------------------------------ + +let private getStoreData<'T when 'T: not null> (lexbuf: Lexbuf) key (getInitialData: unit -> 'T) = + let store = lexbuf.BufferLocalStore + + match store.TryGetValue key with + | true, data -> data :?> 'T + | _ -> + let data = getInitialData () + store[key] <- data + data + +let private tryGetStoreData<'T when 'T: not null> (lexbuf: Lexbuf) key = + let store = lexbuf.BufferLocalStore + + match store.TryGetValue key with + | true, data -> Some(data :?> 'T) + | _ -> None + +let private setStoreData (lexbuf: Lexbuf) key data = lexbuf.BufferLocalStore[key] <- data + +//------------------------------------------------------------------------ +// A SynArgNameGenerator for the current file, used by the parser +//------------------------------------------------------------------------ + +let getSynArgNameGenerator (lexbuf: Lexbuf) = + getStoreData lexbuf "SynArgNameGenerator" SynArgNameGenerator + +//------------------------------------------------------------------------ +// A XmlDocCollector, used to hold the current accumulated Xml doc lines, and related access functions +//------------------------------------------------------------------------ + +[] +module XmlDocStore = + let private xmlDocKey = "XmlDoc" + + let private getCollector (lexbuf: Lexbuf) = + getStoreData lexbuf xmlDocKey XmlDocCollector + + /// Called from the lexer to save a single line of XML doc comment. + let SaveXmlDocLine (lexbuf: Lexbuf, lineText, range: range) = + let collector = getCollector lexbuf + collector.AddXmlDocLine(lineText, range) + + let AddGrabPoint (lexbuf: Lexbuf) = + let collector = getCollector lexbuf + let startPos = lexbuf.StartPos + collector.AddGrabPoint(mkPos startPos.Line startPos.Column) + + /// Allowed cases when there are comments after XmlDoc + /// + /// /// X xmlDoc + /// // comment + /// //// comment + /// (* multiline comment *) + /// let x = ... // X xmlDoc + /// + /// Remember the first position when a comment (//, (* *), ////) is encountered after the XmlDoc block + /// then add a grab point if a new XmlDoc block follows the comments + let AddGrabPointDelayed (lexbuf: Lexbuf) = + let collector = getCollector lexbuf + let startPos = lexbuf.StartPos + collector.AddGrabPointDelayed(mkPos startPos.Line startPos.Column) + + /// Called from the parser each time we parse a construct that marks the end of an XML doc comment range, + /// e.g. a 'type' declaration. The markerRange is the range of the keyword that delimits the construct. + let GrabXmlDocBeforeMarker (lexbuf: Lexbuf, markerRange: range) = + match tryGetStoreData lexbuf xmlDocKey with + | Some collector -> PreXmlDoc.CreateFromGrabPoint(collector, markerRange.Start) + | _ -> PreXmlDoc.Empty + + let ReportInvalidXmlDocPositions (lexbuf: Lexbuf) = + let collector = getCollector lexbuf + collector.CheckInvalidXmlDocPositions() + +//------------------------------------------------------------------------ +// Storage to hold the current accumulated ConditionalDirectiveTrivia, and related types and access functions +//------------------------------------------------------------------------ + +type LexerIfdefExpression = + | IfdefAnd of LexerIfdefExpression * LexerIfdefExpression + | IfdefOr of LexerIfdefExpression * LexerIfdefExpression + | IfdefNot of LexerIfdefExpression + | IfdefId of string + +let rec LexerIfdefEval (lookup: string -> bool) = + function + | IfdefAnd(l, r) -> (LexerIfdefEval lookup l) && (LexerIfdefEval lookup r) + | IfdefOr(l, r) -> (LexerIfdefEval lookup l) || (LexerIfdefEval lookup r) + | IfdefNot e -> not (LexerIfdefEval lookup e) + | IfdefId id -> lookup id + +[] +module IfdefStore = + let private getStore (lexbuf: Lexbuf) = + getStoreData lexbuf "Ifdef" ResizeArray + + let private mkRangeWithoutLeadingWhitespace (lexed: string) (m: range) : range = + let startColumn = lexed.Length - lexed.TrimStart().Length + mkFileIndexRange m.FileIndex (mkPos m.StartLine startColumn) m.End + + let SaveIfHash (lexbuf: Lexbuf, lexed: string, expr: LexerIfdefExpression, range: range) = + let store = getStore lexbuf + + let expr = + let rec visit (expr: LexerIfdefExpression) : IfDirectiveExpression = + match expr with + | LexerIfdefExpression.IfdefAnd(l, r) -> IfDirectiveExpression.And(visit l, visit r) + | LexerIfdefExpression.IfdefOr(l, r) -> IfDirectiveExpression.Or(visit l, visit r) + | LexerIfdefExpression.IfdefNot e -> IfDirectiveExpression.Not(visit e) + | LexerIfdefExpression.IfdefId id -> IfDirectiveExpression.Ident id + + visit expr + + let m = mkRangeWithoutLeadingWhitespace lexed range + + store.Add(ConditionalDirectiveTrivia.If(expr, m)) + + let SaveElseHash (lexbuf: Lexbuf, lexed: string, range: range) = + let store = getStore lexbuf + let m = mkRangeWithoutLeadingWhitespace lexed range + store.Add(ConditionalDirectiveTrivia.Else(m)) + + let SaveEndIfHash (lexbuf: Lexbuf, lexed: string, range: range) = + let store = getStore lexbuf + let m = mkRangeWithoutLeadingWhitespace lexed range + store.Add(ConditionalDirectiveTrivia.EndIf(m)) + + let GetTrivia (lexbuf: Lexbuf) : ConditionalDirectiveTrivia list = + let store = getStore lexbuf + Seq.toList store + +//------------------------------------------------------------------------ +// Storage to hold the current accumulated CommentTrivia, and related access functions +//------------------------------------------------------------------------ + +[] +module CommentStore = + let private getStore (lexbuf: Lexbuf) = + getStoreData lexbuf "Comments" ResizeArray + + let SaveSingleLineComment (lexbuf: Lexbuf, startRange: range, endRange: range) = + let store = getStore lexbuf + let m = unionRanges startRange endRange + store.Add(CommentTrivia.LineComment(m)) + + let SaveBlockComment (lexbuf: Lexbuf, startRange: range, endRange: range) = + let store = getStore lexbuf + let m = unionRanges startRange endRange + store.Add(CommentTrivia.BlockComment(m)) + + let GetComments (lexbuf: Lexbuf) : CommentTrivia list = + let store = getStore lexbuf + Seq.toList store diff --git a/src/Compiler/SyntaxTree/LexerStore.fsi b/src/Compiler/SyntaxTree/LexerStore.fsi new file mode 100644 index 00000000000..952a0cc6f81 --- /dev/null +++ b/src/Compiler/SyntaxTree/LexerStore.fsi @@ -0,0 +1,52 @@ +// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. + +module internal FSharp.Compiler.LexerStore + +open FSharp.Compiler.SyntaxTreeOps +open FSharp.Compiler.SyntaxTrivia +open FSharp.Compiler.UnicodeLexing +open FSharp.Compiler.Text +open FSharp.Compiler.Xml + +val getSynArgNameGenerator: Lexbuf -> SynArgNameGenerator + +[] +module XmlDocStore = + + val SaveXmlDocLine: lexbuf: Lexbuf * lineText: string * range: range -> unit + + val GrabXmlDocBeforeMarker: lexbuf: Lexbuf * markerRange: range -> PreXmlDoc + + val AddGrabPoint: lexbuf: Lexbuf -> unit + + val AddGrabPointDelayed: lexbuf: Lexbuf -> unit + + val ReportInvalidXmlDocPositions: lexbuf: Lexbuf -> range list + +type LexerIfdefExpression = + | IfdefAnd of LexerIfdefExpression * LexerIfdefExpression + | IfdefOr of LexerIfdefExpression * LexerIfdefExpression + | IfdefNot of LexerIfdefExpression + | IfdefId of string + +val LexerIfdefEval: lookup: (string -> bool) -> _arg1: LexerIfdefExpression -> bool + +[] +module IfdefStore = + + val SaveIfHash: lexbuf: Lexbuf * lexed: string * expr: LexerIfdefExpression * range: range -> unit + + val SaveElseHash: lexbuf: Lexbuf * lexed: string * range: range -> unit + + val SaveEndIfHash: lexbuf: Lexbuf * lexed: string * range: range -> unit + + val GetTrivia: lexbuf: Lexbuf -> ConditionalDirectiveTrivia list + +[] +module CommentStore = + + val SaveSingleLineComment: lexbuf: Lexbuf * startRange: range * endRange: range -> unit + + val SaveBlockComment: lexbuf: Lexbuf * startRange: range * endRange: range -> unit + + val GetComments: lexbuf: Lexbuf -> CommentTrivia list diff --git a/src/Compiler/SyntaxTree/ParseHelpers.fs b/src/Compiler/SyntaxTree/ParseHelpers.fs index df30e02caf2..2db1eff74d0 100644 --- a/src/Compiler/SyntaxTree/ParseHelpers.fs +++ b/src/Compiler/SyntaxTree/ParseHelpers.fs @@ -16,7 +16,7 @@ open FSharp.Compiler.Xml open Internal.Utilities.Library open Internal.Utilities.Text.Lexing open Internal.Utilities.Text.Parsing -open System.Text.RegularExpressions +open FSharp.Compiler.LexerStore //------------------------------------------------------------------------ // Parsing: Error recovery exception for fsyacc @@ -69,86 +69,6 @@ let rhs2 (parseState: IParseState) i j = /// Get the range corresponding to one of the r.h.s. symbols of a grammar rule while it is being reduced let rhs parseState i = rhs2 parseState i i -type IParseState with - - /// Get the generator used for compiler-generated argument names. - member x.SynArgNameGenerator = - let key = "SynArgNameGenerator" - let bls = x.LexBuffer.BufferLocalStore - - let gen = - match bls.TryGetValue key with - | true, gen -> gen - | _ -> - let gen = !!(box (SynArgNameGenerator())) - bls[key] <- gen - gen - - gen :?> SynArgNameGenerator - - /// Reset the generator used for compiler-generated argument names. - member x.ResetSynArgNameGenerator() = x.SynArgNameGenerator.Reset() - -//------------------------------------------------------------------------ -// Parsing: grabbing XmlDoc -//------------------------------------------------------------------------ - -/// XmlDoc F# lexer/parser state, held in the BufferLocalStore for the lexer. -module LexbufLocalXmlDocStore = - // The key into the BufferLocalStore used to hold the current accumulated XmlDoc lines - let private xmlDocKey = "XmlDoc" - - let private getCollector (lexbuf: Lexbuf) = - match lexbuf.BufferLocalStore.TryGetValue xmlDocKey with - | true, collector -> collector - | _ -> - let collector = !!(box (XmlDocCollector())) - lexbuf.BufferLocalStore[xmlDocKey] <- collector - collector - - |> unbox - - let ClearXmlDoc (lexbuf: Lexbuf) = - lexbuf.BufferLocalStore[xmlDocKey] <- box (XmlDocCollector()) |> Unchecked.nonNull - - /// Called from the lexer to save a single line of XML doc comment. - let SaveXmlDocLine (lexbuf: Lexbuf, lineText, range: range) = - let collector = getCollector lexbuf - collector.AddXmlDocLine(lineText, range) - - let AddGrabPoint (lexbuf: Lexbuf) = - let collector = getCollector lexbuf - let startPos = lexbuf.StartPos - collector.AddGrabPoint(mkPos startPos.Line startPos.Column) - - /// Allowed cases when there are comments after XmlDoc - /// - /// /// X xmlDoc - /// // comment - /// //// comment - /// (* multiline comment *) - /// let x = ... // X xmlDoc - /// - /// Remember the first position when a comment (//, (* *), ////) is encountered after the XmlDoc block - /// then add a grab point if a new XmlDoc block follows the comments - let AddGrabPointDelayed (lexbuf: Lexbuf) = - let collector = getCollector lexbuf - let startPos = lexbuf.StartPos - collector.AddGrabPointDelayed(mkPos startPos.Line startPos.Column) - - /// Called from the parser each time we parse a construct that marks the end of an XML doc comment range, - /// e.g. a 'type' declaration. The markerRange is the range of the keyword that delimits the construct. - let GrabXmlDocBeforeMarker (lexbuf: Lexbuf, markerRange: range) = - match lexbuf.BufferLocalStore.TryGetValue xmlDocKey with - | true, collector -> - let collector = unbox (collector) - PreXmlDoc.CreateFromGrabPoint(collector, markerRange.Start) - | _ -> PreXmlDoc.Empty - - let ReportInvalidXmlDocPositions (lexbuf: Lexbuf) = - let collector = getCollector lexbuf - collector.CheckInvalidXmlDocPositions() - //------------------------------------------------------------------------ // Parsing/lexing: status of #if/#endif processing in lexing, used for continuations // for whitespace tokens in parser specification. @@ -165,110 +85,12 @@ type LexerIfdefStack = LexerIfdefStackEntries /// Specifies how the 'endline' function in the lexer should continue after /// it reaches end of line or eof. The options are to continue with 'token' function -/// or to continue with 'skip' function. +/// or to continue with 'ifdefSkip' function. [] type LexerEndlineContinuation = | Token | IfdefSkip of int * range: range -type LexerIfdefExpression = - | IfdefAnd of LexerIfdefExpression * LexerIfdefExpression - | IfdefOr of LexerIfdefExpression * LexerIfdefExpression - | IfdefNot of LexerIfdefExpression - | IfdefId of string - -let rec LexerIfdefEval (lookup: string -> bool) = - function - | IfdefAnd(l, r) -> (LexerIfdefEval lookup l) && (LexerIfdefEval lookup r) - | IfdefOr(l, r) -> (LexerIfdefEval lookup l) || (LexerIfdefEval lookup r) - | IfdefNot e -> not (LexerIfdefEval lookup e) - | IfdefId id -> lookup id - -/// Ifdef F# lexer/parser state, held in the BufferLocalStore for the lexer. -/// Used to capture #if, #else and #endif as syntax trivia. -module LexbufIfdefStore = - // The key into the BufferLocalStore used to hold the compiler directives - let private ifDefKey = "Ifdef" - - let private getStore (lexbuf: Lexbuf) : ResizeArray = - match lexbuf.BufferLocalStore.TryGetValue ifDefKey with - | true, store -> store - | _ -> - let store = !!(box (ResizeArray())) - lexbuf.BufferLocalStore[ifDefKey] <- store - store - |> unbox> - - let private mkRangeWithoutLeadingWhitespace (lexed: string) (m: range) : range = - let startColumn = lexed.Length - lexed.TrimStart().Length - mkFileIndexRange m.FileIndex (mkPos m.StartLine startColumn) m.End - - let SaveIfHash (lexbuf: Lexbuf, lexed: string, expr: LexerIfdefExpression, range: range) = - let store = getStore lexbuf - - let expr = - let rec visit (expr: LexerIfdefExpression) : IfDirectiveExpression = - match expr with - | LexerIfdefExpression.IfdefAnd(l, r) -> IfDirectiveExpression.And(visit l, visit r) - | LexerIfdefExpression.IfdefOr(l, r) -> IfDirectiveExpression.Or(visit l, visit r) - | LexerIfdefExpression.IfdefNot e -> IfDirectiveExpression.Not(visit e) - | LexerIfdefExpression.IfdefId id -> IfDirectiveExpression.Ident id - - visit expr - - let m = mkRangeWithoutLeadingWhitespace lexed range - - store.Add(ConditionalDirectiveTrivia.If(expr, m)) - - let SaveElseHash (lexbuf: Lexbuf, lexed: string, range: range) = - let store = getStore lexbuf - let m = mkRangeWithoutLeadingWhitespace lexed range - store.Add(ConditionalDirectiveTrivia.Else(m)) - - let SaveEndIfHash (lexbuf: Lexbuf, lexed: string, range: range) = - let store = getStore lexbuf - let m = mkRangeWithoutLeadingWhitespace lexed range - store.Add(ConditionalDirectiveTrivia.EndIf(m)) - - let GetTrivia (lexbuf: Lexbuf) : ConditionalDirectiveTrivia list = - let store = getStore lexbuf - Seq.toList store - -//------------------------------------------------------------------------ -// Parsing/lexing: capture the ranges of code comments as syntax trivia -//------------------------------------------------------------------------ - -/// Used to capture the ranges of code comments as syntax trivia -module LexbufCommentStore = - // The key into the BufferLocalStore used to hold the compiler directives - let private commentKey = "Comments" - - let private getStore (lexbuf: Lexbuf) : ResizeArray = - match lexbuf.BufferLocalStore.TryGetValue commentKey with - | true, store -> store - | _ -> - let store = !!(box (ResizeArray())) - lexbuf.BufferLocalStore[commentKey] <- store - store - |> unbox> - - let SaveSingleLineComment (lexbuf: Lexbuf, startRange: range, endRange: range) = - let store = getStore lexbuf - let m = unionRanges startRange endRange - store.Add(CommentTrivia.LineComment(m)) - - let SaveBlockComment (lexbuf: Lexbuf, startRange: range, endRange: range) = - let store = getStore lexbuf - let m = unionRanges startRange endRange - store.Add(CommentTrivia.BlockComment(m)) - - let GetComments (lexbuf: Lexbuf) : CommentTrivia list = - let store = getStore lexbuf - Seq.toList store - - let ClearComments (lexbuf: Lexbuf) : unit = - lexbuf.BufferLocalStore.Remove(commentKey) |> ignore - //------------------------------------------------------------------------ // Parsing: continuations for whitespace tokens //------------------------------------------------------------------------ @@ -412,7 +234,7 @@ let grabXmlDocAtRangeStart (parseState: IParseState, optAttributes: SynAttribute | [] -> range | h :: _ -> h.Range - LexbufLocalXmlDocStore.GrabXmlDocBeforeMarker(parseState.LexBuffer, grabPoint) + XmlDocStore.GrabXmlDocBeforeMarker(parseState.LexBuffer, grabPoint) let grabXmlDoc (parseState: IParseState, optAttributes: SynAttributeList list, elemIdx) = grabXmlDocAtRangeStart (parseState, optAttributes, rhs parseState elemIdx) @@ -1234,3 +1056,11 @@ let mkValField mkSynField parseState idOpt typ isMutable access attribs mStaticOpt rangeStart (Some leadingKeyword) SynMemberDefn.ValField(field, field.Range) + +let leadingKeywordIsAbstract = + function + | SynLeadingKeyword.Abstract _ + | SynLeadingKeyword.AbstractMember _ + | SynLeadingKeyword.StaticAbstract _ + | SynLeadingKeyword.StaticAbstractMember _ -> true + | _ -> false diff --git a/src/Compiler/SyntaxTree/ParseHelpers.fsi b/src/Compiler/SyntaxTree/ParseHelpers.fsi index c98e7897a32..84be5f0e4f7 100644 --- a/src/Compiler/SyntaxTree/ParseHelpers.fsi +++ b/src/Compiler/SyntaxTree/ParseHelpers.fsi @@ -38,25 +38,6 @@ val rhs2: parseState: IParseState -> i: int -> j: int -> range val rhs: parseState: IParseState -> i: int -> range -type IParseState with - - member SynArgNameGenerator: SyntaxTreeOps.SynArgNameGenerator - member ResetSynArgNameGenerator: unit -> unit - -module LexbufLocalXmlDocStore = - - val ClearXmlDoc: lexbuf: UnicodeLexing.Lexbuf -> unit - - val SaveXmlDocLine: lexbuf: UnicodeLexing.Lexbuf * lineText: string * range: range -> unit - - val GrabXmlDocBeforeMarker: lexbuf: UnicodeLexing.Lexbuf * markerRange: range -> PreXmlDoc - - val AddGrabPoint: lexbuf: UnicodeLexing.Lexbuf -> unit - - val AddGrabPointDelayed: lexbuf: UnicodeLexing.Lexbuf -> unit - - val ReportInvalidXmlDocPositions: lexbuf: UnicodeLexing.Lexbuf -> range list - type LexerIfdefStackEntry = | IfDefIf | IfDefElse @@ -69,34 +50,6 @@ type LexerEndlineContinuation = | Token | IfdefSkip of int * range: range -type LexerIfdefExpression = - | IfdefAnd of LexerIfdefExpression * LexerIfdefExpression - | IfdefOr of LexerIfdefExpression * LexerIfdefExpression - | IfdefNot of LexerIfdefExpression - | IfdefId of string - -val LexerIfdefEval: lookup: (string -> bool) -> _arg1: LexerIfdefExpression -> bool - -module LexbufIfdefStore = - - val SaveIfHash: lexbuf: UnicodeLexing.Lexbuf * lexed: string * expr: LexerIfdefExpression * range: range -> unit - - val SaveElseHash: lexbuf: UnicodeLexing.Lexbuf * lexed: string * range: range -> unit - - val SaveEndIfHash: lexbuf: UnicodeLexing.Lexbuf * lexed: string * range: range -> unit - - val GetTrivia: lexbuf: UnicodeLexing.Lexbuf -> ConditionalDirectiveTrivia list - -module LexbufCommentStore = - - val SaveSingleLineComment: lexbuf: UnicodeLexing.Lexbuf * startRange: range * endRange: range -> unit - - val SaveBlockComment: lexbuf: UnicodeLexing.Lexbuf * startRange: range * endRange: range -> unit - - val GetComments: lexbuf: UnicodeLexing.Lexbuf -> CommentTrivia list - - val ClearComments: lexbuf: UnicodeLexing.Lexbuf -> unit - [] type LexerStringStyle = | Verbatim @@ -302,3 +255,5 @@ val mkSynField: rangeStart: range -> leadingKeyword: SynLeadingKeyword option -> SynField + +val leadingKeywordIsAbstract: SynLeadingKeyword -> bool diff --git a/src/Compiler/SyntaxTree/SyntaxTree.fs b/src/Compiler/SyntaxTree/SyntaxTree.fs index dfff34ff745..d0232233007 100644 --- a/src/Compiler/SyntaxTree/SyntaxTree.fs +++ b/src/Compiler/SyntaxTree/SyntaxTree.fs @@ -38,7 +38,7 @@ type SynLongIdent = member this.Range = match this with - | SynLongIdent([], _, _) -> failwith "rangeOfLidwd" + | SynLongIdent([], _, _) -> failwith "rangeOfLid" | SynLongIdent([ id ], [], _) -> id.idRange | SynLongIdent([ id ], [ m ], _) -> unionRanges id.idRange m | SynLongIdent(h :: t, [], _) -> unionRanges h.idRange (List.last t).idRange @@ -1048,6 +1048,10 @@ type SynMatchClause = | None -> e.Range | Some x -> unionRanges e.Range x.Range + member this.IsTrueMatchClause = + let (SynMatchClause(trivia = trivia)) = this + trivia.BarRange.IsSome && trivia.ArrowRange.IsSome + member this.Range = match this with | SynMatchClause(range = m) -> m @@ -1489,7 +1493,12 @@ type SynMemberDefn = range: range * trivia: SynMemberDefnImplicitCtorTrivia - | ImplicitInherit of inheritType: SynType * inheritArgs: SynExpr * inheritAlias: Ident option * range: range + | ImplicitInherit of + inheritType: SynType * + inheritArgs: SynExpr * + inheritAlias: Ident option * + range: range * + trivia: SynMemberDefnInheritTrivia | LetBindings of bindings: SynBinding list * isStatic: bool * isRecursive: bool * range: range @@ -1497,7 +1506,7 @@ type SynMemberDefn = | Interface of interfaceType: SynType * withKeyword: range option * members: SynMemberDefns option * range: range - | Inherit of baseType: SynType * asIdent: Ident option * range: range * trivia: SynMemberDefnInheritTrivia + | Inherit of baseType: SynType option * asIdent: Ident option * range: range * trivia: SynMemberDefnInheritTrivia | ValField of fieldInfo: SynField * range: range @@ -1758,7 +1767,7 @@ type ParsedImplFileInput = hashDirectives: ParsedHashDirective list * contents: SynModuleOrNamespace list * flags: (bool * bool) * - trivia: ParsedImplFileInputTrivia * + trivia: ParsedFileInputTrivia * identifiers: Set member x.QualifiedName = @@ -1787,7 +1796,7 @@ type ParsedSigFileInput = qualifiedNameOfFile: QualifiedNameOfFile * hashDirectives: ParsedHashDirective list * contents: SynModuleOrNamespaceSig list * - trivia: ParsedSigFileInputTrivia * + trivia: ParsedFileInputTrivia * identifiers: Set member x.QualifiedName = diff --git a/src/Compiler/SyntaxTree/SyntaxTree.fsi b/src/Compiler/SyntaxTree/SyntaxTree.fsi index 22ed47c58fb..404f2fc6cb6 100644 --- a/src/Compiler/SyntaxTree/SyntaxTree.fsi +++ b/src/Compiler/SyntaxTree/SyntaxTree.fsi @@ -1178,6 +1178,9 @@ type SynMatchClause = /// Gets the syntax range of part of this construct member RangeOfGuardAndRhs: range + /// Is a pattern used in a true match clause e.g. | pat -> expr + member IsTrueMatchClause: bool + /// Gets the syntax range of this construct member Range: range @@ -1655,7 +1658,12 @@ type SynMemberDefn = trivia: SynMemberDefnImplicitCtorTrivia /// An implicit inherit definition, 'inherit (args...) as base' - | ImplicitInherit of inheritType: SynType * inheritArgs: SynExpr * inheritAlias: Ident option * range: range + | ImplicitInherit of + inheritType: SynType * + inheritArgs: SynExpr * + inheritAlias: Ident option * + range: range * + trivia: SynMemberDefnInheritTrivia /// A 'let' definition within a class | LetBindings of bindings: SynBinding list * isStatic: bool * isRecursive: bool * range: range @@ -1671,7 +1679,7 @@ type SynMemberDefn = | Interface of interfaceType: SynType * withKeyword: range option * members: SynMemberDefns option * range: range /// An 'inherit' definition within a class - | Inherit of baseType: SynType * asIdent: Ident option * range: range * trivia: SynMemberDefnInheritTrivia + | Inherit of baseType: SynType option * asIdent: Ident option * range: range * trivia: SynMemberDefnInheritTrivia /// A 'val' definition within a class | ValField of fieldInfo: SynField * range: range @@ -1948,7 +1956,7 @@ type ParsedImplFileInput = hashDirectives: ParsedHashDirective list * contents: SynModuleOrNamespace list * flags: (bool * bool) * - trivia: ParsedImplFileInputTrivia * + trivia: ParsedFileInputTrivia * identifiers: Set member FileName: string @@ -1961,7 +1969,7 @@ type ParsedImplFileInput = member Contents: SynModuleOrNamespace list - member Trivia: ParsedImplFileInputTrivia + member Trivia: ParsedFileInputTrivia member IsLastCompiland: bool @@ -1975,7 +1983,7 @@ type ParsedSigFileInput = qualifiedNameOfFile: QualifiedNameOfFile * hashDirectives: ParsedHashDirective list * contents: SynModuleOrNamespaceSig list * - trivia: ParsedSigFileInputTrivia * + trivia: ParsedFileInputTrivia * identifiers: Set member FileName: string @@ -1986,7 +1994,7 @@ type ParsedSigFileInput = member Contents: SynModuleOrNamespaceSig list - member Trivia: ParsedSigFileInputTrivia + member Trivia: ParsedFileInputTrivia /// Represents the syntax tree for a parsed implementation or signature file [] diff --git a/src/Compiler/SyntaxTree/SyntaxTreeOps.fs b/src/Compiler/SyntaxTree/SyntaxTreeOps.fs index 8dc46313341..7b392487adb 100644 --- a/src/Compiler/SyntaxTree/SyntaxTreeOps.fs +++ b/src/Compiler/SyntaxTree/SyntaxTreeOps.fs @@ -1005,6 +1005,16 @@ let parsedHashDirectiveArguments (input: ParsedHashDirectiveArgument list) (lang | false -> None) input +let parsedHashDirectiveArgumentsNoCheck (input: ParsedHashDirectiveArgument list) = + List.map + (function + | ParsedHashDirectiveArgument.String(s, _, _) -> s + | ParsedHashDirectiveArgument.SourceIdentifier(_, v, _) -> v + | ParsedHashDirectiveArgument.Int32(n, m) -> string n + | ParsedHashDirectiveArgument.Ident(ident, m) -> ident.idText + | ParsedHashDirectiveArgument.LongIdent(ident, m) -> longIdentToString ident) + input + let parsedHashDirectiveStringArguments (input: ParsedHashDirectiveArgument list) (_langVersion: LanguageVersion) = List.choose (function diff --git a/src/Compiler/SyntaxTree/SyntaxTreeOps.fsi b/src/Compiler/SyntaxTree/SyntaxTreeOps.fsi index 568e745a167..3ca2b58be43 100644 --- a/src/Compiler/SyntaxTree/SyntaxTreeOps.fsi +++ b/src/Compiler/SyntaxTree/SyntaxTreeOps.fsi @@ -322,6 +322,8 @@ val synExprContainsError: inpExpr: SynExpr -> bool val parsedHashDirectiveArguments: ParsedHashDirectiveArgument list -> LanguageVersion -> string list +val parsedHashDirectiveArgumentsNoCheck: ParsedHashDirectiveArgument list -> string list + val parsedHashDirectiveStringArguments: ParsedHashDirectiveArgument list -> LanguageVersion -> string list /// 'e1 && e2' diff --git a/src/Compiler/SyntaxTree/SyntaxTrivia.fs b/src/Compiler/SyntaxTree/SyntaxTrivia.fs index 2cd42701e70..4abdec2085a 100644 --- a/src/Compiler/SyntaxTree/SyntaxTrivia.fs +++ b/src/Compiler/SyntaxTree/SyntaxTrivia.fs @@ -28,18 +28,19 @@ type CommentTrivia = | BlockComment of range: range [] -type ParsedImplFileInputTrivia = +type ParsedFileInputTrivia = { ConditionalDirectives: ConditionalDirectiveTrivia list + // WarnDirectives: range list // This should be enabled once the tools can process it CodeComments: CommentTrivia list } -[] -type ParsedSigFileInputTrivia = - { - ConditionalDirectives: ConditionalDirectiveTrivia list - CodeComments: CommentTrivia list - } + static member Empty = + { + ConditionalDirectives = [] + // WarnDirectives = [] + CodeComments = [] + } [] type SynExprTryWithTrivia = diff --git a/src/Compiler/SyntaxTree/SyntaxTrivia.fsi b/src/Compiler/SyntaxTree/SyntaxTrivia.fsi index ab6525bc010..942a5cbb2c7 100644 --- a/src/Compiler/SyntaxTree/SyntaxTrivia.fsi +++ b/src/Compiler/SyntaxTree/SyntaxTrivia.fsi @@ -39,28 +39,22 @@ type CommentTrivia = | LineComment of range: range | BlockComment of range: range -/// Represents additional information for ParsedImplFileInput +/// Represents additional information for ParsedImplFileInput / ParsedSigFileInput [] -type ParsedImplFileInputTrivia = +type ParsedFileInputTrivia = { /// Preprocessor directives of type #if, #else or #endif ConditionalDirectives: ConditionalDirectiveTrivia list - /// Represent code comments found in the source file - CodeComments: CommentTrivia list - } - -/// Represents additional information for ParsedSigFileInputTrivia -[] -type ParsedSigFileInputTrivia = - { - /// Preprocessor directives of type #if, #else or #endif - ConditionalDirectives: ConditionalDirectiveTrivia list + // /// Warn directives (#nowarn / #warnon) + // WarnDirectives: range list // should be enabled once tooling wants it /// Represent code comments found in the source file CodeComments: CommentTrivia list } + static member Empty: ParsedFileInputTrivia + /// Represents additional information for SynExpr.TryWith [] type SynExprTryWithTrivia = diff --git a/src/Compiler/SyntaxTree/WarnScopes.fs b/src/Compiler/SyntaxTree/WarnScopes.fs index c5b1cfaaf26..d682b7f62b6 100644 --- a/src/Compiler/SyntaxTree/WarnScopes.fs +++ b/src/Compiler/SyntaxTree/WarnScopes.fs @@ -10,54 +10,126 @@ open FSharp.Compiler.Diagnostics open FSharp.Compiler.DiagnosticsLogger open FSharp.Compiler.Features open Internal.Utilities.Library -open System open System.Text.RegularExpressions [] module internal WarnScopes = - // The keys into the BufferLocalStore used to hold the warn scopes and related data - let private warnScopeKey = "WarnScopes" - let private lineMapKey = "WarnScopes.LineMaps" - // ************************************* - // Collect the line directives to correctly interact with them + // Temporary storage (during lexing one file) for warn scope related data // ************************************* - let private getLineMap (lexbuf: Lexbuf) = - if not <| lexbuf.BufferLocalStore.ContainsKey lineMapKey then - lexbuf.BufferLocalStore.Add(lineMapKey, LineMap.Empty) + [] + type private WarnCmd = + | Nowarn of int * range + | Warnon of int * range + + type private WarnDirective = + { + DirectiveRange: range + CommentRange: range option + WarnCmds: WarnCmd list + IsWarnon: bool + } + + type private TempData = + { + OriginalFileIndex: int + WarnDirectives: WarnDirective list + LineMap: Map + } - lexbuf.BufferLocalStore[lineMapKey] :?> LineMap + let private initialData (lexbuf: Lexbuf) = + { + OriginalFileIndex = lexbuf.StartPos.FileIndex + WarnDirectives = [] + LineMap = Map.empty + } - let private setLineMap (lexbuf: Lexbuf) lineMap = - lexbuf.BufferLocalStore[lineMapKey] <- LineMap lineMap + let private dataKey = "WarnScopeData" - let RegisterLineDirective (lexbuf, previousFileIndex, fileIndex, line: int) = - let (LineMap lineMap) = getLineMap lexbuf + let private getData (lexbuf: Lexbuf) = + if not <| lexbuf.BufferLocalStore.ContainsKey dataKey then + lexbuf.BufferLocalStore.Add(dataKey, initialData lexbuf) - if not <| lineMap.ContainsKey fileIndex then - lineMap - |> Map.add fileIndex previousFileIndex - |> Map.add previousFileIndex previousFileIndex // to flag that it contains a line directive - |> setLineMap lexbuf + lexbuf.BufferLocalStore[dataKey] :?> TempData - ignore line // for now + let private setData (lexbuf: Lexbuf) (data: TempData) = + lexbuf.BufferLocalStore[dataKey] <- data + + let removeTemporaryData (lexbuf: Lexbuf) = + lexbuf.BufferLocalStore.Remove dataKey |> ignore // ************************************* - // Collect the warn scopes during lexing + // After lexing, the (processed) warn scope data are kept in diagnosticOptions // ************************************* - let private getWarnScopes (lexbuf: Lexbuf) = - if not <| lexbuf.BufferLocalStore.ContainsKey warnScopeKey then - lexbuf.BufferLocalStore.Add(warnScopeKey, WarnScopeMap Map.empty) + /// The range between #nowarn and #warnon, or #warnon and #nowarn, for a warning number. + /// Or between the directive and eof, for the "Open" cases. + [] + type private WarnScope = + | Off of range + | On of range + | OpenOff of range + | OpenOn of range + + type private WarnScopeData = + { + /// The collected WarnScope objects (collected during lexing) + warnScopes: Map + /// Information about the mapping implied by the #line directives. + /// The Map key is the file index of the surrogate source. + /// The Map value contains the file index of the original source and + /// a list of mapped sections (surrogate and original start lines). + lineMaps: Map + } + + let private getWarnScopeData (diagnosticOptions: FSharpDiagnosticOptions) = + match diagnosticOptions.WarnScopeData with + | None -> + { + warnScopes = Map.empty + lineMaps = Map.empty + } + | Some data -> data :?> WarnScopeData + + let private setWarnScopeData (diagnosticOptions: FSharpDiagnosticOptions) data = + diagnosticOptions.WarnScopeData <- Some data - lexbuf.BufferLocalStore[warnScopeKey] :?> WarnScopeMap + // ************************************* + // Collect the line directives to correctly interact with them + // ************************************* - [] - type private WarnDirective = - | Nowarn of int * range - | Warnon of int * range + let RegisterLineDirective (lexbuf, fileIndex, line: int) = + let data = getData lexbuf + let sectionMap = line, lexbuf.StartPos.OriginalLine + 1 + + let changer entry = + match entry with + | None -> Some(data.OriginalFileIndex, [ sectionMap ]) + | Some(originalFileIndex, maps) -> + if originalFileIndex <> data.OriginalFileIndex then + let convert (p: Internal.Utilities.Text.Lexing.Position) = mkPos p.OriginalLine p.Column + + let m = + mkFileIndexRange data.OriginalFileIndex (convert lexbuf.StartPos) (convert lexbuf.EndPos) + + let surrFile = FileIndex.fileOfFileIndex fileIndex + let origFile = FileIndex.fileOfFileIndex originalFileIndex + warning (Error((0, $"File {surrFile} was used in line directives of {origFile} already."), m)) //TODO: FsComp.txt + entry + else + Some(originalFileIndex, sectionMap :: maps) + + let newLineMap = data.LineMap.Change(fileIndex, changer) + let newData = { data with LineMap = newLineMap } + setData lexbuf newData + + // ************************************* + // Collect the warn scopes during lexing + // ************************************* + + type LexPosition = Internal.Utilities.Text.Lexing.Position let private getNumber (langVersion: LanguageVersion) m (ns: string) = let argFeature = LanguageFeature.ParsedHashDirectiveArgumentNonQuotes @@ -74,45 +146,76 @@ module internal WarnScopes = None let removePrefix (s: string) = - if (s.StartsWithOrdinal "FS" && langVersion.SupportsFeature argFeature) then - Some(s.Substring 2, s) - else - Some(s, s) + match s.StartsWithOrdinal "FS", langVersion.SupportsFeature argFeature with + | true, true -> Some(s.Substring 2, s) + | true, false -> + warning (Error(FSComp.SR.buildInvalidWarningNumber s, m)) + None + | false, _ -> Some(s, s) - let parseInt (s: string, displ) = - match System.Int32.TryParse s with + let parseInt (intString: string, argString) = + match System.Int32.TryParse intString with | true, i -> Some i | false, _ -> - warning (Error(FSComp.SR.buildInvalidWarningNumber displ, m)) + if langVersion.SupportsFeature argFeature then + warning (Error(FSComp.SR.buildInvalidWarningNumber argString, m)) + None ns |> removeQuotes |> Option.bind removePrefix |> Option.bind parseInt let private regex = - Regex(" *#(nowarn|warnon)(?: +([^ \r\n/;]+))*(?: *(?:;;|\\/\\/).*)?", RegexOptions.Compiled ||| RegexOptions.CultureInvariant) + Regex(""" *#(nowarn|warnon|\S+)(?: +([^ \r\n/;]+))*(?:;;)? *(\/\/.*)?$""", RegexOptions.CultureInvariant) - let private getDirectives langVersion text m = - let mkDirective (directiveId: string) (m: range) (c: Capture) = - let argRange = - withEnd (mkPos m.StartLine (c.Index + c.Length)) (shiftStart 0 c.Index m) - - match directiveId, getNumber langVersion argRange c.Value with - | "nowarn", Some n -> Some(WarnDirective.Nowarn(n, argRange)) - | "warnon", Some n -> Some(WarnDirective.Warnon(n, argRange)) - | _, Some n -> failwith $"getDirectives: unexpected directive id {directiveId}" - | _, None -> None + let private parseDirective originalFileIndex lexbuf = + let text = Lexbuf.LexemeString lexbuf + let startPos = lexbuf.StartPos let mGroups = (regex.Match text).Groups let dIdent = mGroups[1].Value - let argCaptures = mGroups[2].Captures - - if dIdent = "warnon" then - checkLanguageFeatureError langVersion LanguageFeature.ScopedNowarn m + let argCaptures = [ for c in mGroups[2].Captures -> c ] + let commentGroup = mGroups[3] + + let positions line offset length = + mkPos line (startPos.Column + offset), mkPos line (startPos.Column + offset + length) + // "normal" ranges (i.e. taking #line directives into account), for errors in the warn directive + let mkRange offset length = + positions lexbuf.StartPos.Line offset length + ||> mkFileIndexRange startPos.FileIndex + // "original" ranges, for the warn scopes + let mkOriginalRange offset length = + positions lexbuf.StartPos.OriginalLine offset length + ||> mkFileIndexRange originalFileIndex + + let m = mkRange 0 text.Length + + let directiveRange, commentRange = + if commentGroup.Success then + mkRange 0 commentGroup.Index, Some(mkRange commentGroup.Index commentGroup.Length) + else + m, None - if argCaptures.Count = 0 then + if argCaptures.IsEmpty then errorR (Error(FSComp.SR.lexWarnDirectiveMustHaveArgs (), m)) - [ for c in argCaptures -> c ] |> List.choose (mkDirective dIdent m) + let mkDirective ctor (c: Capture) = + getNumber lexbuf.LanguageVersion (mkRange c.Index c.Length) c.Value + |> Option.map (fun n -> ctor (n, (mkOriginalRange c.Index c.Length))) + + let isWarnon, warnCmds = + match dIdent with + | "warnon" -> true, argCaptures |> List.choose (mkDirective WarnCmd.Warnon) + | "nowarn" -> false, argCaptures |> List.choose (mkDirective WarnCmd.Nowarn) + | _ -> + errorR (Error(FSComp.SR.fsiInvalidDirective ($"#{dIdent}", ""), m)) + false, [] + + { + DirectiveRange = directiveRange + CommentRange = commentRange + WarnCmds = warnCmds + IsWarnon = isWarnon + } let private index (fileIndex, warningNumber) = (int64 fileIndex <<< 32) + int64 warningNumber @@ -125,70 +228,122 @@ module internal WarnScopes = let private mkScope (m1: range) (m2: range) = mkFileIndexRange m1.FileIndex m1.Start m2.End - let private processWarnDirective (langVersion: LanguageVersion) (WarnScopeMap warnScopes) (wd: WarnDirective) = + let ParseAndRegisterWarnDirective (lexbuf: Lexbuf) = + let data = getData lexbuf + let warnDirective = parseDirective data.OriginalFileIndex lexbuf + + let newData = + { data with + WarnDirectives = warnDirective :: data.WarnDirectives + } + + setData lexbuf newData + + // ************************************* + // Move the warnscope data to diagnosticOptions / make ranges available + // ************************************* + + let private processWarnCmd (langVersion: LanguageVersion) warnScopeMap (wd: WarnCmd) = match wd with - | WarnDirective.Nowarn(n, m) -> + | WarnCmd.Nowarn(n, m) -> let idx = index (m.FileIndex, n) - match getScopes idx warnScopes with - | WarnScope.OpenOn m' :: t -> warnScopes.Add(idx, WarnScope.On(mkScope m' m) :: t) + match getScopes idx warnScopeMap with + | WarnScope.OpenOn m' :: t -> warnScopeMap.Add(idx, WarnScope.On(mkScope m' m) :: t) | WarnScope.OpenOff m' :: _ | WarnScope.On m' :: _ -> if langVersion.SupportsFeature LanguageFeature.ScopedNowarn then informationalWarning (Error(FSComp.SR.lexWarnDirectivesMustMatch ("#nowarn", m'.StartLine), m)) - warnScopes - | scopes -> warnScopes.Add(idx, WarnScope.OpenOff(mkScope m m) :: scopes) - | WarnDirective.Warnon(n, m) -> + warnScopeMap + | scopes -> warnScopeMap.Add(idx, WarnScope.OpenOff(mkScope m m) :: scopes) + | WarnCmd.Warnon(n, m) -> let idx = index (m.FileIndex, n) - match getScopes idx warnScopes with - | WarnScope.OpenOff m' :: t -> warnScopes.Add(idx, WarnScope.Off(mkScope m' m) :: t) + match getScopes idx warnScopeMap with + | WarnScope.OpenOff m' :: t -> warnScopeMap.Add(idx, WarnScope.Off(mkScope m' m) :: t) | WarnScope.OpenOn m' :: _ | WarnScope.Off m' :: _ -> warning (Error(FSComp.SR.lexWarnDirectivesMustMatch ("#warnon", m'.EndLine), m)) - warnScopes - | scopes -> warnScopes.Add(idx, WarnScope.OpenOn(mkScope m m) :: scopes) - |> WarnScopeMap + warnScopeMap + | scopes -> warnScopeMap.Add(idx, WarnScope.OpenOn(mkScope m m) :: scopes) - let ParseAndRegisterWarnDirective (lexbuf: Lexbuf) = - let (LineMap lineMap) = getLineMap lexbuf - let convert (p: Internal.Utilities.Text.Lexing.Position) = mkPos p.Line p.Column - let idx = lexbuf.StartPos.FileIndex - let idx = lineMap.TryFind idx |> Option.defaultValue idx - let m = mkFileIndexRange idx (convert lexbuf.StartPos) (convert lexbuf.EndPos) - let text = Lexbuf.LexemeString lexbuf - let directives = getDirectives lexbuf.LanguageVersion text m + let MergeInto (diagnosticOptions: FSharpDiagnosticOptions) (subModuleRanges: range list) (lexbuf: Lexbuf) = + let data = getData lexbuf + let warnDirectives = List.rev data.WarnDirectives - let warnScopes = - (getWarnScopes lexbuf, directives) - ||> List.fold (processWarnDirective lexbuf.LanguageVersion) + let warnCmds = + if lexbuf.LanguageVersion.SupportsFeature LanguageFeature.ScopedNowarn then + warnDirectives |> List.collect _.WarnCmds + else + let isInSubmodule (warnDirective: WarnDirective) = + List.exists (fun mRange -> rangeContainsRange mRange warnDirective.DirectiveRange) subModuleRanges - lexbuf.BufferLocalStore[warnScopeKey] <- warnScopes + let subModuleWarnDirectives, topLevelWarnDirectives = + List.partition isInSubmodule warnDirectives - // ************************************* - // Move the warnscope data to diagnosticOptions - // ************************************* + // Warn about and ignore directives in submodules + subModuleWarnDirectives + |> List.iter (fun wd -> warning (Error(FSComp.SR.buildDirectivesInModulesAreIgnored (), wd.DirectiveRange))) - let MergeInto (diagnosticOptions: FSharpDiagnosticOptions) (lexbuf: Lexbuf) = - let (WarnScopeMap warnScopes) = getWarnScopes lexbuf - let (LineMap lineMap) = getLineMap lexbuf + let topLevelWarnons, topLevelNowarns = + List.partition (_.IsWarnon) topLevelWarnDirectives + + // "feature not available in this language version" error for top-level #nowarn + topLevelWarnons + |> List.iter (fun wd -> + checkLanguageFeatureAndRecover lexbuf.LanguageVersion LanguageFeature.ScopedNowarn wd.DirectiveRange) + + topLevelNowarns |> List.collect _.WarnCmds + + let lexbufWarnScopes = + warnCmds |> List.fold (processWarnCmd lexbuf.LanguageVersion) Map.empty + + let lexbufLineMap = + data.LineMap + |> Map.map (fun _ (oidx, sectionMaps) -> oidx, List.rev sectionMaps) lock diagnosticOptions (fun () -> - let (WarnScopeMap current) = diagnosticOptions.WarnScopes - let warnScopes' = Map.fold (fun wss idx ws -> Map.add idx ws wss) current warnScopes - diagnosticOptions.WarnScopes <- WarnScopeMap warnScopes' - let (LineMap clm) = diagnosticOptions.LineMap - let lineMap' = Map.fold (fun lms idx oidx -> Map.add idx oidx lms) clm lineMap - diagnosticOptions.LineMap <- LineMap lineMap') + let data = getWarnScopeData diagnosticOptions + + let warnScopes = + Map.fold (fun wss idx ws -> Map.add idx ws wss) data.warnScopes lexbufWarnScopes + // TODO: check here also for duplicate file map + let lineMaps = + Map.fold (fun lms idx oidx -> Map.add idx oidx lms) data.lineMaps lexbufLineMap + + let newWarnScopeData = + { + warnScopes = warnScopes + lineMaps = lineMaps + } + + setWarnScopeData diagnosticOptions newWarnScopeData) + + let getDirectiveRanges (lexbuf: Lexbuf) = + (getData lexbuf).WarnDirectives |> List.rev |> List.map _.DirectiveRange - lexbuf.BufferLocalStore.Remove warnScopeKey |> ignore - lexbuf.BufferLocalStore.Remove lineMapKey |> ignore + let getCommentRanges (lexbuf: Lexbuf) = + (getData lexbuf).WarnDirectives |> List.rev |> List.choose _.CommentRange // ************************************* // Apply the warn scopes after lexing // ************************************* + let private originalRange lineMaps (m: range) = + match Map.tryFind m.FileIndex lineMaps with + | None -> m + | Some(originalFileIndex, sectionMaps) -> + let surr, orig = + if List.isEmpty sectionMaps || m.StartLine < fst sectionMaps.Head then + (1, 1) + else + sectionMaps |> List.skipWhile (fun (s, _) -> m.StartLine < s) |> List.head + + let origStart = mkPos (m.StartLine + orig - surr) m.StartColumn + let origEnd = mkPos (m.EndLine + orig - surr) m.EndColumn + mkFileIndexRange originalFileIndex origStart origEnd + /// true if m1 contains the start of m2 (#line directives can appear in the middle of an error range) let private contains (m2: range) (m1: range) = m2.StartLine > m1.StartLine && m2.StartLine < m1.EndLine @@ -205,36 +360,24 @@ module internal WarnScopes = | WarnScope.OpenOff wm when m.StartLine > wm.StartLine -> true | _ -> false - let private isOffScope scope = - match scope with - | WarnScope.Off _ - | WarnScope.OpenOff _ -> true - | _ -> false - let IsWarnon (diagnosticOptions: FSharpDiagnosticOptions) warningNumber (mo: range option) = - let (WarnScopeMap warnScopes) = diagnosticOptions.WarnScopes - let (LineMap lineMap) = diagnosticOptions.LineMap + let data = getWarnScopeData diagnosticOptions - match mo, diagnosticOptions.FSharp9CompatibleNowarn with - | Some m, false -> - if lineMap.ContainsKey m.FileIndex then - false - else - let scopes = getScopes (index (m.FileIndex, warningNumber)) warnScopes - List.exists (isEnclosingWarnonScope m) scopes + match mo, diagnosticOptions.WarnScopesFeatureIsSupported with + | Some m, true -> + let mOrig = originalRange data.lineMaps m + let scopes = getScopes (index (mOrig.FileIndex, warningNumber)) data.warnScopes + List.exists (isEnclosingWarnonScope mOrig) scopes | _ -> false let IsNowarn (diagnosticOptions: FSharpDiagnosticOptions) warningNumber (mo: range option) = - let (WarnScopeMap warnScopes) = diagnosticOptions.WarnScopes - let (LineMap lineMap) = diagnosticOptions.LineMap - - match mo, diagnosticOptions.FSharp9CompatibleNowarn with - | Some m, false -> - match lineMap.TryFind m.FileIndex with - | None -> - let scopes = getScopes (index (m.FileIndex, warningNumber)) warnScopes - List.exists (isEnclosingNowarnScope m) scopes - | Some fileIndex -> // file has #line directives - let scopes = getScopes (index (fileIndex, warningNumber)) warnScopes - List.exists isOffScope scopes - | _ -> warnScopes |> Map.exists (fun idx _ -> warnNumFromIndex idx = warningNumber) + let data = getWarnScopeData diagnosticOptions + + match mo with + | Some m -> + let mOrig = originalRange data.lineMaps m + let scopes = getScopes (index (mOrig.FileIndex, warningNumber)) data.warnScopes + List.exists (isEnclosingNowarnScope mOrig) scopes + | None -> + data.warnScopes + |> Map.exists (fun idx _ -> warnNumFromIndex idx = warningNumber) diff --git a/src/Compiler/SyntaxTree/WarnScopes.fsi b/src/Compiler/SyntaxTree/WarnScopes.fsi index 2f4a6383b0a..20181327a37 100644 --- a/src/Compiler/SyntaxTree/WarnScopes.fsi +++ b/src/Compiler/SyntaxTree/WarnScopes.fsi @@ -9,13 +9,23 @@ open FSharp.Compiler.UnicodeLexing module internal WarnScopes = /// To be called from lex.fsl to register the line directives for warn scope processing - val RegisterLineDirective: lexbuf: Lexbuf * previousFileIndex: int * fileIndex: int * line: int -> unit + val RegisterLineDirective: lexbuf: Lexbuf * fileIndex: int * line: int -> unit - /// To be called from lex.fsl: #nowarn / #warnon directives are turned into warn scopes and saved + /// To be called from lex.fsl: #nowarn / #warnon directives are turned into warn scopes and saved. + /// Warn scopes are always based on the original file index and line number, irrespective of any line directives. val ParseAndRegisterWarnDirective: lexbuf: Lexbuf -> unit /// Add the WarnScopes data of a lexed file into the diagnostics options - val MergeInto: FSharpDiagnosticOptions -> Lexbuf -> unit + val MergeInto: FSharpDiagnosticOptions -> range list -> Lexbuf -> unit + + /// Get the collected ranges of the warn directives + val getDirectiveRanges: Lexbuf -> range list + + /// Get the ranges of any comments after warn directives + val getCommentRanges: Lexbuf -> range list + + /// Clear the temporary warn scope related data in the Lexbuf + val removeTemporaryData: Lexbuf -> unit /// Check if the range is inside a WarnScope.On scope val IsWarnon: FSharpDiagnosticOptions -> warningNumber: int -> mo: range option -> bool diff --git a/src/Compiler/TypedTree/TcGlobals.fs b/src/Compiler/TypedTree/TcGlobals.fs index 531ef79d264..0bf99b86572 100644 --- a/src/Compiler/TypedTree/TcGlobals.fs +++ b/src/Compiler/TypedTree/TcGlobals.fs @@ -175,6 +175,13 @@ let tname_IsByRefLikeAttribute = "System.Runtime.CompilerServices.IsByRefLikeAtt // Table of all these "globals" //------------------------------------------------------------------------- +[] +type CompilationMode = + | Unset + | OneOff + | Service + | Interactive + type TcGlobals( compilingFSharpCore: bool, ilg: ILGlobals, @@ -190,10 +197,11 @@ type TcGlobals( noDebugAttributes: bool, pathMap: PathMap, langVersion: LanguageVersion, - realsig: bool) = + realsig: bool, + compilationMode: CompilationMode) = let v_langFeatureNullness = langVersion.SupportsFeature LanguageFeature.NullnessChecking - + let v_knownWithNull = if v_langFeatureNullness then KnownWithNull else KnownAmbivalentToNull @@ -1825,6 +1833,8 @@ type TcGlobals( /// Are we assuming all code gen is for F# interactive, with no static linking member _.isInteractive=isInteractive + member val compilationMode = compilationMode + /// Indicates if we are generating witness arguments for SRTP constraints. Only done if the FSharp.Core /// supports witness arguments. member g.generateWitnesses = diff --git a/src/Compiler/TypedTree/TcGlobals.fsi b/src/Compiler/TypedTree/TcGlobals.fsi index b7d5a892d06..73d26a64b62 100644 --- a/src/Compiler/TypedTree/TcGlobals.fsi +++ b/src/Compiler/TypedTree/TcGlobals.fsi @@ -2,6 +2,15 @@ module internal FSharp.Compiler.TcGlobals +/// Signals how checker/compiler was invoked - from FSC task/process (a one-off compilation), from tooling or from interactive session. +/// This is used to determine if we want to use certain features in the pipeline, for example, type subsumption cache is only used in one-off compilation now. +[] +type CompilationMode = + | Unset // Default: not set + | OneOff // Running the FSC task/process + | Service // Running from service + | Interactive // Running from interactive session + val internal DummyFileNameForRangesWithoutASpecificLocation: string /// Represents an intrinsic value from FSharp.Core known to the compiler @@ -147,7 +156,8 @@ type internal TcGlobals = noDebugAttributes: bool * pathMap: Internal.Utilities.PathMap * langVersion: FSharp.Compiler.Features.LanguageVersion * - realsig: bool -> + realsig: bool * + compilationMode: CompilationMode -> TcGlobals static member IsInEmbeddableKnownSet: name: string -> bool @@ -810,6 +820,8 @@ type internal TcGlobals = /// Are we assuming all code gen is for F# interactive, with no static linking member isInteractive: bool + member compilationMode: CompilationMode + member isnull_info: IntrinsicValRef member istype_fast_vref: FSharp.Compiler.TypedTree.ValRef diff --git a/src/Compiler/Utilities/TypeHashing.fs b/src/Compiler/Utilities/TypeHashing.fs new file mode 100644 index 00000000000..bcdface38be --- /dev/null +++ b/src/Compiler/Utilities/TypeHashing.fs @@ -0,0 +1,346 @@ +module internal Internal.Utilities.TypeHashing + +open Internal.Utilities.Rational +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.Syntax +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.Text +open FSharp.Compiler.TypedTree +open FSharp.Compiler.TypedTreeBasics +open FSharp.Compiler.TypedTreeOps + +type ObserverVisibility = + | PublicOnly + | PublicAndInternal + +[] +module internal HashingPrimitives = + + type Hash = int + + let inline hashText (s: string) : Hash = hash s + let inline combineHash acc y : Hash = (acc <<< 1) + y + 631 + let inline pipeToHash (value: Hash) (acc: Hash) = combineHash acc value + let inline addFullStructuralHash (value) (acc: Hash) = combineHash (acc) (hash value) + + let inline hashListOrderMatters ([] func) (items: #seq<'T>) : Hash = + let mutable acc = 0 + + for i in items do + let valHash = func i + // We are calling hashListOrderMatters for things like list of types, list of properties, list of fields etc. The ones which are visibility-hidden will return 0, and are omitted. + if valHash <> 0 then + acc <- combineHash acc valHash + + acc + + let inline hashListOrderIndependent ([] func) (items: #seq<'T>) : Hash = + let mutable acc = 0 + + for i in items do + let valHash = func i + acc <- acc ^^^ valHash + + acc + + let (@@) (h1: Hash) (h2: Hash) = combineHash h1 h2 + +[] +module internal HashUtilities = + + let private hashEntityRefName (xref: EntityRef) name = + let tag = + if xref.IsNamespace then + TextTag.Namespace + elif xref.IsModule then + TextTag.Module + elif xref.IsTypeAbbrev then + TextTag.Alias + elif xref.IsFSharpDelegateTycon then + TextTag.Delegate + elif xref.IsILEnumTycon || xref.IsFSharpEnumTycon then + TextTag.Enum + elif xref.IsStructOrEnumTycon then + TextTag.Struct + elif isInterfaceTyconRef xref then + TextTag.Interface + elif xref.IsUnionTycon then + TextTag.Union + elif xref.IsRecordTycon then + TextTag.Record + else + TextTag.Class + + (hash tag) @@ (hashText name) + + let hashTyconRefImpl (tcref: TyconRef) = + let demangled = tcref.DisplayNameWithStaticParameters + let tyconHash = hashEntityRefName tcref demangled + + tcref.CompilationPath.AccessPath + |> hashListOrderMatters (fst >> hashText) + |> pipeToHash tyconHash + +module HashIL = + + let hashILTypeRef (tref: ILTypeRef) = + tref.Enclosing + |> hashListOrderMatters hashText + |> addFullStructuralHash tref.Name + + let private hashILArrayShape (sh: ILArrayShape) = sh.Rank + + let rec hashILType (ty: ILType) : Hash = + match ty with + | ILType.Void -> hash ILType.Void + | ILType.Array(sh, t) -> hashILType t @@ hashILArrayShape sh + | ILType.Value t + | ILType.Boxed t -> hashILTypeRef t.TypeRef @@ (t.GenericArgs |> hashListOrderMatters (hashILType)) + | ILType.Ptr t + | ILType.Byref t -> hashILType t + | ILType.FunctionPointer t -> hashILCallingSignature t + | ILType.TypeVar n -> hash n + | ILType.Modified(_, _, t) -> hashILType t + + and hashILCallingSignature (signature: ILCallingSignature) = + let res = signature.ReturnType |> hashILType + signature.ArgTypes |> hashListOrderMatters (hashILType) |> pipeToHash res + +module HashAccessibility = + + let isHiddenToObserver (TAccess access) (observer: ObserverVisibility) = + let isInternalCompPath x = + match x with + | CompPath(ILScopeRef.Local, _, []) -> true + | _ -> false + + match access with + | [] -> false + | _ when List.forall isInternalCompPath access -> + match observer with + // The 'access' means internal, but our observer can see it (e.g. because of IVT attribute) + | PublicAndInternal -> false + | PublicOnly -> true + | _ -> true + +module rec HashTypes = + open Microsoft.FSharp.Core.LanguagePrimitives + + let stampEquals g ty1 ty2 = + match (stripTyEqns g ty1), (stripTyEqns g ty2) with + | TType_app(tcref1, _, _), TType_app(tcref2, _, _) -> tcref1.Stamp.Equals(tcref2.Stamp) + | TType_var(r1, _), TType_var(r2, _) -> r1.Stamp.Equals(r2.Stamp) + | _ -> false + + /// Get has for Stamp for TType_app tyconref and TType_var typar + let hashStamp g ty = + let v: Stamp = + match (stripTyEqns g ty) with + | TType_app(tcref, _, _) -> tcref.Stamp + | TType_var(r, _) -> r.Stamp + | _ -> GenericZero + + hash v + + /// Hash a reference to a type + let hashTyconRef tcref = hashTyconRefImpl tcref + + /// Hash the flags of a member + let hashMemberFlags (memFlags: SynMemberFlags) = hash memFlags + + /// Hash an attribute 'Type(arg1, ..., argN)' + let private hashAttrib (Attrib(tyconRef = tcref)) = hashTyconRefImpl tcref + + let hashAttributeList attrs = + attrs |> hashListOrderIndependent hashAttrib + + let private hashTyparRef (typar: Typar) = + hashText typar.DisplayName + |> addFullStructuralHash (typar.Rigidity) + |> addFullStructuralHash (typar.StaticReq) + + let private hashTyparRefWithInfo (typar: Typar) = + hashTyparRef typar @@ hashAttributeList typar.Attribs + + let private hashConstraint (g: TcGlobals) struct (tp, tpc) = + let tpHash = hashTyparRefWithInfo tp + + match tpc with + | TyparConstraint.CoercesTo(tgtTy, _) -> tpHash @@ 1 @@ hashTType g tgtTy + | TyparConstraint.MayResolveMember(traitInfo, _) -> tpHash @@ 2 @@ hashTraitWithInfo (* denv *) g traitInfo + | TyparConstraint.DefaultsTo(_, ty, _) -> tpHash @@ 3 @@ hashTType g ty + | TyparConstraint.IsEnum(ty, _) -> tpHash @@ 4 @@ hashTType g ty + | TyparConstraint.SupportsComparison _ -> tpHash @@ 5 + | TyparConstraint.SupportsEquality _ -> tpHash @@ 6 + | TyparConstraint.IsDelegate(aty, bty, _) -> tpHash @@ 7 @@ hashTType g aty @@ hashTType g bty + | TyparConstraint.SupportsNull _ -> tpHash @@ 8 + | TyparConstraint.IsNonNullableStruct _ -> tpHash @@ 9 + | TyparConstraint.IsUnmanaged _ -> tpHash @@ 10 + | TyparConstraint.IsReferenceType _ -> tpHash @@ 11 + | TyparConstraint.SimpleChoice(tys, _) -> tpHash @@ 12 @@ (tys |> hashListOrderIndependent (hashTType g)) + | TyparConstraint.RequiresDefaultConstructor _ -> tpHash @@ 13 + | TyparConstraint.NotSupportsNull(_) -> tpHash @@ 14 + | TyparConstraint.AllowsRefStruct _ -> tpHash @@ 15 + + /// Hash type parameter constraints + let private hashConstraints (g: TcGlobals) cxs = + cxs |> hashListOrderIndependent (hashConstraint g) + + let private hashTraitWithInfo (g: TcGlobals) traitInfo = + let nameHash = hashText traitInfo.MemberLogicalName + let memberHash = hashMemberFlags traitInfo.MemberFlags + + let returnTypeHash = + match traitInfo.CompiledReturnType with + | Some t -> hashTType g t + | _ -> -1 + + traitInfo.CompiledObjectAndArgumentTypes + |> hashListOrderIndependent (hashTType g) + |> pipeToHash (nameHash) + |> pipeToHash (returnTypeHash) + |> pipeToHash memberHash + + /// Hash a unit of measure expression + let private hashMeasure unt = + let measuresWithExponents = + ListMeasureVarOccsWithNonZeroExponents unt + |> List.sortBy (fun (tp: Typar, _) -> tp.DisplayName) + + measuresWithExponents + |> hashListOrderIndependent (fun (typar, exp: Rational) -> hashTyparRef typar @@ hash exp) + + /// Hash a type, taking precedence into account to insert brackets where needed + let hashTType (g: TcGlobals) ty = + + match stripTyparEqns ty |> (stripTyEqns g) with + | TType_ucase(UnionCaseRef(tc, _), args) + | TType_app(tc, args, _) -> args |> hashListOrderMatters (hashTType g) |> pipeToHash (hashTyconRef tc) + | TType_anon(anonInfo, tys) -> + tys + |> hashListOrderMatters (hashTType g) + |> pipeToHash (anonInfo.SortedNames |> hashListOrderMatters hashText) + |> addFullStructuralHash (evalAnonInfoIsStruct anonInfo) + | TType_tuple(tupInfo, t) -> + t + |> hashListOrderMatters (hashTType g) + |> addFullStructuralHash (evalTupInfoIsStruct tupInfo) + // Hash a first-class generic type. + | TType_forall(tps, tau) -> tps |> hashListOrderMatters (hashTyparRef) |> pipeToHash (hashTType g tau) + | TType_fun _ -> + let argTys, retTy = stripFunTy g ty + argTys |> hashListOrderMatters (hashTType g) |> pipeToHash (hashTType g retTy) + | TType_var(r, _) -> hashTyparRefWithInfo r + | TType_measure unt -> hashMeasure unt + + // Hash a single argument, including its name and type + let private hashArgInfo (g: TcGlobals) (ty, argInfo: ArgReprInfo) = + + let attributesHash = hashAttributeList argInfo.Attribs + + let nameHash = + match argInfo.Name with + | Some i -> hashText i.idText + | _ -> -1 + + let typeHash = hashTType g ty + + typeHash @@ nameHash @@ attributesHash + + let private hashCurriedArgInfos (g: TcGlobals) argInfos = + argInfos + |> hashListOrderMatters (fun l -> l |> hashListOrderMatters (hashArgInfo g)) + + /// Hash a single type used as the type of a member or value + let hashTopType (g: TcGlobals) argInfos retTy cxs = + let retTypeHash = hashTType g retTy + let cxsHash = hashConstraints g cxs + let argHash = hashCurriedArgInfos g argInfos + + retTypeHash @@ cxsHash @@ argHash + + let private hashTyparInclConstraints (g: TcGlobals) (typar: Typar) = + typar.Constraints + |> hashListOrderIndependent (fun tpc -> hashConstraint g (typar, tpc)) + |> pipeToHash (hashTyparRef typar) + + /// Hash type parameters + let hashTyparDecls (g: TcGlobals) (typars: Typars) = + typars |> hashListOrderMatters (hashTyparInclConstraints g) + + let private hashUncurriedSig (g: TcGlobals) typarInst argInfos retTy = + typarInst + |> hashListOrderMatters (fun (typar, ttype) -> hashTyparInclConstraints g typar @@ hashTType g ttype) + |> pipeToHash (hashTopType g argInfos retTy []) + + let private hashMemberSigCore (g: TcGlobals) memberToParentInst (typarInst, methTypars: Typars, argInfos, retTy) = + typarInst + |> hashListOrderMatters (fun (typar, ttype) -> hashTyparInclConstraints g typar @@ hashTType g ttype) + |> pipeToHash (hashTopType g argInfos retTy []) + |> pipeToHash ( + memberToParentInst + |> hashListOrderMatters (fun (typar, ty) -> hashTyparRef typar @@ hashTType g ty) + ) + |> pipeToHash (hashTyparDecls g methTypars) + + let hashMemberType (g: TcGlobals) vref typarInst argInfos retTy = + match PartitionValRefTypars g vref with + | Some(_, _, memberMethodTypars, memberToParentInst, _) -> + hashMemberSigCore g memberToParentInst (typarInst, memberMethodTypars, argInfos, retTy) + | None -> hashUncurriedSig g typarInst argInfos retTy + +module HashTastMemberOrVals = + open HashTypes + + let private hashMember (g: TcGlobals, observer) typarInst (v: Val) = + let vref = mkLocalValRef v + + if HashAccessibility.isHiddenToObserver vref.Accessibility observer then + 0 + else + let membInfo = Option.get vref.MemberInfo + let _tps, argInfos, retTy, _ = GetTypeOfMemberInFSharpForm g vref + + let memberFlagsHash = hashMemberFlags membInfo.MemberFlags + let parentTypeHash = hashTyconRef membInfo.ApparentEnclosingEntity + let memberTypeHash = hashMemberType g vref typarInst argInfos retTy + let flagsHash = hash v.val_flags.PickledBits + let nameHash = hashText v.DisplayNameCoreMangled + let attribsHash = hashAttributeList v.Attribs + + let combinedHash = + memberFlagsHash + @@ parentTypeHash + @@ memberTypeHash + @@ flagsHash + @@ nameHash + @@ attribsHash + + combinedHash + + let private hashNonMemberVal (g: TcGlobals, observer) (tps, v: Val, tau, cxs) = + if HashAccessibility.isHiddenToObserver v.Accessibility observer then + 0 + else + let valReprInfo = arityOfValForDisplay v + let nameHash = hashText v.DisplayNameCoreMangled + let typarHash = hashTyparDecls g tps + let argInfos, retTy = GetTopTauTypeInFSharpForm g valReprInfo.ArgInfos tau v.Range + let typeHash = hashTopType g argInfos retTy cxs + let flagsHash = hash v.val_flags.PickledBits + let attribsHash = hashAttributeList v.Attribs + + let combinedHash = nameHash @@ typarHash @@ typeHash @@ flagsHash @@ attribsHash + combinedHash + + let hashValOrMemberNoInst (g, obs) (vref: ValRef) = + match vref.MemberInfo with + | None -> + let tps, tau = vref.GeneralizedType + + let cxs = + tps + |> Seq.collect (fun tp -> tp.Constraints |> Seq.map (fun cx -> struct (tp, cx))) + + hashNonMemberVal (g, obs) (tps, vref.Deref, tau, cxs) + | Some _ -> hashMember (g, obs) emptyTyparInst vref.Deref diff --git a/src/Compiler/lex.fsl b/src/Compiler/lex.fsl index de739ef7aff..2d52ec029f7 100644 --- a/src/Compiler/lex.fsl +++ b/src/Compiler/lex.fsl @@ -185,7 +185,7 @@ let trySaveXmlDoc (lexbuf: LexBuffer) (buff: (range * StringBuilder) optio | None -> () | Some (start, sb) -> let xmlCommentLineRange = mkFileIndexRange start.FileIndex start.Start (posOfLexPosition lexbuf.StartPos) - LexbufLocalXmlDocStore.SaveXmlDocLine (lexbuf, sb.ToString(), xmlCommentLineRange) + XmlDocStore.SaveXmlDocLine (lexbuf, sb.ToString(), xmlCommentLineRange) let tryAppendXmlDoc (buff: (range * StringBuilder) option) (s:string) = match buff with @@ -733,7 +733,7 @@ rule token (args: LexArgs) (skip: bool) = parse | "////" op_char* { // 4+ slash are 1-line comments, online 3 slash are XmlDoc let m = lexbuf.LexemeRange - LexbufLocalXmlDocStore.AddGrabPointDelayed(lexbuf) + XmlDocStore.AddGrabPointDelayed(lexbuf) if not skip then LINE_COMMENT (LexCont.SingleLineComment(args.ifdefStack, args.stringNest, 1, m)) else singleLineComment (None,1,m,m,args) skip lexbuf } @@ -748,7 +748,7 @@ rule token (args: LexArgs) (skip: bool) = parse | "//" op_char* { // Need to read all operator symbols too, otherwise it might be parsed by a rule below let m = lexbuf.LexemeRange - LexbufLocalXmlDocStore.AddGrabPointDelayed(lexbuf) + XmlDocStore.AddGrabPointDelayed(lexbuf) if not skip then LINE_COMMENT (LexCont.SingleLineComment(args.ifdefStack, args.stringNest, 1, m)) else singleLineComment (None,1,m,m,args) skip lexbuf } @@ -818,8 +818,8 @@ rule token (args: LexArgs) (skip: bool) = parse // Construct the new position if args.applyLineDirectives then let fileIndex = match file with Some f -> FileIndex.fileIndexOfFile f | None -> pos.FileIndex + WarnScopes.RegisterLineDirective(lexbuf, fileIndex, line) lexbuf.EndPos <- pos.ApplyLineDirective(fileIndex, line) - WarnScopes.RegisterLineDirective(lexbuf, pos.FileIndex, fileIndex, line) else // add a newline when we don't apply a directive since we consumed a newline getting here incrLine lexbuf @@ -1038,7 +1038,7 @@ rule token (args: LexArgs) (skip: bool) = parse let lexed = lexeme lexbuf let isTrue, expr = evalIfDefExpression lexbuf.StartPos lexbuf.ReportLibraryOnlyFeatures lexbuf.LanguageVersion lexbuf.StrictIndentation args lookup lexed args.ifdefStack <- (IfDefIf,m) :: args.ifdefStack - LexbufIfdefStore.SaveIfHash(lexbuf, lexed, expr, m) + IfdefStore.SaveIfHash(lexbuf, lexed, expr, m) let contCase = if isTrue then LexerEndlineContinuation.Token else LexerEndlineContinuation.IfdefSkip(0, m) let tok = HASH_IF(m, lexed, LexCont.EndLine(args.ifdefStack, args.stringNest, contCase)) if skip then endline contCase args skip lexbuf else tok } @@ -1052,7 +1052,7 @@ rule token (args: LexArgs) (skip: bool) = parse let m = lexbuf.LexemeRange shouldStartLine args lexbuf m (FSComp.SR.lexHashElseMustBeFirst()) args.ifdefStack <- (IfDefElse,m) :: rest - LexbufIfdefStore.SaveElseHash(lexbuf, lexed, m) + IfdefStore.SaveElseHash(lexbuf, lexed, m) let tok = HASH_ELSE(m, lexed, LexCont.EndLine(args.ifdefStack, args.stringNest, LexerEndlineContinuation.IfdefSkip(0, m))) if skip then endline (LexerEndlineContinuation.IfdefSkip(0, m)) args skip lexbuf else tok } @@ -1064,7 +1064,7 @@ rule token (args: LexArgs) (skip: bool) = parse | _ :: rest -> shouldStartLine args lexbuf m (FSComp.SR.lexHashEndifMustBeFirst()) args.ifdefStack <- rest - LexbufIfdefStore.SaveEndIfHash(lexbuf, lexed, m) + IfdefStore.SaveEndIfHash(lexbuf, lexed, m) let tok = HASH_ENDIF(m,lexed,LexCont.EndLine(args.ifdefStack, args.stringNest, LexerEndlineContinuation.Token)) if not skip then tok else endline LexerEndlineContinuation.Token args skip lexbuf } @@ -1082,18 +1082,13 @@ rule token (args: LexArgs) (skip: bool) = parse lexbuf.StartPos <- lexbuf.StartPos.ShiftColumnBy(n) HASH_IDENT(lexemeTrimLeft lexbuf (n+1)) } - | anywhite* ("#nowarn" | "#warnon") anywhite+ anystring + | anywhite* ("#nowarn" | "#warnon") anystring { let m = lexbuf.LexemeRange shouldStartLine args lexbuf m (FSComp.SR.lexWarnDirectiveMustBeFirst()) WarnScopes.ParseAndRegisterWarnDirective lexbuf let tok = WARN_DIRECTIVE(m, lexeme lexbuf, LexCont.EndLine(args.ifdefStack, args.stringNest, LexerEndlineContinuation.Token)) if skip then endline LexerEndlineContinuation.Token args skip lexbuf else tok } - | anywhite* ("#nowarn" | "#warnon") - { let tok = WHITESPACE (LexCont.Token (args.ifdefStack, args.stringNest)) - let tok = fail args lexbuf (FSComp.SR.lexWarnDirectiveMustHaveArgs()) tok - if skip then token args skip lexbuf else tok } - | surrogateChar surrogateChar | _ @@ -1116,7 +1111,7 @@ and ifdefSkip (n: int) (m: range) (args: LexArgs) (skip: bool) = parse let lexed = lexeme lexbuf let lookup id = List.contains id args.conditionalDefines let _, expr = evalIfDefExpression lexbuf.StartPos lexbuf.ReportLibraryOnlyFeatures lexbuf.LanguageVersion lexbuf.StrictIndentation args lookup lexed - LexbufIfdefStore.SaveIfHash(lexbuf, lexed, expr, m) + IfdefStore.SaveIfHash(lexbuf, lexed, expr, m) let tok = INACTIVECODE(LexCont.EndLine(args.ifdefStack, args.stringNest, LexerEndlineContinuation.IfdefSkip(n+1, m))) if skip then endline (LexerEndlineContinuation.IfdefSkip(n+1, m)) args skip lexbuf else tok } @@ -1134,12 +1129,12 @@ and ifdefSkip (n: int) (m: range) (args: LexArgs) (skip: bool) = parse | (IfDefElse,_) :: _rest -> LEX_FAILURE (FSComp.SR.lexHashEndifRequiredForElse()) | (IfDefIf,_) :: rest -> let m = lexbuf.LexemeRange - LexbufIfdefStore.SaveElseHash(lexbuf, lexed, m) + IfdefStore.SaveElseHash(lexbuf, lexed, m) args.ifdefStack <- (IfDefElse,m) :: rest if not skip then HASH_ELSE(m,lexed,LexCont.EndLine(args.ifdefStack, args.stringNest, LexerEndlineContinuation.Token)) else endline LexerEndlineContinuation.Token args skip lexbuf else - LexbufIfdefStore.SaveElseHash(lexbuf, lexed, m) + IfdefStore.SaveElseHash(lexbuf, lexed, m) if not skip then INACTIVECODE(LexCont.EndLine(args.ifdefStack, args.stringNest, LexerEndlineContinuation.IfdefSkip(n, m))) else endline (LexerEndlineContinuation.IfdefSkip(n, m)) args skip lexbuf } @@ -1155,13 +1150,13 @@ and ifdefSkip (n: int) (m: range) (args: LexArgs) (skip: bool) = parse match args.ifdefStack with | [] -> LEX_FAILURE (FSComp.SR.lexHashEndingNoMatchingIf()) | _ :: rest -> - LexbufIfdefStore.SaveEndIfHash(lexbuf, lexed, m) + IfdefStore.SaveEndIfHash(lexbuf, lexed, m) args.ifdefStack <- rest if not skip then HASH_ENDIF(m,lexed,LexCont.EndLine(args.ifdefStack, args.stringNest, LexerEndlineContinuation.Token)) else endline LexerEndlineContinuation.Token args skip lexbuf else shouldStartLine args lexbuf m (FSComp.SR.lexWrongNestedHashEndif()) - LexbufIfdefStore.SaveEndIfHash(lexbuf, lexed, m) + IfdefStore.SaveEndIfHash(lexbuf, lexed, m) let tok = INACTIVECODE(LexCont.EndLine(args.ifdefStack, args.stringNest, LexerEndlineContinuation.IfdefSkip(n-1, m))) if not skip then tok else endline (LexerEndlineContinuation.IfdefSkip(n-1, m)) args skip lexbuf } @@ -1721,13 +1716,13 @@ and singleLineComment (cargs: SingleLineCommentArgs) (skip: bool) = parse // Saves the documentation (if we're collecting any) into a buffer-local variable. if not skip then LINE_COMMENT (LexCont.Token(args.ifdefStack, args.stringNest)) else - if Option.isNone buff then LexbufCommentStore.SaveSingleLineComment(lexbuf, mStart, mEnd) + if Option.isNone buff then CommentStore.SaveSingleLineComment(lexbuf, mStart, mEnd) token args skip lexbuf } | eof { let buff, _n, mStart, mEnd, args = cargs trySaveXmlDoc lexbuf buff - LexbufCommentStore.SaveSingleLineComment(lexbuf, mStart, mEnd) + CommentStore.SaveSingleLineComment(lexbuf, mStart, mEnd) // NOTE: it is legal to end a file with this comment, so we'll return EOF as a token EOF (LexCont.Token(args.ifdefStack, args.stringNest)) } @@ -1768,7 +1763,7 @@ and comment (cargs: BlockCommentArgs) (skip: bool) = parse | "(*)" { let n, m, args = cargs - LexbufLocalXmlDocStore.AddGrabPoint(lexbuf) + XmlDocStore.AddGrabPoint(lexbuf) if not skip then COMMENT (LexCont.Comment(args.ifdefStack, args.stringNest, n, m)) else comment cargs skip lexbuf } @@ -1789,10 +1784,10 @@ and comment (cargs: BlockCommentArgs) (skip: bool) = parse if not skip then COMMENT (LexCont.Comment(args.ifdefStack, args.stringNest, n-1, m)) else comment (n-1,m,args) skip lexbuf else - LexbufLocalXmlDocStore.AddGrabPointDelayed(lexbuf) + XmlDocStore.AddGrabPointDelayed(lexbuf) if not skip then COMMENT (LexCont.Token(args.ifdefStack, args.stringNest)) else - LexbufCommentStore.SaveBlockComment(lexbuf, m, lexbuf.LexemeRange) + CommentStore.SaveBlockComment(lexbuf, m, lexbuf.LexemeRange) token args skip lexbuf } | anywhite+ diff --git a/src/Compiler/pars.fsy b/src/Compiler/pars.fsy index e1b9a9cf0b0..644046573b3 100644 --- a/src/Compiler/pars.fsy +++ b/src/Compiler/pars.fsy @@ -17,6 +17,7 @@ open FSharp.Compiler.AbstractIL open FSharp.Compiler.AbstractIL open FSharp.Compiler.DiagnosticsLogger open FSharp.Compiler.Features +open FSharp.Compiler.LexerStore open FSharp.Compiler.ParseHelpers open FSharp.Compiler.Syntax open FSharp.Compiler.SyntaxTrivia @@ -985,8 +986,12 @@ classMemberSpfn: match optLiteralValue with | None -> m | Some e -> unionRanges m e.Range - + let flags, leadingKeyword = $3 + if leadingKeywordIsAbstract leadingKeyword then + [ $2; $5; getterAccess; setterAccess ] + |> List.iter (function None -> () | Some access -> errorR(Error(FSComp.SR.parsAccessibilityModsIllegalForAbstract(), access.Range))) + let flags = flags (getSetAdjuster arity) let trivia = { LeadingKeyword = leadingKeyword; InlineKeyword = $4; WithKeyword = mWith; EqualsRange = mEquals } let valSpfn = SynValSig($1, id, explicitValTyparDecls, ty, arity, isInline, false, doc, vis2, optLiteralValue, mWhole, trivia) @@ -1298,7 +1303,7 @@ moduleDefn: /* 'let' definitions in non-#light*/ | opt_attributes opt_access defnBindings %prec decl_let { if Option.isSome $2 then errorR(Error(FSComp.SR.parsVisibilityDeclarationsShouldComePriorToIdentifier(), rhs parseState 2)) - parseState.ResetSynArgNameGenerator() + (getSynArgNameGenerator parseState.LexBuffer).Reset() let (BindingSetPreAttrs(_, _, _, _, mWhole)) = $3 mkDefnBindings (mWhole, $3, $1, $2, mWhole) } @@ -1306,7 +1311,7 @@ moduleDefn: | opt_attributes opt_access hardwhiteLetBindings %prec decl_let { let hwlb, m, _ = $3 if Option.isSome $2 then errorR(Error(FSComp.SR.parsVisibilityDeclarationsShouldComePriorToIdentifier(), rhs parseState 2)) - parseState.ResetSynArgNameGenerator() + (getSynArgNameGenerator parseState.LexBuffer).Reset() mkDefnBindings (m, hwlb, $1, $2, m) } /* 'do' definitions in non-#light*/ @@ -2046,10 +2051,11 @@ classDefnMember: let ty = SynType.FromParseError(mInterface.EndRange) [ SynMemberDefn.Interface(ty, None, None, rhs2 parseState 1 3) ] } - | opt_attributes opt_access abstractMemberFlags opt_inline nameop opt_explicitValTyparDecls COLON topTypeWithTypeConstraints classMemberSpfnGetSet opt_ODECLEND - { let ty, arity = $8 - let isInline, doc, id, explicitValTyparDecls = (Option.isSome $4), grabXmlDoc(parseState, $1, 1), $5, $6 - let mWith, (getSet, getSetRangeOpt, getterAccess, setterAccess) = $9 + | opt_attributes opt_access abstractMemberFlags opt_access opt_inline nameop opt_explicitValTyparDecls COLON topTypeWithTypeConstraints classMemberSpfnGetSet opt_ODECLEND + { if Option.isSome $2 then errorR(Error(FSComp.SR.parsVisibilityDeclarationsShouldComePriorToIdentifier(), rhs parseState 2)) + let ty, arity = $9 + let isInline, doc, id, explicitValTyparDecls = (Option.isSome $5), grabXmlDoc(parseState, $1, 1), $6, $7 + let mWith, (getSet, getSetRangeOpt, getterAccess, setterAccess) = $10 let getSetAdjuster arity = match arity, getSet with SynValInfo([], _), SynMemberKind.Member -> SynMemberKind.PropertyGet | _ -> getSet let mWhole = let m = rhs parseState 1 @@ -2057,10 +2063,12 @@ classDefnMember: | None -> unionRanges m ty.Range | Some gs -> unionRanges m gs.Range |> unionRangeWithXmlDoc doc - if Option.isSome $2 || Option.isSome getterAccess || Option.isSome setterAccess - then errorR(Error(FSComp.SR.parsAccessibilityModsIllegalForAbstract(), mWhole)) + + [ $2; $4; getterAccess; setterAccess ] + |> List.iter (function None -> () | Some access -> errorR(Error(FSComp.SR.parsAccessibilityModsIllegalForAbstract(), access.Range))) + let mkFlags, leadingKeyword = $3 - let trivia = { LeadingKeyword = leadingKeyword; InlineKeyword = $4; WithKeyword = mWith; EqualsRange = None } + let trivia = { LeadingKeyword = leadingKeyword; InlineKeyword = $5; WithKeyword = mWith; EqualsRange = None } let vis2 = SynValSigAccess.Single(None) let valSpfn = SynValSig($1, id, explicitValTyparDecls, ty, arity, isInline, false, doc, vis2, None, mWhole, trivia) let trivia: SynMemberDefnAbstractSlotTrivia = { GetSetKeywords = getSetRangeOpt } @@ -2317,17 +2325,18 @@ inheritsDefn: | INHERIT atomTypeNonAtomicDeprecated optBaseSpec { let mDecl = unionRanges (rhs parseState 1) $2.Range let trivia = { InheritKeyword = rhs parseState 1 } - SynMemberDefn.Inherit($2, $3, mDecl, trivia) } + SynMemberDefn.Inherit(Some $2, $3, mDecl, trivia) } | INHERIT atomTypeNonAtomicDeprecated opt_HIGH_PRECEDENCE_APP atomicExprAfterType optBaseSpec { let mDecl = unionRanges (rhs parseState 1) $4.Range - SynMemberDefn.ImplicitInherit($2, $4, $5, mDecl) } + let trivia = { InheritKeyword = rhs parseState 1 } + SynMemberDefn.ImplicitInherit($2, $4, $5, mDecl, trivia) } | INHERIT ends_coming_soon_or_recover { let mDecl = (rhs parseState 1) let trivia = { InheritKeyword = (rhs parseState 1) } if not $2 then errorR (Error(FSComp.SR.parsTypeNameCannotBeEmpty (), mDecl)) - SynMemberDefn.Inherit(SynType.LongIdent(SynLongIdent([], [], [])), None, mDecl, trivia) } + SynMemberDefn.Inherit(None, None, mDecl, trivia) } optAsSpec: | asSpec @@ -5821,44 +5830,44 @@ anonLambdaExpr: | FUN atomicPatterns RARROW typedSequentialExprBlock { let mAll = unionRanges (rhs parseState 1) $4.Range let mArrow = Some(rhs parseState 3) - mkSynFunMatchLambdas parseState.SynArgNameGenerator false mAll $2 mArrow $4 } + mkSynFunMatchLambdas (getSynArgNameGenerator parseState.LexBuffer) false mAll $2 mArrow $4 } | FUN atomicPatterns RARROW error { let mAll = rhs2 parseState 1 3 let mArrow = Some(rhs parseState 3) - mkSynFunMatchLambdas parseState.SynArgNameGenerator false mAll $2 mArrow (arbExpr ("anonLambdaExpr1", (rhs parseState 4))) } + mkSynFunMatchLambdas (getSynArgNameGenerator parseState.LexBuffer) false mAll $2 mArrow (arbExpr ("anonLambdaExpr1", (rhs parseState 4))) } | OFUN atomicPatterns RARROW typedSequentialExprBlockR OEND { let mArrow = rhs parseState 3 let expr = $4 mArrow let mAll = unionRanges (rhs parseState 1) expr.Range - mkSynFunMatchLambdas parseState.SynArgNameGenerator false mAll $2 (Some mArrow) expr } + mkSynFunMatchLambdas (getSynArgNameGenerator parseState.LexBuffer) false mAll $2 (Some mArrow) expr } | OFUN atomicPatterns RARROW typedSequentialExprBlockR recover { if not $5 then reportParseErrorAt (rhs parseState 1) (FSComp.SR.parsUnexpectedEndOfFileFunBody ()) let mArrow = rhs parseState 3 let expr = $4 mArrow let mAll = unionRanges (rhs parseState 1) expr.Range - exprFromParseError (mkSynFunMatchLambdas parseState.SynArgNameGenerator false mAll $2 (Some mArrow) expr) } + exprFromParseError (mkSynFunMatchLambdas (getSynArgNameGenerator parseState.LexBuffer) false mAll $2 (Some mArrow) expr) } | OFUN atomicPatterns RARROW ORIGHT_BLOCK_END OEND { let mLambda = rhs2 parseState 1 3 reportParseErrorAt mLambda (FSComp.SR.parsMissingFunctionBody()) let mArrow = Some(rhs parseState 3) - mkSynFunMatchLambdas parseState.SynArgNameGenerator false mLambda $2 mArrow (arbExpr ("anonLambdaExpr2", mLambda.EndRange)) } + mkSynFunMatchLambdas (getSynArgNameGenerator parseState.LexBuffer) false mLambda $2 mArrow (arbExpr ("anonLambdaExpr2", mLambda.EndRange)) } | OFUN atomicPatterns RARROW recover { if not $4 then reportParseErrorAt (rhs parseState 1) (FSComp.SR.parsUnexpectedEndOfFileFunBody()) let mLambda = rhs2 parseState 1 3 let mArrow = Some(rhs parseState 3) - exprFromParseError (mkSynFunMatchLambdas parseState.SynArgNameGenerator false mLambda $2 mArrow (arbExpr ("anonLambdaExpr3", mLambda.EndRange))) } + exprFromParseError (mkSynFunMatchLambdas (getSynArgNameGenerator parseState.LexBuffer) false mLambda $2 mArrow (arbExpr ("anonLambdaExpr3", mLambda.EndRange))) } | OFUN atomicPatterns error OEND { let mLambda = rhs2 parseState 1 2 - exprFromParseError (mkSynFunMatchLambdas parseState.SynArgNameGenerator false mLambda $2 None (arbExpr ("anonLambdaExpr4", mLambda.EndRange))) } + exprFromParseError (mkSynFunMatchLambdas (getSynArgNameGenerator parseState.LexBuffer) false mLambda $2 None (arbExpr ("anonLambdaExpr4", mLambda.EndRange))) } | OFUN error OEND - { exprFromParseError (mkSynFunMatchLambdas parseState.SynArgNameGenerator false (rhs parseState 1) [] None (arbExpr ("anonLambdaExpr5", (rhs parseState 2)))) } + { exprFromParseError (mkSynFunMatchLambdas (getSynArgNameGenerator parseState.LexBuffer) false (rhs parseState 1) [] None (arbExpr ("anonLambdaExpr5", (rhs parseState 2)))) } anonMatchingExpr: | FUNCTION withPatternClauses %prec expr_function diff --git a/src/Compiler/xlf/FSComp.txt.cs.xlf b/src/Compiler/xlf/FSComp.txt.cs.xlf index 0aa23ee2155..3717cecd858 100644 --- a/src/Compiler/xlf/FSComp.txt.cs.xlf +++ b/src/Compiler/xlf/FSComp.txt.cs.xlf @@ -52,6 +52,11 @@ Tento výraz je anonymní záznam, použijte {{|...|}} místo {{...}}. + + This construct is deprecated. Sequence expressions should be of the form 'seq {{ ... }}' + This construct is deprecated. Sequence expressions should be of the form 'seq {{ ... }}' + + Duplicate parameter. The parameter '{0}' has been used more that once in this method. Duplicitní parametr Parametr {0} byl v této metodě použit vícekrát. @@ -322,11 +327,21 @@ opravit překlad názvů typů delegátů, viz https://github.com/dotnet/fsharp/issues/10228 + + Deprecate places where 'seq' can be omitted + Deprecate places where 'seq' can be omitted + + discard pattern in use binding vzor discard ve vazbě použití + + Don't warn on uppercase identifiers in binding patterns + Don't warn on uppercase identifiers in binding patterns + + dotless float32 literal literál float32 bez tečky @@ -617,6 +632,11 @@ Interoperabilita mezi neřízeným obecným omezením jazyka C# a F# (emitovat další modreq) + + Use type conversion cache during compilation + Use type conversion cache during compilation + + Indexed properties getter and setter must have the same type Metoda getter a setter indexované vlastnosti musí mít stejný typ. @@ -4544,7 +4564,7 @@ Invalid record, sequence or computation expression. Sequence expressions should be of the form 'seq {{ ... }}' - Neplatný výraz záznamu, pořadí nebo výpočtu. Výrazy pořadí by měly mít notaci seq {{ ... }}. + Neplatný výraz záznamu, pořadí nebo výpočtu. Výrazy pořadí by měly mít notaci seq {{ ... }}. diff --git a/src/Compiler/xlf/FSComp.txt.de.xlf b/src/Compiler/xlf/FSComp.txt.de.xlf index 5c8711e3b1c..4ee6916ffe9 100644 --- a/src/Compiler/xlf/FSComp.txt.de.xlf +++ b/src/Compiler/xlf/FSComp.txt.de.xlf @@ -52,6 +52,11 @@ Dieser Ausdruck ist ein anonymer Datensatz. Verwenden Sie {{|...|}} anstelle von {{...}}. + + This construct is deprecated. Sequence expressions should be of the form 'seq {{ ... }}' + This construct is deprecated. Sequence expressions should be of the form 'seq {{ ... }}' + + Duplicate parameter. The parameter '{0}' has been used more that once in this method. Doppelter Parameter. Der Parameter „{0}“ wurde in dieser Methode mehrmals verwendet. @@ -322,11 +327,21 @@ Informationen zur Problembehebung bezüglich der Auflösung von Delegattypnamen finden Sie unter https://github.com/dotnet/fsharp/issues/10228 + + Deprecate places where 'seq' can be omitted + Deprecate places where 'seq' can be omitted + + discard pattern in use binding Das Verwerfen des verwendeten Musters ist verbindlich. + + Don't warn on uppercase identifiers in binding patterns + Don't warn on uppercase identifiers in binding patterns + + dotless float32 literal punktloses float32-Literal @@ -617,6 +632,11 @@ Interop zwischen nicht verwalteter generischer Einschränkung in C# und F# (zusätzlicher ModReq ausgeben) + + Use type conversion cache during compilation + Use type conversion cache during compilation + + Indexed properties getter and setter must have the same type Getter und Setter für indizierte Eigenschaften müssen denselben Typ aufweisen. @@ -4544,7 +4564,7 @@ Invalid record, sequence or computation expression. Sequence expressions should be of the form 'seq {{ ... }}' - Ungültiger Datensatz-, Sequenz- oder Berechnungsausdruck. Sequenzausdrücke müssen das Format "seq {{ ... }}" besitzen. + Ungültiger Datensatz-, Sequenz- oder Berechnungsausdruck. Sequenzausdrücke müssen das Format "seq {{ ... }}" besitzen. diff --git a/src/Compiler/xlf/FSComp.txt.es.xlf b/src/Compiler/xlf/FSComp.txt.es.xlf index ffb757dad5c..0fefbe0d120 100644 --- a/src/Compiler/xlf/FSComp.txt.es.xlf +++ b/src/Compiler/xlf/FSComp.txt.es.xlf @@ -52,6 +52,11 @@ Esta expresión es un registro anónimo; use {{|...|}} en lugar de {{...}}. + + This construct is deprecated. Sequence expressions should be of the form 'seq {{ ... }}' + This construct is deprecated. Sequence expressions should be of the form 'seq {{ ... }}' + + Duplicate parameter. The parameter '{0}' has been used more that once in this method. Parámetro duplicado. El parámetro '{0}' se ha usado más una vez en este método. @@ -322,11 +327,21 @@ corrección para la resolución de nombres de tipo de delegado, consulte https://github.com/dotnet/fsharp/issues/10228 + + Deprecate places where 'seq' can be omitted + Deprecate places where 'seq' can be omitted + + discard pattern in use binding descartar enlace de patrón en uso + + Don't warn on uppercase identifiers in binding patterns + Don't warn on uppercase identifiers in binding patterns + + dotless float32 literal literal float32 sin punto @@ -617,6 +632,11 @@ Interoperabilidad entre la restricción genérica no administrada de C# y F# (emitir modreq adicional) + + Use type conversion cache during compilation + Use type conversion cache during compilation + + Indexed properties getter and setter must have the same type El captador y el establecedor de propiedades indexadas deben tener el mismo tipo. @@ -4544,7 +4564,7 @@ Invalid record, sequence or computation expression. Sequence expressions should be of the form 'seq {{ ... }}' - Expresión de registro, secuencia o cómputo no válida. Las expresiones de secuencia deben tener el formato 'seq {{ ... }}'. + Expresión de registro, secuencia o cómputo no válida. Las expresiones de secuencia deben tener el formato 'seq {{ ... }}'. diff --git a/src/Compiler/xlf/FSComp.txt.fr.xlf b/src/Compiler/xlf/FSComp.txt.fr.xlf index 23e55fd1073..ba9075d9ad1 100644 --- a/src/Compiler/xlf/FSComp.txt.fr.xlf +++ b/src/Compiler/xlf/FSComp.txt.fr.xlf @@ -52,6 +52,11 @@ Cette expression est un enregistrement anonyme, utilisez {{|...|}} au lieu de {{...}}. + + This construct is deprecated. Sequence expressions should be of the form 'seq {{ ... }}' + This construct is deprecated. Sequence expressions should be of the form 'seq {{ ... }}' + + Duplicate parameter. The parameter '{0}' has been used more that once in this method. Paramètre dupliqué. Le paramètre « {0} » a été utilisé une fois de plus dans cette méthode. @@ -322,11 +327,21 @@ corriger pour résoudre les noms de types délégués, voir https://github.com/dotnet/fsharp/issues/10228 + + Deprecate places where 'seq' can be omitted + Deprecate places where 'seq' can be omitted + + discard pattern in use binding annuler le modèle dans la liaison d’utilisation + + Don't warn on uppercase identifiers in binding patterns + Don't warn on uppercase identifiers in binding patterns + + dotless float32 literal littéral float32 sans point @@ -617,6 +632,11 @@ Interopérabilité entre les contraintes génériques non gérées de C# et F# (émettre un modreq supplémentaire) + + Use type conversion cache during compilation + Use type conversion cache during compilation + + Indexed properties getter and setter must have the same type Les propriétés indexées getter et setter doivent avoir le même type @@ -4544,7 +4564,7 @@ Invalid record, sequence or computation expression. Sequence expressions should be of the form 'seq {{ ... }}' - Expression d'enregistrement, de séquence ou de calcul non valide. Les expressions de séquence doivent avoir le format 'seq {{ ... }}' + Expression d'enregistrement, de séquence ou de calcul non valide. Les expressions de séquence doivent avoir le format 'seq {{ ... }}' diff --git a/src/Compiler/xlf/FSComp.txt.it.xlf b/src/Compiler/xlf/FSComp.txt.it.xlf index 48d84054ff4..a3f3162dd51 100644 --- a/src/Compiler/xlf/FSComp.txt.it.xlf +++ b/src/Compiler/xlf/FSComp.txt.it.xlf @@ -52,6 +52,11 @@ Questa espressione è un record anonimo. Usa {{|...|}} invece di {{...}}. + + This construct is deprecated. Sequence expressions should be of the form 'seq {{ ... }}' + This construct is deprecated. Sequence expressions should be of the form 'seq {{ ... }}' + + Duplicate parameter. The parameter '{0}' has been used more that once in this method. Parametro duplicato. Il parametro '{0}' è stato utilizzato più volte in questo metodo. @@ -322,11 +327,21 @@ correggere la risoluzione dei nomi dei tipi delegati, vedere https://github.com/dotnet/fsharp/issues/10228 + + Deprecate places where 'seq' can be omitted + Deprecate places where 'seq' can be omitted + + discard pattern in use binding rimuovi criterio nell'utilizzo dell'associazione + + Don't warn on uppercase identifiers in binding patterns + Don't warn on uppercase identifiers in binding patterns + + dotless float32 literal valore letterale float32 senza punti @@ -617,6 +632,11 @@ Interoperabilità tra il vincolo generico non gestito di C# e di F# (crea un modreq aggiuntivo) + + Use type conversion cache during compilation + Use type conversion cache during compilation + + Indexed properties getter and setter must have the same type Il getter e il setter delle proprietà indicizzate devono avere lo stesso tipo @@ -4544,7 +4564,7 @@ Invalid record, sequence or computation expression. Sequence expressions should be of the form 'seq {{ ... }}' - Espressione di calcolo, sequenza o record non valida. Il formato delle espressioni sequenza deve essere 'seq {{ ... }}' + Espressione di calcolo, sequenza o record non valida. Il formato delle espressioni sequenza deve essere 'seq {{ ... }}' diff --git a/src/Compiler/xlf/FSComp.txt.ja.xlf b/src/Compiler/xlf/FSComp.txt.ja.xlf index ec3a88c534a..1a66387e693 100644 --- a/src/Compiler/xlf/FSComp.txt.ja.xlf +++ b/src/Compiler/xlf/FSComp.txt.ja.xlf @@ -52,6 +52,11 @@ この式は匿名レコードであり、{{...}} の代わりに {{|...|}} を使用してください。 + + This construct is deprecated. Sequence expressions should be of the form 'seq {{ ... }}' + This construct is deprecated. Sequence expressions should be of the form 'seq {{ ... }}' + + Duplicate parameter. The parameter '{0}' has been used more that once in this method. パラメーターが重複しています。パラメーター '{0}' は、このメソッドで 1 回以上使用されています。 @@ -322,11 +327,21 @@ デリゲート型名の解決を修正するには、https://github.com/dotnet/fsharp/issues/10228 を参照してください + + Deprecate places where 'seq' can be omitted + Deprecate places where 'seq' can be omitted + + discard pattern in use binding 使用バインドでパターンを破棄する + + Don't warn on uppercase identifiers in binding patterns + Don't warn on uppercase identifiers in binding patterns + + dotless float32 literal ドットなしの float32 リテラル @@ -617,6 +632,11 @@ C# と F# のアンマネージド ジェネリック制約の間の相互運用 (追加の modreq を出力) + + Use type conversion cache during compilation + Use type conversion cache during compilation + + Indexed properties getter and setter must have the same type インデックス付きプロパティのゲッターとセッターの型は同じである必要があります @@ -4544,7 +4564,7 @@ Invalid record, sequence or computation expression. Sequence expressions should be of the form 'seq {{ ... }}' - 無効なレコード、シーケンス式、またはコンピュテーション式です。シーケンス式は 'seq {{ ... }}' という形式にしてください。 + 無効なレコード、シーケンス式、またはコンピュテーション式です。シーケンス式は 'seq {{ ... }}' という形式にしてください。 diff --git a/src/Compiler/xlf/FSComp.txt.ko.xlf b/src/Compiler/xlf/FSComp.txt.ko.xlf index b54f74c62e5..9dc9726570a 100644 --- a/src/Compiler/xlf/FSComp.txt.ko.xlf +++ b/src/Compiler/xlf/FSComp.txt.ko.xlf @@ -52,6 +52,11 @@ 이 식은 익명 레코드입니다. {{...}} 대신 {{|...|}}을 사용하세요. + + This construct is deprecated. Sequence expressions should be of the form 'seq {{ ... }}' + This construct is deprecated. Sequence expressions should be of the form 'seq {{ ... }}' + + Duplicate parameter. The parameter '{0}' has been used more that once in this method. 매개 변수가 중복되었습니다. 이 메소드에서 매개 변수 '{0}'이(가) 두 번 이상 사용되었습니다. @@ -322,11 +327,21 @@ 대리자 형식 이름의 해결 방법을 수정합니다. https://github.com/dotnet/fsharp/issues/10228 참조하세요. + + Deprecate places where 'seq' can be omitted + Deprecate places where 'seq' can be omitted + + discard pattern in use binding 사용 중인 패턴 바인딩 무시 + + Don't warn on uppercase identifiers in binding patterns + Don't warn on uppercase identifiers in binding patterns + + dotless float32 literal 점이 없는 float32 리터럴 @@ -617,6 +632,11 @@ C#과 F#의 관리되지 않는 제네릭 제약 조건 간의 Interop(추가 modreq 내보내기) + + Use type conversion cache during compilation + Use type conversion cache during compilation + + Indexed properties getter and setter must have the same type 인덱싱된 속성 getter와 setter의 형식이 같아야 합니다. @@ -4544,7 +4564,7 @@ Invalid record, sequence or computation expression. Sequence expressions should be of the form 'seq {{ ... }}' - 레코드, 시퀀스 또는 계산 식이 잘못되었습니다. 시퀀스 식의 형식은 'seq {{ ... }}'여야 합니다. + 레코드, 시퀀스 또는 계산 식이 잘못되었습니다. 시퀀스 식의 형식은 'seq {{ ... }}'여야 합니다. diff --git a/src/Compiler/xlf/FSComp.txt.pl.xlf b/src/Compiler/xlf/FSComp.txt.pl.xlf index 0a6ca4c01d4..c11c0588bb4 100644 --- a/src/Compiler/xlf/FSComp.txt.pl.xlf +++ b/src/Compiler/xlf/FSComp.txt.pl.xlf @@ -52,6 +52,11 @@ To wyrażenie jest rekordem anonimowym. Użyj {{|...|}} zamiast {{...}}. + + This construct is deprecated. Sequence expressions should be of the form 'seq {{ ... }}' + This construct is deprecated. Sequence expressions should be of the form 'seq {{ ... }}' + + Duplicate parameter. The parameter '{0}' has been used more that once in this method. Zduplikowany parametr. Parametr „{0}” został użyty więcej niż raz w tej metodzie. @@ -322,11 +327,21 @@ naprawa rozpoznawania nazw typów delegatów, sprawdź stronę https://github.com/dotnet/fsharp/issues/10228 + + Deprecate places where 'seq' can be omitted + Deprecate places where 'seq' can be omitted + + discard pattern in use binding odrzuć wzorzec w powiązaniu użycia + + Don't warn on uppercase identifiers in binding patterns + Don't warn on uppercase identifiers in binding patterns + + dotless float32 literal bezkropkowy literał float32 @@ -617,6 +632,11 @@ Międzyoperacyjnie między niezarządzanym ograniczeniem ogólnym języka C# i F# (emituj dodatkowe modreq) + + Use type conversion cache during compilation + Use type conversion cache during compilation + + Indexed properties getter and setter must have the same type Metoda pobierająca i metoda ustawiająca właściwości indeksowanych muszą mieć taki sam typ. @@ -4544,7 +4564,7 @@ Invalid record, sequence or computation expression. Sequence expressions should be of the form 'seq {{ ... }}' - Nieprawidłowe wyrażenie rekordu, sekwencji lub obliczenia. Wyrażenia sekwencji powinny mieć postać „seq {{ ... }}” + Nieprawidłowe wyrażenie rekordu, sekwencji lub obliczenia. Wyrażenia sekwencji powinny mieć postać „seq {{ ... }}” diff --git a/src/Compiler/xlf/FSComp.txt.pt-BR.xlf b/src/Compiler/xlf/FSComp.txt.pt-BR.xlf index 2664ac9a79f..d312d8b1bd2 100644 --- a/src/Compiler/xlf/FSComp.txt.pt-BR.xlf +++ b/src/Compiler/xlf/FSComp.txt.pt-BR.xlf @@ -52,6 +52,11 @@ Esta expressão é um registro anônimo, use {{|...|}} em vez de {{...}}. + + This construct is deprecated. Sequence expressions should be of the form 'seq {{ ... }}' + This construct is deprecated. Sequence expressions should be of the form 'seq {{ ... }}' + + Duplicate parameter. The parameter '{0}' has been used more that once in this method. Parâmetro duplicado. O parâmetro '{0}' foi usado mais de uma vez neste método. @@ -322,11 +327,21 @@ corrigir para resolução de nomes de tipos delegados, consulte https://github.com/dotnet/fsharp/issues/10228 + + Deprecate places where 'seq' can be omitted + Deprecate places where 'seq' can be omitted + + discard pattern in use binding descartar o padrão em uso de associação + + Don't warn on uppercase identifiers in binding patterns + Don't warn on uppercase identifiers in binding patterns + + dotless float32 literal literal float32 sem ponto @@ -617,6 +632,11 @@ Interoperabilidade entre a restrição genérica não gerenciada de C# e F# (emitir modreq adicional) + + Use type conversion cache during compilation + Use type conversion cache during compilation + + Indexed properties getter and setter must have the same type As propriedades indexadas getter e setter devem ter o mesmo tipo @@ -4544,7 +4564,7 @@ Invalid record, sequence or computation expression. Sequence expressions should be of the form 'seq {{ ... }}' - Expressão de registro, sequência ou computação inválida. Expressões de sequência devem estar na forma 'seq {{ ... }}' + Expressão de registro, sequência ou computação inválida. Expressões de sequência devem estar na forma 'seq {{ ... }}' diff --git a/src/Compiler/xlf/FSComp.txt.ru.xlf b/src/Compiler/xlf/FSComp.txt.ru.xlf index c87714e23a5..ecd5d457014 100644 --- a/src/Compiler/xlf/FSComp.txt.ru.xlf +++ b/src/Compiler/xlf/FSComp.txt.ru.xlf @@ -52,6 +52,11 @@ Это выражение является анонимной записью. Используйте {{|...|}} вместо {{...}}. + + This construct is deprecated. Sequence expressions should be of the form 'seq {{ ... }}' + This construct is deprecated. Sequence expressions should be of the form 'seq {{ ... }}' + + Duplicate parameter. The parameter '{0}' has been used more that once in this method. Повторяющийся параметр. Параметр "{0}" использовался в этом методе несколько раз. @@ -322,11 +327,21 @@ исправить разрешение имен типов делегатов, см. https://github.com/dotnet/fsharp/issues/10228 + + Deprecate places where 'seq' can be omitted + Deprecate places where 'seq' can be omitted + + discard pattern in use binding шаблон отмены в привязке использования + + Don't warn on uppercase identifiers in binding patterns + Don't warn on uppercase identifiers in binding patterns + + dotless float32 literal литерал float32 без точки @@ -617,6 +632,11 @@ Взаимодействие между универсальным ограничением "unmanaged" C# и F#(создание дополнительного modreq) + + Use type conversion cache during compilation + Use type conversion cache during compilation + + Indexed properties getter and setter must have the same type Методы получения и установки индексированных свойств должны иметь один и тот же тип. @@ -4544,7 +4564,7 @@ Invalid record, sequence or computation expression. Sequence expressions should be of the form 'seq {{ ... }}' - Недопустимая запись, выражение последовательности или вычислительное выражение. Выражения последовательностей должны иметь форму "seq {{ ... }}' + Недопустимая запись, выражение последовательности или вычислительное выражение. Выражения последовательностей должны иметь форму "seq {{ ... }}' diff --git a/src/Compiler/xlf/FSComp.txt.tr.xlf b/src/Compiler/xlf/FSComp.txt.tr.xlf index 3e5d3466a95..bfdb14af2db 100644 --- a/src/Compiler/xlf/FSComp.txt.tr.xlf +++ b/src/Compiler/xlf/FSComp.txt.tr.xlf @@ -52,6 +52,11 @@ Bu ifade, anonim bir kayıt, {{...}} yerine {{|...|}} kullanın. + + This construct is deprecated. Sequence expressions should be of the form 'seq {{ ... }}' + This construct is deprecated. Sequence expressions should be of the form 'seq {{ ... }}' + + Duplicate parameter. The parameter '{0}' has been used more that once in this method. Yinelenen parametre. '{0}' parametresi bu metotta bir kereden fazla kullanıldı. @@ -322,11 +327,21 @@ temsilci türü adlarının çözümlenmesiyle ilgili sorunun çözümü için bkz. https://github.com/dotnet/fsharp/issues/10228 + + Deprecate places where 'seq' can be omitted + Deprecate places where 'seq' can be omitted + + discard pattern in use binding kullanım bağlamasında deseni at + + Don't warn on uppercase identifiers in binding patterns + Don't warn on uppercase identifiers in binding patterns + + dotless float32 literal noktasız float32 sabit değeri @@ -617,6 +632,11 @@ C# ile F#' arasında yönetilmeyen genel kısıtlama (ek modreq yayın) + + Use type conversion cache during compilation + Use type conversion cache during compilation + + Indexed properties getter and setter must have the same type Dizini oluşturulmuş özelliklerin alıcısı ve ayarlayıcısı aynı türde olmalıdır @@ -4544,7 +4564,7 @@ Invalid record, sequence or computation expression. Sequence expressions should be of the form 'seq {{ ... }}' - Geçersiz kayıt, dizi veya hesaplama ifadesi. Dizi ifadeleri 'seq {{ ... }}' biçiminde olmalıdır + Geçersiz kayıt, dizi veya hesaplama ifadesi. Dizi ifadeleri 'seq {{ ... }}' biçiminde olmalıdır diff --git a/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf b/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf index c2d667e4fea..4f1e9f17551 100644 --- a/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf +++ b/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf @@ -52,6 +52,11 @@ 此表达式是匿名记录，请使用 {{|...|}} 而不是 {{...}}。 + + This construct is deprecated. Sequence expressions should be of the form 'seq {{ ... }}' + This construct is deprecated. Sequence expressions should be of the form 'seq {{ ... }}' + + Duplicate parameter. The parameter '{0}' has been used more that once in this method. 参数重复。此方法中多次使用了参数“{0}”。 @@ -322,11 +327,21 @@ 修复了委托类型名称的解析，请参阅 https://github.com/dotnet/fsharp/issues/10228 + + Deprecate places where 'seq' can be omitted + Deprecate places where 'seq' can be omitted + + discard pattern in use binding 放弃使用绑定模式 + + Don't warn on uppercase identifiers in binding patterns + Don't warn on uppercase identifiers in binding patterns + + dotless float32 literal 无点 float32 文本 @@ -617,6 +632,11 @@ C# 和 F# 的非托管泛型约束之间的互操作(发出额外的 modreq) + + Use type conversion cache during compilation + Use type conversion cache during compilation + + Indexed properties getter and setter must have the same type 索引属性 getter 和 setter 必须具有相同的类型 @@ -4544,7 +4564,7 @@ Invalid record, sequence or computation expression. Sequence expressions should be of the form 'seq {{ ... }}' - 记录、序列或计算表达式无效。序列表达式的格式应为“seq {{ ... }}” + 记录、序列或计算表达式无效。序列表达式的格式应为“seq {{ ... }}” diff --git a/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf b/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf index cc73e3a05c6..595d94d852a 100644 --- a/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf +++ b/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf @@ -52,6 +52,11 @@ 此運算式是匿名記錄，請使用 {{|...|}} 而不是 {{...}}。 + + This construct is deprecated. Sequence expressions should be of the form 'seq {{ ... }}' + This construct is deprecated. Sequence expressions should be of the form 'seq {{ ... }}' + + Duplicate parameter. The parameter '{0}' has been used more that once in this method. 重複的參數。參數 '{0}' 在此方法中使用多次。 @@ -322,11 +327,21 @@ 修正委派類型名稱的解析，請參閱 https://github.com/dotnet/fsharp/issues/10228 + + Deprecate places where 'seq' can be omitted + Deprecate places where 'seq' can be omitted + + discard pattern in use binding 捨棄使用繫結中的模式 + + Don't warn on uppercase identifiers in binding patterns + Don't warn on uppercase identifiers in binding patterns + + dotless float32 literal 無點號的 float32 常值 @@ -617,6 +632,11 @@ C# 與 F# 的非受控泛型條件約束之間的 Interop (發出額外的 modreq) + + Use type conversion cache during compilation + Use type conversion cache during compilation + + Indexed properties getter and setter must have the same type 索引屬性 getter 和 setter 必須具有相同的類型 @@ -4544,7 +4564,7 @@ Invalid record, sequence or computation expression. Sequence expressions should be of the form 'seq {{ ... }}' - 無效的記錄、循序項或計算運算式。循序項運算式應該是 'seq {{ ... }}' 形式。 + 無效的記錄、循序項或計算運算式。循序項運算式應該是 'seq {{ ... }}' 形式。 diff --git a/src/Compiler/xlf/FSStrings.cs.xlf b/src/Compiler/xlf/FSStrings.cs.xlf index 86a6be9d7e0..20b53f76f45 100644 --- a/src/Compiler/xlf/FSStrings.cs.xlf +++ b/src/Compiler/xlf/FSStrings.cs.xlf @@ -154,7 +154,7 @@ Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name. - Identifikátory proměnných psané velkými písmeny se ve vzorech obecně nedoporučují. Můžou označovat chybějící otevřenou deklaraci nebo špatně napsaný název vzoru. + Identifikátory proměnných psané velkými písmeny se ve vzorech obecně nedoporučují. Můžou označovat chybějící otevřenou deklaraci nebo špatně napsaný název vzoru. diff --git a/src/Compiler/xlf/FSStrings.de.xlf b/src/Compiler/xlf/FSStrings.de.xlf index 3b7f46a9769..f58d3a4711d 100644 --- a/src/Compiler/xlf/FSStrings.de.xlf +++ b/src/Compiler/xlf/FSStrings.de.xlf @@ -154,7 +154,7 @@ Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name. - Variablenbezeichner in Großbuchstaben sollten im Allgemeinen nicht in Mustern verwendet werden und können ein Hinweis auf eine fehlende open-Deklaration oder einen falsch geschriebenen Musternamen sein. + Variablenbezeichner in Großbuchstaben sollten im Allgemeinen nicht in Mustern verwendet werden und können ein Hinweis auf eine fehlende open-Deklaration oder einen falsch geschriebenen Musternamen sein. diff --git a/src/Compiler/xlf/FSStrings.es.xlf b/src/Compiler/xlf/FSStrings.es.xlf index f2b6d8ed1ca..88a130d699d 100644 --- a/src/Compiler/xlf/FSStrings.es.xlf +++ b/src/Compiler/xlf/FSStrings.es.xlf @@ -154,7 +154,7 @@ Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name. - En general, los identificadores de variables en mayúscula no deben usarse en patrones y pueden indicar una declaración abierta que falta o un nombre de patrón mal escrito. + En general, los identificadores de variables en mayúscula no deben usarse en patrones y pueden indicar una declaración abierta que falta o un nombre de patrón mal escrito. diff --git a/src/Compiler/xlf/FSStrings.fr.xlf b/src/Compiler/xlf/FSStrings.fr.xlf index f3621e55e63..7d7badde4ed 100644 --- a/src/Compiler/xlf/FSStrings.fr.xlf +++ b/src/Compiler/xlf/FSStrings.fr.xlf @@ -154,7 +154,7 @@ Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name. - Les identificateurs de variables en majuscules ne doivent généralement pas être utilisés dans les modèles. Ils peuvent indiquer une absence de déclaration open ou un nom de modèle mal orthographié. + Les identificateurs de variables en majuscules ne doivent généralement pas être utilisés dans les modèles. Ils peuvent indiquer une absence de déclaration open ou un nom de modèle mal orthographié. diff --git a/src/Compiler/xlf/FSStrings.it.xlf b/src/Compiler/xlf/FSStrings.it.xlf index d67bbd27dca..f43c8e77851 100644 --- a/src/Compiler/xlf/FSStrings.it.xlf +++ b/src/Compiler/xlf/FSStrings.it.xlf @@ -154,7 +154,7 @@ Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name. - In genere è consigliabile non usare identificatori di variabili scritti in maiuscolo nei criteri perché potrebbero indicare una dichiarazione OPEN mancante o un nome di criterio con ortografia errata. + In genere è consigliabile non usare identificatori di variabili scritti in maiuscolo nei criteri perché potrebbero indicare una dichiarazione OPEN mancante o un nome di criterio con ortografia errata. diff --git a/src/Compiler/xlf/FSStrings.ja.xlf b/src/Compiler/xlf/FSStrings.ja.xlf index 486c2fac349..6f0a3a978e9 100644 --- a/src/Compiler/xlf/FSStrings.ja.xlf +++ b/src/Compiler/xlf/FSStrings.ja.xlf @@ -154,7 +154,7 @@ Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name. - 通常、大文字の変数識別子はパターンに使用できません。また、欠落している open 宣言か、つづりが間違っているパターン名を示す可能性があります。 + 通常、大文字の変数識別子はパターンに使用できません。また、欠落している open 宣言か、つづりが間違っているパターン名を示す可能性があります。 diff --git a/src/Compiler/xlf/FSStrings.ko.xlf b/src/Compiler/xlf/FSStrings.ko.xlf index 506b9b9e2de..43e0a0f1739 100644 --- a/src/Compiler/xlf/FSStrings.ko.xlf +++ b/src/Compiler/xlf/FSStrings.ko.xlf @@ -154,7 +154,7 @@ Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name. - 일반적으로 대문자 변수 식별자는 패턴에 사용하지 말아야 합니다. 이러한 식별자는 열려 있는 선언이 없거나 철자가 잘못된 패턴 이름을 나타낼 수 있습니다. + 일반적으로 대문자 변수 식별자는 패턴에 사용하지 말아야 합니다. 이러한 식별자는 열려 있는 선언이 없거나 철자가 잘못된 패턴 이름을 나타낼 수 있습니다. diff --git a/src/Compiler/xlf/FSStrings.pl.xlf b/src/Compiler/xlf/FSStrings.pl.xlf index 30f8155bfc8..3096fca8dbf 100644 --- a/src/Compiler/xlf/FSStrings.pl.xlf +++ b/src/Compiler/xlf/FSStrings.pl.xlf @@ -154,7 +154,7 @@ Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name. - Identyfikatory zmiennych pisane wielkimi literami nie powinny być na ogół używane we wzorcach i mogą oznaczać brak deklaracji otwierającej lub błąd pisowni w nazwie wzorca. + Identyfikatory zmiennych pisane wielkimi literami nie powinny być na ogół używane we wzorcach i mogą oznaczać brak deklaracji otwierającej lub błąd pisowni w nazwie wzorca. diff --git a/src/Compiler/xlf/FSStrings.pt-BR.xlf b/src/Compiler/xlf/FSStrings.pt-BR.xlf index cf7e3a94822..ea48f4c3545 100644 --- a/src/Compiler/xlf/FSStrings.pt-BR.xlf +++ b/src/Compiler/xlf/FSStrings.pt-BR.xlf @@ -154,7 +154,7 @@ Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name. - Identificadores de variáveis em maiúsculas geralmente não devem ser usados em padrões, podendo indicar uma declaração aberta ausente ou um nome de padrão escrito incorretamente. + Identificadores de variáveis em maiúsculas geralmente não devem ser usados em padrões, podendo indicar uma declaração aberta ausente ou um nome de padrão escrito incorretamente. diff --git a/src/Compiler/xlf/FSStrings.ru.xlf b/src/Compiler/xlf/FSStrings.ru.xlf index 34278a4b234..7cb20b5e8de 100644 --- a/src/Compiler/xlf/FSStrings.ru.xlf +++ b/src/Compiler/xlf/FSStrings.ru.xlf @@ -154,7 +154,7 @@ Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name. - Идентификаторы переменных в верхнем регистре обычно не должны использоваться в шаблонах, и могут указывать на отсутствующую открытую декларацию или неправильно написанное имя шаблона. + Идентификаторы переменных в верхнем регистре обычно не должны использоваться в шаблонах, и могут указывать на отсутствующую открытую декларацию или неправильно написанное имя шаблона. diff --git a/src/Compiler/xlf/FSStrings.tr.xlf b/src/Compiler/xlf/FSStrings.tr.xlf index a2601885c52..9c65fabe248 100644 --- a/src/Compiler/xlf/FSStrings.tr.xlf +++ b/src/Compiler/xlf/FSStrings.tr.xlf @@ -154,7 +154,7 @@ Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name. - Büyük harfli değişken tanımlayıcıları desenlerde genel olarak kullanılmamalıdır. Bunlar, eksik bir açık bildirimin veya yanlış yazılmış bir desen adının göstergesi olabilirler. + Büyük harfli değişken tanımlayıcıları desenlerde genel olarak kullanılmamalıdır. Bunlar, eksik bir açık bildirimin veya yanlış yazılmış bir desen adının göstergesi olabilirler. diff --git a/src/Compiler/xlf/FSStrings.zh-Hans.xlf b/src/Compiler/xlf/FSStrings.zh-Hans.xlf index 66a54f3d2bb..c895f08ec60 100644 --- a/src/Compiler/xlf/FSStrings.zh-Hans.xlf +++ b/src/Compiler/xlf/FSStrings.zh-Hans.xlf @@ -154,7 +154,7 @@ Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name. - 通常不得在模式中使用大写的变量标识符，存在它们可能表示缺少某个开放声明或某个模式名称拼写错误。 + 通常不得在模式中使用大写的变量标识符，存在它们可能表示缺少某个开放声明或某个模式名称拼写错误。 diff --git a/src/Compiler/xlf/FSStrings.zh-Hant.xlf b/src/Compiler/xlf/FSStrings.zh-Hant.xlf index 35280cee60f..d81a539866e 100644 --- a/src/Compiler/xlf/FSStrings.zh-Hant.xlf +++ b/src/Compiler/xlf/FSStrings.zh-Hant.xlf @@ -154,7 +154,7 @@ Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name. - 通常不應在樣式中使用大寫的變數識別碼。這可能表示缺少公開宣告或樣式名稱拼字錯誤。 + 通常不應在樣式中使用大寫的變數識別碼。這可能表示缺少公開宣告或樣式名稱拼字錯誤。 diff --git a/src/FSharp.Build/Fsc.fs b/src/FSharp.Build/Fsc.fs index 25cdbd34195..ccbece545d5 100644 --- a/src/FSharp.Build/Fsc.fs +++ b/src/FSharp.Build/Fsc.fs @@ -49,6 +49,7 @@ type public Fsc() as this = let mutable otherFlags: string MaybeNull = null let mutable outputAssembly: string MaybeNull = null let mutable outputRefAssembly: string MaybeNull = null + let mutable parallelCompilation: bool option = None let mutable pathMap: string MaybeNull = null let mutable pdbFile: string MaybeNull = null let mutable platform: string MaybeNull = null @@ -202,6 +203,7 @@ type public Fsc() as this = if not tailcalls then builder.AppendSwitch("--tailcalls-") + // Nullables match nullable with | Some true -> builder.AppendSwitch("--checknulls+") @@ -345,6 +347,8 @@ type public Fsc() as this = if deterministic then builder.AppendSwitch("--deterministic+") + builder.AppendOptionalSwitch("--parallelcompilation", parallelCompilation) + // OtherFlags - must be second-to-last builder.AppendSwitchUnquotedIfNotNull("", otherFlags) capturedArguments <- builder.CapturedArguments() @@ -504,6 +508,10 @@ type public Fsc() as this = with get () = outputRefAssembly and set (s) = outputRefAssembly <- s + member _.ParallelCompilation + with get () = parallelCompilation |> Option.defaultValue false + and set (p) = parallelCompilation <- Some p + // --pathmap : Paths to rewrite when producing deterministic builds member _.PathMap with get () = pathMap diff --git a/src/FSharp.Build/Microsoft.FSharp.NetSdk.props b/src/FSharp.Build/Microsoft.FSharp.NetSdk.props index 71dfca26382..38d83cd8ab4 100644 --- a/src/FSharp.Build/Microsoft.FSharp.NetSdk.props +++ b/src/FSharp.Build/Microsoft.FSharp.NetSdk.props @@ -50,6 +50,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and true true false + diff --git a/src/FSharp.Build/Microsoft.FSharp.Targets b/src/FSharp.Build/Microsoft.FSharp.Targets index 7334f979086..a1385f6aff2 100644 --- a/src/FSharp.Build/Microsoft.FSharp.Targets +++ b/src/FSharp.Build/Microsoft.FSharp.Targets @@ -380,6 +380,7 @@ this file. OtherFlags="$(FscOtherFlags)" OutputAssembly="@(IntermediateAssembly)" OutputRefAssembly="@(IntermediateRefAssembly)" + ParallelCompilation="@(ParallelCompilation)" PathMap="$(PathMap)" PdbFile="$(PdbFile)" Platform="$(PlatformTarget)" diff --git a/src/FSharp.Core/mailbox.fs b/src/FSharp.Core/mailbox.fs index a938263a05b..a6fdd418e26 100644 --- a/src/FSharp.Core/mailbox.fs +++ b/src/FSharp.Core/mailbox.fs @@ -340,10 +340,11 @@ type Mailbox<'Msg>(cancellationSupported: bool, isThrowExceptionAfterDisposed: b inboxStore.Clear() arrivals.Clear() - isDisposed <- true) + isDisposed <- true - if isNotNull pulse then - (pulse :> IDisposable).Dispose() + if isNotNull pulse then + (pulse :> IDisposable).Dispose() + pulse <- null) #if DEBUG member x.UnsafeContents = (x.inbox, arrivals, pulse, savedCont) |> box diff --git a/src/fsi/fsimain.fs b/src/fsi/fsimain.fs index c13f37c11bc..4b9e92704a7 100644 --- a/src/fsi/fsimain.fs +++ b/src/fsi/fsimain.fs @@ -358,16 +358,6 @@ let evaluateSession (argv: string[]) = let MainMain argv = ignore argv let argv = System.Environment.GetCommandLineArgs() - let savedOut = Console.Out - - use __ = - { new IDisposable with - member _.Dispose() = - try - Console.SetOut(savedOut) - with _ -> - () - } let timesFlag = argv |> Array.exists (fun x -> x = "/times" || x = "--times") diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Line.fs b/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Line.fs index 4844fb232b3..105670d1adb 100644 --- a/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Line.fs +++ b/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Line.fs @@ -2,16 +2,20 @@ namespace CompilerDirectives open Microsoft.FSharp.Control open Xunit -open FSharp.Test.Compiler +open Internal.Utilities +open FSharp.Compiler open FSharp.Compiler.CodeAnalysis -open FSharp.Compiler.Text +open FSharp.Compiler.DiagnosticsLogger +open FSharp.Compiler.Features +open FSharp.Compiler.Lexhelp open FSharp.Compiler.Syntax +open FSharp.Compiler.Text +open FSharp.Compiler.UnicodeLexing module Line = - let checker = FSharpChecker.Create() - let parse (source: string) = + let checker = FSharpChecker.Create() let langVersion = "preview" let sourceFileName = __SOURCE_FILE__ let parsingOptions = @@ -63,4 +67,51 @@ printfn "" | ParsedInput.SigFile _ -> failwith "unexpected: sig file" if exprRange <> expectedRange then failwith $"case{case}: expected: {expectedRange}, found {exprRange}" - \ No newline at end of file + + + + + + let private getTokens sourceText = + let langVersion = LanguageVersion.Default + let lexargs = + mkLexargs ( + [], + IndentationAwareSyntaxStatus(true, false), + LexResourceManager(), + [], + DiscardErrorsLogger, + PathMap.empty, + true + ) + let lexbuf = StringAsLexbuf(true, langVersion, None, sourceText) + resetLexbufPos "test.fs" lexbuf + let tokenizer _ = + let t = Lexer.token lexargs true lexbuf + let p = lexbuf.StartPos + t, FileIndex.fileOfFileIndex p.FileIndex, p.OriginalLine, p.Line + let isNotEof(t,_,_,_) = match t with Parser.EOF _ -> false | _ -> true + Seq.initInfinite tokenizer |> Seq.takeWhile isNotEof |> Seq.toList + + let private code = """ +1 +#line 5 "other.fs" +2 +#line 10 "test.fs" +3 +""" + + let private expected = [ + "test.fs", 2, 2 + "other.fs", 4, 5 + "test.fs", 6, 10 + ] + + [] + let checkOriginalLineNumbers() = + let tokens = getTokens code + Assert.Equal(expected.Length, tokens.Length) + for ((e_idx, e_oLine, e_line), (_, idx, oLine, line)) in List.zip expected tokens do + Assert.Equal(e_idx, idx) + Assert.Equal(e_oLine, oLine) + Assert.Equal(e_line, line) diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/NonStringArgs.fs b/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/NonStringArgs.fs index d9838581591..ff3080d9e62 100644 --- a/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/NonStringArgs.fs +++ b/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/NonStringArgs.fs @@ -29,9 +29,8 @@ module NonStringArgs = (Error 3350, Line 3, Col 9, Line 3, Col 11, "Feature '# directives with non-quoted string arguments' is not available in F# 8.0. Please use language version 9.0 or greater.") (Error 3350, Line 4, Col 9, Line 4, Col 15, "Feature '# directives with non-quoted string arguments' is not available in F# 8.0. Please use language version 9.0 or greater.") (Error 3350, Line 5, Col 9, Line 5, Col 13, "Feature '# directives with non-quoted string arguments' is not available in F# 8.0. Please use language version 9.0 or greater.") - (Warning 203, Line 6, Col 9, Line 6, Col 13, "Invalid warning number 'FS'") - (Warning 203, Line 7, Col 9, Line 7, Col 17, "Invalid warning number 'FSBLAH'") - (Warning 203, Line 8, Col 9, Line 8, Col 15, "Invalid warning number 'ACME'") + (Warning 203, Line 6, Col 9, Line 6, Col 13, "Invalid warning number 'FS'"); + (Warning 203, Line 7, Col 9, Line 7, Col 17, "Invalid warning number 'FSBLAH'"); else (Warning 203, Line 3, Col 9, Line 3, Col 11, "Invalid warning number 'FS'"); (Warning 203, Line 4, Col 9, Line 4, Col 15, "Invalid warning number 'FSBLAH'"); @@ -41,6 +40,7 @@ module NonStringArgs = (Warning 203, Line 8, Col 9, Line 8, Col 15, "Invalid warning number 'ACME'") ] + [] [] [] @@ -60,9 +60,8 @@ module NonStringArgs = (Error 3350, Line 3, Col 9, Line 3, Col 11, "Feature '# directives with non-quoted string arguments' is not available in F# 8.0. Please use language version 9.0 or greater.") (Error 3350, Line 3, Col 12, Line 3, Col 18, "Feature '# directives with non-quoted string arguments' is not available in F# 8.0. Please use language version 9.0 or greater.") (Error 3350, Line 3, Col 19, Line 3, Col 23, "Feature '# directives with non-quoted string arguments' is not available in F# 8.0. Please use language version 9.0 or greater.") - (Warning 203, Line 3, Col 24, Line 3, Col 28, "Invalid warning number 'FS'") - (Warning 203, Line 3, Col 29, Line 3, Col 37, "Invalid warning number 'FSBLAH'") - (Warning 203, Line 3, Col 38, Line 3, Col 44, "Invalid warning number 'ACME'") + (Warning 203, Line 3, Col 24, Line 3, Col 28, "Invalid warning number 'FS'"); + (Warning 203, Line 3, Col 29, Line 3, Col 37, "Invalid warning number 'FSBLAH'"); else (Warning 203, Line 3, Col 9, Line 3, Col 11, "Invalid warning number 'FS'"); (Warning 203, Line 3, Col 12, Line 3, Col 18, "Invalid warning number 'FSBLAH'"); @@ -119,6 +118,25 @@ module DoBinding = |> shouldSucceed + [] + [] + [] + let ``#nowarn - errors - compiler options`` (languageVersion) = + + FSharp """ +match None with None -> () // creates FS0025 - ignored due to flag +"" // creates FS0020 - ignored due to flag + """ // creates FS0988 - not ignored, different flag prefix + |> withLangVersion languageVersion + |> withOptions ["--nowarn:NU0988"; "--nowarn:FS25"; "--nowarn:20"; "--nowarn:FS"; "--nowarn:FSBLAH"] + |> asExe + |> compile + |> shouldFail + |> withDiagnostics [ + (Warning 988, Line 3, Col 3, Line 3, Col 3, "Main module of program is empty: nothing will happen when it is run") + ] + + [] [] [] diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Nowarn.fs b/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Nowarn.fs index c2ec463fd0d..11c441e0248 100644 --- a/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Nowarn.fs +++ b/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Nowarn.fs @@ -9,20 +9,20 @@ open System.Text module Nowarn = - let private intro = "module A" let private nowarn n = $"#nowarn {n}" let private warnon n = $"#warnon {n}" let private line1 = """#line 1 "some.fsy" """ let private line10 = """#line 10 "some.fsy" """ let private make20 = "1" let private make25 = "match None with None -> ()" - let private subIntro = ["namespace A"; "module B ="] + let private W20 = Warning 20 let private vp = "PREVIEW" let private v9 = "9.0" let private fs = String.concat Environment.NewLine >> FsSource - let private fsSubModule lines = subIntro @ (lines |> List.map (fun s -> " " + s)) |> fs - let private fsi = String.concat System.Environment.NewLine >> FsiSource - let private fsx = String.concat System.Environment.NewLine >> FsxSourceCode + let private fsMod lines = fs ("module A" :: lines) + let private fsSub lines = fs ("namespace A" :: "module B =" :: (lines |> List.map (fun s -> " " + s))) + let private fsi = String.concat Environment.NewLine >> FsiSource + let private fsx = String.concat Environment.NewLine >> FsxSourceCode let private fsiSource44 = [ "namespace A" @@ -50,46 +50,50 @@ module Nowarn = let private testData = [ - vp, [], [fs [intro; make20]], [Warning 20, 2] - vp, [], [fs [intro; nowarn 20; make20]], [] - vp, [], [fs [intro; "#nowarn 20;;"; make20]], [] - vp, [], [fs [intro; make20; nowarn 20; make20; warnon 20; make20]], [Warning 20, 2; Warning 20, 6] - v9, [], [fs [intro; make20; nowarn 20; make20; warnon 20; make20]], [Error 3350, 5] - vp, [], [fs [intro; nowarn 20; line1; make20]], [] - v9, [], [fs [intro; nowarn 20; line1; make20]], [] // warning in real v9 - vp, [], [fs [intro; nowarn 20; line10; make20]], [] - v9, [], [fs [intro; nowarn 20; line10; make20]], [] - vp, [], [fs [intro; nowarn 20; line1; make20; warnon 20; make20]], [] // this will change if we go for the proposed RFC - v9, [], [fs [intro; nowarn 20; line1; make20; warnon 20; make20]], [Error 3350, 2] - vp, ["--nowarn:20"], [fs [intro; make20]], [] - v9, ["--nowarn:20"], [fs [intro; make20]], [] - vp, ["--nowarn:20"], [fs [intro; warnon 20; make20]], [Warning 20, 3] - v9, ["--nowarn:20"], [fs [intro; warnon 20; make20]], [Error 3350, 2] - vp, ["--warnon:3579"], [fs [intro; """ignore $"{1}" """]], [Warning 3579, 2] - v9, ["--warnon:3579"], [fs [intro; """ignore $"{1}" """]], [Warning 3579, 2] - vp, [], [fs [intro; "#warnon 3579"; """ignore $"{1}" """]], [Warning 3579, 3] - v9, [], [fs [intro; "#warnon 3579"; """ignore $"{1}" """]], [Error 3350, 2] - vp, ["--warnaserror"], [fs [intro; make20]], [Error 20, 2] - vp, ["--warnaserror"; "--nowarn:20"], [fs [intro; make20]], [] - vp, ["--warnaserror"; "--nowarn:20"], [fs [intro; warnon 20; make20]], [Error 20, 3] - v9, ["--warnaserror"; "--nowarn:20"], [fs [intro; warnon 20; make20]], [Error 3350, 2] - vp, ["--warnaserror"], [fs [intro; nowarn 20; make20]], [] - vp, ["--warnaserror"; "--warnaserror-:20"], [fs [intro; make20]], [Warning 20, 2] - vp, ["--warnaserror:20"], [fs [intro; nowarn 20; make20]], [] - vp, [], [fsSubModule [nowarn 20; make20]], [] - v9, [], [fsSubModule [nowarn 20; make20]], [Warning 236, 3] - vp, [], [fsSubModule [make20; nowarn 20; make20; warnon 20; make20]], [Warning 20, 3; Warning 20, 7] - v9, [], [fsSubModule [make20; nowarn 20; make20; warnon 20; make20]], [Error 3350, 6] + vp, [], [fsMod [make20]], [W20, 2] + vp, [], [fsMod [nowarn 20; make20]], [] + vp, [], [fsMod ["#nowarn 20;;"; make20]], [] + vp, [], [fsMod [make20; nowarn 20; make20; warnon 20; make20]], [W20, 2; W20, 6] + v9, [], [fsMod [make20; nowarn 20; make20; warnon 20; make20]], [Error 3350, 5] + vp, [], [fsMod [nowarn 20; line1; make20]], [] + v9, [], [fsMod [nowarn 20; line1; make20]], [] + vp, [], [fsMod [nowarn 20; line10; make20]], [] + v9, [], [fsMod [nowarn 20; line10; make20]], [] + vp, [], [fsMod [nowarn 20; line1; make20; warnon 20; make20]], [W20, 3] + v9, [], [fsMod [nowarn 20; line1; make20; warnon 20; make20]], [Error 3350, 2] + vp, ["--nowarn:20"], [fsMod [make20]], [] + v9, ["--nowarn:20"], [fsMod [make20]], [] + vp, ["--nowarn:20"], [fsMod [warnon 20; make20]], [W20, 3] + v9, ["--nowarn:20"], [fsMod [warnon 20; make20]], [Error 3350, 2] + vp, ["--warnon:3579"], [fsMod ["""ignore $"{1}" """]], [Warning 3579, 2] + v9, ["--warnon:3579"], [fsMod ["""ignore $"{1}" """]], [Warning 3579, 2] + vp, [], [fsMod ["#warnon 3579"; """ignore $"{1}" """]], [Warning 3579, 3] + v9, [], [fsMod ["#warnon 3579"; """ignore $"{1}" """]], [Error 3350, 2] + vp, ["--warnaserror"], [fsMod [make20]], [Error 20, 2] + vp, ["--warnaserror"; "--nowarn:20"], [fsMod [make20]], [] + vp, ["--warnaserror"; "--nowarn:20"], [fsMod [warnon 20; make20]], [Error 20, 3] + v9, ["--warnaserror"; "--nowarn:20"], [fsMod [warnon 20; make20]], [Error 3350, 2] + vp, ["--warnaserror"], [fsMod [nowarn 20; make20]], [] + vp, ["--warnaserror"; "--warnaserror-:20"], [fsMod [make20]], [W20, 2] + vp, ["--warnaserror:20"], [fsMod [nowarn 20; make20]], [] + vp, [], [fsSub [nowarn 20; make20]], [] + v9, [], [fsSub [nowarn 20; make20]], [Warning 236, 3; W20, 4] + vp, [], [fsSub [make20; nowarn 20; make20; warnon 20; make20]], [W20, 3; W20, 7] + v9, [], [fsSub [make20; nowarn 20; make20; warnon 20; make20]], [Warning 236, 4; Warning 236, 6; W20, 3; W20, 5; W20, 7] vp, [], [fsi fsiSource44; fs fsSource44], [Warning 44, 4; Warning 44, 8] v9, [], [fsi fsiSource44; fs fsSource44], [Error 3350, 7] - vp, [], [fsx [intro; make20; nowarn 20; make20; warnon 20; make20]], [] // 20 is not checked in scripts - vp, [], [fsx [intro; make25; nowarn 25; make25; warnon 25; make25]], [Warning 25, 2; Warning 25, 6] - v9, [], [fsx [intro; make25; nowarn 25; make25; warnon 25; make25]], [Error 3350, 5] - vp, [], [fs [intro; "let x ="; nowarn 20; " 1"; warnon 20; " 2"; " 3"; "4"]], [Warning 20, 6; Warning 20, 8] - vp, [], [fs [intro; nowarn 20; nowarn 20; warnon 20; make20]], [Information 3875, 3; Warning 20, 5] - vp, [], [fs [intro; nowarn 20; warnon 20; warnon 20; make20]], [Warning 3875, 4; Warning 20, 5] - vp, ["--warnon:3875"], [fs [intro; nowarn 20; nowarn 20; warnon 20; make20]], [Warning 3875, 3; Warning 20, 5] - vp, [], [fs [intro; "#nowarn \"\"\"20\"\"\" "; make20]], [] + vp, [], [fsx ["module A"; make20; nowarn 20; make20; warnon 20; make20]], [] // 20 is not checked in scripts + vp, [], [fsx ["module A"; make25; nowarn 25; make25; warnon 25; make25]], [Warning 25, 2; Warning 25, 6] + v9, [], [fsx ["module A"; make25; nowarn 25; make25; warnon 25; make25]], [Error 3350, 5] + vp, [], [fsMod ["let x ="; nowarn 20; " 1"; warnon 20; " 2"; " 3"; "4"]], [W20, 6; W20, 8] + vp, [], [fsMod [nowarn 20; nowarn 20; warnon 20; make20]], [Information 3876, 3; W20, 5] + vp, [], [fsMod [nowarn 20; warnon 20; warnon 20; make20]], [Warning 3876, 4; W20, 5] + vp, ["--warnon:3876"], [fsMod [nowarn 20; nowarn 20; warnon 20; make20]], [Warning 3876, 3; W20, 5] + vp, [], [fsMod ["#nowarn \"\"\"20\"\"\" "; make20]], [] + vp, [], [fsMod ["#nowarnx 20"; make20]], [Error 3353, 2] + vp, [], [fsMod ["#nowarn 20 // comment"; make20]], [] + vp, [], [fsMod ["#nowarn"; make20]], [Error 3875, 2] + vp, [], [fsMod ["let a = 1; #nowarn 20"; make20]], [Error 3874, 2] ] |> List.mapi (fun i (v, fl, sources, diags) -> [| box (i + 1) @@ -107,7 +111,7 @@ module Nowarn = expected.Length <> actual.Length || (List.zip expected actual |> List.exists(fun((error, line), d) -> error <> d.Error || line <> d.Range.StartLine)) - let withDiags testId langVersion flags (sources: SourceCodeFileKind list) (expected: (ErrorType * int) list) (result: CompilationResult) = + let private withDiags testId langVersion flags (sources: SourceCodeFileKind list) (expected: (ErrorType * int) list) (result: CompilationResult) = let actual = result.Output.Diagnostics if testFailed expected actual then let sb = new StringBuilder() @@ -141,3 +145,17 @@ module Nowarn = |> withOptions flags |> compile |> withDiags testId langVersion flags sources (Array.toList expectedDiags) + + [] + let warnDirectiveArgRange() = + FSharp """ +module A +#nowarn xy "abx" +let a = 1; #nowarn 20 +""" + |> compile + |> withDiagnostics [ + Error 3874, Line 4, Col 11, Line 4, Col 22, "#nowarn/#warnon directives must appear as the first non-whitespace characters on a line" + Warning 203, Line 3, Col 9, Line 3, Col 11, "Invalid warning number 'xy'" + Warning 203, Line 3, Col 12, Line 3, Col 17, "Invalid warning number 'abx'" + ] diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/misc/utf8output.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/misc/utf8output.fs new file mode 100644 index 00000000000..6c6216a8377 --- /dev/null +++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/misc/utf8output.fs @@ -0,0 +1,47 @@ +// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. + +namespace CompilerOptions.Fsc + +open Xunit +open FSharp.Test +open FSharp.Test.Compiler +open System + +module utf8output = + + [] + let ``OutputEncoding is restored after executing compilation`` () = + let currentEncoding = Console.OutputEncoding + use restoreCurrentEncodingAfterTest = { new IDisposable with member _.Dispose() = Console.OutputEncoding <- currentEncoding } + + // UTF16 + let encoding = Text.Encoding.Unicode + + Console.OutputEncoding <- encoding + + Fs """printfn "Hello world" """ + |> asExe + |> withOptionsString "--utf8output" + |> compile + |> shouldSucceed + |> ignore + + Console.OutputEncoding.BodyName |> Assert.shouldBe encoding.BodyName + + [] + let ``OutputEncoding is restored after running script`` () = + let currentEncoding = Console.OutputEncoding + use restoreCurrentEncodingAfterTest = { new IDisposable with member _.Dispose() = Console.OutputEncoding <- currentEncoding } + + // UTF16 + let encoding = Text.Encoding.Unicode + + Console.OutputEncoding <- encoding + + Fsx """printfn "Hello world" """ + |> withOptionsString "--utf8output" + |> runFsi + |> shouldSucceed + |> ignore + + Console.OutputEncoding.BodyName |> Assert.shouldBe encoding.BodyName diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/PermittedLocations.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/PermittedLocations.fs index 68eb881ff7f..7f4c02ab56f 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/PermittedLocations.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/PermittedLocations.fs @@ -27,12 +27,15 @@ module AccessibilityAnnotations_PermittedLocations = |> verifyCompile |> shouldFail |> withDiagnostics [ - (Error 561, Line 18, Col 5, Line 18, Col 62, "Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type.") - (Error 561, Line 19, Col 5, Line 19, Col 62, "Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type.") - (Error 561, Line 20, Col 5, Line 20, Col 62, "Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type.") - (Error 10, Line 21, Col 14, Line 21, Col 20, "Unexpected keyword 'public' in member definition. Expected identifier, '(', '(*)' or other token.") - (Error 561, Line 21, Col 14, Line 22, Col 62, "Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type.") - (Error 10, Line 23, Col 14, Line 23, Col 22, "Unexpected keyword 'internal' in member definition. Expected identifier, '(', '(*)' or other token.") + (Error 531, Line 18, Col 5, Line 18, Col 11, "Accessibility modifiers should come immediately prior to the identifier naming a construct") + (Error 561, Line 18, Col 5, Line 18, Col 11, "Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type.") + (Error 531, Line 19, Col 5, Line 19, Col 12, "Accessibility modifiers should come immediately prior to the identifier naming a construct") + (Error 561, Line 19, Col 5, Line 19, Col 12, "Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type.") + (Error 531, Line 20, Col 5, Line 20, Col 13, "Accessibility modifiers should come immediately prior to the identifier naming a construct") + (Error 561, Line 20, Col 5, Line 20, Col 13, "Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type.") + (Error 561, Line 21, Col 14, Line 21, Col 20, "Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type.") + (Error 561, Line 22, Col 14, Line 22, Col 21, "Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type.") + (Error 561, Line 23, Col 14, Line 23, Col 22, "Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type.") ] // SOURCE=E_accessibilityOnInterface01.fs SCFLAGS="--test:ErrorRanges" # E_accessibilityOnInterface01.fs @@ -42,7 +45,8 @@ module AccessibilityAnnotations_PermittedLocations = |> verifyCompile |> shouldFail |> withDiagnostics [ - (Error 561, Line 13, Col 5, Line 13, Col 67, "Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type.") + (Error 531, Line 13, Col 5, Line 13, Col 11, "Accessibility modifiers should come immediately prior to the identifier naming a construct") + (Error 561, Line 13, Col 5, Line 13, Col 11, "Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type.") ] // SOURCE=E_accessibilityOnInterface02.fs SCFLAGS="--test:ErrorRanges" # E_accessibilityOnInterface02.fs @@ -52,7 +56,8 @@ module AccessibilityAnnotations_PermittedLocations = |> verifyCompile |> shouldFail |> withDiagnostics [ - (Error 561, Line 15, Col 5, Line 15, Col 68, "Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type.") + (Error 531, Line 15, Col 5, Line 15, Col 12, "Accessibility modifiers should come immediately prior to the identifier naming a construct") + (Error 561, Line 15, Col 5, Line 15, Col 12, "Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type.") ] // SOURCE=E_accessibilityOnInterface03.fs SCFLAGS="--test:ErrorRanges" # E_accessibilityOnInterface03.fs @@ -62,7 +67,8 @@ module AccessibilityAnnotations_PermittedLocations = |> verifyCompile |> shouldFail |> withDiagnostics [ - (Error 561, Line 15, Col 5, Line 15, Col 69, "Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type.") + (Error 531, Line 15, Col 5, Line 15, Col 13, "Accessibility modifiers should come immediately prior to the identifier naming a construct") + (Error 561, Line 15, Col 5, Line 15, Col 13, "Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type.") ] // SOURCE=E_accessibilityOnInterface04.fs SCFLAGS="--test:ErrorRanges" # E_accessibilityOnInterface04.fs @@ -72,7 +78,7 @@ module AccessibilityAnnotations_PermittedLocations = |> verifyCompile |> shouldFail |> withDiagnostics [ - (Error 10, Line 15, Col 14, Line 15, Col 20, "Unexpected keyword 'public' in member definition. Expected identifier, '(', '(*)' or other token.") + (Error 561, Line 15, Col 14, Line 15, Col 20, "Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type.") ] // SOURCE=E_accessibilityOnInterface05.fs SCFLAGS="--test:ErrorRanges" # E_accessibilityOnInterface05.fs @@ -82,7 +88,7 @@ module AccessibilityAnnotations_PermittedLocations = |> verifyCompile |> shouldFail |> withDiagnostics [ - (Error 10, Line 15, Col 14, Line 15, Col 21, "Unexpected keyword 'private' in member definition. Expected identifier, '(', '(*)' or other token.") + (Error 561, Line 15, Col 14, Line 15, Col 21, "Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type.") ] // SOURCE=E_accessibilityOnInterface06.fs SCFLAGS="--test:ErrorRanges" # E_accessibilityOnInterface06.fs @@ -92,7 +98,7 @@ module AccessibilityAnnotations_PermittedLocations = |> verifyCompile |> shouldFail |> withDiagnostics [ - (Error 10, Line 15, Col 14, Line 15, Col 22, "Unexpected keyword 'internal' in member definition. Expected identifier, '(', '(*)' or other token.") + (Error 561, Line 15, Col 14, Line 15, Col 22, "Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type.") ] // SOURCE=E_accessibilityOnRecords.fs SCFLAGS="--test:ErrorRanges" # E_accessibilityOnRecords.fs @@ -160,3 +166,32 @@ module AccessibilityAnnotations_PermittedLocations = |> withDiagnostics [ (Error 531, Line 8, Col 13, Line 8, Col 20, "Accessibility modifiers should come immediately prior to the identifier naming a construct") ] + + [] + let ``Signature File Test: abstract member cannot have access modifiers`` () = + Fsi """module Program + +type A = + abstract internal B: int ->int + abstract member internal E: int ->int + abstract member C: int with internal get, private set + abstract internal D: int with get, set + static abstract internal B2: int ->int + static abstract member internal E2: int ->int + static abstract member C2: int with internal get, private set + static abstract internal D2: int with get, set""" + |> withOptions ["--nowarn:3535"] + |> verifyCompile + |> shouldFail + |> withDiagnostics [ + (Error 0561, Line 4, Col 14, Line 4, Col 22, "Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type.") + (Error 0561, Line 5, Col 21, Line 5, Col 29, "Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type.") + (Error 0561, Line 6, Col 33, Line 6, Col 41, "Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type.") + (Error 0561, Line 6, Col 47, Line 6, Col 54, "Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type.") + (Error 0561, Line 7, Col 14, Line 7, Col 22, "Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type.") + (Error 0561, Line 8, Col 21, Line 8, Col 29, "Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type.") + (Error 0561, Line 9, Col 28, Line 9, Col 36, "Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type.") + (Error 0561, Line 10, Col 41, Line 10, Col 49, "Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type.") + (Error 0561, Line 10, Col 55, Line 10, Col 62, "Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type.") + (Error 0561, Line 11, Col 21, Line 11, Col 29, "Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type.") + ] diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/AutoPropsWithModifierBeforeGetSet.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/AutoPropsWithModifierBeforeGetSet.fs index 676746d96f5..7e7cdff06cc 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/AutoPropsWithModifierBeforeGetSet.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/AutoPropsWithModifierBeforeGetSet.fs @@ -110,11 +110,12 @@ let ``Abstract Properties Test: access modifiers are not allowed`` () = |> typecheck |> shouldFail |> withDiagnostics [ - (Error 0561, Line 6, Col 5, Line 6, Col 51, "Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type.") - (Error 0561, Line 8, Col 5, Line 8, Col 51, "Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type.") - (Error 0561, Line 10, Col 5, Line 10, Col 60, "Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type.") - (Error 0561, Line 12, Col 5, Line 12, Col 46, "Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type.") - (Error 0561, Line 14, Col 5, Line 14, Col 46, "Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type.") + (Error 0561, Line 6, Col 34, Line 6, Col 42, "Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type.") + (Error 0561, Line 8, Col 39, Line 8, Col 47, "Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type.") + (Error 0561, Line 10, Col 34, Line 10, Col 42, "Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type.") + (Error 0561, Line 10, Col 48, Line 10, Col 56, "Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type.") + (Error 0561, Line 12, Col 34, Line 12, Col 42, "Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type.") + (Error 0561, Line 14, Col 34, Line 14, Col 42, "Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type.") ] [] @@ -132,7 +133,7 @@ type A = |> verifyCompile |> shouldFail |> withDiagnostics [ - (Error 240, Line 1, Col 1, Line 9, Col 42, "The signature file 'Program' does not have a corresponding implementation file. If an implementation file exists then check the 'module' and 'namespace' declarations in the signature and implementation files match.") + (Error 0561, Line 9, Col 31, Line 9, Col 38, "Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type.") ] [] diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/BindingExpressions/BindingExpressions.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/BindingExpressions/BindingExpressions.fs index 056350802fe..cf2f4a833cc 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/BindingExpressions/BindingExpressions.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/BindingExpressions/BindingExpressions.fs @@ -144,4 +144,43 @@ module BindingExpressions = |> withDiagnostics [ (Warning 64, Line 10, Col 32, Line 10, Col 33, "This construct causes code to be less generic than indicated by the type annotations. The type variable 'b has been constrained to be type ''a'.") ] - + + [] + let ``UpperBindingPattern_fs`` compilation = + compilation + |> asExe + |> withOptions ["--test:ErrorRanges"] + |> typecheck + |> shouldFail + |> withDiagnostics [ + (Warning 49, Line 11, Col 8, Line 11, Col 11, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 11, Col 12, Line 11, Col 15, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 13, Col 8, Line 13, Col 11, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 13, Col 12, Line 13, Col 15, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 22, Col 22, Line 22, Col 25, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 22, Col 27, Line 22, Col 30, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 24, Col 22, Line 24, Col 25, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 24, Col 26, Line 24, Col 29, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 32, Col 20, Line 32, Col 23, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 32, Col 25, Line 32, Col 28, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 34, Col 21, Line 34, Col 24, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 34, Col 25, Line 34, Col 28, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 42, Col 31, Line 42, Col 34, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 46, Col 5, Line 46, Col 8, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 53, Col 18, Line 53, Col 21, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 67, Col 9, Line 67, Col 14, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 73, Col 9, Line 73, Col 18, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 80, Col 9, Line 80, Col 18, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 87, Col 9, Line 87, Col 18, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 117, Col 37, Line 117, Col 40, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 122, Col 12, Line 122, Col 15, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + ] + + [] + let ``UpperBindingPattern_fs preview`` compilation = + compilation + |> asExe + |> withLangVersionPreview + |> withOptions ["--test:ErrorRanges"] + |> typecheck + |> shouldSucceed diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/BindingExpressions/UpperBindingPattern.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/BindingExpressions/UpperBindingPattern.fs new file mode 100644 index 00000000000..79712e2b7f0 --- /dev/null +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/BindingExpressions/UpperBindingPattern.fs @@ -0,0 +1,128 @@ +let Aaa = () + +let f1 Us Uk = () + +let f2 US CA = () + +let f3 U A = () + +let AAA = () + +let f4 USA CAN = () + +let f5 Usa Can = () + +type Class() = + static member f1(Us, Uk) = () + + static member f2 US CA = () + + static member f3 U A = () + + static member f4(USA, CAN) = () + + static member f5 Usa Can = () + + member this.f6(Us, Uk) = () + + member this.f7 US CA = () + + member this.f8 U A = () + + member this.f9(USA, CAN) = () + + member this.f10 Usa Can = () + +type CustomerId = CustomerId of string + +let customerId = CustomerId("123") + +let (CustomerId BBB) = customerId + +let getCustomerId (CustomerId CCC) = id + +let getCustomerId2 (CustomerId CC) = id + +for III in [1..10] do + () + +for II in [1..10] do + () + +[ 1; 3; 5 ] +|> List.map (fun DDD -> DDD + 1) +|> ignore + +[ 1; 3; 5 ] +|> List.map (fun DD -> DD + 1) +|> ignore + +try () +with Ex -> () + +type AnonymousObject<'T1, 'T2> = + val private item1: 'T1 + member x.Item1 = x.item1 + + new(Item1) = { item1 = Item1 } + +type FSharpSource(Item1: string, SourceHash: string) = class end + +let _ = + query { + for UpperCase in [1..10] do + join b in [1..2] on (UpperCase = b) + select b +} + +let _ = + query { + for UpperCase in [1..10] do + groupBy UpperCase into g + select g.Key +} + +let _ = + query { + for UpperCase in [1..10] do + groupJoin UpperCase2 in [|1..2|] on (UpperCase = UpperCase2) into g + for k in g do + select (k + 1) +} + +let _ = + query { + for Up in [1..10] do + join b in [1..2] on (Up = b) + select b +} + +let _ = + query { + for Up in [1..10] do + groupBy Up into g + select g.Key +} + +let _ = + query { + for Up in [1..10] do + groupJoin U2 in [|1..2|] on (Up = U2) into g + for k in g do + select (k + 1) +} + +type CustomerId2 = CustomerId2 of string * string + +let getCustomerId3 (CustomerId2(AA, BBB)) = id + +let (CustomerId2(AA, Bb)) = CustomerId2("AA", "BB") + +try () +with Ex as Foo -> () + +try () +with Ex as Fo -> () + +try () +with Ex as F -> () \ No newline at end of file diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Simple/Simple.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Simple/Simple.fs index 3cd93d8c562..e161faded77 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Simple/Simple.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Simple/Simple.fs @@ -49,6 +49,19 @@ module Simple = (Warning 49, Line 10, Col 16, Line 10, Col 19, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") ] + [] + let ``Simple - W_BindCapitalIdent_fs preview - --test:ErrorRanges`` compilation = + compilation + |> withLangVersionPreview + |> asFsx + |> withOptions ["--test:ErrorRanges"] + |> compile + |> shouldFail + |> withDiagnostics [ + (Warning 49, Line 9, Col 16, Line 9, Col 19, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 10, Col 16, Line 10, Col 19, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + ] + // This test was automatically generated (moved from FSharpQA suite - Conformance/PatternMatching/Simple) [] let ``Simple - CodeGenReg01_fs - --test:ErrorRanges`` compilation = diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Union/Union.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Union/Union.fs index b7330c0acfa..88e98b14542 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Union/Union.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Union/Union.fs @@ -209,4 +209,48 @@ but here has type |> shouldFail |> withDiagnostics [ (Warning 26, Line 8, Col 7, Line 8, Col 55, "This rule will never be matched") - ] \ No newline at end of file + ] + + [] + let ``Union - UpperUnionCasePattern_fs - --test:ErrorRanges`` compilation = + compilation + |> asFs + |> withOptions ["--test:ErrorRanges"; "--nowarn:026"] + |> typecheck + |> shouldFail + |> withDiagnostics [ + (Warning 49, Line 15, Col 7, Line 15, Col 10, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 16, Col 7, Line 16, Col 10, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 20, Col 7, Line 20, Col 10, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 24, Col 3, Line 24, Col 6, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 35, Col 14, Line 35, Col 17, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 41, Col 12, Line 41, Col 15, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 45, Col 20, Line 45, Col 23, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 50, Col 14, Line 50, Col 17, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 50, Col 21, Line 50, Col 24, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 51, Col 14, Line 51, Col 17, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 52, Col 14, Line 52, Col 17, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + ] + + [] + let ``Union - UpperUnionCasePattern_fs preview - --test:ErrorRanges`` compilation = + compilation + |> withLangVersionPreview + |> asFs + |> withOptions ["--test:ErrorRanges"; "--nowarn:026"] + |> typecheck + |> shouldFail + |> withDiagnostics [ + (Warning 49, Line 3, Col 7, Line 3, Col 9, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 4, Col 7, Line 4, Col 9, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 5, Col 7, Line 5, Col 8, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 9, Col 7, Line 9, Col 9, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 10, Col 7, Line 10, Col 9, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 11, Col 7, Line 11, Col 8, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 15, Col 7, Line 15, Col 10, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 16, Col 7, Line 16, Col 10, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 20, Col 7, Line 20, Col 10, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 24, Col 3, Line 24, Col 6, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 28, Col 3, Line 28, Col 5, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + (Warning 49, Line 35, Col 14, Line 35, Col 17, "Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.") + ] \ No newline at end of file diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Union/UpperUnionCasePattern.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Union/UpperUnionCasePattern.fs new file mode 100644 index 00000000000..9d9715f87bf --- /dev/null +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Union/UpperUnionCasePattern.fs @@ -0,0 +1,52 @@ +let a = + match 1 with + | US -> "US" + | UK -> "UK" + | U -> "U" + +let b = + match 2 with + | Us -> "Us" + | Uk -> "Uk" + | U -> "u" + +let c = + match 1 with + | USA -> "USA" + | CAN -> "CAN" + +let d = + match 2 with + | Usa -> "Usa" + +try () +with +| Exn -> () + +try () +with +| Ex -> () + +type CustomerId = CustomerId of string + +let customerId = CustomerId("123") + +match customerId with +| CustomerId BBB -> () + +type Record = { Name: string; Age: int } + +match { Name = "Alice"; Age = 30 } with +| { Name = Al } -> printfn "Alice" +| { Name = Bob } -> printfn "Bob" +| { Name = P } -> printfn "Pepe" + +match { Name = "Alice"; Age = 30 } with +| { Name = Al } as Foo -> printfn "Alice" +| { Name = Al } as Fo -> printfn "Alice" +| { Name = Al } as F -> printfn "Alice" + +match customerId with +| CustomerId BBB as Foo -> () +| CustomerId Aaa as Fo -> () +| CustomerId CCC as F -> () \ No newline at end of file diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ClassesTests.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ClassesTests.fs index f902fa14369..e86621d7093 100644 --- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ClassesTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ClassesTests.fs @@ -831,6 +831,18 @@ type Class() = (Error 961, Line 5, Col 5, Line 5, Col 12, "This 'inherit' declaration specifies the inherited type but no arguments. Consider supplying arguments, e.g. 'inherit BaseType(args)'.") (Error 946, Line 5, Col 13, Line 5, Col 15, "Cannot inherit from interface type. Use interface ... with instead.") ] + + [] + let ``This 'inherit' declaration specifies the inherited type but no arguments. Type name cannot be empty.`` () = + Fsx """ +type Class() = + inherit + """ + |> typecheck + |> shouldFail + |> withDiagnostics [ + (Error 3159, Line 3, Col 5, Line 3, Col 12, "Type name cannot be empty.") + ] [] let ``The types System.ValueType, System.Enum, System.Delegate, System.MulticastDelegate and System.Array cannot be used as super types in an object expression or class.`` () = @@ -849,4 +861,83 @@ type C5 = class inherit System.MulticastDelegate override x.ToString() = "" end (Error 771, Line 4, Col 25, Line 4, Col 36, "The types System.ValueType, System.Enum, System.Delegate, System.MulticastDelegate and System.Array cannot be used as super types in an object expression or class") (Error 771, Line 5, Col 25, Line 5, Col 40, "The types System.ValueType, System.Enum, System.Delegate, System.MulticastDelegate and System.Array cannot be used as super types in an object expression or class"); (Error 771, Line 6, Col 25, Line 6, Col 49, "The types System.ValueType, System.Enum, System.Delegate, System.MulticastDelegate and System.Array cannot be used as super types in an object expression or class") + ] + + + [] + let ``Types can inherit from a single concrete type`` () = + Fsx """ +type ClassA() = class end + +type Class() = + inherit ClassA() + """ + |> typecheck + |> shouldSucceed + + [] + let ``Types cannot inherit from multiple concrete types.`` () = + Fsx """ +type ClassA() = class end + +type ClassB() = class end + +type ClassC() = class end + +type Class() = + inherit ClassA() + inherit ClassB() + inherit ClassC() + """ + |> typecheck + |> shouldFail + |> withDiagnostics [ + (Error 959, Line 8, Col 6, Line 8, Col 11, "Type definitions may only have one 'inherit' specification and it must be the first declaration") + (Error 932, Line 10, Col 13, Line 10, Col 19, "Types cannot inherit from multiple concrete types") + (Error 932, Line 11, Col 13, Line 11, Col 19, "Types cannot inherit from multiple concrete types") + ] + + [] + let ``Types cannot inherit from multiple concrete types. Type name cannot be empty.`` () = + Fsx """ +type IA = interface end + +type I = + inherit IA + inherit + """ + |> typecheck + |> shouldFail + |> withDiagnostics [ + (Error 3159, Line 6, Col 5, Line 6, Col 12, "Type name cannot be empty.") + ] + + [] + let ``Inheriting multiple base interfaces`` () = + Fsx """ +type IA = interface end +type IB = interface end + +type I = + inherit IA + inherit IB + """ + |> typecheck + |> shouldSucceed + + [] + let ``Class inheriting multiple base interfaces`` () = + Fsx """ +type IA = interface end +type IB = interface end + +type I() = + inherit IA + inherit IB + """ + |> typecheck + |> shouldFail + |> withDiagnostics [ + (Error 961, Line 6, Col 5, Line 6, Col 12, "This 'inherit' declaration specifies the inherited type but no arguments. Consider supplying arguments, e.g. 'inherit BaseType(args)'.") + (Error 932, Line 7, Col 13, Line 7, Col 15, "Types cannot inherit from multiple concrete types") ] \ No newline at end of file diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/TailCallAttribute.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/TailCallAttribute.fs index 4eb2d3b2a14..693833ef4b8 100644 --- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/TailCallAttribute.fs +++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/TailCallAttribute.fs @@ -473,6 +473,34 @@ namespace N "The member or function 'f' has the 'TailCallAttribute' attribute, but is not being used in a tail recursive way." } ] + [] + let ``Warn for rec call in Sequential in use scope`` () = + """ +namespace N + + module M = + + [] + let rec f () = + let path = System.IO.Path.GetTempFileName() + use file = System.IO.File.Open(path, System.IO.FileMode.Open) + printfn "Hi!" + f () + """ + |> FSharp + |> withLangVersion80 + |> compile + |> shouldFail + |> withResults [ + { Error = Warning 3569 + Range = { StartLine = 11 + StartColumn = 13 + EndLine = 11 + EndColumn = 14 } + Message = + "The member or function 'f' has the 'TailCallAttribute' attribute, but is not being used in a tail recursive way." } + ] + [] let ``Warn for invalid tailcalls in async expression`` () = """ diff --git a/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj b/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj index 22b003a7d61..eaf30747667 100644 --- a/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj +++ b/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj @@ -28,9 +28,6 @@ - - FsUnit.fs - @@ -224,6 +221,7 @@ + @@ -238,7 +236,6 @@ - @@ -289,6 +286,7 @@ + diff --git a/tests/FSharp.Compiler.ComponentTests/Language/Nullness/NullableReferenceTypesTests.fs b/tests/FSharp.Compiler.ComponentTests/Language/Nullness/NullableReferenceTypesTests.fs index 0da1169b9a8..2933d00e438 100644 --- a/tests/FSharp.Compiler.ComponentTests/Language/Nullness/NullableReferenceTypesTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/Language/Nullness/NullableReferenceTypesTests.fs @@ -19,6 +19,23 @@ let typeCheckWithStrictNullness cu = +[] +let ``Does report when null goes to DateTime Parse`` () = + + FSharp """module TestLib +open System +let parsedDate = DateTime.Parse(null:(string|null)) +let parseDate2(s:string|null) = DateTime.Parse(s) +let parsedDate3 = DateTime.Parse(null) + """ + |> asLibrary + |> typeCheckWithStrictNullness + |> shouldFail + |> withDiagnostics + [Error 3261, Line 3, Col 18, Line 3, Col 52, "Nullness warning: The types 'string' and 'string | null' do not have compatible nullability." + Error 3261, Line 4, Col 33, Line 4, Col 50, "Nullness warning: The types 'string' and 'string | null' do not have compatible nullability." + Error 3261, Line 5, Col 19, Line 5, Col 39, "Nullness warning: The type 'string' does not support 'null'."] + [] let ``Can convert generic value to objnull arg`` () = FSharp """module TestLib diff --git a/tests/FSharp.Compiler.ComponentTests/Language/SequenceExpressions/E_SequenceExpressions01.fs b/tests/FSharp.Compiler.ComponentTests/Language/SequenceExpressions/E_SequenceExpressions01.fs new file mode 100644 index 00000000000..37ca58c3db6 --- /dev/null +++ b/tests/FSharp.Compiler.ComponentTests/Language/SequenceExpressions/E_SequenceExpressions01.fs @@ -0,0 +1,76 @@ +{ 1..10 } + +{ 1..5..10 } + +[| { 1..10 } |] + +[| { 1..5..10 } |] + +let a = { 1..10 } + +let a3 = { 1..10..20 } + +let b = [| { 1..10 } |] + +let b3 = [| { 1..10..20 } |] + +let c = [ { 1..10 } ] + +[| { 1..10 } |] + +[| yield { 1..10 } |] + +[ { 1..10 } ] + +[ { 1..10..10 } ] + +[ yield { 1..10 } ] + +[ yield { 1..10..20 } ] + +ResizeArray({ 1..10 }) + +ResizeArray({ 1..10..20 }) + +let fw start finish = [ for x in { start..finish } -> x ] + +let fe start finish = [| for x in { start..finish } -> x |] + +for x in { 1..10 } do () + +for x in { 1..5..10 } do () + +let f = Seq.head + +let a2 = f { 1..6 } + +let a23 = f { 1..6..10 } + +let b2 = set { 1..6 } + +let f10 start finish = for x in { start..finish } do ignore (float x ** float x) + +let (..) _ _ = "lol" + +let lol1 = { 1..10 } + +{ 1..5..10 } + +let resultInt = Seq.length {1..8} + +let resultInt2 funcInt = Seq.map3 funcInt { 1..8 } { 2..9 } { 3..10 } + +let verify c = failwith "not implemented" + +Seq.splitInto 4 {1..5} |> verify { 1.. 10 } + +seq [ {1..4}; {5..7}; {8..10} ] + +Seq.allPairs { 1..7 } Seq.empty + +Seq.allPairs Seq.empty { 1..7 } + +let intArr1 = [| yield! {1..100} + yield! {1..100} |] + +Array.ofSeq {1..10} \ No newline at end of file diff --git a/tests/FSharp.Compiler.ComponentTests/Language/SequenceExpressionTests.fs b/tests/FSharp.Compiler.ComponentTests/Language/SequenceExpressions/SequenceExpressionTests.fs similarity index 59% rename from tests/FSharp.Compiler.ComponentTests/Language/SequenceExpressionTests.fs rename to tests/FSharp.Compiler.ComponentTests/Language/SequenceExpressions/SequenceExpressionTests.fs index 8247eaf60e3..263f305f7a5 100644 --- a/tests/FSharp.Compiler.ComponentTests/Language/SequenceExpressionTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/Language/SequenceExpressions/SequenceExpressionTests.fs @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module Language.SequenceExpressionTests +module Language.SequenceExpression.SequenceExpressionTests +open FSharp.Test open Xunit open FSharp.Test.Compiler open FSharp.Test.ScriptHelpers @@ -467,4 +468,125 @@ let f2 = return! [ 3; 4 ] |> withDiagnostics [ (Error 748, Line 2, Col 10, Line 2, Col 16, "This construct may only be used within computation expressions. To return a value from an ordinary function simply write the expression without 'return'."); (Error 748, Line 3, Col 10, Line 3, Col 17, "This construct may only be used within computation expressions. To return a value from an ordinary function simply write the expression without 'return'.") - ] \ No newline at end of file + ] + +[] +let ``Sequence(SynExpr.Sequential) expressions should be of the form 'seq { ... } lang version 9``() = + Fsx """ +{ 1;10 } +[| { 1;10 } |] +let a = { 1;10 } +let b = [| { 1;10 } |] +let c = [ { 1;10 } ] + """ + |> withOptions [ "--nowarn:0020" ] + |> withLangVersion90 + |> typecheck + |> shouldFail + |> withDiagnostics [ + (Error 740, Line 2, Col 1, Line 2, Col 9, "Invalid record, sequence or computation expression. Sequence expressions should be of the form 'seq { ... }'") + (Error 740, Line 3, Col 4, Line 3, Col 12, "Invalid record, sequence or computation expression. Sequence expressions should be of the form 'seq { ... }'") + (Error 740, Line 4, Col 9, Line 4, Col 17, "Invalid record, sequence or computation expression. Sequence expressions should be of the form 'seq { ... }'") + (Error 740, Line 5, Col 12, Line 5, Col 20, "Invalid record, sequence or computation expression. Sequence expressions should be of the form 'seq { ... }'") + (Error 740, Line 6, Col 11, Line 6, Col 19, "Invalid record, sequence or computation expression. Sequence expressions should be of the form 'seq { ... }'") + ] + +[] +let ``Sequence(SynExpr.Sequential) expressions should be of the form 'seq { ... } lang version preview``() = + Fsx """ +{ 1;10 } +[| { 1;10 } |] +let a = { 1;10 } +let b = [| { 1;10 } |] +let c = [ { 1;10 } ] + """ + |> withOptions [ "--nowarn:0020" ] + |> withLangVersionPreview + |> typecheck + |> shouldFail + |> withDiagnostics [ + (Error 740, Line 2, Col 1, Line 2, Col 9, "Invalid record, sequence or computation expression. Sequence expressions should be of the form 'seq { ... }'") + (Error 740, Line 3, Col 4, Line 3, Col 12, "Invalid record, sequence or computation expression. Sequence expressions should be of the form 'seq { ... }'") + (Error 740, Line 4, Col 9, Line 4, Col 17, "Invalid record, sequence or computation expression. Sequence expressions should be of the form 'seq { ... }'") + (Error 740, Line 5, Col 12, Line 5, Col 20, "Invalid record, sequence or computation expression. Sequence expressions should be of the form 'seq { ... }'") + (Error 740, Line 6, Col 11, Line 6, Col 19, "Invalid record, sequence or computation expression. Sequence expressions should be of the form 'seq { ... }'") + ] + +// SOURCE=E_SequenceExpressions01.fs # E_SequenceExpressions01.fs +[] +let ``E_SequenceExpressions01 lang version 9`` compilation = + compilation + |> withOptions [ "--nowarn:0020" ] + |> withLangVersion90 + |> typecheck + |> shouldSucceed + +// SOURCE=E_SequenceExpressions01.fs # E_SequenceExpressions01.fs +[] +let ``E_SequenceExpressions01 lang version preview`` compilation = + compilation + |> withOptions [ "--nowarn:0020" ] + |> withLangVersionPreview + |> typecheck + |> shouldFail + |> withDiagnostics [ + (Warning 3873, Line 1, Col 1, Line 1, Col 10, "This construct is deprecated. Sequence expressions should be of the form 'seq { ... }'") + (Warning 3873, Line 3, Col 1, Line 3, Col 13, "This construct is deprecated. Sequence expressions should be of the form 'seq { ... }'") + (Warning 3873, Line 5, Col 4, Line 5, Col 13, "This construct is deprecated. Sequence expressions should be of the form 'seq { ... }'") + (Warning 3873, Line 7, Col 4, Line 7, Col 16, "This construct is deprecated. Sequence expressions should be of the form 'seq { ... }'") + (Warning 3873, Line 9, Col 9, Line 9, Col 18, "This construct is deprecated. Sequence expressions should be of the form 'seq { ... }'") + (Warning 3873, Line 11, Col 10, Line 11, Col 23, "This construct is deprecated. Sequence expressions should be of the form 'seq { ... }'") + (Warning 3873, Line 13, Col 12, Line 13, Col 21, "This construct is deprecated. Sequence expressions should be of the form 'seq { ... }'") + (Warning 3873, Line 15, Col 13, Line 15, Col 26, "This construct is deprecated. Sequence expressions should be of the form 'seq { ... }'") + (Warning 3873, Line 17, Col 11, Line 17, Col 20, "This construct is deprecated. Sequence expressions should be of the form 'seq { ... }'") + (Warning 3873, Line 19, Col 4, Line 19, Col 13, "This construct is deprecated. Sequence expressions should be of the form 'seq { ... }'") + (Warning 3873, Line 21, Col 10, Line 21, Col 19, "This construct is deprecated. Sequence expressions should be of the form 'seq { ... }'") + (Warning 3873, Line 23, Col 3, Line 23, Col 12, "This construct is deprecated. Sequence expressions should be of the form 'seq { ... }'") + (Warning 3873, Line 25, Col 3, Line 25, Col 16, "This construct is deprecated. Sequence expressions should be of the form 'seq { ... }'") + (Warning 3873, Line 27, Col 9, Line 27, Col 18, "This construct is deprecated. Sequence expressions should be of the form 'seq { ... }'") + (Warning 3873, Line 29, Col 9, Line 29, Col 22, "This construct is deprecated. Sequence expressions should be of the form 'seq { ... }'") + (Warning 3873, Line 31, Col 13, Line 31, Col 22, "This construct is deprecated. Sequence expressions should be of the form 'seq { ... }'") + (Warning 3873, Line 33, Col 13, Line 33, Col 26, "This construct is deprecated. Sequence expressions should be of the form 'seq { ... }'") + (Warning 3873, Line 35, Col 34, Line 35, Col 51, "This construct is deprecated. Sequence expressions should be of the form 'seq { ... }'") + (Warning 3873, Line 37, Col 35, Line 37, Col 52, "This construct is deprecated. Sequence expressions should be of the form 'seq { ... }'") + (Warning 3873, Line 39, Col 10, Line 39, Col 19, "This construct is deprecated. Sequence expressions should be of the form 'seq { ... }'") + (Warning 3873, Line 41, Col 10, Line 41, Col 22, "This construct is deprecated. Sequence expressions should be of the form 'seq { ... }'") + (Warning 3873, Line 45, Col 12, Line 45, Col 20, "This construct is deprecated. Sequence expressions should be of the form 'seq { ... }'") + (Warning 3873, Line 47, Col 13, Line 47, Col 25, "This construct is deprecated. Sequence expressions should be of the form 'seq { ... }'") + (Warning 3873, Line 49, Col 14, Line 49, Col 22, "This construct is deprecated. Sequence expressions should be of the form 'seq { ... }'") + (Warning 3873, Line 51, Col 33, Line 51, Col 50, "This construct is deprecated. Sequence expressions should be of the form 'seq { ... }'") + (Warning 3873, Line 55, Col 12, Line 55, Col 21, "This construct is deprecated. Sequence expressions should be of the form 'seq { ... }'") + (Warning 3873, Line 57, Col 1, Line 57, Col 13, "This construct is deprecated. Sequence expressions should be of the form 'seq { ... }'") + (Warning 3873, Line 59, Col 28, Line 59, Col 34, "This construct is deprecated. Sequence expressions should be of the form 'seq { ... }'") + (Warning 3873, Line 61, Col 44, Line 61, Col 52, "This construct is deprecated. Sequence expressions should be of the form 'seq { ... }'") + (Warning 3873, Line 61, Col 53, Line 61, Col 61, "This construct is deprecated. Sequence expressions should be of the form 'seq { ... }'") + (Warning 3873, Line 61, Col 62, Line 61, Col 71, "This construct is deprecated. Sequence expressions should be of the form 'seq { ... }'") + (Warning 3873, Line 65, Col 17, Line 65, Col 23, "This construct is deprecated. Sequence expressions should be of the form 'seq { ... }'") + (Warning 3873, Line 65, Col 34, Line 65, Col 44, "This construct is deprecated. Sequence expressions should be of the form 'seq { ... }'") + (Warning 3873, Line 67, Col 7, Line 67, Col 13, "This construct is deprecated. Sequence expressions should be of the form 'seq { ... }'") + (Warning 3873, Line 67, Col 15, Line 67, Col 21, "This construct is deprecated. Sequence expressions should be of the form 'seq { ... }'") + (Warning 3873, Line 67, Col 23, Line 67, Col 30, "This construct is deprecated. Sequence expressions should be of the form 'seq { ... }'") + (Warning 3873, Line 69, Col 14, Line 69, Col 22, "This construct is deprecated. Sequence expressions should be of the form 'seq { ... }'") + (Warning 3873, Line 71, Col 24, Line 71, Col 32, "This construct is deprecated. Sequence expressions should be of the form 'seq { ... }'") + (Warning 3873, Line 73, Col 25, Line 73, Col 33, "This construct is deprecated. Sequence expressions should be of the form 'seq { ... }'") + (Warning 3873, Line 74, Col 25, Line 74, Col 33, "This construct is deprecated. Sequence expressions should be of the form 'seq { ... }'") + (Warning 3873, Line 76, Col 13, Line 76, Col 20, "This construct is deprecated. Sequence expressions should be of the form 'seq { ... }'") + ] + +// SOURCE=SequenceExpressions01.fs # SequenceExpressions01.fs +[] +let ``SequenceExpressions01 lang version 9`` compilation = + compilation + |> withOptions [ "--nowarn:0020" ] + |> withLangVersion90 + |> typecheck + |> shouldSucceed + +// SOURCE=SequenceExpressions01.fs # SequenceExpressions01.fs +[] +let ``SequenceExpressions01 lang version preview`` compilation = + compilation + |> withOptions [ "--nowarn:0020" ] + |> withLangVersionPreview + |> typecheck + |> shouldSucceed \ No newline at end of file diff --git a/tests/FSharp.Compiler.ComponentTests/Language/SequenceExpressions/SequenceExpressions01.fs b/tests/FSharp.Compiler.ComponentTests/Language/SequenceExpressions/SequenceExpressions01.fs new file mode 100644 index 00000000000..ea1ab603eef --- /dev/null +++ b/tests/FSharp.Compiler.ComponentTests/Language/SequenceExpressions/SequenceExpressions01.fs @@ -0,0 +1,76 @@ +seq { 1..10 } + +seq { 1..5..10 } + +[| seq { 1..10 } |] + +[| seq { 1..5..10 } |] + +let a = seq { 1..10 } + +let a3 = seq { 1..10..20 } + +let b = [| seq { 1..10 } |] + +let b3 = [| seq { 1..10..20 } |] + +let c = [ seq { 1..10 } ] + +[| seq { 1..10 } |] + +[| yield seq { 1..10 } |] + +[ seq { 1..10 } ] + +[ seq { 1..10..10 } ] + +[ yield seq { 1..10 } ] + +[ yield seq { 1..10..20 } ] + +ResizeArray(seq { 1..10 }) + +ResizeArray(seq { 1..10..20 }) + +let fw start finish = [ for x in seq { start..finish } -> x ] + +let fe start finish = [| for x in seq { start..finish } -> x |] + +for x in seq { 1..10 } do () + +for x in seq { 1..5..10 } do () + +let f = Seq.head + +let a2 = f (seq { 1..6 }) + +let a23 = f (seq { 1..6..10 }) + +let b2 = set (seq { 1..6 }) + +let f10 start finish = for x in seq { start..finish } do ignore (float x ** float x) + +let (..) _ _ = "lol" + +let lol1 = seq { 1..10 } + +seq { 1..5..10 } + +let resultInt = Seq.length (seq {1..8}) + +let resultInt2 funcInt = Seq.map3 funcInt (seq { 1..8 }) (seq { 2..9 }) (seq { 3..10 }) + +let verify c = failwith "not implemented" + +Seq.splitInto 4 (seq {1..5}) |> verify (seq { 1.. 10 }) + +seq [ seq {1..4}; seq {5..7}; seq {8..10} ] + +Seq.allPairs (seq { 1..7 }) Seq.empty + +Seq.allPairs Seq.empty (seq { 1..7 }) + +let intArr1 = [| yield! seq {1..100} + yield! seq {1..100} |] + +Array.ofSeq (seq {1..10}) \ No newline at end of file diff --git a/tests/FSharp.Compiler.ComponentTests/Signatures/HashConstraintTests.fs b/tests/FSharp.Compiler.ComponentTests/Signatures/HashConstraintTests.fs index ac624ec19a7..c0911187a86 100644 --- a/tests/FSharp.Compiler.ComponentTests/Signatures/HashConstraintTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/Signatures/HashConstraintTests.fs @@ -1,7 +1,6 @@ module Signatures.HashConstraintTests open Xunit -open FsUnit open FSharp.Test.Compiler open Signatures.TestHelpers diff --git a/tests/FSharp.Compiler.ComponentTests/Signatures/MemberTests.fs b/tests/FSharp.Compiler.ComponentTests/Signatures/MemberTests.fs index 3475535249a..aa0deb220d1 100644 --- a/tests/FSharp.Compiler.ComponentTests/Signatures/MemberTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/Signatures/MemberTests.fs @@ -1,7 +1,6 @@ module Signatures.MemberTests open Xunit -open FsUnit open FSharp.Test.Compiler open Signatures.TestHelpers diff --git a/tests/FSharp.Compiler.ComponentTests/Signatures/ModuleOrNamespaceTests.fs b/tests/FSharp.Compiler.ComponentTests/Signatures/ModuleOrNamespaceTests.fs index 413e4a7fdf9..062b8ba9166 100644 --- a/tests/FSharp.Compiler.ComponentTests/Signatures/ModuleOrNamespaceTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/Signatures/ModuleOrNamespaceTests.fs @@ -1,7 +1,6 @@ module Signatures.ModuleOrNamespaceTests open Xunit -open FsUnit open FSharp.Test.Compiler open Signatures.TestHelpers diff --git a/tests/FSharp.Compiler.ComponentTests/Signatures/NestedTypeTests.fs b/tests/FSharp.Compiler.ComponentTests/Signatures/NestedTypeTests.fs index 4dfce060679..97df2389c78 100644 --- a/tests/FSharp.Compiler.ComponentTests/Signatures/NestedTypeTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/Signatures/NestedTypeTests.fs @@ -1,7 +1,6 @@ module Signatures.NestedTypeTests open Xunit -open FsUnit open FSharp.Test open FSharp.Test.Compiler open Signatures.TestHelpers diff --git a/tests/FSharp.Compiler.ComponentTests/Signatures/RecordTests.fs b/tests/FSharp.Compiler.ComponentTests/Signatures/RecordTests.fs index cb5ec18da97..ae3bbcd57f6 100644 --- a/tests/FSharp.Compiler.ComponentTests/Signatures/RecordTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/Signatures/RecordTests.fs @@ -1,7 +1,6 @@ module Signatures.RecordTests open Xunit -open FsUnit open FSharp.Test.Compiler open Signatures.TestHelpers diff --git a/tests/FSharp.Compiler.ComponentTests/Signatures/TypeTests.fs b/tests/FSharp.Compiler.ComponentTests/Signatures/TypeTests.fs index d066d74dd9a..f6b31e62d24 100644 --- a/tests/FSharp.Compiler.ComponentTests/Signatures/TypeTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/Signatures/TypeTests.fs @@ -2,7 +2,6 @@ open FSharp.Compiler.Symbols open Xunit -open FsUnit open FSharp.Test.Compiler open Signatures.TestHelpers diff --git a/tests/FSharp.Compiler.Service.Tests/AssemblyReaderShim.fs b/tests/FSharp.Compiler.Service.Tests/AssemblyReaderShim.fs index ebe2c3dd61d..9e19b32834f 100644 --- a/tests/FSharp.Compiler.Service.Tests/AssemblyReaderShim.fs +++ b/tests/FSharp.Compiler.Service.Tests/AssemblyReaderShim.fs @@ -1,6 +1,5 @@ module FSharp.Compiler.Service.Tests.AssemblyReaderShim -open FsUnit open FSharp.Compiler.Text open FSharp.Compiler.AbstractIL.ILBinaryReader open Xunit diff --git a/tests/FSharp.Compiler.Service.Tests/CSharpProjectAnalysis.fs b/tests/FSharp.Compiler.Service.Tests/CSharpProjectAnalysis.fs index aa4cc9af679..bcbe03f4fa5 100644 --- a/tests/FSharp.Compiler.Service.Tests/CSharpProjectAnalysis.fs +++ b/tests/FSharp.Compiler.Service.Tests/CSharpProjectAnalysis.fs @@ -1,7 +1,7 @@ module FSharp.Compiler.Service.Tests.CSharpProjectAnalysis open Xunit -open FsUnit +open FSharp.Test.Assert open System.IO open FSharp.Compiler.Diagnostics open FSharp.Compiler.IO diff --git a/tests/FSharp.Compiler.Service.Tests/Common.fs b/tests/FSharp.Compiler.Service.Tests/Common.fs index df51f666ccd..5fd97f5bb21 100644 --- a/tests/FSharp.Compiler.Service.Tests/Common.fs +++ b/tests/FSharp.Compiler.Service.Tests/Common.fs @@ -13,7 +13,7 @@ open FSharp.Compiler.Symbols open FSharp.Compiler.Syntax open FSharp.Compiler.Text open TestFramework -open FsUnit +open FSharp.Test.Assert open Xunit open FSharp.Test.Utilities @@ -476,7 +476,7 @@ let assertRange [] module TempDirUtils = let getTempPath dir = - Path.Combine(Path.GetTempPath(), dir) + Path.Combine(TestFramework.tempDirectoryOfThisTestRun, dir) /// Returns the file name part of a temp file name created with tryCreateTemporaryFileName () /// and an added process id and thread id to ensure uniqueness between threads. diff --git a/tests/FSharp.Compiler.Service.Tests/EditorTests.fs b/tests/FSharp.Compiler.Service.Tests/EditorTests.fs index 79e7f244343..bc6ad3d3e88 100644 --- a/tests/FSharp.Compiler.Service.Tests/EditorTests.fs +++ b/tests/FSharp.Compiler.Service.Tests/EditorTests.fs @@ -1,7 +1,7 @@ module FSharp.Compiler.Service.Tests.EditorTests open Xunit -open FsUnit +open FSharp.Test.Assert open FSharp.Compiler.CodeAnalysis open FSharp.Compiler.EditorServices open FSharp.Compiler.Service.Tests.Common diff --git a/tests/FSharp.Compiler.Service.Tests/ExprTests.fs b/tests/FSharp.Compiler.Service.Tests/ExprTests.fs index c8870dd700e..4d74b131ed5 100644 --- a/tests/FSharp.Compiler.Service.Tests/ExprTests.fs +++ b/tests/FSharp.Compiler.Service.Tests/ExprTests.fs @@ -1,7 +1,7 @@ module FSharp.Compiler.Service.Tests.ExprTests open Xunit -open FsUnit +open FSharp.Test.Assert open System open System.Text open System.Collections.Generic diff --git a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.debug.bsl b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.debug.bsl index 7348a0c072a..c5d91d68d0d 100644 --- a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.debug.bsl +++ b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.debug.bsl @@ -2799,11 +2799,11 @@ FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean Equals(FSharp.Compi FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean Equals(FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions, System.Collections.IEqualityComparer) FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean Equals(System.Object) FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean Equals(System.Object, System.Collections.IEqualityComparer) -FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean FSharp9CompatibleNowarn -FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean FSharp9CompatibleNowarn@ +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean WarnScopesFeatureIsSupported +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean WarnScopesFeatureIsSupported@ FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean GlobalWarnAsError FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean get_CheckXmlDocs() -FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean get_FSharp9CompatibleNowarn() +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean get_WarnScopesFeatureIsSupported() FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean get_GlobalWarnAsError() FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions Default FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions get_Default() @@ -2827,7 +2827,7 @@ FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Microsoft.FSharp.Collection FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Microsoft.FSharp.Collections.FSharpList`1[System.Int32] get_WarnOn() FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: System.String ToString() FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Void .ctor(Int32, Boolean, Microsoft.FSharp.Collections.FSharpList`1[System.Int32], Microsoft.FSharp.Collections.FSharpList`1[System.Int32], Microsoft.FSharp.Collections.FSharpList`1[System.Int32], Microsoft.FSharp.Collections.FSharpList`1[System.Int32], Boolean, FSharp.Compiler.Diagnostics.LineMap, FSharp.Compiler.Diagnostics.WarnScopeMap) -FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Void set_FSharp9CompatibleNowarn(Boolean) +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Void set_WarnScopesFeatureIsSupported(Boolean) FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Void set_LineMap(FSharp.Compiler.Diagnostics.LineMap) FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Void set_WarnScopes(FSharp.Compiler.Diagnostics.WarnScopeMap) FSharp.Compiler.Diagnostics.FSharpDiagnosticSeverity+Tags: Int32 Error @@ -6945,6 +6945,8 @@ FSharp.Compiler.Syntax.SynExpr+Do: FSharp.Compiler.Text.Range get_range() FSharp.Compiler.Syntax.SynExpr+Do: FSharp.Compiler.Text.Range range FSharp.Compiler.Syntax.SynExpr+DoBang: FSharp.Compiler.Syntax.SynExpr expr FSharp.Compiler.Syntax.SynExpr+DoBang: FSharp.Compiler.Syntax.SynExpr get_expr() +FSharp.Compiler.Syntax.SynExpr+DoBang: FSharp.Compiler.SyntaxTrivia.SynExprDoBangTrivia get_trivia() +FSharp.Compiler.Syntax.SynExpr+DoBang: FSharp.Compiler.SyntaxTrivia.SynExprDoBangTrivia trivia FSharp.Compiler.Syntax.SynExpr+DoBang: FSharp.Compiler.Text.Range get_range() FSharp.Compiler.Syntax.SynExpr+DoBang: FSharp.Compiler.Text.Range range FSharp.Compiler.Syntax.SynExpr+DotGet: FSharp.Compiler.Syntax.SynExpr expr @@ -7491,12 +7493,16 @@ FSharp.Compiler.Syntax.SynExpr+WhileBang: FSharp.Compiler.Text.Range get_range() FSharp.Compiler.Syntax.SynExpr+WhileBang: FSharp.Compiler.Text.Range range FSharp.Compiler.Syntax.SynExpr+YieldOrReturn: FSharp.Compiler.Syntax.SynExpr expr FSharp.Compiler.Syntax.SynExpr+YieldOrReturn: FSharp.Compiler.Syntax.SynExpr get_expr() +FSharp.Compiler.Syntax.SynExpr+YieldOrReturn: FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia get_trivia() +FSharp.Compiler.Syntax.SynExpr+YieldOrReturn: FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia trivia FSharp.Compiler.Syntax.SynExpr+YieldOrReturn: FSharp.Compiler.Text.Range get_range() FSharp.Compiler.Syntax.SynExpr+YieldOrReturn: FSharp.Compiler.Text.Range range FSharp.Compiler.Syntax.SynExpr+YieldOrReturn: System.Tuple`2[System.Boolean,System.Boolean] flags FSharp.Compiler.Syntax.SynExpr+YieldOrReturn: System.Tuple`2[System.Boolean,System.Boolean] get_flags() FSharp.Compiler.Syntax.SynExpr+YieldOrReturnFrom: FSharp.Compiler.Syntax.SynExpr expr FSharp.Compiler.Syntax.SynExpr+YieldOrReturnFrom: FSharp.Compiler.Syntax.SynExpr get_expr() +FSharp.Compiler.Syntax.SynExpr+YieldOrReturnFrom: FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnFromTrivia get_trivia() +FSharp.Compiler.Syntax.SynExpr+YieldOrReturnFrom: FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnFromTrivia trivia FSharp.Compiler.Syntax.SynExpr+YieldOrReturnFrom: FSharp.Compiler.Text.Range get_range() FSharp.Compiler.Syntax.SynExpr+YieldOrReturnFrom: FSharp.Compiler.Text.Range range FSharp.Compiler.Syntax.SynExpr+YieldOrReturnFrom: System.Tuple`2[System.Boolean,System.Boolean] flags @@ -7655,13 +7661,7 @@ FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewConst(FSharp.C FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewDebugPoint(FSharp.Compiler.Syntax.DebugPointAtLeafExpr, Boolean, FSharp.Compiler.Syntax.SynExpr) FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewDiscardAfterMissingQualificationAfterDot(FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range, FSharp.Compiler.Text.Range) FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewDo(FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range) -FSharp.Compiler.Syntax.SynExpr+DoBang: FSharp.Compiler.SyntaxTrivia.SynExprDoBangTrivia get_trivia() -FSharp.Compiler.Syntax.SynExpr+DoBang: FSharp.Compiler.SyntaxTrivia.SynExprDoBangTrivia trivia FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewDoBang(FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range, FSharp.Compiler.SyntaxTrivia.SynExprDoBangTrivia) -FSharp.Compiler.SyntaxTrivia.SynExprDoBangTrivia: FSharp.Compiler.Text.Range DoBangKeyword -FSharp.Compiler.SyntaxTrivia.SynExprDoBangTrivia: FSharp.Compiler.Text.Range get_DoBangKeyword() -FSharp.Compiler.SyntaxTrivia.SynExprDoBangTrivia: System.String ToString() -FSharp.Compiler.SyntaxTrivia.SynExprDoBangTrivia: Void .ctor(FSharp.Compiler.Text.Range) FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewDotGet(FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range, FSharp.Compiler.Syntax.SynLongIdent, FSharp.Compiler.Text.Range) FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewDotIndexedGet(FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range, FSharp.Compiler.Text.Range) FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewDotIndexedSet(FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range, FSharp.Compiler.Text.Range, FSharp.Compiler.Text.Range) @@ -7717,22 +7717,8 @@ FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewTyped(FSharp.C FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewUpcast(FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Syntax.SynType, FSharp.Compiler.Text.Range) FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewWhile(FSharp.Compiler.Syntax.DebugPointAtWhile, FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range) FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewWhileBang(FSharp.Compiler.Syntax.DebugPointAtWhile, FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range) -FSharp.Compiler.Syntax.SynExpr+YieldOrReturn: FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia get_trivia() -FSharp.Compiler.Syntax.SynExpr+YieldOrReturn: FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia trivia -FSharp.Compiler.Syntax.SynExpr+YieldOrReturnFrom: FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnFromTrivia get_trivia() -FSharp.Compiler.Syntax.SynExpr+YieldOrReturnFrom: FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnFromTrivia trivia FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewYieldOrReturn(System.Tuple`2[System.Boolean,System.Boolean], FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range, FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia) FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewYieldOrReturnFrom(System.Tuple`2[System.Boolean,System.Boolean], FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range, FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnFromTrivia) -FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnFromTrivia: FSharp.Compiler.Text.Range YieldOrReturnFromKeyword -FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnFromTrivia: FSharp.Compiler.Text.Range get_YieldOrReturnFromKeyword() -FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnFromTrivia: System.String ToString() -FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnFromTrivia: Void .ctor(FSharp.Compiler.Text.Range) -FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia: FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia Zero -FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia: FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia get_Zero() -FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia: FSharp.Compiler.Text.Range YieldOrReturnKeyword -FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia: FSharp.Compiler.Text.Range get_YieldOrReturnKeyword() -FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia: System.String ToString() -FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia: Void .ctor(FSharp.Compiler.Text.Range) FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr+AddressOf FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr+AnonRecd FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr+App @@ -7944,6 +7930,8 @@ FSharp.Compiler.Syntax.SynLongIdent: Microsoft.FSharp.Collections.FSharpList`1[M FSharp.Compiler.Syntax.SynLongIdent: System.String ToString() FSharp.Compiler.Syntax.SynLongIdentHelpers: FSharp.Compiler.Syntax.SynLongIdent LongIdentWithDots(Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.Ident], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Text.Range]) FSharp.Compiler.Syntax.SynLongIdentHelpers: System.Tuple`2[Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.Ident],Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Text.Range]] |LongIdentWithDots|(FSharp.Compiler.Syntax.SynLongIdent) +FSharp.Compiler.Syntax.SynMatchClause: Boolean IsTrueMatchClause +FSharp.Compiler.Syntax.SynMatchClause: Boolean get_IsTrueMatchClause() FSharp.Compiler.Syntax.SynMatchClause: FSharp.Compiler.Syntax.DebugPointAtTarget debugPoint FSharp.Compiler.Syntax.SynMatchClause: FSharp.Compiler.Syntax.DebugPointAtTarget get_debugPoint() FSharp.Compiler.Syntax.SynMatchClause: FSharp.Compiler.Syntax.SynExpr get_resultExpr() @@ -8115,16 +8103,20 @@ FSharp.Compiler.Syntax.SynMemberDefn+ImplicitInherit: FSharp.Compiler.Syntax.Syn FSharp.Compiler.Syntax.SynMemberDefn+ImplicitInherit: FSharp.Compiler.Syntax.SynExpr inheritArgs FSharp.Compiler.Syntax.SynMemberDefn+ImplicitInherit: FSharp.Compiler.Syntax.SynType get_inheritType() FSharp.Compiler.Syntax.SynMemberDefn+ImplicitInherit: FSharp.Compiler.Syntax.SynType inheritType +FSharp.Compiler.Syntax.SynMemberDefn+ImplicitInherit: FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia get_trivia() +FSharp.Compiler.Syntax.SynMemberDefn+ImplicitInherit: FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia trivia FSharp.Compiler.Syntax.SynMemberDefn+ImplicitInherit: FSharp.Compiler.Text.Range get_range() FSharp.Compiler.Syntax.SynMemberDefn+ImplicitInherit: FSharp.Compiler.Text.Range range FSharp.Compiler.Syntax.SynMemberDefn+ImplicitInherit: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.Ident] get_inheritAlias() FSharp.Compiler.Syntax.SynMemberDefn+ImplicitInherit: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.Ident] inheritAlias -FSharp.Compiler.Syntax.SynMemberDefn+Inherit: FSharp.Compiler.Syntax.SynType baseType -FSharp.Compiler.Syntax.SynMemberDefn+Inherit: FSharp.Compiler.Syntax.SynType get_baseType() +FSharp.Compiler.Syntax.SynMemberDefn+Inherit: FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia get_trivia() +FSharp.Compiler.Syntax.SynMemberDefn+Inherit: FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia trivia FSharp.Compiler.Syntax.SynMemberDefn+Inherit: FSharp.Compiler.Text.Range get_range() FSharp.Compiler.Syntax.SynMemberDefn+Inherit: FSharp.Compiler.Text.Range range FSharp.Compiler.Syntax.SynMemberDefn+Inherit: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.Ident] asIdent FSharp.Compiler.Syntax.SynMemberDefn+Inherit: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.Ident] get_asIdent() +FSharp.Compiler.Syntax.SynMemberDefn+Inherit: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.SynType] baseType +FSharp.Compiler.Syntax.SynMemberDefn+Inherit: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.SynType] get_baseType() FSharp.Compiler.Syntax.SynMemberDefn+Interface: FSharp.Compiler.Syntax.SynType get_interfaceType() FSharp.Compiler.Syntax.SynMemberDefn+Interface: FSharp.Compiler.Syntax.SynType interfaceType FSharp.Compiler.Syntax.SynMemberDefn+Interface: FSharp.Compiler.Text.Range get_range() @@ -8199,14 +8191,8 @@ FSharp.Compiler.Syntax.SynMemberDefn: FSharp.Compiler.Syntax.SynMemberDefn NewAb FSharp.Compiler.Syntax.SynMemberDefn: FSharp.Compiler.Syntax.SynMemberDefn NewAutoProperty(Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynAttributeList], Boolean, FSharp.Compiler.Syntax.Ident, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.SynType], FSharp.Compiler.Syntax.SynMemberKind, FSharp.Compiler.Syntax.SynMemberFlags, FSharp.Compiler.Syntax.SynMemberFlags, FSharp.Compiler.Xml.PreXmlDoc, FSharp.Compiler.Syntax.SynValSigAccess, FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range, FSharp.Compiler.SyntaxTrivia.SynMemberDefnAutoPropertyTrivia) FSharp.Compiler.Syntax.SynMemberDefn: FSharp.Compiler.Syntax.SynMemberDefn NewGetSetMember(Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.SynBinding], Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.SynBinding], FSharp.Compiler.Text.Range, FSharp.Compiler.SyntaxTrivia.SynMemberGetSetTrivia) FSharp.Compiler.Syntax.SynMemberDefn: FSharp.Compiler.Syntax.SynMemberDefn NewImplicitCtor(Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.SynAccess], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynAttributeList], FSharp.Compiler.Syntax.SynPat, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.Ident], FSharp.Compiler.Xml.PreXmlDoc, FSharp.Compiler.Text.Range, FSharp.Compiler.SyntaxTrivia.SynMemberDefnImplicitCtorTrivia) -FSharp.Compiler.Syntax.SynMemberDefn: FSharp.Compiler.Syntax.SynMemberDefn NewImplicitInherit(FSharp.Compiler.Syntax.SynType, FSharp.Compiler.Syntax.SynExpr, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.Ident], FSharp.Compiler.Text.Range) -FSharp.Compiler.Syntax.SynMemberDefn+Inherit: FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia get_trivia() -FSharp.Compiler.Syntax.SynMemberDefn+Inherit: FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia trivia -FSharp.Compiler.Syntax.SynMemberDefn: FSharp.Compiler.Syntax.SynMemberDefn NewInherit(FSharp.Compiler.Syntax.SynType, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.Ident], FSharp.Compiler.Text.Range, FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia) -FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia: FSharp.Compiler.Text.Range InheritKeyword -FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia: FSharp.Compiler.Text.Range get_InheritKeyword() -FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia: System.String ToString() -FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia: Void .ctor(FSharp.Compiler.Text.Range) +FSharp.Compiler.Syntax.SynMemberDefn: FSharp.Compiler.Syntax.SynMemberDefn NewImplicitInherit(FSharp.Compiler.Syntax.SynType, FSharp.Compiler.Syntax.SynExpr, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.Ident], FSharp.Compiler.Text.Range, FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia) +FSharp.Compiler.Syntax.SynMemberDefn: FSharp.Compiler.Syntax.SynMemberDefn NewInherit(Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.SynType], Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.Ident], FSharp.Compiler.Text.Range, FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia) FSharp.Compiler.Syntax.SynMemberDefn: FSharp.Compiler.Syntax.SynMemberDefn NewInterface(FSharp.Compiler.Syntax.SynType, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range], Microsoft.FSharp.Core.FSharpOption`1[Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynMemberDefn]], FSharp.Compiler.Text.Range) FSharp.Compiler.Syntax.SynMemberDefn: FSharp.Compiler.Syntax.SynMemberDefn NewLetBindings(Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynBinding], Boolean, Boolean, FSharp.Compiler.Text.Range) FSharp.Compiler.Syntax.SynMemberDefn: FSharp.Compiler.Syntax.SynMemberDefn NewMember(FSharp.Compiler.Syntax.SynBinding, FSharp.Compiler.Text.Range) @@ -10249,6 +10235,10 @@ FSharp.Compiler.SyntaxTrivia.SynExprAnonRecdTrivia: FSharp.Compiler.Text.Range O FSharp.Compiler.SyntaxTrivia.SynExprAnonRecdTrivia: FSharp.Compiler.Text.Range get_OpeningBraceRange() FSharp.Compiler.SyntaxTrivia.SynExprAnonRecdTrivia: System.String ToString() FSharp.Compiler.SyntaxTrivia.SynExprAnonRecdTrivia: Void .ctor(FSharp.Compiler.Text.Range) +FSharp.Compiler.SyntaxTrivia.SynExprDoBangTrivia: FSharp.Compiler.Text.Range DoBangKeyword +FSharp.Compiler.SyntaxTrivia.SynExprDoBangTrivia: FSharp.Compiler.Text.Range get_DoBangKeyword() +FSharp.Compiler.SyntaxTrivia.SynExprDoBangTrivia: System.String ToString() +FSharp.Compiler.SyntaxTrivia.SynExprDoBangTrivia: Void .ctor(FSharp.Compiler.Text.Range) FSharp.Compiler.SyntaxTrivia.SynExprDotLambdaTrivia: FSharp.Compiler.Text.Range DotRange FSharp.Compiler.SyntaxTrivia.SynExprDotLambdaTrivia: FSharp.Compiler.Text.Range UnderscoreRange FSharp.Compiler.SyntaxTrivia.SynExprDotLambdaTrivia: FSharp.Compiler.Text.Range get_DotRange() @@ -10275,19 +10265,19 @@ FSharp.Compiler.SyntaxTrivia.SynExprLambdaTrivia: System.String ToString() FSharp.Compiler.SyntaxTrivia.SynExprLambdaTrivia: Void .ctor(Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range]) FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia: FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia Zero FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia: FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia get_Zero() +FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia: FSharp.Compiler.Text.Range LetOrUseBangKeyword +FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia: FSharp.Compiler.Text.Range get_LetOrUseBangKeyword() FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range] EqualsRange FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range] get_EqualsRange() FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia: System.String ToString() -FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia: FSharp.Compiler.Text.Range LetOrUseBangKeyword -FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia: FSharp.Compiler.Text.Range get_LetOrUseBangKeyword() FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia: Void .ctor(FSharp.Compiler.Text.Range, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range]) FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia Zero FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia get_Zero() +FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: FSharp.Compiler.Text.Range LetOrUseKeyword +FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: FSharp.Compiler.Text.Range get_LetOrUseKeyword() FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range] InKeyword FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range] get_InKeyword() FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: System.String ToString() -FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: FSharp.Compiler.Text.Range LetOrUseKeyword -FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: FSharp.Compiler.Text.Range get_LetOrUseKeyword() FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: Void .ctor(FSharp.Compiler.Text.Range, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range]) FSharp.Compiler.SyntaxTrivia.SynExprMatchBangTrivia: FSharp.Compiler.Text.Range MatchBangKeyword FSharp.Compiler.SyntaxTrivia.SynExprMatchBangTrivia: FSharp.Compiler.Text.Range WithKeyword @@ -10323,6 +10313,16 @@ FSharp.Compiler.SyntaxTrivia.SynExprTryWithTrivia: FSharp.Compiler.Text.Range ge FSharp.Compiler.SyntaxTrivia.SynExprTryWithTrivia: FSharp.Compiler.Text.Range get_WithToEndRange() FSharp.Compiler.SyntaxTrivia.SynExprTryWithTrivia: System.String ToString() FSharp.Compiler.SyntaxTrivia.SynExprTryWithTrivia: Void .ctor(FSharp.Compiler.Text.Range, FSharp.Compiler.Text.Range, FSharp.Compiler.Text.Range, FSharp.Compiler.Text.Range) +FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnFromTrivia: FSharp.Compiler.Text.Range YieldOrReturnFromKeyword +FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnFromTrivia: FSharp.Compiler.Text.Range get_YieldOrReturnFromKeyword() +FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnFromTrivia: System.String ToString() +FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnFromTrivia: Void .ctor(FSharp.Compiler.Text.Range) +FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia: FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia Zero +FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia: FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia get_Zero() +FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia: FSharp.Compiler.Text.Range YieldOrReturnKeyword +FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia: FSharp.Compiler.Text.Range get_YieldOrReturnKeyword() +FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia: System.String ToString() +FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia: Void .ctor(FSharp.Compiler.Text.Range) FSharp.Compiler.SyntaxTrivia.SynFieldTrivia: FSharp.Compiler.SyntaxTrivia.SynFieldTrivia Zero FSharp.Compiler.SyntaxTrivia.SynFieldTrivia: FSharp.Compiler.SyntaxTrivia.SynFieldTrivia get_Zero() FSharp.Compiler.SyntaxTrivia.SynFieldTrivia: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.SyntaxTrivia.SynLeadingKeyword] LeadingKeyword @@ -10592,6 +10592,10 @@ FSharp.Compiler.SyntaxTrivia.SynMemberDefnImplicitCtorTrivia: Microsoft.FSharp.C FSharp.Compiler.SyntaxTrivia.SynMemberDefnImplicitCtorTrivia: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range] get_AsKeyword() FSharp.Compiler.SyntaxTrivia.SynMemberDefnImplicitCtorTrivia: System.String ToString() FSharp.Compiler.SyntaxTrivia.SynMemberDefnImplicitCtorTrivia: Void .ctor(Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range]) +FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia: FSharp.Compiler.Text.Range InheritKeyword +FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia: FSharp.Compiler.Text.Range get_InheritKeyword() +FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia: System.String ToString() +FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia: Void .ctor(FSharp.Compiler.Text.Range) FSharp.Compiler.SyntaxTrivia.SynMemberGetSetTrivia: FSharp.Compiler.Text.Range WithKeyword FSharp.Compiler.SyntaxTrivia.SynMemberGetSetTrivia: FSharp.Compiler.Text.Range get_WithKeyword() FSharp.Compiler.SyntaxTrivia.SynMemberGetSetTrivia: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range] AndKeyword diff --git a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.release.bsl b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.release.bsl index c6fb2c25f61..fac349784e4 100644 --- a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.release.bsl +++ b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.release.bsl @@ -2799,20 +2799,13 @@ FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean Equals(FSharp.Compi FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean Equals(FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions, System.Collections.IEqualityComparer) FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean Equals(System.Object) FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean Equals(System.Object, System.Collections.IEqualityComparer) -FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean FSharp9CompatibleNowarn -FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean FSharp9CompatibleNowarn@ FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean GlobalWarnAsError +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean WarnScopesFeatureIsSupported FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean get_CheckXmlDocs() -FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean get_FSharp9CompatibleNowarn() FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean get_GlobalWarnAsError() +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Boolean get_WarnScopesFeatureIsSupported() FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions Default FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions get_Default() -FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: FSharp.Compiler.Diagnostics.LineMap LineMap -FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: FSharp.Compiler.Diagnostics.LineMap LineMap@ -FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: FSharp.Compiler.Diagnostics.LineMap get_LineMap() -FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: FSharp.Compiler.Diagnostics.WarnScopeMap WarnScopes -FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: FSharp.Compiler.Diagnostics.WarnScopeMap WarnScopes@ -FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: FSharp.Compiler.Diagnostics.WarnScopeMap get_WarnScopes() FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Int32 GetHashCode() FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Int32 GetHashCode(System.Collections.IEqualityComparer) FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Int32 WarnLevel @@ -2825,11 +2818,12 @@ FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Microsoft.FSharp.Collection FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Microsoft.FSharp.Collections.FSharpList`1[System.Int32] get_WarnAsWarn() FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Microsoft.FSharp.Collections.FSharpList`1[System.Int32] get_WarnOff() FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Microsoft.FSharp.Collections.FSharpList`1[System.Int32] get_WarnOn() +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Microsoft.FSharp.Core.FSharpOption`1[System.Object] WarnScopeData +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Microsoft.FSharp.Core.FSharpOption`1[System.Object] WarnScopeData@ +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Microsoft.FSharp.Core.FSharpOption`1[System.Object] get_WarnScopeData() FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: System.String ToString() -FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Void .ctor(Int32, Boolean, Microsoft.FSharp.Collections.FSharpList`1[System.Int32], Microsoft.FSharp.Collections.FSharpList`1[System.Int32], Microsoft.FSharp.Collections.FSharpList`1[System.Int32], Microsoft.FSharp.Collections.FSharpList`1[System.Int32], Boolean, FSharp.Compiler.Diagnostics.LineMap, FSharp.Compiler.Diagnostics.WarnScopeMap) -FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Void set_FSharp9CompatibleNowarn(Boolean) -FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Void set_LineMap(FSharp.Compiler.Diagnostics.LineMap) -FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Void set_WarnScopes(FSharp.Compiler.Diagnostics.WarnScopeMap) +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Void .ctor(Int32, Boolean, Microsoft.FSharp.Collections.FSharpList`1[System.Int32], Microsoft.FSharp.Collections.FSharpList`1[System.Int32], Microsoft.FSharp.Collections.FSharpList`1[System.Int32], Microsoft.FSharp.Collections.FSharpList`1[System.Int32], Boolean, Microsoft.FSharp.Core.FSharpOption`1[System.Object]) +FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions: Void set_WarnScopeData(Microsoft.FSharp.Core.FSharpOption`1[System.Object]) FSharp.Compiler.Diagnostics.FSharpDiagnosticSeverity+Tags: Int32 Error FSharp.Compiler.Diagnostics.FSharpDiagnosticSeverity+Tags: Int32 Hidden FSharp.Compiler.Diagnostics.FSharpDiagnosticSeverity+Tags: Int32 Info @@ -2863,73 +2857,6 @@ FSharp.Compiler.Diagnostics.FSharpDiagnosticSeverity: Int32 GetHashCode(System.C FSharp.Compiler.Diagnostics.FSharpDiagnosticSeverity: Int32 Tag FSharp.Compiler.Diagnostics.FSharpDiagnosticSeverity: Int32 get_Tag() FSharp.Compiler.Diagnostics.FSharpDiagnosticSeverity: System.String ToString() -FSharp.Compiler.Diagnostics.LineMap: Boolean Equals(FSharp.Compiler.Diagnostics.LineMap) -FSharp.Compiler.Diagnostics.LineMap: Boolean Equals(FSharp.Compiler.Diagnostics.LineMap, System.Collections.IEqualityComparer) -FSharp.Compiler.Diagnostics.LineMap: Boolean Equals(System.Object) -FSharp.Compiler.Diagnostics.LineMap: Boolean Equals(System.Object, System.Collections.IEqualityComparer) -FSharp.Compiler.Diagnostics.LineMap: FSharp.Compiler.Diagnostics.LineMap Empty -FSharp.Compiler.Diagnostics.LineMap: FSharp.Compiler.Diagnostics.LineMap NewLineMap(Microsoft.FSharp.Collections.FSharpMap`2[System.Int32,System.Int32]) -FSharp.Compiler.Diagnostics.LineMap: FSharp.Compiler.Diagnostics.LineMap get_Empty() -FSharp.Compiler.Diagnostics.LineMap: Int32 CompareTo(FSharp.Compiler.Diagnostics.LineMap) -FSharp.Compiler.Diagnostics.LineMap: Int32 CompareTo(System.Object) -FSharp.Compiler.Diagnostics.LineMap: Int32 CompareTo(System.Object, System.Collections.IComparer) -FSharp.Compiler.Diagnostics.LineMap: Int32 GetHashCode() -FSharp.Compiler.Diagnostics.LineMap: Int32 GetHashCode(System.Collections.IEqualityComparer) -FSharp.Compiler.Diagnostics.LineMap: Int32 Tag -FSharp.Compiler.Diagnostics.LineMap: Int32 get_Tag() -FSharp.Compiler.Diagnostics.LineMap: Microsoft.FSharp.Collections.FSharpMap`2[System.Int32,System.Int32] Item -FSharp.Compiler.Diagnostics.LineMap: Microsoft.FSharp.Collections.FSharpMap`2[System.Int32,System.Int32] get_Item() -FSharp.Compiler.Diagnostics.LineMap: System.String ToString() -FSharp.Compiler.Diagnostics.WarnScope+Off: FSharp.Compiler.Text.Range Item -FSharp.Compiler.Diagnostics.WarnScope+Off: FSharp.Compiler.Text.Range get_Item() -FSharp.Compiler.Diagnostics.WarnScope+On: FSharp.Compiler.Text.Range Item -FSharp.Compiler.Diagnostics.WarnScope+On: FSharp.Compiler.Text.Range get_Item() -FSharp.Compiler.Diagnostics.WarnScope+OpenOff: FSharp.Compiler.Text.Range Item -FSharp.Compiler.Diagnostics.WarnScope+OpenOff: FSharp.Compiler.Text.Range get_Item() -FSharp.Compiler.Diagnostics.WarnScope+OpenOn: FSharp.Compiler.Text.Range Item -FSharp.Compiler.Diagnostics.WarnScope+OpenOn: FSharp.Compiler.Text.Range get_Item() -FSharp.Compiler.Diagnostics.WarnScope+Tags: Int32 Off -FSharp.Compiler.Diagnostics.WarnScope+Tags: Int32 On -FSharp.Compiler.Diagnostics.WarnScope+Tags: Int32 OpenOff -FSharp.Compiler.Diagnostics.WarnScope+Tags: Int32 OpenOn -FSharp.Compiler.Diagnostics.WarnScope: Boolean Equals(FSharp.Compiler.Diagnostics.WarnScope) -FSharp.Compiler.Diagnostics.WarnScope: Boolean Equals(FSharp.Compiler.Diagnostics.WarnScope, System.Collections.IEqualityComparer) -FSharp.Compiler.Diagnostics.WarnScope: Boolean Equals(System.Object) -FSharp.Compiler.Diagnostics.WarnScope: Boolean Equals(System.Object, System.Collections.IEqualityComparer) -FSharp.Compiler.Diagnostics.WarnScope: Boolean IsOff -FSharp.Compiler.Diagnostics.WarnScope: Boolean IsOn -FSharp.Compiler.Diagnostics.WarnScope: Boolean IsOpenOff -FSharp.Compiler.Diagnostics.WarnScope: Boolean IsOpenOn -FSharp.Compiler.Diagnostics.WarnScope: Boolean get_IsOff() -FSharp.Compiler.Diagnostics.WarnScope: Boolean get_IsOn() -FSharp.Compiler.Diagnostics.WarnScope: Boolean get_IsOpenOff() -FSharp.Compiler.Diagnostics.WarnScope: Boolean get_IsOpenOn() -FSharp.Compiler.Diagnostics.WarnScope: FSharp.Compiler.Diagnostics.WarnScope NewOff(FSharp.Compiler.Text.Range) -FSharp.Compiler.Diagnostics.WarnScope: FSharp.Compiler.Diagnostics.WarnScope NewOn(FSharp.Compiler.Text.Range) -FSharp.Compiler.Diagnostics.WarnScope: FSharp.Compiler.Diagnostics.WarnScope NewOpenOff(FSharp.Compiler.Text.Range) -FSharp.Compiler.Diagnostics.WarnScope: FSharp.Compiler.Diagnostics.WarnScope NewOpenOn(FSharp.Compiler.Text.Range) -FSharp.Compiler.Diagnostics.WarnScope: FSharp.Compiler.Diagnostics.WarnScope+Off -FSharp.Compiler.Diagnostics.WarnScope: FSharp.Compiler.Diagnostics.WarnScope+On -FSharp.Compiler.Diagnostics.WarnScope: FSharp.Compiler.Diagnostics.WarnScope+OpenOff -FSharp.Compiler.Diagnostics.WarnScope: FSharp.Compiler.Diagnostics.WarnScope+OpenOn -FSharp.Compiler.Diagnostics.WarnScope: FSharp.Compiler.Diagnostics.WarnScope+Tags -FSharp.Compiler.Diagnostics.WarnScope: Int32 GetHashCode() -FSharp.Compiler.Diagnostics.WarnScope: Int32 GetHashCode(System.Collections.IEqualityComparer) -FSharp.Compiler.Diagnostics.WarnScope: Int32 Tag -FSharp.Compiler.Diagnostics.WarnScope: Int32 get_Tag() -FSharp.Compiler.Diagnostics.WarnScope: System.String ToString() -FSharp.Compiler.Diagnostics.WarnScopeMap: Boolean Equals(FSharp.Compiler.Diagnostics.WarnScopeMap) -FSharp.Compiler.Diagnostics.WarnScopeMap: Boolean Equals(FSharp.Compiler.Diagnostics.WarnScopeMap, System.Collections.IEqualityComparer) -FSharp.Compiler.Diagnostics.WarnScopeMap: Boolean Equals(System.Object) -FSharp.Compiler.Diagnostics.WarnScopeMap: Boolean Equals(System.Object, System.Collections.IEqualityComparer) -FSharp.Compiler.Diagnostics.WarnScopeMap: FSharp.Compiler.Diagnostics.WarnScopeMap NewWarnScopeMap(Microsoft.FSharp.Collections.FSharpMap`2[System.Int64,Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Diagnostics.WarnScope]]) -FSharp.Compiler.Diagnostics.WarnScopeMap: Int32 GetHashCode() -FSharp.Compiler.Diagnostics.WarnScopeMap: Int32 GetHashCode(System.Collections.IEqualityComparer) -FSharp.Compiler.Diagnostics.WarnScopeMap: Int32 Tag -FSharp.Compiler.Diagnostics.WarnScopeMap: Int32 get_Tag() -FSharp.Compiler.Diagnostics.WarnScopeMap: Microsoft.FSharp.Collections.FSharpMap`2[System.Int64,Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Diagnostics.WarnScope]] Item -FSharp.Compiler.Diagnostics.WarnScopeMap: Microsoft.FSharp.Collections.FSharpMap`2[System.Int64,Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Diagnostics.WarnScope]] get_Item() -FSharp.Compiler.Diagnostics.WarnScopeMap: System.String ToString() FSharp.Compiler.EditorServices.AssemblyContent: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.EditorServices.AssemblySymbol] GetAssemblyContent(Microsoft.FSharp.Core.FSharpFunc`2[Microsoft.FSharp.Core.FSharpFunc`2[FSharp.Compiler.EditorServices.IAssemblyContentCache,Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.EditorServices.AssemblySymbol]],Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.EditorServices.AssemblySymbol]], FSharp.Compiler.EditorServices.AssemblyContentType, Microsoft.FSharp.Core.FSharpOption`1[System.String], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Symbols.FSharpAssembly]) FSharp.Compiler.EditorServices.AssemblyContent: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.EditorServices.AssemblySymbol] GetAssemblySignatureContent(FSharp.Compiler.EditorServices.AssemblyContentType, FSharp.Compiler.Symbols.FSharpAssemblySignature) FSharp.Compiler.EditorServices.AssemblyContentType+Tags: Int32 Full @@ -6206,15 +6133,15 @@ FSharp.Compiler.Syntax.ParsedImplFileInput: Boolean get_IsLastCompiland() FSharp.Compiler.Syntax.ParsedImplFileInput: Boolean get_IsScript() FSharp.Compiler.Syntax.ParsedImplFileInput: Boolean get_isScript() FSharp.Compiler.Syntax.ParsedImplFileInput: Boolean isScript -FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.Syntax.ParsedImplFileInput NewParsedImplFileInput(System.String, Boolean, FSharp.Compiler.Syntax.QualifiedNameOfFile, Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynModuleOrNamespace], System.Tuple`2[System.Boolean,System.Boolean], FSharp.Compiler.SyntaxTrivia.ParsedImplFileInputTrivia, Microsoft.FSharp.Collections.FSharpSet`1[System.String]) +FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.Syntax.ParsedImplFileInput NewParsedImplFileInput(System.String, Boolean, FSharp.Compiler.Syntax.QualifiedNameOfFile, Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynModuleOrNamespace], System.Tuple`2[System.Boolean,System.Boolean], FSharp.Compiler.SyntaxTrivia.ParsedFileInputTrivia, Microsoft.FSharp.Collections.FSharpSet`1[System.String]) FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.Syntax.QualifiedNameOfFile QualifiedName FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.Syntax.QualifiedNameOfFile get_QualifiedName() FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.Syntax.QualifiedNameOfFile get_qualifiedNameOfFile() FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.Syntax.QualifiedNameOfFile qualifiedNameOfFile -FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.SyntaxTrivia.ParsedImplFileInputTrivia Trivia -FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.SyntaxTrivia.ParsedImplFileInputTrivia get_Trivia() -FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.SyntaxTrivia.ParsedImplFileInputTrivia get_trivia() -FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.SyntaxTrivia.ParsedImplFileInputTrivia trivia +FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.SyntaxTrivia.ParsedFileInputTrivia Trivia +FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.SyntaxTrivia.ParsedFileInputTrivia get_Trivia() +FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.SyntaxTrivia.ParsedFileInputTrivia get_trivia() +FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.SyntaxTrivia.ParsedFileInputTrivia trivia FSharp.Compiler.Syntax.ParsedImplFileInput: Int32 Tag FSharp.Compiler.Syntax.ParsedImplFileInput: Int32 get_Tag() FSharp.Compiler.Syntax.ParsedImplFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective] HashDirectives @@ -6323,15 +6250,15 @@ FSharp.Compiler.Syntax.ParsedSigFileFragment: FSharp.Compiler.Syntax.ParsedSigFi FSharp.Compiler.Syntax.ParsedSigFileFragment: Int32 Tag FSharp.Compiler.Syntax.ParsedSigFileFragment: Int32 get_Tag() FSharp.Compiler.Syntax.ParsedSigFileFragment: System.String ToString() -FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.Syntax.ParsedSigFileInput NewParsedSigFileInput(System.String, FSharp.Compiler.Syntax.QualifiedNameOfFile, Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynModuleOrNamespaceSig], FSharp.Compiler.SyntaxTrivia.ParsedSigFileInputTrivia, Microsoft.FSharp.Collections.FSharpSet`1[System.String]) +FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.Syntax.ParsedSigFileInput NewParsedSigFileInput(System.String, FSharp.Compiler.Syntax.QualifiedNameOfFile, Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynModuleOrNamespaceSig], FSharp.Compiler.SyntaxTrivia.ParsedFileInputTrivia, Microsoft.FSharp.Collections.FSharpSet`1[System.String]) FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.Syntax.QualifiedNameOfFile QualifiedName FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.Syntax.QualifiedNameOfFile get_QualifiedName() FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.Syntax.QualifiedNameOfFile get_qualifiedNameOfFile() FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.Syntax.QualifiedNameOfFile qualifiedNameOfFile -FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.SyntaxTrivia.ParsedSigFileInputTrivia Trivia -FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.SyntaxTrivia.ParsedSigFileInputTrivia get_Trivia() -FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.SyntaxTrivia.ParsedSigFileInputTrivia get_trivia() -FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.SyntaxTrivia.ParsedSigFileInputTrivia trivia +FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.SyntaxTrivia.ParsedFileInputTrivia Trivia +FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.SyntaxTrivia.ParsedFileInputTrivia get_Trivia() +FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.SyntaxTrivia.ParsedFileInputTrivia get_trivia() +FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.SyntaxTrivia.ParsedFileInputTrivia trivia FSharp.Compiler.Syntax.ParsedSigFileInput: Int32 Tag FSharp.Compiler.Syntax.ParsedSigFileInput: Int32 get_Tag() FSharp.Compiler.Syntax.ParsedSigFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective] HashDirectives @@ -7493,12 +7420,16 @@ FSharp.Compiler.Syntax.SynExpr+WhileBang: FSharp.Compiler.Text.Range get_range() FSharp.Compiler.Syntax.SynExpr+WhileBang: FSharp.Compiler.Text.Range range FSharp.Compiler.Syntax.SynExpr+YieldOrReturn: FSharp.Compiler.Syntax.SynExpr expr FSharp.Compiler.Syntax.SynExpr+YieldOrReturn: FSharp.Compiler.Syntax.SynExpr get_expr() +FSharp.Compiler.Syntax.SynExpr+YieldOrReturn: FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia get_trivia() +FSharp.Compiler.Syntax.SynExpr+YieldOrReturn: FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia trivia FSharp.Compiler.Syntax.SynExpr+YieldOrReturn: FSharp.Compiler.Text.Range get_range() FSharp.Compiler.Syntax.SynExpr+YieldOrReturn: FSharp.Compiler.Text.Range range FSharp.Compiler.Syntax.SynExpr+YieldOrReturn: System.Tuple`2[System.Boolean,System.Boolean] flags FSharp.Compiler.Syntax.SynExpr+YieldOrReturn: System.Tuple`2[System.Boolean,System.Boolean] get_flags() FSharp.Compiler.Syntax.SynExpr+YieldOrReturnFrom: FSharp.Compiler.Syntax.SynExpr expr FSharp.Compiler.Syntax.SynExpr+YieldOrReturnFrom: FSharp.Compiler.Syntax.SynExpr get_expr() +FSharp.Compiler.Syntax.SynExpr+YieldOrReturnFrom: FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnFromTrivia get_trivia() +FSharp.Compiler.Syntax.SynExpr+YieldOrReturnFrom: FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnFromTrivia trivia FSharp.Compiler.Syntax.SynExpr+YieldOrReturnFrom: FSharp.Compiler.Text.Range get_range() FSharp.Compiler.Syntax.SynExpr+YieldOrReturnFrom: FSharp.Compiler.Text.Range range FSharp.Compiler.Syntax.SynExpr+YieldOrReturnFrom: System.Tuple`2[System.Boolean,System.Boolean] flags @@ -7713,22 +7644,8 @@ FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewTyped(FSharp.C FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewUpcast(FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Syntax.SynType, FSharp.Compiler.Text.Range) FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewWhile(FSharp.Compiler.Syntax.DebugPointAtWhile, FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range) FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewWhileBang(FSharp.Compiler.Syntax.DebugPointAtWhile, FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range) -FSharp.Compiler.Syntax.SynExpr+YieldOrReturn: FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia get_trivia() -FSharp.Compiler.Syntax.SynExpr+YieldOrReturn: FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia trivia -FSharp.Compiler.Syntax.SynExpr+YieldOrReturnFrom: FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnFromTrivia get_trivia() -FSharp.Compiler.Syntax.SynExpr+YieldOrReturnFrom: FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnFromTrivia trivia FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewYieldOrReturn(System.Tuple`2[System.Boolean,System.Boolean], FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range, FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia) FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewYieldOrReturnFrom(System.Tuple`2[System.Boolean,System.Boolean], FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range, FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnFromTrivia) -FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnFromTrivia: FSharp.Compiler.Text.Range YieldOrReturnFromKeyword -FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnFromTrivia: FSharp.Compiler.Text.Range get_YieldOrReturnFromKeyword() -FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnFromTrivia: System.String ToString() -FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnFromTrivia: Void .ctor(FSharp.Compiler.Text.Range) -FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia: FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia Zero -FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia: FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia get_Zero() -FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia: FSharp.Compiler.Text.Range YieldOrReturnKeyword -FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia: FSharp.Compiler.Text.Range get_YieldOrReturnKeyword() -FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia: System.String ToString() -FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia: Void .ctor(FSharp.Compiler.Text.Range) FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr+AddressOf FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr+AnonRecd FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr+App @@ -7940,6 +7857,8 @@ FSharp.Compiler.Syntax.SynLongIdent: Microsoft.FSharp.Collections.FSharpList`1[M FSharp.Compiler.Syntax.SynLongIdent: System.String ToString() FSharp.Compiler.Syntax.SynLongIdentHelpers: FSharp.Compiler.Syntax.SynLongIdent LongIdentWithDots(Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.Ident], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Text.Range]) FSharp.Compiler.Syntax.SynLongIdentHelpers: System.Tuple`2[Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.Ident],Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Text.Range]] |LongIdentWithDots|(FSharp.Compiler.Syntax.SynLongIdent) +FSharp.Compiler.Syntax.SynMatchClause: Boolean IsTrueMatchClause +FSharp.Compiler.Syntax.SynMatchClause: Boolean get_IsTrueMatchClause() FSharp.Compiler.Syntax.SynMatchClause: FSharp.Compiler.Syntax.DebugPointAtTarget debugPoint FSharp.Compiler.Syntax.SynMatchClause: FSharp.Compiler.Syntax.DebugPointAtTarget get_debugPoint() FSharp.Compiler.Syntax.SynMatchClause: FSharp.Compiler.Syntax.SynExpr get_resultExpr() @@ -8111,16 +8030,20 @@ FSharp.Compiler.Syntax.SynMemberDefn+ImplicitInherit: FSharp.Compiler.Syntax.Syn FSharp.Compiler.Syntax.SynMemberDefn+ImplicitInherit: FSharp.Compiler.Syntax.SynExpr inheritArgs FSharp.Compiler.Syntax.SynMemberDefn+ImplicitInherit: FSharp.Compiler.Syntax.SynType get_inheritType() FSharp.Compiler.Syntax.SynMemberDefn+ImplicitInherit: FSharp.Compiler.Syntax.SynType inheritType +FSharp.Compiler.Syntax.SynMemberDefn+ImplicitInherit: FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia get_trivia() +FSharp.Compiler.Syntax.SynMemberDefn+ImplicitInherit: FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia trivia FSharp.Compiler.Syntax.SynMemberDefn+ImplicitInherit: FSharp.Compiler.Text.Range get_range() FSharp.Compiler.Syntax.SynMemberDefn+ImplicitInherit: FSharp.Compiler.Text.Range range FSharp.Compiler.Syntax.SynMemberDefn+ImplicitInherit: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.Ident] get_inheritAlias() FSharp.Compiler.Syntax.SynMemberDefn+ImplicitInherit: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.Ident] inheritAlias -FSharp.Compiler.Syntax.SynMemberDefn+Inherit: FSharp.Compiler.Syntax.SynType baseType -FSharp.Compiler.Syntax.SynMemberDefn+Inherit: FSharp.Compiler.Syntax.SynType get_baseType() +FSharp.Compiler.Syntax.SynMemberDefn+Inherit: FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia get_trivia() +FSharp.Compiler.Syntax.SynMemberDefn+Inherit: FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia trivia FSharp.Compiler.Syntax.SynMemberDefn+Inherit: FSharp.Compiler.Text.Range get_range() FSharp.Compiler.Syntax.SynMemberDefn+Inherit: FSharp.Compiler.Text.Range range FSharp.Compiler.Syntax.SynMemberDefn+Inherit: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.Ident] asIdent FSharp.Compiler.Syntax.SynMemberDefn+Inherit: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.Ident] get_asIdent() +FSharp.Compiler.Syntax.SynMemberDefn+Inherit: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.SynType] baseType +FSharp.Compiler.Syntax.SynMemberDefn+Inherit: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.SynType] get_baseType() FSharp.Compiler.Syntax.SynMemberDefn+Interface: FSharp.Compiler.Syntax.SynType get_interfaceType() FSharp.Compiler.Syntax.SynMemberDefn+Interface: FSharp.Compiler.Syntax.SynType interfaceType FSharp.Compiler.Syntax.SynMemberDefn+Interface: FSharp.Compiler.Text.Range get_range() @@ -8195,14 +8118,8 @@ FSharp.Compiler.Syntax.SynMemberDefn: FSharp.Compiler.Syntax.SynMemberDefn NewAb FSharp.Compiler.Syntax.SynMemberDefn: FSharp.Compiler.Syntax.SynMemberDefn NewAutoProperty(Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynAttributeList], Boolean, FSharp.Compiler.Syntax.Ident, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.SynType], FSharp.Compiler.Syntax.SynMemberKind, FSharp.Compiler.Syntax.SynMemberFlags, FSharp.Compiler.Syntax.SynMemberFlags, FSharp.Compiler.Xml.PreXmlDoc, FSharp.Compiler.Syntax.SynValSigAccess, FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range, FSharp.Compiler.SyntaxTrivia.SynMemberDefnAutoPropertyTrivia) FSharp.Compiler.Syntax.SynMemberDefn: FSharp.Compiler.Syntax.SynMemberDefn NewGetSetMember(Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.SynBinding], Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.SynBinding], FSharp.Compiler.Text.Range, FSharp.Compiler.SyntaxTrivia.SynMemberGetSetTrivia) FSharp.Compiler.Syntax.SynMemberDefn: FSharp.Compiler.Syntax.SynMemberDefn NewImplicitCtor(Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.SynAccess], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynAttributeList], FSharp.Compiler.Syntax.SynPat, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.Ident], FSharp.Compiler.Xml.PreXmlDoc, FSharp.Compiler.Text.Range, FSharp.Compiler.SyntaxTrivia.SynMemberDefnImplicitCtorTrivia) -FSharp.Compiler.Syntax.SynMemberDefn: FSharp.Compiler.Syntax.SynMemberDefn NewImplicitInherit(FSharp.Compiler.Syntax.SynType, FSharp.Compiler.Syntax.SynExpr, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.Ident], FSharp.Compiler.Text.Range) -FSharp.Compiler.Syntax.SynMemberDefn+Inherit: FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia get_trivia() -FSharp.Compiler.Syntax.SynMemberDefn+Inherit: FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia trivia -FSharp.Compiler.Syntax.SynMemberDefn: FSharp.Compiler.Syntax.SynMemberDefn NewInherit(FSharp.Compiler.Syntax.SynType, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.Ident], FSharp.Compiler.Text.Range, FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia) -FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia: FSharp.Compiler.Text.Range InheritKeyword -FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia: FSharp.Compiler.Text.Range get_InheritKeyword() -FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia: System.String ToString() -FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia: Void .ctor(FSharp.Compiler.Text.Range) +FSharp.Compiler.Syntax.SynMemberDefn: FSharp.Compiler.Syntax.SynMemberDefn NewImplicitInherit(FSharp.Compiler.Syntax.SynType, FSharp.Compiler.Syntax.SynExpr, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.Ident], FSharp.Compiler.Text.Range, FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia) +FSharp.Compiler.Syntax.SynMemberDefn: FSharp.Compiler.Syntax.SynMemberDefn NewInherit(Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.SynType], Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.Ident], FSharp.Compiler.Text.Range, FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia) FSharp.Compiler.Syntax.SynMemberDefn: FSharp.Compiler.Syntax.SynMemberDefn NewInterface(FSharp.Compiler.Syntax.SynType, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range], Microsoft.FSharp.Core.FSharpOption`1[Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynMemberDefn]], FSharp.Compiler.Text.Range) FSharp.Compiler.Syntax.SynMemberDefn: FSharp.Compiler.Syntax.SynMemberDefn NewLetBindings(Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynBinding], Boolean, Boolean, FSharp.Compiler.Text.Range) FSharp.Compiler.Syntax.SynMemberDefn: FSharp.Compiler.Syntax.SynMemberDefn NewMember(FSharp.Compiler.Syntax.SynBinding, FSharp.Compiler.Text.Range) @@ -10197,18 +10114,14 @@ FSharp.Compiler.SyntaxTrivia.IfDirectiveExpression: FSharp.Compiler.SyntaxTrivia FSharp.Compiler.SyntaxTrivia.IfDirectiveExpression: Int32 Tag FSharp.Compiler.SyntaxTrivia.IfDirectiveExpression: Int32 get_Tag() FSharp.Compiler.SyntaxTrivia.IfDirectiveExpression: System.String ToString() -FSharp.Compiler.SyntaxTrivia.ParsedImplFileInputTrivia: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.CommentTrivia] CodeComments -FSharp.Compiler.SyntaxTrivia.ParsedImplFileInputTrivia: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.CommentTrivia] get_CodeComments() -FSharp.Compiler.SyntaxTrivia.ParsedImplFileInputTrivia: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.ConditionalDirectiveTrivia] ConditionalDirectives -FSharp.Compiler.SyntaxTrivia.ParsedImplFileInputTrivia: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.ConditionalDirectiveTrivia] get_ConditionalDirectives() -FSharp.Compiler.SyntaxTrivia.ParsedImplFileInputTrivia: System.String ToString() -FSharp.Compiler.SyntaxTrivia.ParsedImplFileInputTrivia: Void .ctor(Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.ConditionalDirectiveTrivia], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.CommentTrivia]) -FSharp.Compiler.SyntaxTrivia.ParsedSigFileInputTrivia: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.CommentTrivia] CodeComments -FSharp.Compiler.SyntaxTrivia.ParsedSigFileInputTrivia: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.CommentTrivia] get_CodeComments() -FSharp.Compiler.SyntaxTrivia.ParsedSigFileInputTrivia: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.ConditionalDirectiveTrivia] ConditionalDirectives -FSharp.Compiler.SyntaxTrivia.ParsedSigFileInputTrivia: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.ConditionalDirectiveTrivia] get_ConditionalDirectives() -FSharp.Compiler.SyntaxTrivia.ParsedSigFileInputTrivia: System.String ToString() -FSharp.Compiler.SyntaxTrivia.ParsedSigFileInputTrivia: Void .ctor(Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.ConditionalDirectiveTrivia], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.CommentTrivia]) +FSharp.Compiler.SyntaxTrivia.ParsedFileInputTrivia: FSharp.Compiler.SyntaxTrivia.ParsedFileInputTrivia Empty +FSharp.Compiler.SyntaxTrivia.ParsedFileInputTrivia: FSharp.Compiler.SyntaxTrivia.ParsedFileInputTrivia get_Empty() +FSharp.Compiler.SyntaxTrivia.ParsedFileInputTrivia: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.CommentTrivia] CodeComments +FSharp.Compiler.SyntaxTrivia.ParsedFileInputTrivia: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.CommentTrivia] get_CodeComments() +FSharp.Compiler.SyntaxTrivia.ParsedFileInputTrivia: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.ConditionalDirectiveTrivia] ConditionalDirectives +FSharp.Compiler.SyntaxTrivia.ParsedFileInputTrivia: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.ConditionalDirectiveTrivia] get_ConditionalDirectives() +FSharp.Compiler.SyntaxTrivia.ParsedFileInputTrivia: System.String ToString() +FSharp.Compiler.SyntaxTrivia.ParsedFileInputTrivia: Void .ctor(Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.ConditionalDirectiveTrivia], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.CommentTrivia]) FSharp.Compiler.SyntaxTrivia.SynArgPatsNamePatPairsTrivia: FSharp.Compiler.Text.Range ParenRange FSharp.Compiler.SyntaxTrivia.SynArgPatsNamePatPairsTrivia: FSharp.Compiler.Text.Range get_ParenRange() FSharp.Compiler.SyntaxTrivia.SynArgPatsNamePatPairsTrivia: System.String ToString() @@ -10283,11 +10196,11 @@ FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia: System.String ToString() FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia: Void .ctor(FSharp.Compiler.Text.Range, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range]) FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia Zero FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia get_Zero() +FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: FSharp.Compiler.Text.Range LetOrUseKeyword +FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: FSharp.Compiler.Text.Range get_LetOrUseKeyword() FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range] InKeyword FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range] get_InKeyword() FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: System.String ToString() -FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: FSharp.Compiler.Text.Range LetOrUseKeyword -FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: FSharp.Compiler.Text.Range get_LetOrUseKeyword() FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: Void .ctor(FSharp.Compiler.Text.Range, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range]) FSharp.Compiler.SyntaxTrivia.SynExprMatchBangTrivia: FSharp.Compiler.Text.Range MatchBangKeyword FSharp.Compiler.SyntaxTrivia.SynExprMatchBangTrivia: FSharp.Compiler.Text.Range WithKeyword @@ -10323,6 +10236,16 @@ FSharp.Compiler.SyntaxTrivia.SynExprTryWithTrivia: FSharp.Compiler.Text.Range ge FSharp.Compiler.SyntaxTrivia.SynExprTryWithTrivia: FSharp.Compiler.Text.Range get_WithToEndRange() FSharp.Compiler.SyntaxTrivia.SynExprTryWithTrivia: System.String ToString() FSharp.Compiler.SyntaxTrivia.SynExprTryWithTrivia: Void .ctor(FSharp.Compiler.Text.Range, FSharp.Compiler.Text.Range, FSharp.Compiler.Text.Range, FSharp.Compiler.Text.Range) +FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnFromTrivia: FSharp.Compiler.Text.Range YieldOrReturnFromKeyword +FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnFromTrivia: FSharp.Compiler.Text.Range get_YieldOrReturnFromKeyword() +FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnFromTrivia: System.String ToString() +FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnFromTrivia: Void .ctor(FSharp.Compiler.Text.Range) +FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia: FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia Zero +FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia: FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia get_Zero() +FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia: FSharp.Compiler.Text.Range YieldOrReturnKeyword +FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia: FSharp.Compiler.Text.Range get_YieldOrReturnKeyword() +FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia: System.String ToString() +FSharp.Compiler.SyntaxTrivia.SynExprYieldOrReturnTrivia: Void .ctor(FSharp.Compiler.Text.Range) FSharp.Compiler.SyntaxTrivia.SynFieldTrivia: FSharp.Compiler.SyntaxTrivia.SynFieldTrivia Zero FSharp.Compiler.SyntaxTrivia.SynFieldTrivia: FSharp.Compiler.SyntaxTrivia.SynFieldTrivia get_Zero() FSharp.Compiler.SyntaxTrivia.SynFieldTrivia: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.SyntaxTrivia.SynLeadingKeyword] LeadingKeyword @@ -10592,6 +10515,10 @@ FSharp.Compiler.SyntaxTrivia.SynMemberDefnImplicitCtorTrivia: Microsoft.FSharp.C FSharp.Compiler.SyntaxTrivia.SynMemberDefnImplicitCtorTrivia: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range] get_AsKeyword() FSharp.Compiler.SyntaxTrivia.SynMemberDefnImplicitCtorTrivia: System.String ToString() FSharp.Compiler.SyntaxTrivia.SynMemberDefnImplicitCtorTrivia: Void .ctor(Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range]) +FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia: FSharp.Compiler.Text.Range InheritKeyword +FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia: FSharp.Compiler.Text.Range get_InheritKeyword() +FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia: System.String ToString() +FSharp.Compiler.SyntaxTrivia.SynMemberDefnInheritTrivia: Void .ctor(FSharp.Compiler.Text.Range) FSharp.Compiler.SyntaxTrivia.SynMemberGetSetTrivia: FSharp.Compiler.Text.Range WithKeyword FSharp.Compiler.SyntaxTrivia.SynMemberGetSetTrivia: FSharp.Compiler.Text.Range get_WithKeyword() FSharp.Compiler.SyntaxTrivia.SynMemberGetSetTrivia: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range] AndKeyword diff --git a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj index dfd70e68e0a..2c983b129ed 100644 --- a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj +++ b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj @@ -18,9 +18,6 @@ - - FsUnit.fs - diff --git a/tests/FSharp.Compiler.Service.Tests/FileSystemTests.fs b/tests/FSharp.Compiler.Service.Tests/FileSystemTests.fs index 77a1d657308..ff62594067d 100644 --- a/tests/FSharp.Compiler.Service.Tests/FileSystemTests.fs +++ b/tests/FSharp.Compiler.Service.Tests/FileSystemTests.fs @@ -1,7 +1,7 @@ module FSharp.Compiler.Service.Tests.FileSystemTests open Xunit -open FsUnit +open FSharp.Test.Assert open FSharp.Test open System open System.IO diff --git a/tests/FSharp.Compiler.Service.Tests/HashIfExpression.fs b/tests/FSharp.Compiler.Service.Tests/HashIfExpression.fs index f871ee96582..d348f692aaa 100644 --- a/tests/FSharp.Compiler.Service.Tests/HashIfExpression.fs +++ b/tests/FSharp.Compiler.Service.Tests/HashIfExpression.fs @@ -16,7 +16,7 @@ open FSharp.Compiler.Diagnostics open FSharp.Compiler.Lexhelp open FSharp.Compiler.DiagnosticsLogger open FSharp.Compiler.Features -open FSharp.Compiler.ParseHelpers +open FSharp.Compiler.LexerStore type public HashIfExpression() = let preludes = [|"#if "; "#elif "|] diff --git a/tests/FSharp.Compiler.Service.Tests/InteractiveCheckerTests.fs b/tests/FSharp.Compiler.Service.Tests/InteractiveCheckerTests.fs index 39e113310c5..39e38dfd1a1 100644 --- a/tests/FSharp.Compiler.Service.Tests/InteractiveCheckerTests.fs +++ b/tests/FSharp.Compiler.Service.Tests/InteractiveCheckerTests.fs @@ -1,7 +1,7 @@ module FSharp.Compiler.Service.Tests.InteractiveCheckerTests open Xunit -open FsUnit +open FSharp.Test.Assert open System open FSharp.Compiler.Service.Tests.Common open FSharp.Compiler.Syntax diff --git a/tests/FSharp.Compiler.Service.Tests/ModuleReaderCancellationTests.fs b/tests/FSharp.Compiler.Service.Tests/ModuleReaderCancellationTests.fs index ed245117916..c760a5f070c 100644 --- a/tests/FSharp.Compiler.Service.Tests/ModuleReaderCancellationTests.fs +++ b/tests/FSharp.Compiler.Service.Tests/ModuleReaderCancellationTests.fs @@ -9,7 +9,7 @@ open FSharp.Compiler.AbstractIL.IL open FSharp.Compiler.AbstractIL.ILBinaryReader open FSharp.Compiler.CodeAnalysis open FSharp.Compiler.Text -open FsUnit +open FSharp.Test.Assert open Internal.Utilities.Library open FSharp.Compiler.Service.Tests.Common open Xunit diff --git a/tests/FSharp.Compiler.Service.Tests/MultiProjectAnalysisTests.fs b/tests/FSharp.Compiler.Service.Tests/MultiProjectAnalysisTests.fs index 3564288b229..230d90f2527 100644 --- a/tests/FSharp.Compiler.Service.Tests/MultiProjectAnalysisTests.fs +++ b/tests/FSharp.Compiler.Service.Tests/MultiProjectAnalysisTests.fs @@ -1,7 +1,7 @@ module FSharp.Compiler.Service.Tests.MultiProjectAnalysisTests open Xunit -open FsUnit +open FSharp.Test.Assert open System.IO open System.Collections.Generic open FSharp.Compiler.CodeAnalysis diff --git a/tests/FSharp.Compiler.Service.Tests/ParserTests.fs b/tests/FSharp.Compiler.Service.Tests/ParserTests.fs index 149a74d25b2..2fc76220cd8 100644 --- a/tests/FSharp.Compiler.Service.Tests/ParserTests.fs +++ b/tests/FSharp.Compiler.Service.Tests/ParserTests.fs @@ -3,7 +3,7 @@ open FSharp.Compiler.Service.Tests.Common open FSharp.Compiler.Syntax open FSharp.Compiler.Text -open FsUnit +open FSharp.Test.Assert open Xunit [] diff --git a/tests/FSharp.Compiler.Service.Tests/PatternMatchCompilationTests.fs b/tests/FSharp.Compiler.Service.Tests/PatternMatchCompilationTests.fs index 4ae43434099..5bd733d5316 100644 --- a/tests/FSharp.Compiler.Service.Tests/PatternMatchCompilationTests.fs +++ b/tests/FSharp.Compiler.Service.Tests/PatternMatchCompilationTests.fs @@ -3,7 +3,7 @@ module FSharp.Compiler.Service.Tests.PatternMatchCompilationTests // Most tests here weren't running on desktop and fails open FSharp.Compiler.Service.Tests.Common -open FsUnit +open FSharp.Test.Assert open Xunit open FSharp.Test @@ -455,7 +455,7 @@ let r as _ = 10 let s as Id0 = 11 let t as (u) = 12 let v as struct(w, x) = 13, 14 -let y as z : int = 15{set { 'a'..'x' } - set [ 'p'; 'v' ] |> Set.map (sprintf " + %c") |> System.String.Concat} +let y as z : int = 15{set (seq { 'a'..'x' }) - set [ 'p'; 'v' ] |> Set.map (sprintf " + %c") |> System.String.Concat} Some p |> eq Some v |> eq () @@ -590,7 +590,7 @@ let _ as r = 10 let Id0 as s = 11 let (t) as u = 12 let struct(w, v) as x = 13, 14 -let (y : int) as z = 15{set { 'a'..'v' } - set [ 'h'; 'q' ] |> Set.map (sprintf " + %c") |> System.String.Concat} +let (y : int) as z = 15{set (seq { 'a'..'v' }) - set [ 'h'; 'q' ] |> Set.map (sprintf " + %c") |> System.String.Concat} Some h |> eq Some q |> eq Some x |> eq @@ -917,7 +917,7 @@ let :? z as [] let ``As 16 - syntactical precedence matrix testing left with type tests - total patterns`` () = - let validSet = set { 'a'..'x' } - set [ 'p'; 'q' ] |> Set.map string + let validSet = set (seq { 'a'..'x' }) - set [ 'p'; 'q' ] |> Set.map string let _, checkResults = getParseAndCheckResults70 $""" let eq<'T> (x:'T option) = () // FS-1093-safe type assert function let (|Id0|) = ignore diff --git a/tests/FSharp.Compiler.Service.Tests/PerfTests.fs b/tests/FSharp.Compiler.Service.Tests/PerfTests.fs index 0a58bd4ec72..aa270182895 100644 --- a/tests/FSharp.Compiler.Service.Tests/PerfTests.fs +++ b/tests/FSharp.Compiler.Service.Tests/PerfTests.fs @@ -1,7 +1,7 @@ module FSharp.Compiler.Service.Tests.PerfTests open Xunit -open FsUnit +open FSharp.Test.Assert open System.IO open FSharp.Compiler.CodeAnalysis open FSharp.Compiler.IO diff --git a/tests/FSharp.Compiler.Service.Tests/ProjectAnalysisTests.fs b/tests/FSharp.Compiler.Service.Tests/ProjectAnalysisTests.fs index 5752f9de41c..9f86267886f 100644 --- a/tests/FSharp.Compiler.Service.Tests/ProjectAnalysisTests.fs +++ b/tests/FSharp.Compiler.Service.Tests/ProjectAnalysisTests.fs @@ -5,7 +5,7 @@ let runningOnMono = try System.Type.GetType("Mono.Runtime") <> null with e -> false open Xunit -open FsUnit +open FSharp.Test.Assert open FSharp.Test open System open System.IO @@ -96,7 +96,7 @@ let mmmm2 : M.CAbbrev = new M.CAbbrev() // note, these don't count as uses of C let ``Test project1 whole project errors`` () = let wholeProjectResults = checker.ParseAndCheckProject(Project1.options) |> Async.RunImmediate - wholeProjectResults .Diagnostics.Length |> shouldEqual 2 + wholeProjectResults.Diagnostics.Length |> shouldEqual 2 wholeProjectResults.Diagnostics[1].Message.Contains("Incomplete pattern matches on this expression") |> shouldEqual true // yes it does wholeProjectResults.Diagnostics[1].ErrorNumber |> shouldEqual 25 @@ -108,6 +108,9 @@ let ``Test project1 whole project errors`` () = [] let ``Test project1 and make sure TcImports gets cleaned up`` () = + // A private checker for this test. + let checker = FSharpChecker.Create() + let test () = let _, checkFileAnswer = checker.ParseAndCheckFileInProject(Project1.fileName1, 0, Project1.fileSource1, Project1.options) |> Async.RunImmediate match checkFileAnswer with @@ -123,15 +126,7 @@ let ``Test project1 and make sure TcImports gets cleaned up`` () = let weakTcImports = test () checker.InvalidateConfiguration Project1.options checker.ClearLanguageServiceRootCachesAndCollectAndFinalizeAllTransients() - - //collect 2 more times for good measure, - // See for example: https://github.com/dotnet/runtime/discussions/108081 - GC.Collect() - GC.WaitForPendingFinalizers() - GC.Collect() - GC.WaitForPendingFinalizers() - - Assert.False weakTcImports.IsAlive + System.Threading.SpinWait.SpinUntil(fun () -> not weakTcImports.IsAlive) [] let ``Test Project1 should have protected FullName and TryFullName return same results`` () = diff --git a/tests/FSharp.Compiler.Service.Tests/RangeTests.fs b/tests/FSharp.Compiler.Service.Tests/RangeTests.fs index d177d92165c..9bf0564e437 100644 --- a/tests/FSharp.Compiler.Service.Tests/RangeTests.fs +++ b/tests/FSharp.Compiler.Service.Tests/RangeTests.fs @@ -3,7 +3,7 @@ open FSharp.Compiler.Text open FSharp.Compiler.Text.Position open FSharp.Compiler.Text.Range -open FsUnit +open FSharp.Test.Assert open Xunit [] diff --git a/tests/FSharp.Compiler.Service.Tests/ServiceUntypedParseTests.fs b/tests/FSharp.Compiler.Service.Tests/ServiceUntypedParseTests.fs index 330bcae5c5c..51be9f0c058 100644 --- a/tests/FSharp.Compiler.Service.Tests/ServiceUntypedParseTests.fs +++ b/tests/FSharp.Compiler.Service.Tests/ServiceUntypedParseTests.fs @@ -1,7 +1,7 @@ module FSharp.Compiler.Service.Tests.ServiceUntypedParseTests open System.IO -open FsUnit +open FSharp.Test.Assert open FSharp.Compiler.EditorServices open FSharp.Compiler.Service.Tests.Common open FSharp.Compiler.Syntax diff --git a/tests/FSharp.Compiler.Service.Tests/Symbols.fs b/tests/FSharp.Compiler.Service.Tests/Symbols.fs index e0082fcde30..eba673f5963 100644 --- a/tests/FSharp.Compiler.Service.Tests/Symbols.fs +++ b/tests/FSharp.Compiler.Service.Tests/Symbols.fs @@ -5,7 +5,7 @@ open FSharp.Compiler.Service.Tests.Common open FSharp.Compiler.Symbols open FSharp.Compiler.Syntax open FSharp.Compiler.SyntaxTrivia -open FsUnit +open FSharp.Test.Assert open Xunit module ActivePatterns = diff --git a/tests/FSharp.Compiler.Service.Tests/XmlDocTests.fs b/tests/FSharp.Compiler.Service.Tests/XmlDocTests.fs index 90290dd99f6..3e427293e25 100644 --- a/tests/FSharp.Compiler.Service.Tests/XmlDocTests.fs +++ b/tests/FSharp.Compiler.Service.Tests/XmlDocTests.fs @@ -5,7 +5,7 @@ open FSharp.Compiler.Service.Tests.Common open FSharp.Compiler.Symbols open FSharp.Compiler.Syntax open FSharp.Test.Compiler -open FsUnit +open FSharp.Test.Assert open Xunit let (|Types|TypeSigs|) = function diff --git a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Collections/ArrayModule.fs b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Collections/ArrayModule.fs index c2b0d240372..662a729e28f 100644 --- a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Collections/ArrayModule.fs +++ b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Collections/ArrayModule.fs @@ -259,8 +259,8 @@ type ArrayModule() = [] member _.Except() = // integer array - let intArr1 = [| yield! {1..100} - yield! {1..100} |] + let intArr1 = [| yield! seq {1..100} + yield! seq {1..100} |] let intArr2 = [| 1 .. 10 |] let expectedIntArr = [| 11 .. 100 |] diff --git a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Collections/ArrayModule2.fs b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Collections/ArrayModule2.fs index ec30e724bbb..5c5afc3c234 100644 --- a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Collections/ArrayModule2.fs +++ b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Collections/ArrayModule2.fs @@ -372,7 +372,7 @@ type ArrayModule2() = [] member this.Of_Seq() = // integer array - let resultInt = Array.ofSeq {1..10} + let resultInt = Array.ofSeq (seq {1..10}) if resultInt <> [|1..10|] then Assert.Fail() // string array diff --git a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Collections/ListModule.fs b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Collections/ListModule.fs index 9f3ae062d02..8b0fcf507e5 100644 --- a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Collections/ListModule.fs +++ b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Collections/ListModule.fs @@ -346,8 +346,8 @@ type ListModule() = [] member _.Except() = // integer list - let intList1 = [ yield! {1..100} - yield! {1..100} ] + let intList1 = [ yield! seq {1..100} + yield! seq {1..100} ] let intList2 = [1..10] let expectedIntList = [11..100] diff --git a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Collections/ListModule2.fs b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Collections/ListModule2.fs index 328574bdac0..3a27d4e7d2a 100644 --- a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Collections/ListModule2.fs +++ b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Collections/ListModule2.fs @@ -367,7 +367,7 @@ type ListModule02() = [] member this.Of_Seq() = // integer List - let resultInt = List.ofSeq {1..10} + let resultInt = List.ofSeq (seq {1..10}) Assert.AreEqual([1..10], resultInt) // string List diff --git a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Collections/ObsoleteSeqFunctions.fs b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Collections/ObsoleteSeqFunctions.fs index 3b8727fc538..67c5aeba747 100644 --- a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Collections/ObsoleteSeqFunctions.fs +++ b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Collections/ObsoleteSeqFunctions.fs @@ -15,14 +15,14 @@ type ObsoleteSeqFunctions() = // Negative index for i = -1 downto -10 do - CheckThrowsArgumentException (fun () -> Seq.nth i { 10 .. 20 } |> ignore) + CheckThrowsArgumentException (fun () -> Seq.nth i (seq { 10 .. 20 }) |> ignore) // Out of range for i = 11 to 20 do - CheckThrowsArgumentException (fun () -> Seq.nth i { 10 .. 20 } |> ignore) + CheckThrowsArgumentException (fun () -> Seq.nth i (seq { 10 .. 20 }) |> ignore) // integer Seq - let resultInt = Seq.nth 3 { 10..20 } + let resultInt = Seq.nth 3 (seq { 10..20 }) Assert.AreEqual(13, resultInt) // string Seq diff --git a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Collections/SeqModule.fs b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Collections/SeqModule.fs index de6f66dd7ec..f2f88933506 100644 --- a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Collections/SeqModule.fs +++ b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Collections/SeqModule.fs @@ -39,8 +39,8 @@ type SeqModule() = // empty Seq VerifySeqsEqual Seq.empty <| Seq.allPairs Seq.empty Seq.empty - VerifySeqsEqual Seq.empty <| Seq.allPairs { 1..7 } Seq.empty - VerifySeqsEqual Seq.empty <| Seq.allPairs Seq.empty { 1..7 } + VerifySeqsEqual Seq.empty <| Seq.allPairs (seq { 1..7 }) Seq.empty + VerifySeqsEqual Seq.empty <| Seq.allPairs Seq.empty (seq { 1..7 }) // null Seq CheckThrowsArgumentNullException(fun() -> Seq.allPairs null null |> ignore) @@ -349,9 +349,9 @@ type SeqModule() = |> Seq.iter ((<||) VerifySeqsEqual) // int Seq - verify [[1..4];[5..8]] <| Seq.chunkBySize 4 {1..8} - verify [[1..4];[5..8];[9..10]] <| Seq.chunkBySize 4 {1..10} - verify [[1]; [2]; [3]; [4]] <| Seq.chunkBySize 1 {1..4} + verify [[1..4];[5..8]] <| Seq.chunkBySize 4 (seq {1..8}) + verify [[1..4];[5..8];[9..10]] <| Seq.chunkBySize 4 (seq {1..10}) + verify [[1]; [2]; [3]; [4]] <| Seq.chunkBySize 1 (seq {1..4}) Seq.chunkBySize 2 (Seq.initInfinite id) |> Seq.take 3 @@ -372,8 +372,8 @@ type SeqModule() = CheckThrowsArgumentNullException (fun () -> Seq.chunkBySize 3 nullSeq |> ignore) // invalidArg - CheckThrowsArgumentException (fun () -> Seq.chunkBySize 0 {1..10} |> ignore) - CheckThrowsArgumentException (fun () -> Seq.chunkBySize -1 {1..10} |> ignore) + CheckThrowsArgumentException (fun () -> Seq.chunkBySize 0 (seq {1..10}) |> ignore) + CheckThrowsArgumentException (fun () -> Seq.chunkBySize -1 (seq {1..10}) |> ignore) () @@ -385,12 +385,12 @@ type SeqModule() = |> Seq.iter ((<||) VerifySeqsEqual) // int Seq - Seq.splitInto 3 {1..10} |> verify (seq [ {1..4}; {5..7}; {8..10} ]) - Seq.splitInto 3 {1..11} |> verify (seq [ {1..4}; {5..8}; {9..11} ]) - Seq.splitInto 3 {1..12} |> verify (seq [ {1..4}; {5..8}; {9..12} ]) + Seq.splitInto 3 (seq {1..10}) |> verify (seq [ seq {1..4}; seq {5..7}; seq {8..10} ]) + Seq.splitInto 3 (seq {1..11}) |> verify (seq [ seq {1..4}; seq {5..8}; seq {9..11} ]) + Seq.splitInto 3 (seq {1..12}) |> verify (seq [ seq {1..4}; seq {5..8}; seq {9..12} ]) - Seq.splitInto 4 {1..5} |> verify (seq [ [1..2]; [3]; [4]; [5] ]) - Seq.splitInto 20 {1..4} |> verify (seq [ [1]; [2]; [3]; [4] ]) + Seq.splitInto 4 (seq {1..5}) |> verify (seq [ [1..2]; [3]; [4]; [5] ]) + Seq.splitInto 20 (seq {1..4}) |> verify (seq [ [1]; [2]; [3]; [4] ]) // string Seq Seq.splitInto 3 ["a";"b";"c";"d";"e"] |> verify ([ ["a"; "b"]; ["c";"d"]; ["e"] ]) @@ -586,10 +586,10 @@ type SeqModule() = [] member _.Except() = // integer Seq - let intSeq1 = seq { yield! {1..100} - yield! {1..100} } - let intSeq2 = {1..10} - let expectedIntSeq = {11..100} + let intSeq1 = seq { yield! seq {1..100} + yield! seq {1..100} } + let intSeq2 = seq {1..10} + let expectedIntSeq = seq {11..100} VerifySeqsEqual expectedIntSeq <| Seq.except intSeq2 intSeq1 @@ -609,7 +609,7 @@ type SeqModule() = // empty Seq let emptyIntSeq = Seq.empty - VerifySeqsEqual {1..100} <| Seq.except emptyIntSeq intSeq1 + VerifySeqsEqual (seq {1..100}) <| Seq.except emptyIntSeq intSeq1 VerifySeqsEqual emptyIntSeq <| Seq.except intSeq1 emptyIntSeq VerifySeqsEqual emptyIntSeq <| Seq.except emptyIntSeq emptyIntSeq VerifySeqsEqual emptyIntSeq <| Seq.except intSeq1 intSeq1 diff --git a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Collections/SeqModule2.fs b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Collections/SeqModule2.fs index 8412b999b5d..db3b8a3adcc 100644 --- a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Collections/SeqModule2.fs +++ b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Collections/SeqModule2.fs @@ -479,7 +479,7 @@ type SeqModule2() = member _.Length() = // integer seq - let resultInt = Seq.length {1..8} + let resultInt = Seq.length (seq {1..8}) if resultInt <> 8 then Assert.Fail() // string Seq @@ -505,7 +505,7 @@ type SeqModule2() = | _ when x % 2 = 0 -> 10*x | _ -> x - let resultInt = Seq.map funcInt { 1..10 } + let resultInt = Seq.map funcInt (seq { 1..10 }) let expectedint = seq [1;20;3;40;5;60;7;80;9;100] VerifySeqsEqual expectedint resultInt @@ -531,7 +531,7 @@ type SeqModule2() = member _.Map2() = // integer Seq let funcInt x y = x+y - let resultInt = Seq.map2 funcInt { 1..10 } {2..2..20} + let resultInt = Seq.map2 funcInt (seq { 1..10 }) (seq {2..2..20}) let expectedint = seq [3;6;9;12;15;18;21;24;27;30] VerifySeqsEqual expectedint resultInt @@ -558,16 +558,16 @@ type SeqModule2() = member _.Map3() = // Integer seq let funcInt a b c = (a + b) * c - let resultInt = Seq.map3 funcInt { 1..8 } { 2..9 } { 3..10 } + let resultInt = Seq.map3 funcInt (seq { 1..8 }) (seq { 2..9 }) (seq { 3..10 }) let expectedInt = seq [9; 20; 35; 54; 77; 104; 135; 170] VerifySeqsEqual expectedInt resultInt // First seq is shorter - VerifySeqsEqual (seq [9; 20]) (Seq.map3 funcInt { 1..2 } { 2..9 } { 3..10 }) + VerifySeqsEqual (seq [9; 20]) (Seq.map3 funcInt (seq { 1..2 }) (seq { 2..9 }) (seq { 3..10 })) // Second seq is shorter - VerifySeqsEqual (seq [9; 20; 35]) (Seq.map3 funcInt { 1..8 } { 2..4 } { 3..10 }) + VerifySeqsEqual (seq [9; 20; 35]) (Seq.map3 funcInt (seq { 1..8 }) (seq { 2..4 }) (seq { 3..10 })) // Third seq is shorter - VerifySeqsEqual (seq [9; 20; 35; 54]) (Seq.map3 funcInt { 1..8 } { 2..6 } { 3..6 }) + VerifySeqsEqual (seq [9; 20; 35; 54]) (Seq.map3 funcInt (seq { 1..8 }) (seq { 2..6 }) (seq { 3..6 })) // String seq let funcStr a b c = a + b + c @@ -812,7 +812,7 @@ type SeqModule2() = member _.Collect() = // integer Seq let funcInt x = seq [x+1] - let resultInt = Seq.collect funcInt { 1..10 } + let resultInt = Seq.collect funcInt (seq { 1..10 }) let expectedint = seq {2..11} @@ -843,7 +843,7 @@ type SeqModule2() = // integer Seq let funcInt x y = x+y - let resultInt = Seq.mapi funcInt { 10..2..20 } + let resultInt = Seq.mapi funcInt (seq { 10..2..20 }) let expectedint = seq [10;13;16;19;22;25] VerifySeqsEqual expectedint resultInt @@ -871,7 +871,7 @@ type SeqModule2() = member _.Mapi2() = // integer Seq let funcInt x y z = x+y+z - let resultInt = Seq.mapi2 funcInt { 1..10 } {2..2..20} + let resultInt = Seq.mapi2 funcInt (seq { 1..10 }) (seq {2..2..20}) let expectedint = seq [3;7;11;15;19;23;27;31;35;39] VerifySeqsEqual expectedint resultInt @@ -907,7 +907,7 @@ type SeqModule2() = member _.Indexed() = // integer Seq - let resultInt = Seq.indexed { 10..2..20 } + let resultInt = Seq.indexed (seq { 10..2..20 }) let expectedint = seq [(0,10);(1,12);(2,14);(3,16);(4,18);(5,20)] VerifySeqsEqual expectedint resultInt @@ -931,7 +931,7 @@ type SeqModule2() = [] member _.Max() = // integer Seq - let resultInt = Seq.max { 10..20 } + let resultInt = Seq.max (seq { 10..20 }) Assert.AreEqual(20,resultInt) @@ -954,7 +954,7 @@ type SeqModule2() = // integer Seq let funcInt x = x % 8 - let resultInt = Seq.maxBy funcInt { 2..2..20 } + let resultInt = Seq.maxBy funcInt (seq { 2..2..20 }) Assert.AreEqual(6,resultInt) // string Seq @@ -976,7 +976,7 @@ type SeqModule2() = // integer Seq let funcInt x = x % 8 - let resultInt = Seq.minBy funcInt { 2..2..20 } + let resultInt = Seq.minBy funcInt (seq { 2..2..20 }) Assert.AreEqual(8,resultInt) // string Seq @@ -998,7 +998,7 @@ type SeqModule2() = member _.Min() = // integer Seq - let resultInt = Seq.min { 10..20 } + let resultInt = Seq.min (seq { 10..20 }) Assert.AreEqual(10,resultInt) // string Seq @@ -1017,7 +1017,7 @@ type SeqModule2() = [] member _.Item() = // integer Seq - let resultInt = Seq.item 3 { 10..20 } + let resultInt = Seq.item 3 (seq { 10..20 }) Assert.AreEqual(13, resultInt) // string Seq @@ -1033,11 +1033,11 @@ type SeqModule2() = // Negative index for i = -1 downto -10 do - CheckThrowsArgumentException (fun () -> Seq.item i { 10 .. 20 } |> ignore) + CheckThrowsArgumentException (fun () -> Seq.item i (seq { 10 .. 20 }) |> ignore) // Out of range for i = 11 to 20 do - CheckThrowsArgumentException (fun () -> Seq.item i { 10 .. 20 } |> ignore) + CheckThrowsArgumentException (fun () -> Seq.item i (seq { 10 .. 20 }) |> ignore) [] member _.``item should fail with correct number of missing elements``() = @@ -1057,7 +1057,7 @@ type SeqModule2() = member _.Of_Array() = // integer Seq let resultInt = Seq.ofArray [|1..10|] - let expectedInt = {1..10} + let expectedInt = seq {1..10} VerifySeqsEqual expectedInt resultInt @@ -1076,7 +1076,7 @@ type SeqModule2() = member _.Of_List() = // integer Seq let resultInt = Seq.ofList [1..10] - let expectedInt = {1..10} + let expectedInt = seq {1..10} VerifySeqsEqual expectedInt resultInt @@ -1095,7 +1095,7 @@ type SeqModule2() = [] member _.Pairwise() = // integer Seq - let resultInt = Seq.pairwise {1..3} + let resultInt = Seq.pairwise (seq {1..3}) let expectedInt = seq [1,2;2,3] @@ -1182,7 +1182,7 @@ type SeqModule2() = member _.Scan() = // integer Seq let funcInt x y = x+y - let resultInt = Seq.scan funcInt 9 {1..10} + let resultInt = Seq.scan funcInt 9 (seq {1..10}) let expectedInt = seq [9;10;12;15;19;24;30;37;45;54;64] VerifySeqsEqual expectedInt resultInt @@ -1207,7 +1207,7 @@ type SeqModule2() = member _.ScanBack() = // integer Seq let funcInt x y = x+y - let resultInt = Seq.scanBack funcInt { 1..10 } 9 + let resultInt = Seq.scanBack funcInt (seq { 1..10 }) 9 let expectedInt = seq [64;63;61;58;54;49;43;36;28;19;9] VerifySeqsEqual expectedInt resultInt @@ -1313,7 +1313,7 @@ type SeqModule2() = // integer Seq let resultInt = Seq.sort (seq [1;3;2;4;6;5;7]) - let expectedInt = {1..7} + let expectedInt = seq {1..7} VerifySeqsEqual expectedInt resultInt // string Seq @@ -1960,7 +1960,7 @@ type SeqModule2() = [] member _.tryItem() = // integer Seq - let resultInt = Seq.tryItem 3 { 10..20 } + let resultInt = Seq.tryItem 3 (seq { 10..20 }) Assert.AreEqual(Some(13), resultInt) // string Seq @@ -1976,11 +1976,11 @@ type SeqModule2() = CheckThrowsArgumentNullException (fun () -> Seq.tryItem 3 nullSeq |> ignore) // Negative index - let resultNegativeIndex = Seq.tryItem -1 { 10..20 } + let resultNegativeIndex = Seq.tryItem -1 (seq { 10..20 }) Assert.AreEqual(None, resultNegativeIndex) // Index greater than length - let resultIndexGreater = Seq.tryItem 31 { 10..20 } + let resultIndexGreater = Seq.tryItem 31 (seq { 10..20 }) Assert.AreEqual(None, resultIndexGreater) [] diff --git a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/AsyncModule.fs b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/AsyncModule.fs index 213ff435adf..e3ead3bc768 100644 --- a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/AsyncModule.fs +++ b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/AsyncModule.fs @@ -379,23 +379,23 @@ type AsyncModule() = member _.``AwaitWaitHandle.DisposedWaitHandle2``() = let wh = new ManualResetEvent(false) let started = new ManualResetEventSlim(false) - - let test = - async { + let cts = new CancellationTokenSource() + let test = + Async.StartAsTask( async { + printfn "starting the test" started.Set() - let! timeout = Async.AwaitWaitHandle(wh, 5000) - Assert.False(timeout, "Timeout expected") - } - |> Async.StartAsTask - - task { - started.Wait() - // Wait a moment then dispose waithandle - nothing should happen - do! Task.Delay 500 - Assert.False(test.IsCompleted, "Test completed too early") - dispose wh - do! test - } + let! _ = Async.AwaitWaitHandle(wh) + printfn "should never get here" + }, cancellationToken = cts.Token) + + // Wait for the test to start then dispose waithandle - nothing should happen. + started.Wait() + Assert.False(test.Wait 100, "Test completed too early.") + printfn "disposing" + dispose wh + printfn "cancelling in 1 second" + cts.CancelAfter 1000 + Assert.ThrowsAsync(fun () -> test) [] member _.``RunSynchronously.NoThreadJumpsAndTimeout``() = @@ -469,21 +469,27 @@ type AsyncModule() = member _.``error on one workflow should cancel all others``() = task { use failOnlyOne = new Semaphore(0, 1) - let mutable cancelled = 0 - let mutable started = 0 + // Start from 1. + let mutable running = new CountdownEvent(1) let job i = async { - Interlocked.Increment &started |> ignore - use! holder = Async.OnCancel (fun () -> Interlocked.Increment &cancelled |> ignore) + use! holder = Async.OnCancel (running.Signal >> ignore) + running.AddCount 1 do! failOnlyOne |> Async.AwaitWaitHandle |> Async.Ignore + running.Signal() |> ignore failwith "boom" } let test = Async.Parallel [ for i in 1 .. 100 -> job i ] |> Async.Catch |> Async.Ignore |> Async.StartAsTask - do! Task.Delay 100 + // Wait for more than one job to start + while running.CurrentCount < 2 do + do! Task.Yield() + printfn $"started jobs: {running.CurrentCount - 1}" failOnlyOne.Release() |> ignore do! test - Assert.Equal(started - 1, cancelled) + // running.CurrentCount should eventually settle back at 1. Signal it one more time and it should be 0. + running.Signal() |> ignore + return! Async.AwaitWaitHandle running.WaitHandle } [] diff --git a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/AsyncType.fs b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/AsyncType.fs index 1b15be8fa98..97ea8fca1a8 100644 --- a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/AsyncType.fs +++ b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/AsyncType.fs @@ -67,6 +67,8 @@ type AsyncType() = |> Async.Parallel |> Async.RunSynchronously |> Set.ofArray + printfn $"RunSynchronously used {usedThreads.Count} threads. Environment.ProcessorCount is {Environment.ProcessorCount}." + // Some arbitrary large number but in practice it should not use more threads than there are CPU cores. Assert.True(usedThreads.Count < 256, $"RunSynchronously used {usedThreads.Count} threads.") [] diff --git a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/Cancellation.fs b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/Cancellation.fs index cecfaec7590..b4a75843369 100644 --- a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/Cancellation.fs +++ b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/Cancellation.fs @@ -12,6 +12,15 @@ open System.Threading.Tasks type CancellationType() = + let ordered() = + let mutable current = 1 + + fun n -> + async { + SpinWait.SpinUntil(fun () -> current = n) + Interlocked.Increment ¤t |> ignore + } + [] member this.CancellationNoCallbacks() = let _ : CancellationTokenSource = null // compilation test @@ -234,6 +243,8 @@ type CancellationType() = // See https://github.com/dotnet/fsharp/issues/3254 [] member this.AwaitTaskCancellationAfterAsyncTokenCancellation() = + let step = ordered() + let StartCatchCancellation cancellationToken (work) = Async.FromContinuations(fun (cont, econt, _) -> // When the child is cancelled, report OperationCancelled @@ -265,25 +276,27 @@ type CancellationType() = let cts = new CancellationTokenSource() let tcs = System.Threading.Tasks.TaskCompletionSource<_>() - let test() = + let t = async { + do! step 1 do! tcs.Task |> Async.AwaitTask } - |> StartAsTaskProperCancel None (Some cts.Token) :> Task + |> StartAsTaskProperCancel None (Some cts.Token) // First cancel the token, then set the task as cancelled. - async { - do! Async.Sleep 100 + task { + do! step 2 cts.Cancel() - do! Async.Sleep 100 + do! step 3 tcs.TrySetException (TimeoutException "Task timed out after token.") |> ignore - } |> Async.Start - task { - let! agg = Assert.ThrowsAsync(test) - let inner = agg.InnerException - Assert.True(inner :? TimeoutException, $"Excepted TimeoutException wrapped in an AggregateException, but got %A{inner}") + try + let res = t.Wait() + let msg = sprintf "Excepted TimeoutException wrapped in an AggregateException, but got %A" res + printfn "failure msg: %s" msg + Assert.Fail (msg) + with :? AggregateException as agg -> () } // Simpler regression test for https://github.com/dotnet/fsharp/issues/3254 diff --git a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/MailboxProcessorType.fs b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/MailboxProcessorType.fs index f3964aaa78c..1e2fcd58545 100644 --- a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/MailboxProcessorType.fs +++ b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/MailboxProcessorType.fs @@ -557,3 +557,42 @@ module MailboxProcessorType = } Assert.True(iteration.Result > 1, "TryScan did not timeout") + + let ordered() = + let mutable current = 1 + fun n -> + if n < current then failwith $"step {n} already happened" + SpinWait.SpinUntil(fun () -> n = current) + current <- n + 1 + + // See https://github.com/dotnet/fsharp/issues/17849 + [] + let ``Disposed MailboxProcessor does not throw on Post`` () = + task { + let step = ordered() + + let cts = new CancellationTokenSource() + let mb = + MailboxProcessor.Start( (fun inbox -> + async { + step 1 + do! inbox.Receive() + do! inbox.Receive() + return () + }), + cancellationToken = cts.Token + ) + + step 2 + // ensure pulse gets created + do! Task.Delay 100 + mb.Post() + + mb.Dispose() + + do! Task.Delay 100 + + mb.Post() + + cts.Cancel() + } diff --git a/tests/FSharp.Core.UnitTests/FSharp.Core/PrimTypes.fs b/tests/FSharp.Core.UnitTests/FSharp.Core/PrimTypes.fs index 8e24be62850..68692f65c67 100644 --- a/tests/FSharp.Core.UnitTests/FSharp.Core/PrimTypes.fs +++ b/tests/FSharp.Core.UnitTests/FSharp.Core/PrimTypes.fs @@ -821,7 +821,7 @@ module internal RangeTestsHelpers = enumerator.Current |> ignore let inline exceptions zero one two = - Assert.Throws (typeof, (fun () -> {one .. zero .. two} |> Seq.length |> ignore)) |> ignore + Assert.Throws (typeof, (fun () -> seq {one .. zero .. two} |> Seq.length |> ignore)) |> ignore Assert.Throws (typeof, (fun () -> [one .. zero .. two] |> List.length |> ignore)) |> ignore Assert.Throws (typeof, (fun () -> [|one .. zero .. two|] |> Array.length |> ignore)) |> ignore @@ -831,10 +831,10 @@ module internal RangeTestsHelpers = Assert.Throws (typeof, (fun () -> regressionExceptionAfterEndVariableStepIntegralRange zero two)) |> ignore let inline common (min0, min1, min2, min3) (max0, max1, max2, max3) (zero, one, two, three) = - Assert.AreEqual (seq {yield min0; yield min1; yield min2; yield min3}, {min0 .. min3}) - Assert.AreEqual (seq {min0; min1; min2; min3}, {min0 .. one .. min3}) - Assert.AreEqual (seq {min0; min2}, {min0 .. two .. min3}) - Assert.AreEqual (seq {min0; min3}, {min0 .. three .. min3}) + Assert.AreEqual (seq {yield min0; yield min1; yield min2; yield min3}, seq {min0 .. min3}) + Assert.AreEqual (seq {min0; min1; min2; min3}, seq {min0 .. one .. min3}) + Assert.AreEqual (seq {min0; min2}, seq {min0 .. two .. min3}) + Assert.AreEqual (seq {min0; min3}, seq {min0 .. three .. min3}) Assert.AreEqual ([min0; min1; min2; min3], [min0 .. min3]) Assert.AreEqual ([min0; min1; min2; min3], [min0 .. one .. min3]) @@ -846,10 +846,10 @@ module internal RangeTestsHelpers = Assert.AreEqual ([|min0; min2|], [|min0 .. two .. min3|]) Assert.AreEqual ([|min0; min3|], [|min0 .. three .. min3|]) - Assert.AreEqual (seq {yield max3; yield max2; yield max1; yield max0}, {max3 .. max0}) - Assert.AreEqual (seq {max3; max2; max1; max0}, {max3 .. one .. max0}) - Assert.AreEqual (seq {max3; max1}, {max3 .. two .. max0}) - Assert.AreEqual (seq {max3; max0}, {max3 .. three .. max0}) + Assert.AreEqual (seq {yield max3; yield max2; yield max1; yield max0}, seq {max3 .. max0}) + Assert.AreEqual (seq {max3; max2; max1; max0}, seq {max3 .. one .. max0}) + Assert.AreEqual (seq {max3; max1}, seq {max3 .. two .. max0}) + Assert.AreEqual (seq {max3; max0}, seq {max3 .. three .. max0}) Assert.AreEqual ([max3; max2; max1; max0], [max3 .. max0]) Assert.AreEqual ([max3; max2; max1; max0], [max3 .. one .. max0]) @@ -861,10 +861,10 @@ module internal RangeTestsHelpers = Assert.AreEqual ([|max3; max1|], [|max3 .. two .. max0|]) Assert.AreEqual ([|max3; max0|], [|max3 .. three .. max0|]) - Assert.AreEqual (Seq.empty, {max0 .. min0}) - Assert.AreEqual (Seq.empty, {max0 .. one .. min0}) - Assert.AreEqual (Seq.empty, {max0 .. two .. min0}) - Assert.AreEqual (Seq.empty, {max0 .. three .. min0}) + Assert.AreEqual (Seq.empty, seq {max0 .. min0}) + Assert.AreEqual (Seq.empty, seq {max0 .. one .. min0}) + Assert.AreEqual (Seq.empty, seq {max0 .. two .. min0}) + Assert.AreEqual (Seq.empty, seq {max0 .. three .. min0}) Assert.AreEqual ([], [max0 .. min0]) Assert.AreEqual ([], [max0 .. one .. min0]) @@ -880,8 +880,8 @@ module internal RangeTestsHelpers = // tests for singleStepRangeEnumerator, as it only is used if start and/or end are not the // minimum or maximum of the number range and it is counting by 1s - Assert.AreEqual (seq {min1; min2; min3}, {min1 .. min3}) - Assert.AreEqual (seq {max3; max2; max1}, {max3 .. max1}) + Assert.AreEqual (seq {min1; min2; min3}, seq {min1 .. min3}) + Assert.AreEqual (seq {max3; max2; max1}, seq {max3 .. max1}) Assert.AreEqual ([min1; min2; min3], [min1 .. min3]) Assert.AreEqual ([max3; max2; max1], [max3 .. max1]) @@ -903,10 +903,10 @@ module internal RangeTestsHelpers = common (min0, min1, min2, min3) (max0, max1, max2, max3) (zero, one, two, three) - Assert.AreEqual (seq { min0; min0 + max0; min0 + max0 + max0 }, {min0 .. max0 .. max0}) - Assert.AreEqual (seq { min0; min0 + max1; min0 + max1 + max1 }, {min0 .. max1 .. max0}) - Assert.AreEqual (seq { min0; min0 + max2; min0 + max2 + max2 }, {min0 .. max2 .. max0}) - Assert.AreEqual (seq { min0; min0 + max3; min0 + max3 + max3 }, {min0 .. max3 .. max0}) + Assert.AreEqual (seq { min0; min0 + max0; min0 + max0 + max0 }, seq {min0 .. max0 .. max0}) + Assert.AreEqual (seq { min0; min0 + max1; min0 + max1 + max1 }, seq {min0 .. max1 .. max0}) + Assert.AreEqual (seq { min0; min0 + max2; min0 + max2 + max2 }, seq {min0 .. max2 .. max0}) + Assert.AreEqual (seq { min0; min0 + max3; min0 + max3 + max3 }, seq {min0 .. max3 .. max0}) Assert.AreEqual ([ min0; min0 + max0; min0 + max0 + max0 ], [min0 .. max0 .. max0]) Assert.AreEqual ([ min0; min0 + max1; min0 + max1 + max1 ], [min0 .. max1 .. max0]) @@ -918,9 +918,9 @@ module internal RangeTestsHelpers = Assert.AreEqual ([| min0; min0 + max2; min0 + max2 + max2 |], [|min0 .. max2 .. max0|]) Assert.AreEqual ([| min0; min0 + max3; min0 + max3 + max3 |], [|min0 .. max3 .. max0|]) - Assert.AreEqual (seq {min3; min2; min1; min0}, {min3 .. -one .. min0}) - Assert.AreEqual (seq {min3; min1}, {min3 .. -two .. min0}) - Assert.AreEqual (seq {min3; min0}, {min3 .. -three .. min0}) + Assert.AreEqual (seq {min3; min2; min1; min0}, seq {min3 .. -one .. min0}) + Assert.AreEqual (seq {min3; min1}, seq {min3 .. -two .. min0}) + Assert.AreEqual (seq {min3; min0}, seq {min3 .. -three .. min0}) Assert.AreEqual ([min3; min2; min1; min0], [min3 .. -one .. min0]) Assert.AreEqual ([min3; min1], [min3 .. -two .. min0]) @@ -930,9 +930,9 @@ module internal RangeTestsHelpers = Assert.AreEqual ([|min3; min1|], [|min3 .. -two .. min0|]) Assert.AreEqual ([|min3; min0|], [|min3 .. -three .. min0|]) - Assert.AreEqual (seq {max0; max1; max2; max3}, {max0 .. -one .. max3}) - Assert.AreEqual (seq {max0; max2}, {max0 .. -two .. max3}) - Assert.AreEqual (seq {max0; max3}, {max0 .. -three .. max3}) + Assert.AreEqual (seq {max0; max1; max2; max3}, seq {max0 .. -one .. max3}) + Assert.AreEqual (seq {max0; max2}, seq {max0 .. -two .. max3}) + Assert.AreEqual (seq {max0; max3}, seq {max0 .. -three .. max3}) Assert.AreEqual ([max0; max1; max2; max3], [max0 .. -one .. max3]) Assert.AreEqual ([max0; max2], [max0 .. -two .. max3]) @@ -942,9 +942,9 @@ module internal RangeTestsHelpers = Assert.AreEqual ([|max0; max2|], [|max0 .. -two .. max3|]) Assert.AreEqual ([|max0; max3|], [|max0 .. -three .. max3|]) - Assert.AreEqual (Seq.empty, {min0 .. -one .. max0}) - Assert.AreEqual (Seq.empty, {min0 .. -two .. max0}) - Assert.AreEqual (Seq.empty, {min0 .. -three .. max0}) + Assert.AreEqual (Seq.empty, seq {min0 .. -one .. max0}) + Assert.AreEqual (Seq.empty, seq {min0 .. -two .. max0}) + Assert.AreEqual (Seq.empty, seq {min0 .. -three .. max0}) Assert.AreEqual ([], [min0 .. -one .. max0]) Assert.AreEqual ([], [min0 .. -two .. max0]) @@ -954,10 +954,10 @@ module internal RangeTestsHelpers = Assert.AreEqual ([||], [|min0 .. -two .. max0|]) Assert.AreEqual ([||], [|min0 .. -three .. max0|]) - Assert.AreEqual (seq {max0; max0 + min0}, {max0 .. min0 .. min0}) - Assert.AreEqual (seq {max0; max0 + min1; max0 + min1 + min1 }, {max0 .. min1 .. min0}) - Assert.AreEqual (seq {max0; max0 + min2; max0 + min2 + min2 }, {max0 .. min2 .. min0}) - Assert.AreEqual (seq {max0; max0 + min3; max0 + min3 + min3 }, {max0 .. min3 .. min0}) + Assert.AreEqual (seq {max0; max0 + min0}, seq {max0 .. min0 .. min0}) + Assert.AreEqual (seq {max0; max0 + min1; max0 + min1 + min1 }, seq {max0 .. min1 .. min0}) + Assert.AreEqual (seq {max0; max0 + min2; max0 + min2 + min2 }, seq {max0 .. min2 .. min0}) + Assert.AreEqual (seq {max0; max0 + min3; max0 + min3 + min3 }, seq {max0 .. min3 .. min0}) Assert.AreEqual ([max0; max0 + min0], [max0 .. min0 .. min0]) Assert.AreEqual ([max0; max0 + min1; max0 + min1 + min1 ], [max0 .. min1 .. min0]) @@ -983,10 +983,10 @@ module internal RangeTestsHelpers = common (min0, min1, min2, min3) (max0, max1, max2, max3) (zero, one, two, three) - Assert.AreEqual (seq {yield min0; yield min0 + max0}, {min0 .. max0 .. max0}) - Assert.AreEqual (seq {min0; min0 + max1}, {min0 .. max1 .. max0}) - Assert.AreEqual (seq {min0; min0 + max2}, {min0 .. max2 .. max0}) - Assert.AreEqual (seq {min0; min0 + max3}, {min0 .. max3 .. max0}) + Assert.AreEqual (seq {yield min0; yield min0 + max0}, seq {min0 .. max0 .. max0}) + Assert.AreEqual (seq {min0; min0 + max1}, seq {min0 .. max1 .. max0}) + Assert.AreEqual (seq {min0; min0 + max2}, seq {min0 .. max2 .. max0}) + Assert.AreEqual (seq {min0; min0 + max3}, seq {min0 .. max3 .. max0}) Assert.AreEqual ([min0; min0 + max0], [min0 .. max0 .. max0]) Assert.AreEqual ([min0; min0 + max1], [min0 .. max1 .. max0]) @@ -1064,15 +1064,15 @@ module RangeTests = Assert.AreEqual(256, let mutable c = 0 in for _ in System.SByte.MinValue..1y..System.SByte.MaxValue do c <- c + 1 done; c) Assert.AreEqual(256, let mutable c = 0 in for _ in System.SByte.MaxValue .. -1y .. System.SByte.MinValue do c <- c + 1 done; c) - Assert.AreEqual(allSBytesSeq, {System.SByte.MinValue..System.SByte.MaxValue}) + Assert.AreEqual(allSBytesSeq, seq {System.SByte.MinValue..System.SByte.MaxValue}) Assert.AreEqual(allSBytesList, [System.SByte.MinValue..System.SByte.MaxValue]) Assert.AreEqual(allSBytesArray, [|System.SByte.MinValue..System.SByte.MaxValue|]) - Assert.AreEqual(allSBytesSeq, {System.SByte.MinValue..1y..System.SByte.MaxValue}) + Assert.AreEqual(allSBytesSeq, seq {System.SByte.MinValue..1y..System.SByte.MaxValue}) Assert.AreEqual(allSBytesList, [System.SByte.MinValue..1y..System.SByte.MaxValue]) Assert.AreEqual(allSBytesArray, [|System.SByte.MinValue..1y..System.SByte.MaxValue|]) - Assert.AreEqual(Seq.rev allSBytesSeq, {System.SByte.MaxValue .. -1y .. System.SByte.MinValue}) + Assert.AreEqual(Seq.rev allSBytesSeq, seq {System.SByte.MaxValue .. -1y .. System.SByte.MinValue}) Assert.AreEqual(List.rev allSBytesList, [System.SByte.MaxValue .. -1y .. System.SByte.MinValue]) Assert.AreEqual(Array.rev allSBytesArray, [|System.SByte.MaxValue .. -1y .. System.SByte.MinValue|]) @@ -1083,11 +1083,11 @@ module RangeTests = Assert.AreEqual(256, let mutable c = 0 in for _ in System.Byte.MinValue..System.Byte.MaxValue do c <- c + 1 done; c) Assert.AreEqual(256, let mutable c = 0 in for _ in System.Byte.MinValue..1uy..System.Byte.MaxValue do c <- c + 1 done; c) - Assert.AreEqual(allBytesSeq, {System.Byte.MinValue..System.Byte.MaxValue}) + Assert.AreEqual(allBytesSeq, seq {System.Byte.MinValue..System.Byte.MaxValue}) Assert.AreEqual(allBytesList, [System.Byte.MinValue..System.Byte.MaxValue]) Assert.AreEqual(allBytesArray, [|System.Byte.MinValue..System.Byte.MaxValue|]) - Assert.AreEqual(allBytesSeq, {System.Byte.MinValue..1uy..System.Byte.MaxValue}) + Assert.AreEqual(allBytesSeq, seq {System.Byte.MinValue..1uy..System.Byte.MaxValue}) Assert.AreEqual(allBytesList, [System.Byte.MinValue..1uy..System.Byte.MaxValue]) Assert.AreEqual(allBytesArray, [|System.Byte.MinValue..1uy..System.Byte.MaxValue|]) @@ -1141,15 +1141,15 @@ module RangeTests = Assert.AreEqual(256, let mutable c = 0 in for _ in min0..one..max0 do c <- c + 1 done; c) Assert.AreEqual(256, let mutable c = 0 in for _ in max0 .. -one .. min0 do c <- c + 1 done; c) - Assert.AreEqual(allSBytesSeq, {min0..max0}) + Assert.AreEqual(allSBytesSeq, seq {min0..max0}) Assert.AreEqual(allSBytesList, [min0..max0]) Assert.AreEqual(allSBytesArray, [|min0..max0|]) - Assert.AreEqual(allSBytesSeq, {min0..one..max0}) + Assert.AreEqual(allSBytesSeq, seq {min0..one..max0}) Assert.AreEqual(allSBytesList, [min0..one..max0]) Assert.AreEqual(allSBytesArray, [|min0..one..max0|]) - Assert.AreEqual(Seq.rev allSBytesSeq, {max0 .. -one .. min0}) + Assert.AreEqual(Seq.rev allSBytesSeq, seq {max0 .. -one .. min0}) Assert.AreEqual(List.rev allSBytesList, [max0 .. -one .. min0]) Assert.AreEqual(Array.rev allSBytesArray, [|max0 .. -one .. min0|]) @@ -1160,11 +1160,11 @@ module RangeTests = Assert.AreEqual(256, let mutable c = 0 in for _ in min0..max0 do c <- c + 1 done; c) Assert.AreEqual(256, let mutable c = 0 in for _ in min0..one..max0 do c <- c + 1 done; c) - Assert.AreEqual(allBytesSeq, {min0..max0}) + Assert.AreEqual(allBytesSeq, seq {min0..max0}) Assert.AreEqual(allBytesList, [min0..max0]) Assert.AreEqual(allBytesArray, [|min0..max0|]) - Assert.AreEqual(allBytesSeq, {min0..one..max0}) + Assert.AreEqual(allBytesSeq, seq {min0..one..max0}) Assert.AreEqual(allBytesList, [min0..one..max0]) Assert.AreEqual(allBytesArray, [|min0..one..max0|]) diff --git a/tests/FSharp.Core.UnitTests/TestFrameworkHelpers.fs b/tests/FSharp.Core.UnitTests/TestFrameworkHelpers.fs index d5fe22cc3b3..31a699ae586 100644 --- a/tests/FSharp.Core.UnitTests/TestFrameworkHelpers.fs +++ b/tests/FSharp.Core.UnitTests/TestFrameworkHelpers.fs @@ -72,7 +72,7 @@ module private Impl = let ub = a1.GetUpperBound(0) if lb <> a2.GetLowerBound(0) || ub <> a2.GetUpperBound(0) then false else - {lb..ub} |> Seq.forall(fun i -> equals (a1.GetValue(i)) (a2.GetValue(i))) + seq {lb..ub} |> Seq.forall(fun i -> equals (a1.GetValue(i)) (a2.GetValue(i))) | _ -> Object.Equals(expected, actual) diff --git a/tests/FSharp.Test.Utilities/Assert.fs b/tests/FSharp.Test.Utilities/Assert.fs index fc36129666f..41287757a0f 100644 --- a/tests/FSharp.Test.Utilities/Assert.fs +++ b/tests/FSharp.Test.Utilities/Assert.fs @@ -3,7 +3,7 @@ namespace FSharp.Test module Assert = open FluentAssertions open System.Collections - open System.Text + open Xunit open System.IO let inline shouldBeEqualWith (expected : ^T) (message: string) (actual: ^U) = @@ -18,9 +18,18 @@ module Assert = let inline shouldContain (needle : string) (haystack : string) = haystack.Should().Contain(needle) |> ignore + // One fine day, all of the 3 things below should be purged and replaced with pure Assert.Equal. + // Xunit checks types by default. These are just artifacts of the testing chaos in the repo back in a day. let inline shouldBe (expected : ^T) (actual : ^U) = actual.Should().Be(expected, "") |> ignore + let inline areEqual (expected: ^T) (actual: ^T) = + Assert.Equal<^T>(expected, actual) + + let inline shouldEqual (x: 'a) (y: 'a) = + Assert.Equal<'a>(x, y) + // + let inline shouldBeEmpty (actual : ^T when ^T :> IEnumerable) = actual.Should().BeEmpty("") |> ignore diff --git a/tests/FSharp.Test.Utilities/DirectoryAttribute.fs b/tests/FSharp.Test.Utilities/DirectoryAttribute.fs index c1561fa6c9b..1266bc295a8 100644 --- a/tests/FSharp.Test.Utilities/DirectoryAttribute.fs +++ b/tests/FSharp.Test.Utilities/DirectoryAttribute.fs @@ -9,6 +9,7 @@ open Xunit.Sdk open FSharp.Compiler.IO open FSharp.Test.Compiler open FSharp.Test.Utilities +open TestFramework /// Attribute to use with Xunit's TheoryAttribute. /// Takes a directory, relative to current test suite's root. @@ -22,7 +23,6 @@ type DirectoryAttribute(dir: string) = invalidArg "dir" "Directory cannot be null, empty or whitespace only." let dirInfo = normalizePathSeparator (Path.GetFullPath(dir)) - let outputDirectory methodName extraDirectory = getTestOutputDirectory dir methodName extraDirectory let mutable baselineSuffix = "" let mutable includes = Array.empty @@ -31,19 +31,8 @@ type DirectoryAttribute(dir: string) = | true -> Some (File.ReadAllText path) | _ -> None - let createCompilationUnit path (filename: string) methodName multipleFiles = - // if there are multiple files being processed, add extra directory for each test to avoid reference file conflicts - let extraDirectory = - if multipleFiles then - let extension = Path.GetExtension(filename) - filename.Substring(0, filename.Length - extension.Length) // remove .fs/the extension - |> normalizeName - else "" - let outputDirectory = outputDirectory methodName extraDirectory - let outputDirectoryPath = - match outputDirectory with - | Some path -> path.FullName - | None -> failwith "Can't set the output directory" + let createCompilationUnit path (filename: string) = + let outputDirectoryPath = createTemporaryDirectory "dir" let sourceFilePath = normalizePathSeparator (path ++ filename) let fsBslFilePath = sourceFilePath + baselineSuffix + ".err.bsl" let ilBslFilePath = @@ -97,7 +86,7 @@ type DirectoryAttribute(dir: string) = Name = Some filename IgnoreWarnings = false References = [] - OutputDirectory = outputDirectory + OutputDirectory = Some (DirectoryInfo(outputDirectoryPath)) TargetFramework = TargetFramework.Current StaticLink = false } |> FS @@ -107,7 +96,7 @@ type DirectoryAttribute(dir: string) = member _.BaselineSuffix with get() = baselineSuffix and set v = baselineSuffix <- v member _.Includes with get() = includes and set v = includes <- v - override _.GetData(method: MethodInfo) = + override _.GetData _ = if not (Directory.Exists(dirInfo)) then failwith (sprintf "Directory does not exist: \"%s\"." dirInfo) @@ -127,8 +116,6 @@ type DirectoryAttribute(dir: string) = if not <| FileSystem.FileExistsShim(f) then failwithf "Requested file \"%s\" not found.\nAll files: %A.\nIncludes:%A." f allFiles includes - let multipleFiles = fsFiles |> Array.length > 1 - fsFiles - |> Array.map (fun fs -> createCompilationUnit dirInfo fs method.Name multipleFiles) + |> Array.map (fun fs -> createCompilationUnit dirInfo fs) |> Seq.map (fun c -> [| c |]) diff --git a/tests/FSharp.Test.Utilities/ProjectGeneration.fs b/tests/FSharp.Test.Utilities/ProjectGeneration.fs index a75784240dd..197788b0e2e 100644 --- a/tests/FSharp.Test.Utilities/ProjectGeneration.fs +++ b/tests/FSharp.Test.Utilities/ProjectGeneration.fs @@ -30,6 +30,7 @@ open FSharp.Compiler.Diagnostics open FSharp.Compiler.Text open Xunit +open FSharp.Test.Utilities open OpenTelemetry open OpenTelemetry.Resources @@ -224,10 +225,7 @@ let sourceFile fileId deps = IsPhysicalFile = false } -let OptionsCache = ConcurrentDictionary() - - - +let OptionsCache = ConcurrentDictionary<_, Lazy>() type SyntheticProject = { Name: string @@ -295,7 +293,7 @@ type SyntheticProject = member this.GetProjectOptions(checker: FSharpChecker) = - let cacheKey = + let key = this.GetAllFiles() |> List.collect (fun (p, f) -> [ p.Name @@ -305,53 +303,56 @@ type SyntheticProject = this.FrameworkReferences, this.NugetReferences - if not (OptionsCache.ContainsKey cacheKey) then - OptionsCache[cacheKey] <- - use _ = Activity.start "SyntheticProject.GetProjectOptions" [ "project", this.Name ] + let factory _ = + lazy + use _ = Activity.start "SyntheticProject.GetProjectOptions" [ "project", this.Name ] - let referenceScript = - seq { - yield! this.FrameworkReferences |> Seq.map getFrameworkReference + let referenceScript = + seq { + yield! this.FrameworkReferences |> Seq.map getFrameworkReference + if not this.NugetReferences.IsEmpty then this.NugetReferences |> getNugetReferences (Some "https://api.nuget.org/v3/index.json") - } - |> String.concat "\n" - - let baseOptions, _ = - checker.GetProjectOptionsFromScript( - "file.fsx", - SourceText.ofString referenceScript, - assumeDotNetFramework = false - ) - |> Async.RunSynchronously - - { - ProjectFileName = this.ProjectFileName - ProjectId = None - SourceFiles = - [| for f in this.SourceFiles do - if f.HasSignatureFile then - this.ProjectDir ++ f.SignatureFileName - - this.ProjectDir ++ f.FileName |] - OtherOptions = - Set [ - yield! baseOptions.OtherOptions - "--optimize+" - for p in this.DependsOn do - $"-r:{p.OutputFilename}" - yield! this.OtherOptions ] - |> Set.toArray - ReferencedProjects = - [| for p in this.DependsOn do - FSharpReferencedProject.FSharpReference(p.OutputFilename, p.GetProjectOptions checker) |] - IsIncompleteTypeCheckEnvironment = false - UseScriptResolutionRules = this.UseScriptResolutionRules - LoadTime = DateTime() - UnresolvedReferences = None - OriginalLoadReferences = [] - Stamp = None } - - OptionsCache[cacheKey] + } + |> String.concat "\n" + + let baseOptions, _ = + checker.GetProjectOptionsFromScript( + "file.fsx", + SourceText.ofString referenceScript, + assumeDotNetFramework = false + ) + |> Async.RunImmediate + + { + ProjectFileName = this.ProjectFileName + ProjectId = None + SourceFiles = + [| for f in this.SourceFiles do + if f.HasSignatureFile then + this.ProjectDir ++ f.SignatureFileName + + this.ProjectDir ++ f.FileName |] + OtherOptions = + Set [ + yield! baseOptions.OtherOptions + "--optimize+" + for p in this.DependsOn do + $"-r:{p.OutputFilename}" + yield! this.OtherOptions ] + |> Set.toArray + ReferencedProjects = + [| for p in this.DependsOn do + FSharpReferencedProject.FSharpReference(p.OutputFilename, p.GetProjectOptions checker) |] + IsIncompleteTypeCheckEnvironment = false + UseScriptResolutionRules = this.UseScriptResolutionRules + LoadTime = DateTime() + UnresolvedReferences = None + OriginalLoadReferences = [] + Stamp = None } + + + OptionsCache.GetOrAdd(key, factory).Value + member this.GetAllProjects() = [ this @@ -1027,11 +1028,11 @@ type ProjectWorkflowBuilder member this.Execute(workflow: Async) = try - Async.RunSynchronously(workflow, timeout = defaultArg runTimeout 600_000) + Async.RunSynchronously(workflow, ?timeout = runTimeout) finally if initialContext.IsNone && not isExistingProject then this.DeleteProjectDir() - activity |> Option.iter (fun x -> x.Dispose()) + activity |> Option.iter (fun x -> if not (isNull x) then x.Dispose()) tracerProvider |> Option.iter (fun x -> x.ForceFlush() |> ignore x.Dispose()) @@ -1135,14 +1136,10 @@ type ProjectWorkflowBuilder async { let! ctx = workflow - use activity = - Activity.start "ProjectWorkflowBuilder.CheckFile" [ Activity.Tags.project, initialProject.Name; "fileId", fileId ] - let! results = + use _ = Activity.start "ProjectWorkflowBuilder.CheckFile" [ Activity.Tags.project, initialProject.Name; "fileId", fileId ] checkFile fileId ctx.Project checker - activity.Dispose() - let oldSignature = ctx.Signatures[fileId] let newSignature = getSignature results diff --git a/tests/fsharp/Compiler/Conformance/BasicGrammarElements/CharConstants.fs b/tests/fsharp/Compiler/Conformance/BasicGrammarElements/CharConstants.fs index 7f91ed7653b..1730976ad20 100644 --- a/tests/fsharp/Compiler/Conformance/BasicGrammarElements/CharConstants.fs +++ b/tests/fsharp/Compiler/Conformance/BasicGrammarElements/CharConstants.fs @@ -3,6 +3,7 @@ namespace FSharp.Compiler.UnitTests open Xunit +open FSharp.Test module ``Char Constants`` = diff --git a/tests/fsharp/Compiler/Conformance/BasicGrammarElements/DecimalConstants.fs b/tests/fsharp/Compiler/Conformance/BasicGrammarElements/DecimalConstants.fs index e40e1024006..0333711b8ac 100644 --- a/tests/fsharp/Compiler/Conformance/BasicGrammarElements/DecimalConstants.fs +++ b/tests/fsharp/Compiler/Conformance/BasicGrammarElements/DecimalConstants.fs @@ -3,6 +3,7 @@ namespace FSharp.Compiler.UnitTests open Xunit +open FSharp.Test module ``Decimal Constants`` = diff --git a/tests/fsharp/Compiler/Conformance/BasicGrammarElements/IntegerConstants.fs b/tests/fsharp/Compiler/Conformance/BasicGrammarElements/IntegerConstants.fs index a91c92ae6e9..46fb01dca01 100644 --- a/tests/fsharp/Compiler/Conformance/BasicGrammarElements/IntegerConstants.fs +++ b/tests/fsharp/Compiler/Conformance/BasicGrammarElements/IntegerConstants.fs @@ -3,6 +3,7 @@ namespace FSharp.Compiler.UnitTests open Xunit +open FSharp.Test module ``Integer Constants`` = diff --git a/tests/fsharp/Compiler/Libraries/Core/Collections/IEnumerableTests.fs b/tests/fsharp/Compiler/Libraries/Core/Collections/IEnumerableTests.fs index e7bca1b380e..46e10f6605e 100644 --- a/tests/fsharp/Compiler/Libraries/Core/Collections/IEnumerableTests.fs +++ b/tests/fsharp/Compiler/Libraries/Core/Collections/IEnumerableTests.fs @@ -3,6 +3,7 @@ namespace FSharp.Compiler.UnitTests open Xunit +open FSharp.Test module ``IEnumerable Tests`` = diff --git a/tests/fsharp/Compiler/Libraries/Core/Operators/RoundTests.fs b/tests/fsharp/Compiler/Libraries/Core/Operators/RoundTests.fs index 523c5aeb47b..3153a82d9e9 100644 --- a/tests/fsharp/Compiler/Libraries/Core/Operators/RoundTests.fs +++ b/tests/fsharp/Compiler/Libraries/Core/Operators/RoundTests.fs @@ -3,6 +3,7 @@ namespace FSharp.Compiler.UnitTests open Xunit +open FSharp.Test module ``Round Tests`` = diff --git a/tests/fsharp/Compiler/Libraries/Core/Operators/StringTests.fs b/tests/fsharp/Compiler/Libraries/Core/Operators/StringTests.fs index 0a4de5d8219..3317542d33f 100644 --- a/tests/fsharp/Compiler/Libraries/Core/Operators/StringTests.fs +++ b/tests/fsharp/Compiler/Libraries/Core/Operators/StringTests.fs @@ -4,6 +4,7 @@ namespace FSharp.Compiler.UnitTests open Xunit open System +open FSharp.Test module ``String Tests`` = diff --git a/tests/fsharp/Compiler/Libraries/Core/Reflection/SprintfTests.fs b/tests/fsharp/Compiler/Libraries/Core/Reflection/SprintfTests.fs index aa4aa6aac8a..e16e8372263 100644 --- a/tests/fsharp/Compiler/Libraries/Core/Reflection/SprintfTests.fs +++ b/tests/fsharp/Compiler/Libraries/Core/Reflection/SprintfTests.fs @@ -3,6 +3,7 @@ namespace FSharp.Compiler.UnitTests open Xunit +open FSharp.Test module ``Sprintf Tests`` = diff --git a/tests/fsharp/Compiler/Libraries/Core/Unchecked/DefaultOfTests.fs b/tests/fsharp/Compiler/Libraries/Core/Unchecked/DefaultOfTests.fs index e34c074ef13..781807492c7 100644 --- a/tests/fsharp/Compiler/Libraries/Core/Unchecked/DefaultOfTests.fs +++ b/tests/fsharp/Compiler/Libraries/Core/Unchecked/DefaultOfTests.fs @@ -3,6 +3,7 @@ namespace FSharp.Compiler.UnitTests open Xunit +open FSharp.Test module ``DefaultOf Tests`` = diff --git a/tests/fsharp/XunitHelpers.fs b/tests/fsharp/XunitHelpers.fs index c7e7493c046..6bfb5031f13 100644 --- a/tests/fsharp/XunitHelpers.fs +++ b/tests/fsharp/XunitHelpers.fs @@ -6,10 +6,3 @@ module Assert = [] do() - - let inline fail message = Assert.Fail message - - let inline failf fmt = Printf.kprintf fail fmt - - let inline areEqual (expected: ^T) (actual: ^T) = - Assert.Equal<^T>(expected, actual) diff --git a/tests/fsharp/tests.fs b/tests/fsharp/tests.fs index ed99adda96a..8b13fc003a3 100644 --- a/tests/fsharp/tests.fs +++ b/tests/fsharp/tests.fs @@ -404,7 +404,7 @@ module CoreTests = let diffs = fsdiff cfg outFile expectedFile match diffs with | "" -> () - | _ -> Assert.failf "'%s' and '%s' differ; %A" outFile expectedFile diffs + | _ -> failwithf "'%s' and '%s' differ; %A" outFile expectedFile diffs [] let fsfromcs () = @@ -468,7 +468,7 @@ module CoreTests = let diffs = fsdiff cfg outFile expectedFile match diffs with | "" -> () - | _ -> Assert.failf "'%s' and '%s' differ; %A" outFile expectedFile diffs + | _ -> failwithf "'%s' and '%s' differ; %A" outFile expectedFile diffs // check error messages for some cases let outFile = "compilation.errors.output.txt" @@ -478,7 +478,7 @@ module CoreTests = let diffs = fsdiff cfg outFile expectedFile match diffs with | "" -> () - | _ -> Assert.failf "'%s' and '%s' differ; %A" outFile expectedFile diffs + | _ -> failwithf "'%s' and '%s' differ; %A" outFile expectedFile diffs [] let ``fsi-reference`` () = @@ -619,11 +619,11 @@ module CoreTests = match fsdiff cfg diffFileOut expectedFileOut with | "" -> () - | diffs -> Assert.failf "'%s' and '%s' differ; %A" diffFileOut expectedFileOut diffs + | diffs -> failwithf "'%s' and '%s' differ; %A" diffFileOut expectedFileOut diffs match fsdiff cfg diffFileErr expectedFileErr with | "" -> () - | diffs -> Assert.failf "'%s' and '%s' differ; %A" diffFileErr expectedFileErr diffs + | diffs -> failwithf "'%s' and '%s' differ; %A" diffFileErr expectedFileErr diffs [] let ``printing`` () = @@ -1031,13 +1031,13 @@ module CoreTests = match diffs with | "" -> () - | _ -> Assert.failf "'%s' and '%s' differ; %A" stdoutPath stdoutBaseline diffs + | _ -> failwithf "'%s' and '%s' differ; %A" stdoutPath stdoutBaseline diffs let diffs2 = fsdiff cfg stderrPath stderrBaseline match diffs2 with | "" -> () - | _ -> Assert.failf "'%s' and '%s' differ; %A" stderrPath stderrBaseline diffs2 + | _ -> failwithf "'%s' and '%s' differ; %A" stderrPath stderrBaseline diffs2 [] let ``load-script`` () = @@ -1160,13 +1160,13 @@ module CoreTests = match diffs with | "" -> () - | _ -> Assert.failf "'%s' and '%s' differ; %A" stdoutPath stdoutBaseline diffs + | _ -> failwithf "'%s' and '%s' differ; %A" stdoutPath stdoutBaseline diffs let diffs2 = fsdiff cfg stderrPath stderrBaseline match diffs2 with | "" -> () - | _ -> Assert.failf "'%s' and '%s' differ; %A" stderrPath stderrBaseline diffs2 + | _ -> failwithf "'%s' and '%s' differ; %A" stderrPath stderrBaseline diffs2 #endif @@ -1739,7 +1739,7 @@ module RegressionTests = match diff with | "" -> () | _ -> - Assert.failf "'%s' and '%s' differ; %A" (getfullpath cfg outFile) (getfullpath cfg expectedFile) diff + failwithf "'%s' and '%s' differ; %A" (getfullpath cfg outFile) (getfullpath cfg expectedFile) diff let outFile2 = "output.test.txt" let expectedFile2 = "output.test.bsl" @@ -1750,7 +1750,7 @@ module RegressionTests = match diff2 with | "" -> () | _ -> - Assert.failf "'%s' and '%s' differ; %A" (getfullpath cfg outFile2) (getfullpath cfg expectedFile2) diff2 + failwithf "'%s' and '%s' differ; %A" (getfullpath cfg outFile2) (getfullpath cfg expectedFile2) diff2 #endif [] @@ -1838,7 +1838,7 @@ module OptimizationTests = match diff with | "" -> () | _ -> - Assert.failf "'%s' and '%s' differ; %A" (getfullpath cfg outFile) (getfullpath cfg expectedFile) diff + failwithf "'%s' and '%s' differ; %A" (getfullpath cfg outFile) (getfullpath cfg expectedFile) diff [] @@ -1855,7 +1855,7 @@ module OptimizationTests = match diff with | "" -> () - | _ -> Assert.failf "'%s' and '%s' differ; %A" (getfullpath cfg outFile) (getfullpath cfg expectedFile) diff + | _ -> failwithf "'%s' and '%s' differ; %A" (getfullpath cfg outFile) (getfullpath cfg expectedFile) diff [] @@ -1872,7 +1872,7 @@ module OptimizationTests = match diff with | "" -> () - | _ -> Assert.failf "'%s' and '%s' differ; %A" (getfullpath cfg outFile) (getfullpath cfg expectedFile) diff + | _ -> failwithf "'%s' and '%s' differ; %A" (getfullpath cfg outFile) (getfullpath cfg expectedFile) diff [] @@ -1889,7 +1889,7 @@ module OptimizationTests = match diff with | "" -> () - | _ -> Assert.failf "'%s' and '%s' differ; %A" (getfullpath cfg outFile) (getfullpath cfg expectedFile) diff + | _ -> failwithf "'%s' and '%s' differ; %A" (getfullpath cfg outFile) (getfullpath cfg expectedFile) diff [] @@ -1922,7 +1922,7 @@ module OptimizationTests = match ``test--optimize.il`` with | [] -> () | lines -> - Assert.failf "Error: optimizations not removed. Relevant lines from IL file follow: %A" lines + failwithf "Error: optimizations not removed. Relevant lines from IL file follow: %A" lines let numElim = File.ReadLines (getfullpath cfg "test.il") diff --git a/tests/service/FsUnit.fs b/tests/service/FsUnit.fs deleted file mode 100644 index e17be411776..00000000000 --- a/tests/service/FsUnit.fs +++ /dev/null @@ -1,6 +0,0 @@ -module FsUnit - -open Xunit - -let shouldEqual (x: 'a) (y: 'a) = - Assert.Equal<'a>(x, y) \ No newline at end of file diff --git a/tests/service/data/SyntaxTree/Member/Inherit 01.fs.bsl b/tests/service/data/SyntaxTree/Member/Inherit 01.fs.bsl index 052b66e5e46..2868664e0e8 100644 --- a/tests/service/data/SyntaxTree/Member/Inherit 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Inherit 01.fs.bsl @@ -12,7 +12,7 @@ ImplFile ObjectModel (Unspecified, [Inherit - (LongIdent (SynLongIdent ([I], [], [None])), None, + (Some (LongIdent (SynLongIdent ([I], [], [None]))), None, (4,4--4,13), { InheritKeyword = (4,4--4,11) })], (4,4--4,13)), [], None, (3,5--4,13), { LeadingKeyword = Type (3,0--3,4) diff --git a/tests/service/data/SyntaxTree/Member/Inherit 02.fs.bsl b/tests/service/data/SyntaxTree/Member/Inherit 02.fs.bsl index 3e382c3b622..55bff6eef03 100644 --- a/tests/service/data/SyntaxTree/Member/Inherit 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Inherit 02.fs.bsl @@ -13,11 +13,11 @@ ImplFile (Unspecified, [ImplicitInherit (LongIdent (SynLongIdent ([T2], [], [None])), - Const (Unit, (4,14--4,16)), None, (4,4--4,16))], - (4,4--4,16)), [], None, (3,5--4,16), - { LeadingKeyword = Type (3,0--3,4) - EqualsRange = Some (3,8--3,9) - WithKeyword = None })], (3,0--4,16))], + Const (Unit, (4,14--4,16)), None, (4,4--4,16), + { InheritKeyword = (4,4--4,11) })], (4,4--4,16)), [], + None, (3,5--4,16), { LeadingKeyword = Type (3,0--3,4) + EqualsRange = Some (3,8--3,9) + WithKeyword = None })], (3,0--4,16))], PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None, (1,0--4,16), { LeadingKeyword = Module (1,0--1,6) })], (true, true), { ConditionalDirectives = [] diff --git a/tests/service/data/SyntaxTree/Member/Inherit 03.fs.bsl b/tests/service/data/SyntaxTree/Member/Inherit 03.fs.bsl index c41c36b56fa..76ad4393f0b 100644 --- a/tests/service/data/SyntaxTree/Member/Inherit 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Inherit 03.fs.bsl @@ -12,12 +12,11 @@ ImplFile ObjectModel (Unspecified, [Inherit - (LongIdent (SynLongIdent ([], [], [])), None, - (4,4--4,11), { InheritKeyword = (4,4--4,11) })], - (4,4--4,11)), [], None, (3,5--4,11), - { LeadingKeyword = Type (3,0--3,4) - EqualsRange = Some (3,7--3,8) - WithKeyword = None })], (3,0--4,11))], + (None, None, (4,4--4,11), + { InheritKeyword = (4,4--4,11) })], (4,4--4,11)), [], + None, (3,5--4,11), { LeadingKeyword = Type (3,0--3,4) + EqualsRange = Some (3,7--3,8) + WithKeyword = None })], (3,0--4,11))], PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None, (1,0--4,11), { LeadingKeyword = Module (1,0--1,6) })], (true, true), { ConditionalDirectives = [] diff --git a/tests/service/data/SyntaxTree/Member/Inherit 04.fs.bsl b/tests/service/data/SyntaxTree/Member/Inherit 04.fs.bsl index 1021e79be66..55bf03fb69f 100644 --- a/tests/service/data/SyntaxTree/Member/Inherit 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Inherit 04.fs.bsl @@ -12,12 +12,11 @@ ImplFile ObjectModel (Unspecified, [Inherit - (LongIdent (SynLongIdent ([], [], [])), None, - (4,4--4,11), { InheritKeyword = (4,4--4,11) })], - (4,4--4,11)), [], None, (3,5--4,11), - { LeadingKeyword = Type (3,0--3,4) - EqualsRange = Some (3,7--3,8) - WithKeyword = None })], (3,0--4,11)); + (None, None, (4,4--4,11), + { InheritKeyword = (4,4--4,11) })], (4,4--4,11)), [], + None, (3,5--4,11), { LeadingKeyword = Type (3,0--3,4) + EqualsRange = Some (3,7--3,8) + WithKeyword = None })], (3,0--4,11)); Expr (Ident I, (6,0--6,1))], PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None, (1,0--6,1), { LeadingKeyword = Module (1,0--1,6) })], (true, true), diff --git a/tests/service/data/SyntaxTree/Member/Inherit 05.fs.bsl b/tests/service/data/SyntaxTree/Member/Inherit 05.fs.bsl index 5db0de3b349..a81b9924adc 100644 --- a/tests/service/data/SyntaxTree/Member/Inherit 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Inherit 05.fs.bsl @@ -12,8 +12,8 @@ ImplFile ObjectModel (Unspecified, [Inherit - (LongIdent (SynLongIdent ([], [], [])), None, - (4,4--4,11), { InheritKeyword = (4,4--4,11) }); + (None, None, (4,4--4,11), + { InheritKeyword = (4,4--4,11) }); Member (SynBinding (None, Normal, false, false, [], diff --git a/tests/service/data/SyntaxTree/Member/Inherit 08.fs.bsl b/tests/service/data/SyntaxTree/Member/Inherit 08.fs.bsl index 8b091e3d8b8..89cf5579843 100644 --- a/tests/service/data/SyntaxTree/Member/Inherit 08.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Inherit 08.fs.bsl @@ -12,8 +12,8 @@ ImplFile ObjectModel (Unspecified, [Inherit - (LongIdent (SynLongIdent ([], [], [])), None, - (4,4--4,11), { InheritKeyword = (4,4--4,11) }); + (None, None, (4,4--4,11), + { InheritKeyword = (4,4--4,11) }); Member (SynBinding (None, Normal, false, false, [], diff --git a/vsintegration/src/FSharp.Editor/Classification/ClassificationService.fs b/vsintegration/src/FSharp.Editor/Classification/ClassificationService.fs index 889ebec9718..afdb990489b 100644 --- a/vsintegration/src/FSharp.Editor/Classification/ClassificationService.fs +++ b/vsintegration/src/FSharp.Editor/Classification/ClassificationService.fs @@ -295,6 +295,7 @@ type internal FSharpClassificationService [] () = addSemanticClassification sourceText textSpan classificationData result } + |> CancellableTask.ifCanceledReturn () |> CancellableTask.startAsTask cancellationToken // Do not perform classification if we don't have project options (#defines matter) diff --git a/vsintegration/src/FSharp.Editor/CodeFixes/AddMissingSeq.fs b/vsintegration/src/FSharp.Editor/CodeFixes/AddMissingSeq.fs new file mode 100644 index 00000000000..e9a5783bbb2 --- /dev/null +++ b/vsintegration/src/FSharp.Editor/CodeFixes/AddMissingSeq.fs @@ -0,0 +1,77 @@ +// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. + +namespace Microsoft.VisualStudio.FSharp.Editor + +open System.Collections.Immutable +open System.Composition +open FSharp.Compiler.Syntax +open FSharp.Compiler.Text +open Microsoft.CodeAnalysis.CodeFixes +open Microsoft.CodeAnalysis.Text +open CancellableTasks + +[] +[] +type internal AddMissingSeqCodeFixProvider() = + inherit CodeFixProvider() + + static let title = SR.AddMissingSeq() + static let fixableDiagnosticIds = ImmutableArray.Create("FS3873", "FS0740") + + override _.FixableDiagnosticIds = fixableDiagnosticIds + override this.RegisterCodeFixesAsync context = context.RegisterFsharpFix this + override this.GetFixAllProvider() = this.RegisterFsharpFixAll() + + interface IFSharpCodeFixProvider with + member _.GetCodeFixIfAppliesAsync context = + cancellableTask { + let! sourceText = context.GetSourceTextAsync() + let! parseFileResults = context.Document.GetFSharpParseResultsAsync(nameof AddMissingSeqCodeFixProvider) + + let getSourceLineStr line = + sourceText.Lines[Line.toZ line].ToString() + + let range = + RoslynHelpers.TextSpanToFSharpRange(context.Document.FilePath, context.Span, sourceText) + + let needsParens = + (range.Start, parseFileResults.ParseTree) + ||> ParsedInput.exists (fun path node -> + match path, node with + | SyntaxNode.SynExpr outer :: _, SyntaxNode.SynExpr(expr & SynExpr.ComputationExpr _) when + expr.Range |> Range.equals range + -> + let seqRange = + range + |> Range.withEnd (Position.mkPos range.Start.Line (range.Start.Column + 3)) + + let inner = + SynExpr.App( + ExprAtomicFlag.NonAtomic, + false, + SynExpr.Ident(Ident(nameof seq, seqRange)), + expr, + Range.unionRanges seqRange expr.Range + ) + + let outer = + match outer with + | SynExpr.App(flag, isInfix, funcExpr, _, outerAppRange) -> + SynExpr.App(flag, isInfix, funcExpr, inner, outerAppRange) + | outer -> outer + + inner + |> SynExpr.shouldBeParenthesizedInContext getSourceLineStr (SyntaxNode.SynExpr outer :: path) + | _ -> false) + + let text = sourceText.ToString(TextSpan(context.Span.Start, context.Span.Length)) + let newText = if needsParens then $"(seq {text})" else $"seq {text}" + + return + ValueSome + { + Name = CodeFix.AddMissingSeq + Message = title + Changes = [ TextChange(context.Span, newText) ] + } + } diff --git a/vsintegration/src/FSharp.Editor/Common/CancellableTasks.fs b/vsintegration/src/FSharp.Editor/Common/CancellableTasks.fs index 99eb3946bba..78a28eb0de2 100644 --- a/vsintegration/src/FSharp.Editor/Common/CancellableTasks.fs +++ b/vsintegration/src/FSharp.Editor/Common/CancellableTasks.fs @@ -19,7 +19,7 @@ // The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - + namespace Microsoft.VisualStudio.FSharp.Editor // Don't warn about the resumable code invocation @@ -467,8 +467,8 @@ module CancellableTasks = // Low priority extensions type CancellableTaskBuilderBase with - [] - member inline _.Source(awaiter: CancellableTask) = + [] + member inline _.Source(awaiter: CancellableTask) = (fun (token) -> (awaiter token :> Task).GetAwaiter()) /// @@ -611,10 +611,10 @@ module CancellableTasks = fun sm -> if __useResumableCode then sm.Data.ThrowIfCancellationRequested() - + let mutable awaiter = getAwaiter let mutable __stack_fin = true - + if not (Awaiter.isCompleted awaiter) then let __stack_yield_fin = ResumableCode.Yield().Invoke(&sm) __stack_fin <- __stack_yield_fin @@ -706,7 +706,7 @@ module CancellableTasks = (task: 'Awaitable) : 'Awaiter = Awaitable.getAwaiter task - + /// Allows the computation expression to turn other types into CancellationToken -> 'Awaiter /// @@ -1119,6 +1119,17 @@ module CancellableTasks = let inline ignore ([] ctask: CancellableTask<_>) = toUnit ctask + /// If this CancellableTask gets canceled for another reason than the token being canceled, return the specified value. + let inline ifCanceledReturn value (ctask : CancellableTask<_>) = + cancellableTask { + let! ct = getCancellationToken () + + try + return! ctask + with :? OperationCanceledException when ct.IsCancellationRequested = false -> + return value + } + /// [] module MergeSourcesExtensions = diff --git a/vsintegration/src/FSharp.Editor/Common/Constants.fs b/vsintegration/src/FSharp.Editor/Common/Constants.fs index 822af01d16a..24ee22eb433 100644 --- a/vsintegration/src/FSharp.Editor/Common/Constants.fs +++ b/vsintegration/src/FSharp.Editor/Common/Constants.fs @@ -208,3 +208,6 @@ module internal CodeFix = [] let RemoveUnnecessaryParentheses = "RemoveUnnecessaryParentheses" + + [] + let AddMissingSeq = "AddMissingSeq" diff --git a/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj b/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj index 37bb02d43d2..2ec608dda20 100644 --- a/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj +++ b/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj @@ -141,6 +141,7 @@ + diff --git a/vsintegration/src/FSharp.Editor/FSharp.Editor.resx b/vsintegration/src/FSharp.Editor/FSharp.Editor.resx index 26b96dcc405..fac57e8b469 100644 --- a/vsintegration/src/FSharp.Editor/FSharp.Editor.resx +++ b/vsintegration/src/FSharp.Editor/FSharp.Editor.resx @@ -359,6 +359,9 @@ Use live (unsaved) buffers for analysis Remove unnecessary parentheses + + Add missing 'seq' + Remarks: diff --git a/vsintegration/src/FSharp.Editor/Structure/BlockStructureService.fs b/vsintegration/src/FSharp.Editor/Structure/BlockStructureService.fs index f96ea848c1f..d0326d84311 100644 --- a/vsintegration/src/FSharp.Editor/Structure/BlockStructureService.fs +++ b/vsintegration/src/FSharp.Editor/Structure/BlockStructureService.fs @@ -156,6 +156,8 @@ open CancellableTasks [)>] type internal FSharpBlockStructureService [] () = + let emptyValue = FSharpBlockStructure ImmutableArray.empty + interface IFSharpBlockStructureService with member _.GetBlockStructureAsync(document, cancellationToken) : Task = @@ -171,4 +173,5 @@ type internal FSharpBlockStructureService [] () = |> Seq.toImmutableArray |> FSharpBlockStructure } + |> CancellableTask.ifCanceledReturn emptyValue |> CancellableTask.start cancellationToken diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.cs.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.cs.xlf index 421cc037111..7f7c1064aad 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.cs.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.cs.xlf @@ -17,6 +17,11 @@ Přidat chybějící parametr člena instance + + Add missing 'seq' + Add missing 'seq' + + Add 'new' keyword Přidejte klíčové slovo new. diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.de.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.de.xlf index ff2a415b3a0..4117ecceddc 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.de.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.de.xlf @@ -17,6 +17,11 @@ Fehlenden Instanzmemberparameter hinzufügen + + Add missing 'seq' + Add missing 'seq' + + Add 'new' keyword Schlüsselwort "new" hinzufügen diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.es.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.es.xlf index 5df84b54acc..729a252061a 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.es.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.es.xlf @@ -17,6 +17,11 @@ Agregar parámetro de miembro de instancia que falta + + Add missing 'seq' + Add missing 'seq' + + Add 'new' keyword Agregar "nueva" palabra clave diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.fr.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.fr.xlf index efe15d65037..a49ba5d1a13 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.fr.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.fr.xlf @@ -17,6 +17,11 @@ Ajouter un paramètre de membre d’instance manquant + + Add missing 'seq' + Add missing 'seq' + + Add 'new' keyword Ajouter le mot clé 'new' diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.it.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.it.xlf index ca32c029946..0f82d483df8 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.it.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.it.xlf @@ -17,6 +17,11 @@ Aggiungi parametro membro di istanza mancante + + Add missing 'seq' + Add missing 'seq' + + Add 'new' keyword Aggiungi la parola chiave 'new' diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ja.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ja.xlf index 44ca609e1cd..71c981ec17c 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ja.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ja.xlf @@ -17,6 +17,11 @@ 見つからないインスタンス メンバー パラメーターを追加する + + Add missing 'seq' + Add missing 'seq' + + Add 'new' keyword 'new' キーワードを追加する diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ko.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ko.xlf index 66cfbeed575..776efa37ca0 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ko.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ko.xlf @@ -17,6 +17,11 @@ 누락된 인스턴스 멤버 매개 변수 추가 + + Add missing 'seq' + Add missing 'seq' + + Add 'new' keyword 'new' 키워드 추가 diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.pl.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.pl.xlf index 1675887bd6d..d4b1c40cd09 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.pl.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.pl.xlf @@ -17,6 +17,11 @@ Dodaj brakujący parametr składowej wystąpienia + + Add missing 'seq' + Add missing 'seq' + + Add 'new' keyword Dodaj słowo kluczowe „new” diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.pt-BR.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.pt-BR.xlf index f6770d970de..d743e4f549d 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.pt-BR.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.pt-BR.xlf @@ -17,6 +17,11 @@ Adicionar parâmetro de membro de instância ausente + + Add missing 'seq' + Add missing 'seq' + + Add 'new' keyword Adicionar a palavra-chave 'new' diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ru.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ru.xlf index bc8554237a8..623dbc446f3 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ru.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ru.xlf @@ -17,6 +17,11 @@ Добавить отсутствующий параметр экземплярного элемента + + Add missing 'seq' + Add missing 'seq' + + Add 'new' keyword Добавить ключевое слово "new" diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.tr.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.tr.xlf index cf2198ba7d3..d652ca45127 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.tr.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.tr.xlf @@ -17,6 +17,11 @@ Eksik örnek üye parametresini ekleyin + + Add missing 'seq' + Add missing 'seq' + + Add 'new' keyword 'new' anahtar sözcüğünü ekleme diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.zh-Hans.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.zh-Hans.xlf index 16a89acc021..e0d31417ab4 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.zh-Hans.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.zh-Hans.xlf @@ -17,6 +17,11 @@ 添加缺少的实例成员参数 + + Add missing 'seq' + Add missing 'seq' + + Add 'new' keyword 添加“新”关键字 diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.zh-Hant.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.zh-Hant.xlf index 932d4de3e61..89f6de50bcd 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.zh-Hant.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.zh-Hant.xlf @@ -17,6 +17,11 @@ 新增缺少的執行個體成員參數 + + Add missing 'seq' + Add missing 'seq' + + Add 'new' keyword 新增 'new' 關鍵字 diff --git a/vsintegration/tests/FSharp.Editor.Tests/CodeFixes/AddMissingSeqTests.fs b/vsintegration/tests/FSharp.Editor.Tests/CodeFixes/AddMissingSeqTests.fs new file mode 100644 index 00000000000..8a51be6a8fc --- /dev/null +++ b/vsintegration/tests/FSharp.Editor.Tests/CodeFixes/AddMissingSeqTests.fs @@ -0,0 +1,239 @@ +// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. + +module FSharp.Editor.Tests.CodeFixes.AddMissingSeqTests + +open Microsoft.VisualStudio.FSharp.Editor +open Xunit +open CodeFixTestFramework + +let private codeFix = AddMissingSeqCodeFixProvider() + +// This can be changed to Auto when featureDeprecatePlacesWhereSeqCanBeOmitted is out of preview. +let mode = WithOption "--langversion:preview" + +[] +let ``FS3873 — Adds missing seq before { start..finish }`` () = + let code = "let xs = { 1..10 }" + + let expected = + Some + { + Message = "Add missing 'seq'" + FixedCode = "let xs = seq { 1..10 }" + } + + let actual = codeFix |> tryFix code mode + + Assert.Equal(expected, actual) + +[] +let ``FS3873 — Adds missing seq before { start..step..finish }`` () = + let code = "let xs = { 1..5..10 }" + + let expected = + Some + { + Message = "Add missing 'seq'" + FixedCode = "let xs = seq { 1..5..10 }" + } + + let actual = codeFix |> tryFix code mode + + Assert.Equal(expected, actual) + +[] +let ``FS0740 — Adds missing seq before { x; y }`` () = + let code = "let xs = { 1; 10 }" + + let expected = + Some + { + Message = "Add missing 'seq'" + FixedCode = "let xs = seq { 1; 10 }" + } + + let actual = codeFix |> tryFix code mode + + Assert.Equal(expected, actual) + +[] +let ``FS3873 — Adds missing seq before yield { start..finish }`` () = + let code = "let xs = [| yield { 1..100 } |]" + + let expected = + Some + { + Message = "Add missing 'seq'" + FixedCode = "let xs = [| yield seq { 1..100 } |]" + } + + let actual = codeFix |> tryFix code mode + + Assert.Equal(expected, actual) + +[] +let ``FS3873 — Adds missing seq before yield { start..finish } multiline`` () = + let code = + """ +let xs = [| yield seq { 1..100 } + yield { 1..100 } |] +""" + + let expected = + Some + { + Message = "Add missing 'seq'" + FixedCode = + """ +let xs = [| yield seq { 1..100 } + yield seq { 1..100 } |] +""" + } + + let actual = codeFix |> tryFix code mode + + Assert.Equal(expected, actual) + +[] +let ``FS3873 — Adds parens when needed — app`` () = + let code = "let xs = id { 1..10 }" + + let expected = + Some + { + Message = "Add missing 'seq'" + FixedCode = "let xs = id (seq { 1..10 })" + } + + let actual = codeFix |> tryFix code mode + + Assert.Equal(expected, actual) + +[] +let ``FS3873 — Adds parens when needed — app parens`` () = + let code = "let xs = ResizeArray({ 1..10 })" + + let expected = + Some + { + Message = "Add missing 'seq'" + FixedCode = "let xs = ResizeArray(seq { 1..10 })" + } + + let actual = codeFix |> tryFix code mode + + Assert.Equal(expected, actual) + +[] +let ``FS3873 — Adds parens when needed — foreach`` () = + let code = "[ for x in { 1..10 } -> x ]" + + let expected = + Some + { + Message = "Add missing 'seq'" + FixedCode = "[ for x in seq { 1..10 } -> x ]" + } + + let actual = codeFix |> tryFix code mode + + Assert.Equal(expected, actual) + +[] +let ``FS3873 — Adds parens when needed — dot`` () = + let code = "let s = { 1..10 }.ToString ()" + + let expected = + Some + { + Message = "Add missing 'seq'" + FixedCode = "let s = (seq { 1..10 }).ToString ()" + } + + let actual = codeFix |> tryFix code mode + + Assert.Equal(expected, actual) + +[] +let ``FS0740 — Adds parens when needed — app`` () = + let code = "let xs = id { 1; 10 }" + + let expected = + Some + { + Message = "Add missing 'seq'" + FixedCode = "let xs = id (seq { 1; 10 })" + } + + let actual = codeFix |> tryFix code mode + + Assert.Equal(expected, actual) + +[] +let ``FS0740 — Adds parens when needed — dot`` () = + let code = "let s = { 1; 10 }.ToString ()" + + let expected = + Some + { + Message = "Add missing 'seq'" + FixedCode = "let s = (seq { 1; 10 }).ToString ()" + } + + let actual = codeFix |> tryFix code mode + + Assert.Equal(expected, actual) + +[] +let ``FS3873 — Adds parens when needed — multiline`` () = + let code = + """ +let xs = + id { + 1..10 + } +""" + + let expected = + Some + { + Message = "Add missing 'seq'" + FixedCode = + """ +let xs = + id (seq { + 1..10 + }) +""" + } + + let actual = codeFix |> tryFix code mode + + Assert.Equal(expected, actual) + +[] +let ``FS0740 — Adds parens when needed — multiline`` () = + let code = + """ +let xs = + id { + 1; 10 + } +""" + + let expected = + Some + { + Message = "Add missing 'seq'" + FixedCode = + """ +let xs = + id (seq { + 1; 10 + }) +""" + } + + let actual = codeFix |> tryFix code mode + + Assert.Equal(expected, actual) diff --git a/vsintegration/tests/FSharp.Editor.Tests/FSharp.Editor.Tests.fsproj b/vsintegration/tests/FSharp.Editor.Tests/FSharp.Editor.Tests.fsproj index a180accc43f..738a3e1323c 100644 --- a/vsintegration/tests/FSharp.Editor.Tests/FSharp.Editor.Tests.fsproj +++ b/vsintegration/tests/FSharp.Editor.Tests/FSharp.Editor.Tests.fsproj @@ -72,6 +72,7 @@ + diff --git a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.Completion.fs b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.Completion.fs index cb08d34ae88..9516280cba9 100644 --- a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.Completion.fs +++ b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.Completion.fs @@ -997,7 +997,7 @@ for i in 0..a."] ] ] for ifs in shouldBeInterface do - AssertCtrlSpaceCompleteContains ifs "(*M*)" ["seq"] ["obj"] + AssertCtrlSpaceCompleteContains ifs "(*M*)" ["seq"] [] [] @@ -1026,7 +1026,7 @@ for i in 0..a."] ] ] for cls in shouldBeClass do - AssertCtrlSpaceCompleteContains cls "(*M*)" ["obj"] ["seq"] + AssertCtrlSpaceCompleteContains cls "(*M*)" ["obj"] [] [] member this.``Completion.DetectUnknownCompletionContext``() = @@ -1036,31 +1036,12 @@ for i in 0..a."] " inherit (*M*)" ] - AssertCtrlSpaceCompleteContains content "(*M*)" ["obj"; "seq"] ["abs"] + AssertCtrlSpaceCompleteContains content "(*M*)" ["obj"; "seq"] [] [] member this.``Completion.DetectInvalidCompletionContext``() = let shouldBeInvalid = [ - [ - "type X = struct" - " inherit (*M*)" - ] - [ - "[]" - "type X = class" - " inherit (*M*)" - ] - [ - "[]" - "type X = interface" - " inherit (*M*)" - ] - [ - "[]" - "type X = interface" - " inherit (*M*)" - ] [ "type X =" " inherit System (*M*)." @@ -1076,7 +1057,6 @@ for i in 0..a."] for invalid in shouldBeInvalid do AssertCtrlSpaceCompletionListIsEmpty invalid "(*M*)" - [] member this.``Completion.LongIdentifiers``() = // System.Diagnostics.Debugger.Launch() |> ignore From c3d61e0d0195526bd3db948bb328d053e91cc888 Mon Sep 17 00:00:00 2001 From: Martin521 <29605222+Martin521@users.noreply.github.com> Date: Fri, 8 Nov 2024 09:47:23 +0000 Subject: [PATCH 30/35] fixed merge issues --- .config/dotnet-tools.json | 2 +- docs/release-notes/.FSharp.Core/9.0.200.md | 3 +++ eng/Version.Details.xml | 4 ++-- src/FSharp.Core/prim-types.fs | 15 ++++++++++----- .../FSharp.Core/OperatorsModule2.fs | 9 +++++++++ 5 files changed, 25 insertions(+), 8 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 5cf9775974e..88f8c3d1576 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -59,4 +59,4 @@ "rollForward": true } } -} \ No newline at end of file +} diff --git a/docs/release-notes/.FSharp.Core/9.0.200.md b/docs/release-notes/.FSharp.Core/9.0.200.md index 9801210174b..f28a62465b3 100644 --- a/docs/release-notes/.FSharp.Core/9.0.200.md +++ b/docs/release-notes/.FSharp.Core/9.0.200.md @@ -5,5 +5,8 @@ ### Added ### Changed +* String function changed to guarantee a non-null string return type ([PR #17809](https://github.com/dotnet/fsharp/pull/17809)) + ### Breaking Changes + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 72e666ba74d..5447b5a644f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/source-build-reference-packages - e781442b88c4d939f06a94f38f24a5dc18c383d4 + 346f2ca639adb1b363592e27bf62aba52916ea3f diff --git a/src/FSharp.Core/prim-types.fs b/src/FSharp.Core/prim-types.fs index e1f093e13eb..7c5f12f764d 100644 --- a/src/FSharp.Core/prim-types.fs +++ b/src/FSharp.Core/prim-types.fs @@ -890,11 +890,16 @@ namespace Microsoft.FSharp.Core for m = 0 to len4 - 1 do SetArray4D dst (src1+i) (src2+j) (src3+k) (src4+m) (GetArray4D src i j k m) + let inline defaultIfNull (defaultStr:string) x = + match x with + | null -> defaultStr + | nonNullString -> nonNullString + let inline anyToString nullStr x = match box x with - | :? IFormattable as f -> f.ToString(null, CultureInfo.InvariantCulture) + | :? IFormattable as f -> defaultIfNull nullStr (f.ToString(null, CultureInfo.InvariantCulture)) | null -> nullStr - | _ -> x.ToString() + | _ -> defaultIfNull nullStr (x.ToString()) let anyToStringShowingNull x = anyToString "null" x @@ -5200,8 +5205,8 @@ namespace Microsoft.FSharp.Core when 'T : Guid = let x = (# "" value : Guid #) in x.ToString(null, CultureInfo.InvariantCulture) when 'T struct = match box value with - | :? IFormattable as f -> f.ToString(null, CultureInfo.InvariantCulture) - | _ -> value.ToString() + | :? IFormattable as f -> defaultIfNull "" (f.ToString(null, CultureInfo.InvariantCulture)) + | _ -> defaultIfNull "" (value.ToString()) // other common mscorlib reference types when 'T : StringBuilder = @@ -5210,7 +5215,7 @@ namespace Microsoft.FSharp.Core when 'T : IFormattable = if value = unsafeDefault<'T> then "" - else let x = (# "" value : IFormattable #) in x.ToString(null, CultureInfo.InvariantCulture) + else let x = (# "" value : IFormattable #) in defaultIfNull "" (x.ToString(null, CultureInfo.InvariantCulture)) [] [] diff --git a/tests/FSharp.Core.UnitTests/FSharp.Core/OperatorsModule2.fs b/tests/FSharp.Core.UnitTests/FSharp.Core/OperatorsModule2.fs index 57647ead9ed..f2dc93d9ee9 100644 --- a/tests/FSharp.Core.UnitTests/FSharp.Core/OperatorsModule2.fs +++ b/tests/FSharp.Core.UnitTests/FSharp.Core/OperatorsModule2.fs @@ -872,6 +872,15 @@ type OperatorsModule2() = let result = Operators.string 123.456M Assert.AreEqual("123.456", result) + let result = Operators.string { new obj () with override _.ToString () = null } + Assert.AreEqual("", result) + + let result = Operators.string { new obj () with override _.ToString () = Operators.string null } + Assert.AreEqual("", result) + + let result = Operators.string { new IFormattable with override _.ToString (_, _) = null } + Assert.AreEqual("", result) + // Following tests ensure that InvariantCulture is used if type implements IFormattable // safe current culture, then switch culture From 393d0750f42038f0b6517cb771d76f0447f75610 Mon Sep 17 00:00:00 2001 From: Martin521 <29605222+Martin521@users.noreply.github.com> Date: Tue, 12 Nov 2024 15:22:01 +0000 Subject: [PATCH 31/35] Some refactoring of WarnScopes; Moving BufferLocalStore access to UnicodeLexing --- src/Compiler/SyntaxTree/UnicodeLexing.fs | 10 ++ src/Compiler/SyntaxTree/UnicodeLexing.fsi | 3 + src/Compiler/SyntaxTree/WarnScopes.fs | 128 +++++++++------------- src/Compiler/SyntaxTree/WarnScopes.fsi | 3 - 4 files changed, 66 insertions(+), 78 deletions(-) diff --git a/src/Compiler/SyntaxTree/UnicodeLexing.fs b/src/Compiler/SyntaxTree/UnicodeLexing.fs index 5a2d4393ee7..56a104b5b3d 100644 --- a/src/Compiler/SyntaxTree/UnicodeLexing.fs +++ b/src/Compiler/SyntaxTree/UnicodeLexing.fs @@ -8,6 +8,16 @@ open Internal.Utilities.Text.Lexing type Lexbuf = LexBuffer +type LexBuffer<'char> with + + member lexbuf.GetLocalData<'T when 'T: not null>(key: string, initializer) = + match lexbuf.BufferLocalStore.TryGetValue key with + | true, data -> data :?> 'T + | _ -> + let data = initializer () + lexbuf.BufferLocalStore[key] <- data + data + let StringAsLexbuf (reportLibraryOnlyFeatures, langVersion, strictIndentation, s: string) = LexBuffer .FromChars(reportLibraryOnlyFeatures, langVersion, strictIndentation, s.ToCharArray()) diff --git a/src/Compiler/SyntaxTree/UnicodeLexing.fsi b/src/Compiler/SyntaxTree/UnicodeLexing.fsi index 80d772e03e1..a7e24b1adc9 100644 --- a/src/Compiler/SyntaxTree/UnicodeLexing.fsi +++ b/src/Compiler/SyntaxTree/UnicodeLexing.fsi @@ -9,6 +9,9 @@ open Internal.Utilities.Text.Lexing type Lexbuf = LexBuffer +type LexBuffer<'char> with + member GetLocalData<'T when 'T: not null>: key: string * initializer: (unit -> 'T) -> 'T + val StringAsLexbuf: reportLibraryOnlyFeatures: bool * langVersion: LanguageVersion * strictIndentation: bool option * string -> Lexbuf diff --git a/src/Compiler/SyntaxTree/WarnScopes.fs b/src/Compiler/SyntaxTree/WarnScopes.fs index d682b7f62b6..fb8e5122dcf 100644 --- a/src/Compiler/SyntaxTree/WarnScopes.fs +++ b/src/Compiler/SyntaxTree/WarnScopes.fs @@ -35,8 +35,8 @@ module internal WarnScopes = type private TempData = { OriginalFileIndex: int - WarnDirectives: WarnDirective list - LineMap: Map + mutable WarnDirectives: WarnDirective list + mutable LineMap: Map } let private initialData (lexbuf: Lexbuf) = @@ -46,62 +46,15 @@ module internal WarnScopes = LineMap = Map.empty } - let private dataKey = "WarnScopeData" - - let private getData (lexbuf: Lexbuf) = - if not <| lexbuf.BufferLocalStore.ContainsKey dataKey then - lexbuf.BufferLocalStore.Add(dataKey, initialData lexbuf) - - lexbuf.BufferLocalStore[dataKey] :?> TempData - - let private setData (lexbuf: Lexbuf) (data: TempData) = - lexbuf.BufferLocalStore[dataKey] <- data - - let removeTemporaryData (lexbuf: Lexbuf) = - lexbuf.BufferLocalStore.Remove dataKey |> ignore - - // ************************************* - // After lexing, the (processed) warn scope data are kept in diagnosticOptions - // ************************************* - - /// The range between #nowarn and #warnon, or #warnon and #nowarn, for a warning number. - /// Or between the directive and eof, for the "Open" cases. - [] - type private WarnScope = - | Off of range - | On of range - | OpenOff of range - | OpenOn of range - - type private WarnScopeData = - { - /// The collected WarnScope objects (collected during lexing) - warnScopes: Map - /// Information about the mapping implied by the #line directives. - /// The Map key is the file index of the surrogate source. - /// The Map value contains the file index of the original source and - /// a list of mapped sections (surrogate and original start lines). - lineMaps: Map - } - - let private getWarnScopeData (diagnosticOptions: FSharpDiagnosticOptions) = - match diagnosticOptions.WarnScopeData with - | None -> - { - warnScopes = Map.empty - lineMaps = Map.empty - } - | Some data -> data :?> WarnScopeData - - let private setWarnScopeData (diagnosticOptions: FSharpDiagnosticOptions) data = - diagnosticOptions.WarnScopeData <- Some data + let private getTempData (lexbuf: Lexbuf) = + lexbuf.GetLocalData("WarnScopeData", (fun () -> initialData lexbuf)) // ************************************* // Collect the line directives to correctly interact with them // ************************************* let RegisterLineDirective (lexbuf, fileIndex, line: int) = - let data = getData lexbuf + let data = getTempData lexbuf let sectionMap = line, lexbuf.StartPos.OriginalLine + 1 let changer entry = @@ -121,9 +74,7 @@ module internal WarnScopes = else Some(originalFileIndex, sectionMap :: maps) - let newLineMap = data.LineMap.Change(fileIndex, changer) - let newData = { data with LineMap = newLineMap } - setData lexbuf newData + data.LineMap <- data.LineMap.Change(fileIndex, changer) // ************************************* // Collect the warn scopes during lexing @@ -217,11 +168,6 @@ module internal WarnScopes = IsWarnon = isWarnon } - let private index (fileIndex, warningNumber) = - (int64 fileIndex <<< 32) + int64 warningNumber - - let private warnNumFromIndex (idx: int64) = idx &&& 0xFFFFFFFFL - let private getScopes idx warnScopes = Map.tryFind idx warnScopes |> Option.defaultValue [] @@ -229,15 +175,49 @@ module internal WarnScopes = mkFileIndexRange m1.FileIndex m1.Start m2.End let ParseAndRegisterWarnDirective (lexbuf: Lexbuf) = - let data = getData lexbuf + let data = getTempData lexbuf let warnDirective = parseDirective data.OriginalFileIndex lexbuf + data.WarnDirectives <- warnDirective :: data.WarnDirectives + + // ************************************* + // After lexing, the (processed) warn scope data are kept in diagnosticOptions + // ************************************* + + type private FileIndex = int + type private WarningNumber = int + type private LineNumber = int + + /// The range between #nowarn and #warnon, or #warnon and #nowarn, for a warning number. + /// Or between the directive and eof, for the "Open" cases. + [] + type private WarnScope = + | Off of range + | On of range + | OpenOff of range + | OpenOn of range + + type private WarnScopeData = + { + /// The collected WarnScope objects (collected during lexing) + warnScopes: Map + /// Information about the mapping implied by the #line directives. + /// The Map key is the file index of the surrogate source. + /// The Map value contains the file index of the original source and + /// a list of mapped sections (surrogate and original start lines). + lineMaps: Map + } - let newData = - { data with - WarnDirectives = warnDirective :: data.WarnDirectives + let private getWarnScopeData (diagnosticOptions: FSharpDiagnosticOptions) = + match diagnosticOptions.WarnScopeData with + | None -> + { + warnScopes = Map.empty + lineMaps = Map.empty } + | Some data -> data :?> WarnScopeData - setData lexbuf newData + let private setWarnScopeData (diagnosticOptions: FSharpDiagnosticOptions) data = + diagnosticOptions.WarnScopeData <- Some data // ************************************* // Move the warnscope data to diagnosticOptions / make ranges available @@ -246,7 +226,7 @@ module internal WarnScopes = let private processWarnCmd (langVersion: LanguageVersion) warnScopeMap (wd: WarnCmd) = match wd with | WarnCmd.Nowarn(n, m) -> - let idx = index (m.FileIndex, n) + let idx = m.FileIndex, n match getScopes idx warnScopeMap with | WarnScope.OpenOn m' :: t -> warnScopeMap.Add(idx, WarnScope.On(mkScope m' m) :: t) @@ -258,7 +238,7 @@ module internal WarnScopes = warnScopeMap | scopes -> warnScopeMap.Add(idx, WarnScope.OpenOff(mkScope m m) :: scopes) | WarnCmd.Warnon(n, m) -> - let idx = index (m.FileIndex, n) + let idx = m.FileIndex, n match getScopes idx warnScopeMap with | WarnScope.OpenOff m' :: t -> warnScopeMap.Add(idx, WarnScope.Off(mkScope m' m) :: t) @@ -269,7 +249,7 @@ module internal WarnScopes = | scopes -> warnScopeMap.Add(idx, WarnScope.OpenOn(mkScope m m) :: scopes) let MergeInto (diagnosticOptions: FSharpDiagnosticOptions) (subModuleRanges: range list) (lexbuf: Lexbuf) = - let data = getData lexbuf + let data = getTempData lexbuf let warnDirectives = List.rev data.WarnDirectives let warnCmds = @@ -321,10 +301,10 @@ module internal WarnScopes = setWarnScopeData diagnosticOptions newWarnScopeData) let getDirectiveRanges (lexbuf: Lexbuf) = - (getData lexbuf).WarnDirectives |> List.rev |> List.map _.DirectiveRange + (getTempData lexbuf).WarnDirectives |> List.rev |> List.map _.DirectiveRange let getCommentRanges (lexbuf: Lexbuf) = - (getData lexbuf).WarnDirectives |> List.rev |> List.choose _.CommentRange + (getTempData lexbuf).WarnDirectives |> List.rev |> List.choose _.CommentRange // ************************************* // Apply the warn scopes after lexing @@ -366,7 +346,7 @@ module internal WarnScopes = match mo, diagnosticOptions.WarnScopesFeatureIsSupported with | Some m, true -> let mOrig = originalRange data.lineMaps m - let scopes = getScopes (index (mOrig.FileIndex, warningNumber)) data.warnScopes + let scopes = getScopes (mOrig.FileIndex, warningNumber) data.warnScopes List.exists (isEnclosingWarnonScope mOrig) scopes | _ -> false @@ -376,8 +356,6 @@ module internal WarnScopes = match mo with | Some m -> let mOrig = originalRange data.lineMaps m - let scopes = getScopes (index (mOrig.FileIndex, warningNumber)) data.warnScopes + let scopes = getScopes (mOrig.FileIndex, warningNumber) data.warnScopes List.exists (isEnclosingNowarnScope mOrig) scopes - | None -> - data.warnScopes - |> Map.exists (fun idx _ -> warnNumFromIndex idx = warningNumber) + | None -> data.warnScopes |> Map.exists (fun idx _ -> snd idx = warningNumber) diff --git a/src/Compiler/SyntaxTree/WarnScopes.fsi b/src/Compiler/SyntaxTree/WarnScopes.fsi index 20181327a37..c30bec77cfa 100644 --- a/src/Compiler/SyntaxTree/WarnScopes.fsi +++ b/src/Compiler/SyntaxTree/WarnScopes.fsi @@ -24,9 +24,6 @@ module internal WarnScopes = /// Get the ranges of any comments after warn directives val getCommentRanges: Lexbuf -> range list - /// Clear the temporary warn scope related data in the Lexbuf - val removeTemporaryData: Lexbuf -> unit - /// Check if the range is inside a WarnScope.On scope val IsWarnon: FSharpDiagnosticOptions -> warningNumber: int -> mo: range option -> bool From 01c00f57e7515d81a02a4be8cdf4c68dcf1f08af Mon Sep 17 00:00:00 2001 From: Martin521 <29605222+Martin521@users.noreply.github.com> Date: Tue, 12 Nov 2024 16:02:54 +0000 Subject: [PATCH 32/35] make LexerStore use lexbuf.GetLocalData --- src/Compiler/SyntaxTree/LexerStore.fs | 45 ++++++++------------------- src/Compiler/SyntaxTree/XmlDoc.fs | 2 ++ src/Compiler/SyntaxTree/XmlDoc.fsi | 3 ++ 3 files changed, 18 insertions(+), 32 deletions(-) diff --git a/src/Compiler/SyntaxTree/LexerStore.fs b/src/Compiler/SyntaxTree/LexerStore.fs index 711e9530cd9..cd5813b500e 100644 --- a/src/Compiler/SyntaxTree/LexerStore.fs +++ b/src/Compiler/SyntaxTree/LexerStore.fs @@ -10,36 +10,12 @@ open FSharp.Compiler.Text.Position open FSharp.Compiler.Text.Range open FSharp.Compiler.Xml -//------------------------------------------------------------------------ -// Lexbuf.BufferLocalStore is used during lexing/parsing of a file for different purposes. -// All access happens through the functions and modules below. -//------------------------------------------------------------------------ - -let private getStoreData<'T when 'T: not null> (lexbuf: Lexbuf) key (getInitialData: unit -> 'T) = - let store = lexbuf.BufferLocalStore - - match store.TryGetValue key with - | true, data -> data :?> 'T - | _ -> - let data = getInitialData () - store[key] <- data - data - -let private tryGetStoreData<'T when 'T: not null> (lexbuf: Lexbuf) key = - let store = lexbuf.BufferLocalStore - - match store.TryGetValue key with - | true, data -> Some(data :?> 'T) - | _ -> None - -let private setStoreData (lexbuf: Lexbuf) key data = lexbuf.BufferLocalStore[key] <- data - //------------------------------------------------------------------------ // A SynArgNameGenerator for the current file, used by the parser //------------------------------------------------------------------------ let getSynArgNameGenerator (lexbuf: Lexbuf) = - getStoreData lexbuf "SynArgNameGenerator" SynArgNameGenerator + lexbuf.GetLocalData("SynArgNameGenerator", SynArgNameGenerator) //------------------------------------------------------------------------ // A XmlDocCollector, used to hold the current accumulated Xml doc lines, and related access functions @@ -47,10 +23,8 @@ let getSynArgNameGenerator (lexbuf: Lexbuf) = [] module XmlDocStore = - let private xmlDocKey = "XmlDoc" - - let private getCollector (lexbuf: Lexbuf) = - getStoreData lexbuf xmlDocKey XmlDocCollector + let private getCollector (lexbuf: Lexbuf) : XmlDocCollector = + lexbuf.GetLocalData("XmlDoc", XmlDocCollector) /// Called from the lexer to save a single line of XML doc comment. let SaveXmlDocLine (lexbuf: Lexbuf, lineText, range: range) = @@ -77,10 +51,17 @@ module XmlDocStore = let startPos = lexbuf.StartPos collector.AddGrabPointDelayed(mkPos startPos.Line startPos.Column) + let private tryGetStoreData<'T when 'T: not null> (lexbuf: Lexbuf) key = + let store = lexbuf.BufferLocalStore + + match store.TryGetValue key with + | true, data -> Some(data :?> 'T) + | _ -> None + /// Called from the parser each time we parse a construct that marks the end of an XML doc comment range, /// e.g. a 'type' declaration. The markerRange is the range of the keyword that delimits the construct. let GrabXmlDocBeforeMarker (lexbuf: Lexbuf, markerRange: range) = - match tryGetStoreData lexbuf xmlDocKey with + match tryGetStoreData lexbuf "XmlDoc" with | Some collector -> PreXmlDoc.CreateFromGrabPoint(collector, markerRange.Start) | _ -> PreXmlDoc.Empty @@ -108,7 +89,7 @@ let rec LexerIfdefEval (lookup: string -> bool) = [] module IfdefStore = let private getStore (lexbuf: Lexbuf) = - getStoreData lexbuf "Ifdef" ResizeArray + lexbuf.GetLocalData("Ifdef", ResizeArray) let private mkRangeWithoutLeadingWhitespace (lexed: string) (m: range) : range = let startColumn = lexed.Length - lexed.TrimStart().Length @@ -152,7 +133,7 @@ module IfdefStore = [] module CommentStore = let private getStore (lexbuf: Lexbuf) = - getStoreData lexbuf "Comments" ResizeArray + lexbuf.GetLocalData("Comments", ResizeArray) let SaveSingleLineComment (lexbuf: Lexbuf, startRange: range, endRange: range) = let store = getStore lexbuf diff --git a/src/Compiler/SyntaxTree/XmlDoc.fs b/src/Compiler/SyntaxTree/XmlDoc.fs index a366a69a8a6..5610a0e6d96 100644 --- a/src/Compiler/SyntaxTree/XmlDoc.fs +++ b/src/Compiler/SyntaxTree/XmlDoc.fs @@ -132,6 +132,8 @@ type XmlDocCollector() = let mutable currentGrabPointCommentsCount = 0 let mutable delayedGrabPoint = ValueNone + member _.IsEmpty = currentGrabPointCommentsCount = 0 + member _.AddGrabPoint(pos: pos) = if currentGrabPointCommentsCount = 0 then () diff --git a/src/Compiler/SyntaxTree/XmlDoc.fsi b/src/Compiler/SyntaxTree/XmlDoc.fsi index 33b168786cc..b42971af300 100644 --- a/src/Compiler/SyntaxTree/XmlDoc.fsi +++ b/src/Compiler/SyntaxTree/XmlDoc.fsi @@ -43,6 +43,9 @@ type internal XmlDocCollector = /// Create a fresh XmlDocCollector new: unit -> XmlDocCollector + /// True if no XML documentation lines have been collected yet + member IsEmpty: bool + /// Add a point where prior XmlDoc are collected member AddGrabPoint: pos: pos -> unit From c17404e6dc1cdf2afa041810aaef6c0e9820254c Mon Sep 17 00:00:00 2001 From: Martin521 <29605222+Martin521@users.noreply.github.com> Date: Tue, 12 Nov 2024 19:15:05 +0000 Subject: [PATCH 33/35] fixes --- src/Compiler/SyntaxTree/LexerStore.fs | 11 ++--------- src/Compiler/SyntaxTree/UnicodeLexing.fs | 5 +++++ src/Compiler/SyntaxTree/UnicodeLexing.fsi | 1 + src/Compiler/SyntaxTree/XmlDoc.fs | 2 -- src/Compiler/SyntaxTree/XmlDoc.fsi | 3 --- 5 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/Compiler/SyntaxTree/LexerStore.fs b/src/Compiler/SyntaxTree/LexerStore.fs index cd5813b500e..da8a02da7f0 100644 --- a/src/Compiler/SyntaxTree/LexerStore.fs +++ b/src/Compiler/SyntaxTree/LexerStore.fs @@ -51,19 +51,12 @@ module XmlDocStore = let startPos = lexbuf.StartPos collector.AddGrabPointDelayed(mkPos startPos.Line startPos.Column) - let private tryGetStoreData<'T when 'T: not null> (lexbuf: Lexbuf) key = - let store = lexbuf.BufferLocalStore - - match store.TryGetValue key with - | true, data -> Some(data :?> 'T) - | _ -> None - /// Called from the parser each time we parse a construct that marks the end of an XML doc comment range, /// e.g. a 'type' declaration. The markerRange is the range of the keyword that delimits the construct. let GrabXmlDocBeforeMarker (lexbuf: Lexbuf, markerRange: range) = - match tryGetStoreData lexbuf "XmlDoc" with + match lexbuf.TryGetLocalData "XmlDoc" with | Some collector -> PreXmlDoc.CreateFromGrabPoint(collector, markerRange.Start) - | _ -> PreXmlDoc.Empty + | None -> PreXmlDoc.Empty let ReportInvalidXmlDocPositions (lexbuf: Lexbuf) = let collector = getCollector lexbuf diff --git a/src/Compiler/SyntaxTree/UnicodeLexing.fs b/src/Compiler/SyntaxTree/UnicodeLexing.fs index 56a104b5b3d..19b64e10ebd 100644 --- a/src/Compiler/SyntaxTree/UnicodeLexing.fs +++ b/src/Compiler/SyntaxTree/UnicodeLexing.fs @@ -18,6 +18,11 @@ type LexBuffer<'char> with lexbuf.BufferLocalStore[key] <- data data + member lexbuf.TryGetLocalData<'T when 'T: not null>(key: string) = + match lexbuf.BufferLocalStore.TryGetValue key with + | true, data -> Some (data :?> 'T) + | _ -> None + let StringAsLexbuf (reportLibraryOnlyFeatures, langVersion, strictIndentation, s: string) = LexBuffer .FromChars(reportLibraryOnlyFeatures, langVersion, strictIndentation, s.ToCharArray()) diff --git a/src/Compiler/SyntaxTree/UnicodeLexing.fsi b/src/Compiler/SyntaxTree/UnicodeLexing.fsi index a7e24b1adc9..b0d6f9c6a7f 100644 --- a/src/Compiler/SyntaxTree/UnicodeLexing.fsi +++ b/src/Compiler/SyntaxTree/UnicodeLexing.fsi @@ -11,6 +11,7 @@ type Lexbuf = LexBuffer type LexBuffer<'char> with member GetLocalData<'T when 'T: not null>: key: string * initializer: (unit -> 'T) -> 'T + member TryGetLocalData<'T when 'T: not null>: key: string -> 'T option val StringAsLexbuf: reportLibraryOnlyFeatures: bool * langVersion: LanguageVersion * strictIndentation: bool option * string -> Lexbuf diff --git a/src/Compiler/SyntaxTree/XmlDoc.fs b/src/Compiler/SyntaxTree/XmlDoc.fs index 5610a0e6d96..a366a69a8a6 100644 --- a/src/Compiler/SyntaxTree/XmlDoc.fs +++ b/src/Compiler/SyntaxTree/XmlDoc.fs @@ -132,8 +132,6 @@ type XmlDocCollector() = let mutable currentGrabPointCommentsCount = 0 let mutable delayedGrabPoint = ValueNone - member _.IsEmpty = currentGrabPointCommentsCount = 0 - member _.AddGrabPoint(pos: pos) = if currentGrabPointCommentsCount = 0 then () diff --git a/src/Compiler/SyntaxTree/XmlDoc.fsi b/src/Compiler/SyntaxTree/XmlDoc.fsi index b42971af300..33b168786cc 100644 --- a/src/Compiler/SyntaxTree/XmlDoc.fsi +++ b/src/Compiler/SyntaxTree/XmlDoc.fsi @@ -43,9 +43,6 @@ type internal XmlDocCollector = /// Create a fresh XmlDocCollector new: unit -> XmlDocCollector - /// True if no XML documentation lines have been collected yet - member IsEmpty: bool - /// Add a point where prior XmlDoc are collected member AddGrabPoint: pos: pos -> unit From 2f6fe8cc95e9808783b28065c6e0e9504115ee4e Mon Sep 17 00:00:00 2001 From: Martin521 <29605222+Martin521@users.noreply.github.com> Date: Wed, 13 Nov 2024 08:23:44 +0000 Subject: [PATCH 34/35] formatting fixed --- .fantomasignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.fantomasignore b/.fantomasignore index d731fb6d9a5..a57b3f1bbbe 100644 --- a/.fantomasignore +++ b/.fantomasignore @@ -116,7 +116,8 @@ src/Compiler/Utilities/HashMultiMap.fs src/Compiler/Facilities/AsyncMemoize.fsi src/Compiler/Facilities/AsyncMemoize.fs src/Compiler/AbstractIL/il.fs -src/Compiler/SyntaxTree/LexerStore.fs +src/Compiler/SyntaxTree/UnicodeLexing.fsi +src/Compiler/SyntaxTree/UnicodeLexing.fs src/Compiler/Driver/GraphChecking/Graph.fsi src/Compiler/Driver/GraphChecking/Graph.fs From bb7b32ca811665235b347c3d79798b2d4244618a Mon Sep 17 00:00:00 2001 From: Martin521 <29605222+Martin521@users.noreply.github.com> Date: Thu, 14 Nov 2024 13:40:04 +0000 Subject: [PATCH 35/35] revert test change --- .../LegacyLanguageService/Tests.LanguageService.ErrorList.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs index 8df930cf38b..b5cc13f4501 100644 --- a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs +++ b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs @@ -519,7 +519,7 @@ type staticInInterface = |> List.exists(fun error -> (error.ToString().Contains("新規baProgram")))) // In this bug, particular warns were still present after nowarn - [] + [] member public this.``NoWarn.Bug5424``() = let fileContent = """ #nowarn "67" // this type test or downcast will always hold