From 6b88572ee2da5c1bfaa1e7f3b65fbf19257ce030 Mon Sep 17 00:00:00 2001 From: Eugene Auduchinok Date: Fri, 31 Jul 2026 22:22:31 +0200 Subject: [PATCH 1/4] LexFilter: drop non-strict mode --- azure-pipelines-PR.yml | 72 ------------------- src/Compiler/Driver/CompilerConfig.fs | 5 -- src/Compiler/Driver/CompilerConfig.fsi | 4 -- src/Compiler/Driver/CompilerOptions.fs | 8 --- src/Compiler/Driver/ParseAndCheckInputs.fs | 6 +- src/Compiler/Driver/ScriptClosure.fs | 3 +- src/Compiler/FSComp.txt | 4 +- src/Compiler/Facilities/LanguageFeatures.fs | 3 - src/Compiler/Facilities/LanguageFeatures.fsi | 1 - src/Compiler/Facilities/prim-lexing.fs | 25 +++---- src/Compiler/Facilities/prim-lexing.fsi | 13 +--- src/Compiler/Interactive/fsi.fs | 11 ++- src/Compiler/Service/FSharpCheckerResults.fs | 12 ++-- src/Compiler/Service/FSharpCheckerResults.fsi | 2 - src/Compiler/Service/ServiceLexing.fs | 17 ++--- src/Compiler/Service/ServiceLexing.fsi | 8 +-- src/Compiler/Service/TransparentCompiler.fs | 1 - src/Compiler/Service/service.fs | 2 +- src/Compiler/SyntaxTree/LexFilter.fs | 12 ++-- src/Compiler/SyntaxTree/ParseHelpers.fs | 8 +-- src/Compiler/SyntaxTree/ParseHelpers.fsi | 14 +--- src/Compiler/SyntaxTree/UnicodeLexing.fs | 15 ++-- src/Compiler/SyntaxTree/UnicodeLexing.fsi | 21 ++---- src/Compiler/lex.fsl | 12 ++-- src/Compiler/pars.fsy | 8 +-- src/Compiler/xlf/FSComp.txt.cs.xlf | 14 +--- src/Compiler/xlf/FSComp.txt.de.xlf | 14 +--- src/Compiler/xlf/FSComp.txt.es.xlf | 14 +--- src/Compiler/xlf/FSComp.txt.fr.xlf | 14 +--- src/Compiler/xlf/FSComp.txt.it.xlf | 14 +--- src/Compiler/xlf/FSComp.txt.ja.xlf | 14 +--- src/Compiler/xlf/FSComp.txt.ko.xlf | 14 +--- src/Compiler/xlf/FSComp.txt.pl.xlf | 14 +--- src/Compiler/xlf/FSComp.txt.pt-BR.xlf | 14 +--- src/Compiler/xlf/FSComp.txt.ru.xlf | 14 +--- src/Compiler/xlf/FSComp.txt.tr.xlf | 14 +--- src/Compiler/xlf/FSComp.txt.zh-Hans.xlf | 14 +--- src/Compiler/xlf/FSComp.txt.zh-Hant.xlf | 14 +--- .../CompilerDirectives/Line.fs | 2 +- .../CompilerOptions/Fsc/UncoveredOptions.fs | 2 - .../fsc/misc/compiler_help_output.bsl | 1 - .../PermittedLocations/PermittedLocations.fs | 4 +- .../LetBindings/Basic/Basic.fs | 2 +- .../OffsideExceptions/OffsideExceptions.fs | 2 +- .../OffsideExceptions/RelaxWhitespace2.fs | 2 +- .../Types/UnionTypes/UnionTypes.fs | 2 +- .../Language/CompilerDirectiveTests.fs | 2 +- ...iler.Service.SurfaceArea.netstandard20.bsl | 8 +-- .../HashIfExpression.fs | 2 +- .../PatternMatchCompilationTests.fs | 16 ++--- .../TokenizerTests.fs | 6 +- .../expected-help-output.bsl | 3 - .../CompilerServiceBenchmarks.fs | 1 - .../Compiler/Language/StringInterpolation.fs | 2 +- tests/fsharp/typecheck/sigs/neg114.bsl | 2 - tests/fsharp/typecheck/sigs/neg114.vsbsl | 2 - tests/fsharp/typecheck/sigs/neg69.bsl | 30 -------- tests/fsharp/typecheck/sigs/neg69.vsbsl | 30 -------- tests/fsharp/typecheck/sigs/neg74.bsl | 1 - tests/fsharp/typecheck/sigs/neg74.vsbsl | 1 - tests/fsharp/typecheck/sigs/neg75.bsl | 1 - tests/fsharp/typecheck/sigs/neg75.vsbsl | 1 - tests/fsharp/typecheck/sigs/neg76.bsl | 1 - tests/fsharp/typecheck/sigs/neg76.vsbsl | 1 - tests/fsharp/typecheck/sigs/neg77.bsl | 1 - tests/fsharp/typecheck/sigs/neg77.vsbsl | 1 - tests/fsharp/typecheck/sigs/neg81.bsl | 1 - tests/fsharp/typecheck/sigs/neg81.vsbsl | 1 - tests/fsharp/typecheck/sigs/neg82.bsl | 7 -- tests/fsharp/typecheck/sigs/neg82.vsbsl | 7 -- tests/fsharp/typecheck/sigs/neg83.bsl | 2 - tests/fsharp/typecheck/sigs/neg83.vsbsl | 2 - tests/fsharp/typecheck/sigs/neg_anon_2.bsl | 2 - tests/fsharp/typecheck/sigs/neg_anon_2.vsbsl | 2 - .../Expression/Binary - Plus 02.fs.bsl | 1 - .../Expression/Binary - Plus 05.fs.bsl | 1 - .../data/SyntaxTree/Expression/Do 03.fs.bsl | 1 - .../SyntaxTree/Expression/Downcast 01.fs.bsl | 1 - .../data/SyntaxTree/Expression/For 03.fs.bsl | 1 - .../data/SyntaxTree/Expression/If 05.fs.bsl | 1 - .../data/SyntaxTree/Expression/If 06.fs.bsl | 1 - .../data/SyntaxTree/Expression/If 10.fs.bsl | 1 - .../data/SyntaxTree/Expression/If 11.fs.bsl | 1 - .../data/SyntaxTree/Expression/If 12.fs.bsl | 1 - .../data/SyntaxTree/Expression/If 14.fs.bsl | 1 - .../Lambda - Missing expr 02.fs.bsl | 1 - .../data/SyntaxTree/Expression/Lazy 03.fs.bsl | 1 - .../data/SyntaxTree/Expression/Let 02.fs.bsl | 1 - .../Expression/Object - Class 11.fs.bsl | 1 - .../data/SyntaxTree/Expression/Set 04.fs.bsl | 1 - .../Expression/Try - Finally 04.fs.bsl | 1 - .../Expression/Try - With 04.fs.bsl | 1 - .../Expression/Try - With 06.fs.bsl | 1 - .../data/SyntaxTree/Expression/Try 02.fs.bsl | 1 - .../Try with - Missing expr 02.fs.bsl | 1 - .../Try with - Missing expr 03.fs.bsl | 1 - .../Expression/Tuple - Missing item 08.fs.bsl | 1 - .../Expression/Tuple - Missing item 10.fs.bsl | 1 - .../SyntaxTree/Expression/Upcast 01.fs.bsl | 1 - .../SyntaxTree/Expression/Upcast 04.fs.bsl | 1 - .../SyntaxTree/Expression/Upcast 05.fs.bsl | 1 - .../SyntaxTree/Expression/While 03.fs.bsl | 1 - .../SyntaxTree/Expression/While 04.fs.bsl | 1 - .../SyntaxTree/Expression/WhileBang 03.fs.bsl | 1 - .../SyntaxTree/Expression/WhileBang 04.fs.bsl | 1 - .../IfThenElse/Comment after else 02.fs.bsl | 2 - .../MatchClause/Missing expr 02.fs.bsl | 1 - .../MatchClause/Missing expr 05.fs.bsl | 1 - .../Member/Abstract - Property 03.fs.bsl | 1 - .../Member/Abstract - Property 04.fs.bsl | 1 - .../Member/Abstract - Property 05.fs.bsl | 1 - .../SyntaxTree/Member/Auto property 02.fs.bsl | 1 - .../SyntaxTree/Member/Auto property 03.fs.bsl | 1 - .../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 12.fs.bsl | 2 - .../SyntaxTree/Member/Auto property 13.fs.bsl | 2 - .../data/SyntaxTree/Member/Do 03.fs.bsl | 1 - .../data/SyntaxTree/Member/Do 04.fs.bsl | 1 - .../SyntaxTree/Member/Interface 02.fs.bsl | 1 - .../SyntaxTree/Member/Interface 06.fs.bsl | 1 - .../data/SyntaxTree/Member/Let 02.fs.bsl | 1 - .../data/SyntaxTree/Member/Member 05.fs.bsl | 1 - .../data/SyntaxTree/ModuleMember/Do 01.fs.bsl | 1 - .../data/SyntaxTree/ModuleMember/Do 02.fs.bsl | 1 - .../SyntaxTree/ModuleMember/Let 02.fs.bsl | 1 - .../ModuleOrNamespace/Module 04.fs.bsl | 4 -- .../ModuleOrNamespace/Nested module 02.fs.bsl | 1 - .../ModuleOrNamespace/Nested module 09.fs.bsl | 1 - .../ModuleOrNamespace/Nested module 14.fs.bsl | 1 - .../ModuleOrNamespace/Nested module 15.fs.bsl | 1 - .../Pattern/Tuple - Recover 01.fs.bsl | 1 - .../Pattern/Tuple - Recover 02.fs.bsl | 1 - .../data/SyntaxTree/Type/And 06.fs.bsl | 1 - .../data/SyntaxTree/Type/Interface 05.fs.bsl | 1 - .../data/SyntaxTree/Type/Interface 06.fs.bsl | 1 - .../SyntaxTree/Type/Primary ctor 04.fs.bsl | 1 - .../data/SyntaxTree/Type/Type 06.fs.bsl | 1 - .../data/SyntaxTree/Type/Union 03.fs.bsl | 1 - .../data/SyntaxTree/Type/Union 04.fs.bsl | 1 - .../data/SyntaxTree/Type/With 02.fs.bsl | 1 - .../data/SyntaxTree/Type/With 03.fs.bsl | 1 - .../data/SyntaxTree/Type/With 05.fs.bsl | 1 - .../BraceCompletionSessionProvider.fs | 1 - .../Classification/ClassificationService.fs | 3 +- .../CodeFixes/AddMissingFunKeyword.fs | 3 +- .../AddMissingRecToMutuallyRecFunctions.fs | 3 +- .../CodeFixes/AddOpenCodeFixProvider.fs | 3 +- .../CodeFixes/ImplementInterface.fs | 2 - .../Commands/HelpContextService.fs | 3 +- .../Completion/CompletionProvider.fs | 10 ++- .../Completion/CompletionService.fs | 3 +- .../Completion/CompletionUtils.fs | 5 +- .../HashDirectiveCompletionProvider.fs | 3 +- .../FSharp.Editor/Completion/SignatureHelp.fs | 8 +-- .../Debugging/LanguageDebugInfoService.fs | 3 +- .../Formatting/EditorFormattingService.fs | 1 - .../Formatting/IndentationService.fs | 1 - .../FSharpProjectOptionsManager.fs | 2 +- .../LanguageService/SymbolHelpers.fs | 3 +- .../LanguageService/Tokenizer.fs | 11 +-- .../LanguageService/WorkspaceExtensions.fs | 8 +-- .../FSharp.Editor/TaskList/TaskListService.fs | 11 ++- .../CompletionProviderTests.fs | 1 - .../GoToDefinitionServiceTests.fs | 1 - .../HelpContextServiceTests.fs | 1 - .../LanguageDebugInfoServiceTests.fs | 1 - .../SignatureHelpProviderTests.fs | 2 - .../SyntacticColorizationServiceTests.fs | 1 - .../TaskListServiceTests.fs | 2 +- .../Salsa/FSharpLanguageServiceTestable.fs | 2 +- 172 files changed, 144 insertions(+), 652 deletions(-) diff --git a/azure-pipelines-PR.yml b/azure-pipelines-PR.yml index 1f18517bccb..65f45277382 100644 --- a/azure-pipelines-PR.yml +++ b/azure-pipelines-PR.yml @@ -339,78 +339,6 @@ stages: ArtifactType: Container parallel: true - - job: WindowsStrictIndentation - pool: - name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals $(_WindowsMachineQueueName) - timeoutInMinutes: 120 - steps: - - checkout: self - clean: true - - - script: eng\CIBuildNoPublish.cmd -compressallmetadata -configuration Release /p:AdditionalFscCmdFlags=--strict-indentation+ - env: - DOTNET_DbgEnableMiniDump: 1 - DOTNET_DbgMiniDumpType: 2 # 1=mini, 2=heap, 3=triage, 4=full. Heap dumps include managed object data for debugging. - DOTNET_DbgMiniDumpName: $(Build.SourcesDirectory)\artifacts\log\Release\$(Build.BuildId)-%e-%p-%t.dmp - NativeToolsOnMachine: true - displayName: Build - - - task: PublishBuildArtifacts@1 - displayName: Publish Build BinLog - condition: always() - continueOnError: true - inputs: - PathToPublish: '$(Build.SourcesDirectory)\artifacts\log/Release\Build.VisualFSharp.slnx.binlog' - ArtifactName: 'Windows Release build binlogs' - ArtifactType: Container - parallel: true - - task: PublishBuildArtifacts@1 - displayName: Publish Dumps - condition: failed() - continueOnError: true - inputs: - PathToPublish: '$(Build.SourcesDirectory)\artifacts\log\Release' - ArtifactName: 'Windows Release WindowsStrictIndentation process dumps' - ArtifactType: Container - parallel: true - - - job: WindowsNoStrictIndentation - pool: - name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals $(_WindowsMachineQueueName) - timeoutInMinutes: 120 - steps: - - checkout: self - clean: true - - - script: eng\CIBuildNoPublish.cmd -compressallmetadata -configuration Release /p:AdditionalFscCmdFlags=--strict-indentation- - env: - DOTNET_DbgEnableMiniDump: 1 - DOTNET_DbgMiniDumpType: 2 # 1=mini, 2=heap, 3=triage, 4=full. Heap dumps include managed object data for debugging. - DOTNET_DbgMiniDumpName: $(Build.SourcesDirectory)\artifacts\log\Release\$(Build.BuildId)-%e-%p-%t.dmp - NativeToolsOnMachine: true - displayName: Build - - - task: PublishBuildArtifacts@1 - displayName: Publish Build BinLog - condition: always() - continueOnError: true - inputs: - PathToPublish: '$(Build.SourcesDirectory)\artifacts\log/Release\Build.VisualFSharp.slnx.binlog' - ArtifactName: 'Windows Release build binlogs' - ArtifactType: Container - parallel: true - - task: PublishBuildArtifacts@1 - displayName: Publish Dumps - condition: failed() - continueOnError: true - inputs: - PathToPublish: '$(Build.SourcesDirectory)\artifacts\log\Release' - ArtifactName: 'Windows Release WindowsNoStrictIndentation process dumps' - ArtifactType: Container - parallel: true - # Windows With Compressed Metadata - job: WindowsCompressedMetadata variables: diff --git a/src/Compiler/Driver/CompilerConfig.fs b/src/Compiler/Driver/CompilerConfig.fs index a1e7937b0d9..4e39b4407f8 100644 --- a/src/Compiler/Driver/CompilerConfig.fs +++ b/src/Compiler/Driver/CompilerConfig.fs @@ -598,8 +598,6 @@ type TcConfigBuilder = /// If true - every expression in quotations will be augmented with full debug info (fileName, location in file) mutable emitDebugInfoInQuotations: bool - mutable strictIndentation: bool option - mutable alwaysInline: bool option mutable exename: string option @@ -854,7 +852,6 @@ type TcConfigBuilder = } dumpSignatureData = false realsig = false - strictIndentation = None alwaysInline = None compilationMode = TcGlobals.CompilationMode.Unset } @@ -1255,8 +1252,6 @@ type TcConfig private (data: TcConfigBuilder, validate: bool) = member _.bufferWidth = data.bufferWidth member _.fsiMultiAssemblyEmit = data.fsiMultiAssemblyEmit member _.FxResolver = data.FxResolver - member _.strictIndentation = data.strictIndentation - member _.alwaysInline = data.alwaysInline |> Option.defaultValue ( diff --git a/src/Compiler/Driver/CompilerConfig.fsi b/src/Compiler/Driver/CompilerConfig.fsi index 9f19b8e59ba..89731f6decc 100644 --- a/src/Compiler/Driver/CompilerConfig.fsi +++ b/src/Compiler/Driver/CompilerConfig.fsi @@ -470,8 +470,6 @@ type TcConfigBuilder = mutable emitDebugInfoInQuotations: bool - mutable strictIndentation: bool option - mutable alwaysInline: bool option mutable exename: string option @@ -814,8 +812,6 @@ type TcConfig = member FxResolver: FxResolver - member strictIndentation: bool option - member alwaysInline: bool member GetTargetFrameworkDirectories: unit -> string list diff --git a/src/Compiler/Driver/CompilerOptions.fs b/src/Compiler/Driver/CompilerOptions.fs index f54f36fa7f9..48574325813 100644 --- a/src/Compiler/Driver/CompilerOptions.fs +++ b/src/Compiler/Driver/CompilerOptions.fs @@ -1200,14 +1200,6 @@ let languageFlags tcConfigB = CompilerOption("define", tagString, OptionString(defineSymbol tcConfigB), None, Some(FSComp.SR.optsDefine ())) - CompilerOption( - "strict-indentation", - tagNone, - OptionSwitch(fun switch -> tcConfigB.strictIndentation <- Some(switch = OptionSwitch.On)), - None, - Some(FSComp.SR.optsStrictIndentation (formatOptionSwitch (Option.defaultValue false tcConfigB.strictIndentation))) - ) - CompilerOption( "always-inline", tagNone, diff --git a/src/Compiler/Driver/ParseAndCheckInputs.fs b/src/Compiler/Driver/ParseAndCheckInputs.fs index 92e72d6b89b..1590b9fe458 100644 --- a/src/Compiler/Driver/ParseAndCheckInputs.fs +++ b/src/Compiler/Driver/ParseAndCheckInputs.fs @@ -648,7 +648,7 @@ let parseInputStreamAux // Set up the LexBuffer for the file let lexbuf = - UnicodeLexing.StreamReaderAsLexbuf(not tcConfig.compilingFSharpCore, tcConfig.langVersion, tcConfig.strictIndentation, reader) + UnicodeLexing.StreamReaderAsLexbuf(not tcConfig.compilingFSharpCore, tcConfig.langVersion, reader) // Parse the file drawing tokens from the lexbuf ParseOneInputLexbuf(tcConfig, lexResourceManager, lexbuf, fileName, isLastCompiland, diagnosticsLogger) @@ -658,7 +658,7 @@ let parseInputSourceTextAux = // Set up the LexBuffer for the file let lexbuf = - UnicodeLexing.SourceTextAsLexbuf(not tcConfig.compilingFSharpCore, tcConfig.langVersion, tcConfig.strictIndentation, sourceText) + UnicodeLexing.SourceTextAsLexbuf(not tcConfig.compilingFSharpCore, tcConfig.langVersion, sourceText) // Parse the file drawing tokens from the lexbuf ParseOneInputLexbuf(tcConfig, lexResourceManager, lexbuf, fileName, isLastCompiland, diagnosticsLogger) @@ -670,7 +670,7 @@ let parseInputFileAux (tcConfig: TcConfig, lexResourceManager, fileName, isLastC // Set up the LexBuffer for the file let lexbuf = - UnicodeLexing.StreamReaderAsLexbuf(not tcConfig.compilingFSharpCore, tcConfig.langVersion, tcConfig.strictIndentation, reader) + UnicodeLexing.StreamReaderAsLexbuf(not tcConfig.compilingFSharpCore, tcConfig.langVersion, reader) // Parse the file drawing tokens from the lexbuf ParseOneInputLexbuf(tcConfig, lexResourceManager, lexbuf, fileName, isLastCompiland, diagnosticsLogger) diff --git a/src/Compiler/Driver/ScriptClosure.fs b/src/Compiler/Driver/ScriptClosure.fs index 7f25c7b826d..a83b49a2a0e 100644 --- a/src/Compiler/Driver/ScriptClosure.fs +++ b/src/Compiler/Driver/ScriptClosure.fs @@ -15,7 +15,6 @@ open FSharp.Compiler.CompilerConfig open FSharp.Compiler.CompilerDiagnostics open FSharp.Compiler.CompilerImports open FSharp.Compiler.DependencyManager -open FSharp.Compiler.Diagnostics open FSharp.Compiler.DiagnosticsLogger open FSharp.Compiler.IO open FSharp.Compiler.CodeAnalysis @@ -135,7 +134,7 @@ module ScriptPreprocessClosure = let tcConfig = TcConfig.Create(tcConfigB, false) let lexbuf = - UnicodeLexing.SourceTextAsLexbuf(true, tcConfig.langVersion, tcConfig.strictIndentation, sourceText) + UnicodeLexing.SourceTextAsLexbuf(true, tcConfig.langVersion, sourceText) // The root compiland is last in the list of compilands. let isLastCompiland = (IsScript fileName, tcConfig.target.IsExe) diff --git a/src/Compiler/FSComp.txt b/src/Compiler/FSComp.txt index 2b4bc25c5a7..ff1928b0b30 100644 --- a/src/Compiler/FSComp.txt +++ b/src/Compiler/FSComp.txt @@ -999,7 +999,7 @@ lexhlpIdentifierReserved,"The identifier '%s' is reserved for future use by F#" 1118,optFailedToInlineValue,"Failed to inline the value '%s' marked 'inline', perhaps because a recursive value was marked 'inline'" 1119,optRecursiveValValue,"Recursive ValValue %s" lexfltIncorrentIndentationOfIn,"The indentation of this 'in' token is incorrect with respect to the corresponding 'let'" -lexfltTokenIsOffsideOfContextStartedEarlier,"Unexpected syntax or possible incorrect indentation: this token is offside of context started at position %s. Try indenting this further.\nTo continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7." +lexfltTokenIsOffsideOfContextStartedEarlier,"Unexpected syntax or possible incorrect indentation: this token is offside of context started at position %s. Try indenting this further." lexfltSeparatorTokensOfPatternMatchMisaligned,"The '|' tokens separating rules of this pattern match are misaligned by one column. Consider realigning your code or using further indentation." lexfltInvalidNestedTypeDefinition,"Nested type definitions are not allowed. Types must be defined at module or namespace level." lexfltInvalidNestedModule,"Modules cannot be nested inside types. Define modules at module or namespace level." @@ -1560,7 +1560,6 @@ optsGetLangVersions,"Display the allowed values for language version." optsSetLangVersion,"Specify language version such as 'latest' or 'preview'." optsDisableLanguageFeature,"Disable a specific language feature by name." optsSupportedLangVersions,"Supported language versions:" -optsStrictIndentation,"Override indentation rules implied by the language version (%s by default)" optsAlwaysInline,"Always inline 'inline' functions" nativeResourceFormatError,"Stream does not begin with a null resource and is not in '.RES' format." nativeResourceHeaderMalformed,"Resource header beginning at offset %s is malformed." @@ -1606,7 +1605,6 @@ featureNestedCopyAndUpdate,"Nested record field copy-and-update" featureExtendedStringInterpolation,"Extended string interpolation similar to C# raw string literals." featureWarningWhenMultipleRecdTypeChoice,"Raises warnings when multiple record type matches were found during name resolution because of overlapping field names." featureImprovedImpliedArgumentNames,"Improved implied argument names" -featureStrictIndentation,"Raises errors on incorrect indentation, allows better recovery and analysis during editing" featureConstraintIntersectionOnFlexibleTypes,"Constraint intersection on flexible types" featureChkNotTailRecursive,"Raises warnings if a member or function has the 'TailCall' attribute, but is not being used in a tail recursive way." featureWhileBang,"'while!' expression" diff --git a/src/Compiler/Facilities/LanguageFeatures.fs b/src/Compiler/Facilities/LanguageFeatures.fs index 1356335fd28..5e77bdb17da 100644 --- a/src/Compiler/Facilities/LanguageFeatures.fs +++ b/src/Compiler/Facilities/LanguageFeatures.fs @@ -20,7 +20,6 @@ type LanguageFeature = | WildCardInForLoop | RelaxWhitespace | RelaxWhitespace2 - | StrictIndentation | NameOf | ImplicitYield | OpenTypeDeclaration @@ -215,7 +214,6 @@ type LanguageVersion(versionText, ?disabledFeaturesArray: LanguageFeature array) LanguageFeature.DiagnosticForObjInference, languageVersion80 LanguageFeature.WarningWhenTailRecAttributeButNonTailRecUsage, languageVersion80 LanguageFeature.StaticLetInRecordsDusEmptyTypes, languageVersion80 - LanguageFeature.StrictIndentation, languageVersion80 LanguageFeature.ConstraintIntersectionOnFlexibleTypes, languageVersion80 LanguageFeature.WhileBang, languageVersion80 LanguageFeature.ExtendedFixedBindings, languageVersion80 @@ -423,7 +421,6 @@ type LanguageVersion(versionText, ?disabledFeaturesArray: LanguageFeature array) | LanguageFeature.DiagnosticForObjInference -> FSComp.SR.featureInformationalObjInferenceDiagnostic () | LanguageFeature.StaticLetInRecordsDusEmptyTypes -> FSComp.SR.featureStaticLetInRecordsDusEmptyTypes () - | LanguageFeature.StrictIndentation -> FSComp.SR.featureStrictIndentation () | LanguageFeature.ConstraintIntersectionOnFlexibleTypes -> FSComp.SR.featureConstraintIntersectionOnFlexibleTypes () | LanguageFeature.WarningWhenTailRecAttributeButNonTailRecUsage -> FSComp.SR.featureChkNotTailRecursive () | LanguageFeature.UnmanagedConstraintCsharpInterop -> FSComp.SR.featureUnmanagedConstraintCsharpInterop () diff --git a/src/Compiler/Facilities/LanguageFeatures.fsi b/src/Compiler/Facilities/LanguageFeatures.fsi index c5d4009bc04..79abed89ba1 100644 --- a/src/Compiler/Facilities/LanguageFeatures.fsi +++ b/src/Compiler/Facilities/LanguageFeatures.fsi @@ -10,7 +10,6 @@ type LanguageFeature = | WildCardInForLoop | RelaxWhitespace | RelaxWhitespace2 - | StrictIndentation | NameOf | ImplicitYield | OpenTypeDeclaration diff --git a/src/Compiler/Facilities/prim-lexing.fs b/src/Compiler/Facilities/prim-lexing.fs index cfde35d5a77..795baf0ea3f 100644 --- a/src/Compiler/Facilities/prim-lexing.fs +++ b/src/Compiler/Facilities/prim-lexing.fs @@ -243,7 +243,7 @@ type internal Position = type internal LexBufferFiller<'Char> = LexBuffer<'Char> -> unit and [] internal LexBuffer<'Char> - (filler: LexBufferFiller<'Char>, reportLibraryOnlyFeatures: bool, langVersion: LanguageVersion, strictIndentation: bool option) = + (filler: LexBufferFiller<'Char>, reportLibraryOnlyFeatures: bool, langVersion: LanguageVersion) = let context = Dictionary(1) let mutable buffer = [||] /// number of valid characters beyond bufferScanStart. @@ -344,14 +344,10 @@ and [] internal LexBuffer<'Char> member _.SupportsFeature featureId = langVersion.SupportsFeature featureId - member _.StrictIndentation = strictIndentation - member _.CheckLanguageFeatureAndRecover featureId range = FSharp.Compiler.DiagnosticsLogger.checkLanguageFeatureAndRecover langVersion featureId range - static member FromFunction - (reportLibraryOnlyFeatures, langVersion, strictIndentation, f: 'Char[] * int * int -> int) - : LexBuffer<'Char> = + static member FromFunction(reportLibraryOnlyFeatures, langVersion, f: 'Char[] * int * int -> int) : LexBuffer<'Char> = let extension = Array.zeroCreate 4096 let filler (lexBuffer: LexBuffer<'Char>) = @@ -360,35 +356,34 @@ and [] internal LexBuffer<'Char> Array.blit extension 0 lexBuffer.Buffer lexBuffer.BufferScanPos n lexBuffer.BufferMaxScanLength <- lexBuffer.BufferScanLength + n - new LexBuffer<'Char>(filler, reportLibraryOnlyFeatures, langVersion, strictIndentation) + new LexBuffer<'Char>(filler, reportLibraryOnlyFeatures, langVersion) // Important: This method takes ownership of the array - static member FromArrayNoCopy(reportLibraryOnlyFeatures, langVersion, strictIndentation, buffer: 'Char[]) : LexBuffer<'Char> = + static member FromArrayNoCopy(reportLibraryOnlyFeatures, langVersion, buffer: 'Char[]) : LexBuffer<'Char> = let lexBuffer = - new LexBuffer<'Char>((fun _ -> ()), reportLibraryOnlyFeatures, langVersion, strictIndentation) + new LexBuffer<'Char>((fun _ -> ()), reportLibraryOnlyFeatures, langVersion) lexBuffer.Buffer <- buffer lexBuffer.BufferMaxScanLength <- buffer.Length lexBuffer // Important: this method does copy the array - static member FromArray(reportLibraryOnlyFeatures, langVersion, strictIndentation, s: 'Char[]) : LexBuffer<'Char> = + static member FromArray(reportLibraryOnlyFeatures, langVersion, s: 'Char[]) : LexBuffer<'Char> = let buffer = Array.copy s - LexBuffer<'Char>.FromArrayNoCopy(reportLibraryOnlyFeatures, langVersion, strictIndentation, buffer) + LexBuffer<'Char>.FromArrayNoCopy(reportLibraryOnlyFeatures, langVersion, buffer) // Important: This method takes ownership of the array - static member FromChars(reportLibraryOnlyFeatures, langVersion, strictIndentation, arr: char[]) = - LexBuffer.FromArrayNoCopy(reportLibraryOnlyFeatures, langVersion, strictIndentation, arr) + static member FromChars(reportLibraryOnlyFeatures, langVersion, arr: char[]) = + LexBuffer.FromArrayNoCopy(reportLibraryOnlyFeatures, langVersion, arr) - static member FromSourceText(reportLibraryOnlyFeatures, langVersion, strictIndentation, sourceText: ISourceText) = + static member FromSourceText(reportLibraryOnlyFeatures, langVersion, sourceText: ISourceText) = let mutable currentSourceIndex = 0 LexBuffer .FromFunction( reportLibraryOnlyFeatures, langVersion, - strictIndentation, fun (chars, start, length) -> let lengthToCopy = if currentSourceIndex + length <= sourceText.Length then diff --git a/src/Compiler/Facilities/prim-lexing.fsi b/src/Compiler/Facilities/prim-lexing.fsi index bcb60fc4977..99fb259c175 100644 --- a/src/Compiler/Facilities/prim-lexing.fsi +++ b/src/Compiler/Facilities/prim-lexing.fsi @@ -146,29 +146,22 @@ type internal LexBuffer<'Char> = /// True if the specified language feature is supported. member SupportsFeature: LanguageFeature -> bool - member StrictIndentation: bool option - /// Logs a recoverable error if a language feature is unsupported, at the specified range. member CheckLanguageFeatureAndRecover: LanguageFeature -> range -> unit /// Create a lex buffer suitable for Unicode lexing that reads characters from the given array. /// Important: does take ownership of the array. static member FromChars: - reportLibraryOnlyFeatures: bool * langVersion: LanguageVersion * strictIndentation: bool option * char[] -> - LexBuffer + reportLibraryOnlyFeatures: bool * langVersion: LanguageVersion * char[] -> LexBuffer /// Create a lex buffer that reads character or byte inputs by using the given function. static member FromFunction: - reportLibraryOnlyFeatures: bool * - langVersion: LanguageVersion * - strictIndentation: bool option * - ('Char[] * int * int -> int) -> + reportLibraryOnlyFeatures: bool * langVersion: LanguageVersion * ('Char[] * int * int -> int) -> LexBuffer<'Char> /// Create a lex buffer backed by source text. static member FromSourceText: - reportLibraryOnlyFeatures: bool * langVersion: LanguageVersion * strictIndentation: bool option * ISourceText -> - LexBuffer + reportLibraryOnlyFeatures: bool * langVersion: LanguageVersion * ISourceText -> LexBuffer /// The type of tables for an unicode lexer generated by fslex.exe. [] diff --git a/src/Compiler/Interactive/fsi.fs b/src/Compiler/Interactive/fsi.fs index a41b658cab1..2e922045602 100644 --- a/src/Compiler/Interactive/fsi.fs +++ b/src/Compiler/Interactive/fsi.fs @@ -3591,7 +3591,6 @@ type FsiStdinLexerProvider UnicodeLexing.FunctionAsLexbuf( true, tcConfigB.langVersion, - tcConfigB.strictIndentation, (fun (buf: char[], start, len) -> //fprintf fsiConsoleOutput.Out "Calling ReadLine\n" let inputOption = @@ -3671,14 +3670,14 @@ type FsiStdinLexerProvider // Create a new lexer to read an "included" script file member _.CreateIncludedScriptLexer(sourceFileName, reader, diagnosticsLogger) = let lexbuf = - UnicodeLexing.StreamReaderAsLexbuf(true, tcConfigB.langVersion, tcConfigB.strictIndentation, reader) + UnicodeLexing.StreamReaderAsLexbuf(true, tcConfigB.langVersion, reader) CreateLexerForLexBuffer(sourceFileName, lexbuf, diagnosticsLogger) // Create a new lexer to read a string member _.CreateStringLexer(sourceFileName, source, diagnosticsLogger) = let lexbuf = - UnicodeLexing.StringAsLexbuf(true, tcConfigB.langVersion, tcConfigB.strictIndentation, source) + UnicodeLexing.StringAsLexbuf(true, tcConfigB.langVersion, source) CreateLexerForLexBuffer(sourceFileName, lexbuf, diagnosticsLogger) @@ -3799,7 +3798,7 @@ type FsiInteractionProcessor let runhDirective diagnosticsLogger ctok istate source = let lexbuf = - UnicodeLexing.StringAsLexbuf(true, tcConfigB.langVersion, tcConfigB.strictIndentation, $"<@@ {source} @@>") + UnicodeLexing.StringAsLexbuf(true, tcConfigB.langVersion, $"<@@ {source} @@>") let tokenizer = fsiStdinLexerProvider.CreateBufferLexer("hdummy.fsx", lexbuf, diagnosticsLogger) @@ -4363,7 +4362,7 @@ type FsiInteractionProcessor use _scope = SetCurrentUICultureForThread fsiOptions.FsiLCID let lexbuf = - UnicodeLexing.StringAsLexbuf(true, tcConfigB.langVersion, tcConfigB.strictIndentation, sourceText) + UnicodeLexing.StringAsLexbuf(true, tcConfigB.langVersion, sourceText) let tokenizer = fsiStdinLexerProvider.CreateBufferLexer(scriptFileName, lexbuf, diagnosticsLogger) @@ -4385,7 +4384,7 @@ type FsiInteractionProcessor use _scope = SetCurrentUICultureForThread fsiOptions.FsiLCID let lexbuf = - UnicodeLexing.StringAsLexbuf(true, tcConfigB.langVersion, tcConfigB.strictIndentation, sourceText) + UnicodeLexing.StringAsLexbuf(true, tcConfigB.langVersion, sourceText) let tokenizer = fsiStdinLexerProvider.CreateBufferLexer(scriptFileName, lexbuf, diagnosticsLogger) diff --git a/src/Compiler/Service/FSharpCheckerResults.fs b/src/Compiler/Service/FSharpCheckerResults.fs index c7b36f720e2..f48a86cde6a 100644 --- a/src/Compiler/Service/FSharpCheckerResults.fs +++ b/src/Compiler/Service/FSharpCheckerResults.fs @@ -2858,7 +2858,6 @@ type FSharpParsingOptions = DiagnosticOptions: FSharpDiagnosticOptions LangVersionText: string IsInteractive: bool - StrictIndentation: bool option CompilingFSharpCore: bool IsExe: bool } @@ -2875,7 +2874,6 @@ type FSharpParsingOptions = DiagnosticOptions = FSharpDiagnosticOptions.Default LangVersionText = LanguageVersion.Default.VersionText IsInteractive = false - StrictIndentation = None CompilingFSharpCore = false IsExe = false } @@ -2888,7 +2886,6 @@ type FSharpParsingOptions = DiagnosticOptions = tcConfig.diagnosticsOptions LangVersionText = tcConfig.langVersion.VersionText IsInteractive = isInteractive - StrictIndentation = tcConfig.strictIndentation CompilingFSharpCore = tcConfig.compilingFSharpCore IsExe = tcConfig.target.IsExe } @@ -2901,7 +2898,6 @@ type FSharpParsingOptions = DiagnosticOptions = tcConfigB.diagnosticsOptions LangVersionText = tcConfigB.langVersion.VersionText IsInteractive = isInteractive - StrictIndentation = tcConfigB.strictIndentation CompilingFSharpCore = tcConfigB.compilingFSharpCore IsExe = tcConfigB.target.IsExe } @@ -3013,8 +3009,8 @@ module internal ParseAndCheckFile = else (fun _ -> tokenizer.GetToken()) - let createLexbuf langVersion strictIndentation sourceText = - UnicodeLexing.SourceTextAsLexbuf(true, LanguageVersion(langVersion), strictIndentation, sourceText) + let createLexbuf langVersion sourceText = + UnicodeLexing.SourceTextAsLexbuf(true, LanguageVersion(langVersion), sourceText) let matchBraces ( @@ -3034,7 +3030,7 @@ module internal ParseAndCheckFile = let matchingBraces = ResizeArray<_>() - usingLexbufForParsing (createLexbuf options.LangVersionText options.StrictIndentation sourceText, fileName) (fun lexbuf -> + usingLexbufForParsing (createLexbuf options.LangVersionText sourceText, fileName) (fun lexbuf -> let errHandler = DiagnosticsHandler(false, fileName, options.DiagnosticOptions, suggestNamesForErrors, false) @@ -3147,7 +3143,7 @@ module internal ParseAndCheckFile = use _ = UseBuildPhase BuildPhase.Parse let parseResult = - usingLexbufForParsing (createLexbuf options.LangVersionText options.StrictIndentation sourceText, fileName) (fun lexbuf -> + usingLexbufForParsing (createLexbuf options.LangVersionText sourceText, fileName) (fun lexbuf -> let lexfun = createLexerFunction options lexbuf errHandler ct diff --git a/src/Compiler/Service/FSharpCheckerResults.fsi b/src/Compiler/Service/FSharpCheckerResults.fsi index 9b5a95c28a9..b1b5f78f675 100644 --- a/src/Compiler/Service/FSharpCheckerResults.fsi +++ b/src/Compiler/Service/FSharpCheckerResults.fsi @@ -224,8 +224,6 @@ type public FSharpParsingOptions = IsInteractive: bool - StrictIndentation: bool option - CompilingFSharpCore: bool IsExe: bool diff --git a/src/Compiler/Service/ServiceLexing.fs b/src/Compiler/Service/ServiceLexing.fs index 5ce87706c51..058ffb37cfa 100644 --- a/src/Compiler/Service/ServiceLexing.fs +++ b/src/Compiler/Service/ServiceLexing.fs @@ -1130,8 +1130,7 @@ type FSharpLineTokenizer(lexbuf: UnicodeLexing.Lexbuf, maxLength: int option, fi } [] -type FSharpSourceTokenizer - (conditionalDefines: string list, fileName: string option, langVersion: string option, strictIndentation: bool option) = +type FSharpSourceTokenizer(conditionalDefines: string list, fileName: string option, langVersion: string option) = let langVersion = langVersion @@ -1149,13 +1148,13 @@ type FSharpSourceTokenizer member _.CreateLineTokenizer(lineText: string) = let lexbuf = - UnicodeLexing.StringAsLexbuf(reportLibraryOnlyFeatures, langVersion, strictIndentation, lineText) + UnicodeLexing.StringAsLexbuf(reportLibraryOnlyFeatures, langVersion, lineText) FSharpLineTokenizer(lexbuf, Some lineText.Length, fileName, lexargs) member _.CreateBufferTokenizer bufferFiller = let lexbuf = - UnicodeLexing.FunctionAsLexbuf(reportLibraryOnlyFeatures, langVersion, strictIndentation, bufferFiller) + UnicodeLexing.FunctionAsLexbuf(reportLibraryOnlyFeatures, langVersion, bufferFiller) FSharpLineTokenizer(lexbuf, None, fileName, lexargs) @@ -1731,7 +1730,6 @@ module FSharpLexerImpl = (flags: FSharpLexerFlags) reportLibraryOnlyFeatures langVersion - strictIndentation diagnosticsLogger onToken pathMap @@ -1750,7 +1748,7 @@ module FSharpLexerImpl = (flags &&& FSharpLexerFlags.UseLexFilter) = FSharpLexerFlags.UseLexFilter let lexbuf = - UnicodeLexing.SourceTextAsLexbuf(reportLibraryOnlyFeatures, langVersion, strictIndentation, text) + UnicodeLexing.SourceTextAsLexbuf(reportLibraryOnlyFeatures, langVersion, text) let applyLineDirectives = isCompiling @@ -1776,7 +1774,7 @@ module FSharpLexerImpl = ct.ThrowIfCancellationRequested() onToken (getNextToken lexbuf) lexbuf.LexemeRange - let lex text conditionalDefines flags reportLibraryOnlyFeatures langVersion strictIndentation lexCallback pathMap ct = + let lex text conditionalDefines flags reportLibraryOnlyFeatures langVersion lexCallback pathMap ct = let diagnosticsLogger = CompilationDiagnosticLogger("Lexer", FSharpDiagnosticOptions.Default) @@ -1786,7 +1784,6 @@ module FSharpLexerImpl = flags reportLibraryOnlyFeatures langVersion - strictIndentation diagnosticsLogger lexCallback pathMap @@ -1796,7 +1793,7 @@ module FSharpLexerImpl = type FSharpLexer = static member Tokenize - (text: ISourceText, tokenCallback, ?langVersion, ?strictIndentation, ?filePath: string, ?conditionalDefines, ?flags, ?pathMap, ?ct) + (text: ISourceText, tokenCallback, ?langVersion, ?filePath: string, ?conditionalDefines, ?flags, ?pathMap, ?ct) = let langVersion = defaultArg langVersion "latestmajor" |> LanguageVersion let flags = defaultArg flags FSharpLexerFlags.Default @@ -1817,4 +1814,4 @@ type FSharpLexer = | _ -> tokenCallback fsTok let reportLibraryOnlyFeatures = true - lex text conditionalDefines flags reportLibraryOnlyFeatures langVersion strictIndentation onToken pathMap ct + lex text conditionalDefines flags reportLibraryOnlyFeatures langVersion onToken pathMap ct diff --git a/src/Compiler/Service/ServiceLexing.fsi b/src/Compiler/Service/ServiceLexing.fsi index fab55c4645e..525c7109fea 100755 --- a/src/Compiler/Service/ServiceLexing.fsi +++ b/src/Compiler/Service/ServiceLexing.fsi @@ -324,12 +324,7 @@ type FSharpLineTokenizer = type FSharpSourceTokenizer = /// Create a tokenizer for a source file. - new: - conditionalDefines: string list * - fileName: string option * - langVersion: string option * - strictIndentation: bool option -> - FSharpSourceTokenizer + new: conditionalDefines: string list * fileName: string option * langVersion: string option -> FSharpSourceTokenizer /// Create a tokenizer for a line of this source file member CreateLineTokenizer: lineText: string -> FSharpLineTokenizer @@ -580,7 +575,6 @@ type public FSharpLexer = text: ISourceText * tokenCallback: (FSharpToken -> unit) * ?langVersion: string * - ?strictIndentation: bool * ?filePath: string * ?conditionalDefines: string list * ?flags: FSharpLexerFlags * diff --git a/src/Compiler/Service/TransparentCompiler.fs b/src/Compiler/Service/TransparentCompiler.fs index fe3caffc6d7..4666aa930ed 100644 --- a/src/Compiler/Service/TransparentCompiler.fs +++ b/src/Compiler/Service/TransparentCompiler.fs @@ -2170,7 +2170,6 @@ type internal TransparentCompiler yield options.ApplyLineDirectives yield options.DiagnosticOptions.GlobalWarnAsError yield options.IsInteractive - yield! (Option.toList options.StrictIndentation) yield options.CompilingFSharpCore yield options.IsExe ] diff --git a/src/Compiler/Service/service.fs b/src/Compiler/Service/service.fs index 3584ca61e49..1006def6da1 100644 --- a/src/Compiler/Service/service.fs +++ b/src/Compiler/Service/service.fs @@ -627,7 +627,7 @@ type FSharpChecker /// Tokenize a single line, returning token information and a tokenization state represented by an integer member _.TokenizeLine(line: string, state: FSharpTokenizerLexState) = - let tokenizer = FSharpSourceTokenizer([], None, None, None) + let tokenizer = FSharpSourceTokenizer([], None, None) let lineTokenizer = tokenizer.CreateLineTokenizer line let mutable state = (None, state) diff --git a/src/Compiler/SyntaxTree/LexFilter.fs b/src/Compiler/SyntaxTree/LexFilter.fs index e0e450c398f..807e3e728c1 100644 --- a/src/Compiler/SyntaxTree/LexFilter.fs +++ b/src/Compiler/SyntaxTree/LexFilter.fs @@ -771,9 +771,6 @@ type LexFilterImpl ( let relaxWhitespace2 = lexbuf.SupportsFeature LanguageFeature.RelaxWhitespace2 - let strictIndentation = - lexbuf.StrictIndentation |> Option.defaultWith (fun _ -> lexbuf.SupportsFeature LanguageFeature.StrictIndentation) - //let indexerNotationWithoutDot = lexbuf.SupportsFeature LanguageFeature.IndexerNotationWithoutDot let tryPushCtxt strict ignoreIndent tokenTup (newCtxt: Context) = @@ -1010,8 +1007,7 @@ type LexFilterImpl ( let isCorrectIndent = c2 >= p1.Column if not isCorrectIndent then - let warnF = if strictIndentation then error else warn - warnF tokenTup + error tokenTup (if debug then sprintf "possible incorrect indentation: this token is offside of context at (original!) position %s, newCtxt = %A, stack = %A, newCtxtPos = %s, c1 = %d, c2 = %d" (warningStringOfPosition p1.Position) newCtxt offsideStack (stringOfPos newCtxt.StartPos) p1.Column c2 @@ -2358,7 +2354,7 @@ type LexFilterImpl ( let leadingBar = match peekNextToken() with BAR -> true | _ -> false if debug then dprintf "WITH, pushing CtxtMatchClauses, lookaheadTokenStartPos = %a, tokenStartPos = %a\n" outputPos lookaheadTokenStartPos outputPos tokenStartPos - tryPushCtxt strictIndentation false lookaheadTokenTup (CtxtMatchClauses(leadingBar, lookaheadTokenStartPos)) |> ignore + tryPushCtxt true false lookaheadTokenTup (CtxtMatchClauses(leadingBar, lookaheadTokenStartPos)) |> ignore returnToken tokenLexbufState OWITH @@ -2770,10 +2766,10 @@ type LexFilterImpl ( false and pushCtxtSeqBlock fallbackToken addBlockEnd = - pushCtxtSeqBlockAt strictIndentation true fallbackToken (peekNextTokenTup ()) addBlockEnd + pushCtxtSeqBlockAt true true fallbackToken (peekNextTokenTup ()) addBlockEnd and tryPushCtxtSeqBlock fallbackToken addBlockEnd = - pushCtxtSeqBlockAt strictIndentation false fallbackToken (peekNextTokenTup ()) addBlockEnd + pushCtxtSeqBlockAt true false fallbackToken (peekNextTokenTup ()) addBlockEnd and pushCtxtSeqBlockAt strict (useFallback: bool) (fallbackToken: TokenTup) (tokenTup: TokenTup) addBlockEnd = let pushed = tryPushCtxt strict false tokenTup (CtxtSeqBlock(FirstInSeqBlock, startPosOfTokenTup tokenTup, addBlockEnd)) diff --git a/src/Compiler/SyntaxTree/ParseHelpers.fs b/src/Compiler/SyntaxTree/ParseHelpers.fs index b329d48ee34..d4b63eb5d02 100644 --- a/src/Compiler/SyntaxTree/ParseHelpers.fs +++ b/src/Compiler/SyntaxTree/ParseHelpers.fs @@ -197,7 +197,7 @@ and LexCont = LexerContinuation // Parse IL assembly code //------------------------------------------------------------------------ -let ParseAssemblyCodeInstructions s reportLibraryOnlyFeatures langVersion strictIndentation m : IL.ILInstr[] = +let ParseAssemblyCodeInstructions s reportLibraryOnlyFeatures langVersion m : IL.ILInstr[] = #if NO_INLINE_IL_PARSER ignore s ignore isFeatureSupported @@ -206,13 +206,13 @@ let ParseAssemblyCodeInstructions s reportLibraryOnlyFeatures langVersion strict [||] #else try - AsciiParser.ilInstrs AsciiLexer.token (StringAsLexbuf(reportLibraryOnlyFeatures, langVersion, strictIndentation, s)) + AsciiParser.ilInstrs AsciiLexer.token (StringAsLexbuf(reportLibraryOnlyFeatures, langVersion, s)) with _ -> errorR (Error(FSComp.SR.astParseEmbeddedILError (), m)) [||] #endif -let ParseAssemblyCodeType s reportLibraryOnlyFeatures langVersion strictIndentation m = +let ParseAssemblyCodeType s reportLibraryOnlyFeatures langVersion m = ignore s #if NO_INLINE_IL_PARSER @@ -220,7 +220,7 @@ let ParseAssemblyCodeType s reportLibraryOnlyFeatures langVersion strictIndentat IL.PrimaryAssemblyILGlobals.typ_Object #else try - AsciiParser.ilType AsciiLexer.token (StringAsLexbuf(reportLibraryOnlyFeatures, langVersion, strictIndentation, s)) + AsciiParser.ilType AsciiLexer.token (StringAsLexbuf(reportLibraryOnlyFeatures, langVersion, s)) with RecoverableParseError -> errorR (Error(FSComp.SR.astParseEmbeddedILTypeError (), m)) IL.PrimaryAssemblyILGlobals.typ_Object diff --git a/src/Compiler/SyntaxTree/ParseHelpers.fsi b/src/Compiler/SyntaxTree/ParseHelpers.fsi index aae952d210c..b1ae4aaf995 100644 --- a/src/Compiler/SyntaxTree/ParseHelpers.fsi +++ b/src/Compiler/SyntaxTree/ParseHelpers.fsi @@ -105,24 +105,14 @@ type LexerContinuation = and LexCont = LexerContinuation val ParseAssemblyCodeInstructions: - s: string -> - reportLibraryOnlyFeatures: bool -> - langVersion: LanguageVersion -> - strictIndentation: bool option -> - m: range -> - ILInstr[] + s: string -> reportLibraryOnlyFeatures: bool -> langVersion: LanguageVersion -> m: range -> ILInstr[] val grabXmlDocAtRangeStart: parseState: IParseState * optAttributes: SynAttributeList list * range: range -> PreXmlDoc val grabXmlDoc: parseState: IParseState * optAttributes: SynAttributeList list * elemIdx: int -> PreXmlDoc val ParseAssemblyCodeType: - s: string -> - reportLibraryOnlyFeatures: bool -> - langVersion: LanguageVersion -> - strictIndentation: bool option -> - m: range -> - ILType + s: string -> reportLibraryOnlyFeatures: bool -> langVersion: LanguageVersion -> m: range -> ILType val reportParseErrorAt: range -> (int * string) -> unit diff --git a/src/Compiler/SyntaxTree/UnicodeLexing.fs b/src/Compiler/SyntaxTree/UnicodeLexing.fs index 4ea41cbcf84..ad6ef32154a 100644 --- a/src/Compiler/SyntaxTree/UnicodeLexing.fs +++ b/src/Compiler/SyntaxTree/UnicodeLexing.fs @@ -23,22 +23,21 @@ type LexBuffer<'char> with | true, data -> Some(data :?> 'T) | _ -> None -let StringAsLexbuf (reportLibraryOnlyFeatures, langVersion, strictIndentation, s: string) = - LexBuffer.FromChars(reportLibraryOnlyFeatures, langVersion, strictIndentation, s.ToCharArray()) +let StringAsLexbuf (reportLibraryOnlyFeatures, langVersion, s: string) = + LexBuffer.FromChars(reportLibraryOnlyFeatures, langVersion, s.ToCharArray()) -let FunctionAsLexbuf (reportLibraryOnlyFeatures, langVersion, strictIndentation, bufferFiller) = - LexBuffer.FromFunction(reportLibraryOnlyFeatures, langVersion, strictIndentation, bufferFiller) +let FunctionAsLexbuf (reportLibraryOnlyFeatures, langVersion, bufferFiller) = + LexBuffer.FromFunction(reportLibraryOnlyFeatures, langVersion, bufferFiller) -let SourceTextAsLexbuf (reportLibraryOnlyFeatures, langVersion, strictIndentation, sourceText) = - LexBuffer.FromSourceText(reportLibraryOnlyFeatures, langVersion, strictIndentation, sourceText) +let SourceTextAsLexbuf (reportLibraryOnlyFeatures, langVersion, sourceText) = + LexBuffer.FromSourceText(reportLibraryOnlyFeatures, langVersion, sourceText) -let StreamReaderAsLexbuf (reportLibraryOnlyFeatures, langVersion, strictIndentation, reader: StreamReader) = +let StreamReaderAsLexbuf (reportLibraryOnlyFeatures, langVersion, reader: StreamReader) = let mutable isFinished = false FunctionAsLexbuf( reportLibraryOnlyFeatures, langVersion, - strictIndentation, fun (chars, start, length) -> if isFinished then 0 diff --git a/src/Compiler/SyntaxTree/UnicodeLexing.fsi b/src/Compiler/SyntaxTree/UnicodeLexing.fsi index ee722ee08c3..e8e3d0b3436 100644 --- a/src/Compiler/SyntaxTree/UnicodeLexing.fsi +++ b/src/Compiler/SyntaxTree/UnicodeLexing.fsi @@ -13,27 +13,14 @@ 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 +val StringAsLexbuf: reportLibraryOnlyFeatures: bool * langVersion: LanguageVersion * string -> Lexbuf val FunctionAsLexbuf: - reportLibraryOnlyFeatures: bool * - langVersion: LanguageVersion * - strictIndentation: bool option * - bufferFiller: (char[] * int * int -> int) -> - Lexbuf + reportLibraryOnlyFeatures: bool * langVersion: LanguageVersion * bufferFiller: (char[] * int * int -> int) -> Lexbuf val SourceTextAsLexbuf: - reportLibraryOnlyFeatures: bool * - langVersion: LanguageVersion * - strictIndentation: bool option * - sourceText: ISourceText -> - Lexbuf + reportLibraryOnlyFeatures: bool * langVersion: LanguageVersion * sourceText: ISourceText -> Lexbuf /// Will not dispose of the stream reader. val StreamReaderAsLexbuf: - reportLibraryOnlyFeatures: bool * - langVersion: LanguageVersion * - strictIndentation: bool option * - reader: StreamReader -> - Lexbuf + reportLibraryOnlyFeatures: bool * langVersion: LanguageVersion * reader: StreamReader -> Lexbuf diff --git a/src/Compiler/lex.fsl b/src/Compiler/lex.fsl index ce4dd5955a6..2c43eab162a 100644 --- a/src/Compiler/lex.fsl +++ b/src/Compiler/lex.fsl @@ -201,8 +201,8 @@ let shouldStartFile args lexbuf (m:range) err tok = if (m.StartColumn <> 0 || m.StartLine <> 1) then fail args lexbuf err tok else tok -let evalIfDefExpression startPos reportLibraryOnlyFeatures langVersion strictIndentation args (lookup: string -> bool) (lexed: string) = - let lexbuf = LexBuffer.FromChars (reportLibraryOnlyFeatures, langVersion, strictIndentation, lexed.ToCharArray ()) +let evalIfDefExpression startPos reportLibraryOnlyFeatures langVersion args (lookup: string -> bool) (lexed: string) = + let lexbuf = LexBuffer.FromChars (reportLibraryOnlyFeatures, langVersion, lexed.ToCharArray ()) lexbuf.StartPos <- startPos lexbuf.EndPos <- startPos let tokenStream = FSharp.Compiler.PPLexer.tokenstream args @@ -1024,7 +1024,7 @@ rule token (args: LexArgs) (skip: bool) = parse 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 + let isTrue, expr = evalIfDefExpression lexbuf.StartPos lexbuf.ReportLibraryOnlyFeatures lexbuf.LanguageVersion args lookup lexed args.ifdefStack <- (IfDefIf,m) :: args.ifdefStack IfdefStore.SaveIfHash(lexbuf, lexed, expr, m) let contCase = if isTrue then LexerEndlineContinuation.Token else LexerEndlineContinuation.IfdefSkip(0, m) @@ -1056,7 +1056,7 @@ rule token (args: LexArgs) (skip: bool) = parse let lookup id = List.contains id args.conditionalDefines // Result is discarded: in active code, a prior #if/#elif branch is executing, // so this #elif always transitions to skipping. Eval is needed for trivia storage. - let _, expr = evalIfDefExpression lexbuf.StartPos lexbuf.ReportLibraryOnlyFeatures lexbuf.LanguageVersion lexbuf.StrictIndentation args lookup lexed + let _, expr = evalIfDefExpression lexbuf.StartPos lexbuf.ReportLibraryOnlyFeatures lexbuf.LanguageVersion args lookup lexed args.ifdefStack <- (IfDefElif,m) :: rest IfdefStore.SaveElifHash(lexbuf, lexed, expr, m) let tok = HASH_ELIF(m, lexed, LexCont.EndLine(args.ifdefStack, args.stringNest, LexerEndlineContinuation.IfdefSkip(0, m))) @@ -1121,7 +1121,7 @@ and ifdefSkip (n: int) (m: range) (args: LexArgs) (skip: bool) = parse 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 + let _, expr = evalIfDefExpression lexbuf.StartPos lexbuf.ReportLibraryOnlyFeatures lexbuf.LanguageVersion args lookup lexed 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 } @@ -1160,7 +1160,7 @@ and ifdefSkip (n: int) (m: range) (args: LexArgs) (skip: bool) = parse let evalAndSaveElif () = let lookup id = List.contains id args.conditionalDefines - let result, expr = evalIfDefExpression lexbuf.StartPos lexbuf.ReportLibraryOnlyFeatures lexbuf.LanguageVersion lexbuf.StrictIndentation args lookup lexed + let result, expr = evalIfDefExpression lexbuf.StartPos lexbuf.ReportLibraryOnlyFeatures lexbuf.LanguageVersion args lookup lexed IfdefStore.SaveElifHash(lexbuf, lexed, expr, m) result diff --git a/src/Compiler/pars.fsy b/src/Compiler/pars.fsy index 01120123a36..f7e6e89c3e0 100644 --- a/src/Compiler/pars.fsy +++ b/src/Compiler/pars.fsy @@ -1857,9 +1857,7 @@ classDefnMembersAtLeastOne: | classDefnMember opt_seps classDefnMembers { match $1, $3 with | [ SynMemberDefn.Interface(members=Some []; range=m) ], nextMember :: _ -> - let strictIndentation = parseState.LexBuffer.SupportsFeature LanguageFeature.StrictIndentation - let warnF = if strictIndentation then errorR else warning - warnF(IndentationProblem(FSComp.SR.lexfltTokenIsOffsideOfContextStartedEarlier(warningStringOfPos m.Start), nextMember.Range)) + errorR(IndentationProblem(FSComp.SR.lexfltTokenIsOffsideOfContextStartedEarlier(warningStringOfPos m.Start), nextMember.Range)) | _ -> () $1 @ $3 } @@ -2487,7 +2485,7 @@ tyconDefnOrSpfnSimpleRepr: if parseState.LexBuffer.ReportLibraryOnlyFeatures then libraryOnlyError mLhs if Option.isSome $2 then errorR(Error(FSComp.SR.parsInlineAssemblyCannotHaveVisibilityDeclarations(), rhs parseState 2)) let s, _ = $5 - let ilType = ParseAssemblyCodeType s parseState.LexBuffer.ReportLibraryOnlyFeatures parseState.LexBuffer.LanguageVersion parseState.LexBuffer.StrictIndentation (rhs parseState 5) + let ilType = ParseAssemblyCodeType s parseState.LexBuffer.ReportLibraryOnlyFeatures parseState.LexBuffer.LanguageVersion (rhs parseState 5) SynTypeDefnSimpleRepr.LibraryOnlyILAssembly(box ilType, mLhs) } @@ -5740,7 +5738,7 @@ inlineAssemblyExpr: { if parseState.LexBuffer.ReportLibraryOnlyFeatures then libraryOnlyWarning (lhs parseState) let (s, _), sm = $2, rhs parseState 2 (fun m -> - let ilInstrs = ParseAssemblyCodeInstructions s parseState.LexBuffer.ReportLibraryOnlyFeatures parseState.LexBuffer.LanguageVersion parseState.LexBuffer.StrictIndentation sm + let ilInstrs = ParseAssemblyCodeInstructions s parseState.LexBuffer.ReportLibraryOnlyFeatures parseState.LexBuffer.LanguageVersion sm SynExpr.LibraryOnlyILAssembly(box ilInstrs, $3, List.rev $4, $5, m)) } optCurriedArgExprs: diff --git a/src/Compiler/xlf/FSComp.txt.cs.xlf b/src/Compiler/xlf/FSComp.txt.cs.xlf index 97a0e7790ea..4a438385c73 100644 --- a/src/Compiler/xlf/FSComp.txt.cs.xlf +++ b/src/Compiler/xlf/FSComp.txt.cs.xlf @@ -672,11 +672,6 @@ Statické členy v rozhraních - - Raises errors on incorrect indentation, allows better recovery and analysis during editing - Vyvolává chyby při nesprávném odsazení, umožňuje lepší obnovení a analýzu během úprav - - string interpolation interpolace řetězce @@ -1122,11 +1117,6 @@ Zahrnout informace o rozhraní F#, výchozí je soubor. Klíčové pro distribuci knihoven. - - Override indentation rules implied by the language version ({0} by default) - Override indentation rules implied by the language version ({0} by default) - - Supported language versions: Podporované jazykové verze: @@ -6638,8 +6628,8 @@ - Unexpected syntax or possible incorrect indentation: this token is offside of context started at position {0}. Try indenting this further.\nTo continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. - Neočekávaná syntaxe nebo možné nesprávné odsazení: Tento token je mimo kontext spuštěný na pozici {0}. Zkuste toto odsazení ještě více odsadit.\nPokud chcete dál používat neodpovídající odsazení, předejte kompilátoru příznak '--strict-indentation-' nebo nastavte jazykovou verzi na F# 7. + Unexpected syntax or possible incorrect indentation: this token is offside of context started at position {0}. Try indenting this further. + Neočekávaná syntaxe nebo možné nesprávné odsazení: Tento token je mimo kontext spuštěný na pozici {0}. Zkuste toto odsazení ještě více odsadit.\nPokud chcete dál používat neodpovídající odsazení, předejte kompilátoru příznak '--strict-indentation-' nebo nastavte jazykovou verzi na F# 7. diff --git a/src/Compiler/xlf/FSComp.txt.de.xlf b/src/Compiler/xlf/FSComp.txt.de.xlf index a503b84d990..a6e4544092c 100644 --- a/src/Compiler/xlf/FSComp.txt.de.xlf +++ b/src/Compiler/xlf/FSComp.txt.de.xlf @@ -672,11 +672,6 @@ Statische Member in Schnittstellen - - Raises errors on incorrect indentation, allows better recovery and analysis during editing - Löst Fehler bei fehlerhaftem Einzug aus und ermöglicht eine bessere Wiederherstellung und Analyse während der Bearbeitung. - - string interpolation Zeichenfolgeninterpolation @@ -1122,11 +1117,6 @@ Schließen Sie F#-Schnittstelleninformationen ein, der Standardwert ist „file“. Wesentlich für die Verteilung von Bibliotheken. - - Override indentation rules implied by the language version ({0} by default) - Override indentation rules implied by the language version ({0} by default) - - Supported language versions: Unterstützte Sprachversionen: @@ -6638,8 +6628,8 @@ - Unexpected syntax or possible incorrect indentation: this token is offside of context started at position {0}. Try indenting this further.\nTo continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. - Unerwartete Syntax oder möglicherweise falscher Einzug: Dieses Token befindet sich außerhalb des Kontexts, der an Position {0}gestartet wurde. Versuchen Sie, dies weiter einzurücken.\nUm weiterhin eine nicht konforme Einrückung zu verwenden, übergeben Sie dem Compiler das Flag „--strict-indentation-“ oder setzen Sie die Sprachversion auf F# 7. + Unexpected syntax or possible incorrect indentation: this token is offside of context started at position {0}. Try indenting this further. + Unerwartete Syntax oder möglicherweise falscher Einzug: Dieses Token befindet sich außerhalb des Kontexts, der an Position {0}gestartet wurde. Versuchen Sie, dies weiter einzurücken.\nUm weiterhin eine nicht konforme Einrückung zu verwenden, übergeben Sie dem Compiler das Flag „--strict-indentation-“ oder setzen Sie die Sprachversion auf F# 7. diff --git a/src/Compiler/xlf/FSComp.txt.es.xlf b/src/Compiler/xlf/FSComp.txt.es.xlf index bceeb3bd1c0..03434416923 100644 --- a/src/Compiler/xlf/FSComp.txt.es.xlf +++ b/src/Compiler/xlf/FSComp.txt.es.xlf @@ -672,11 +672,6 @@ Miembros estáticos en interfaces - - Raises errors on incorrect indentation, allows better recovery and analysis during editing - Genera errores en una sangría incorrecta, permite una mejor recuperación y análisis durante la edición. - - string interpolation interpolación de cadena @@ -1122,11 +1117,6 @@ Incluir información de interfaz de F#, el valor predeterminado es file. Esencial para distribuir bibliotecas. - - Override indentation rules implied by the language version ({0} by default) - Override indentation rules implied by the language version ({0} by default) - - Supported language versions: Versiones de lenguaje admitidas: @@ -6638,8 +6628,8 @@ - Unexpected syntax or possible incorrect indentation: this token is offside of context started at position {0}. Try indenting this further.\nTo continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. - Sintaxis inesperada o posible sangría incorrecta: este token está fuera del contexto iniciado en la posición {0}. Intente aplicar más sangría.\nPara seguir usando la sangría no conforme, pase la marca "--strict-indentation-" al compilador o establezca la versión del lenguaje en F# 7. + Unexpected syntax or possible incorrect indentation: this token is offside of context started at position {0}. Try indenting this further. + Sintaxis inesperada o posible sangría incorrecta: este token está fuera del contexto iniciado en la posición {0}. Intente aplicar más sangría.\nPara seguir usando la sangría no conforme, pase la marca "--strict-indentation-" al compilador o establezca la versión del lenguaje en F# 7. diff --git a/src/Compiler/xlf/FSComp.txt.fr.xlf b/src/Compiler/xlf/FSComp.txt.fr.xlf index e07e1f49ea6..43a944615e8 100644 --- a/src/Compiler/xlf/FSComp.txt.fr.xlf +++ b/src/Compiler/xlf/FSComp.txt.fr.xlf @@ -672,11 +672,6 @@ Membres statiques dans les interfaces - - Raises errors on incorrect indentation, allows better recovery and analysis during editing - Génère des erreurs en cas d'indentation incorrecte, permet une meilleure récupération et analyse lors de l'édition - - string interpolation interpolation de chaîne @@ -1122,11 +1117,6 @@ Incluez les informations de l’interface F#, la valeur par défaut est un fichier. Essentiel pour la distribution des bibliothèques. - - Override indentation rules implied by the language version ({0} by default) - Override indentation rules implied by the language version ({0} by default) - - Supported language versions: Versions linguistiques prises en charge : @@ -6638,8 +6628,8 @@ - Unexpected syntax or possible incorrect indentation: this token is offside of context started at position {0}. Try indenting this further.\nTo continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. - Syntaxe inattendue ou mise en retrait incorrecte possible : ce jeton est hors du contexte démarré à la position {0}. Essayez de mettre cela en retrait.\nPour continuer à utiliser une mise en retrait non conforme, passez l’indicateur '--strict-indentation-' au compilateur ou définissez la version de langage sur F# 7. + Unexpected syntax or possible incorrect indentation: this token is offside of context started at position {0}. Try indenting this further. + Syntaxe inattendue ou mise en retrait incorrecte possible : ce jeton est hors du contexte démarré à la position {0}. Essayez de mettre cela en retrait.\nPour continuer à utiliser une mise en retrait non conforme, passez l’indicateur '--strict-indentation-' au compilateur ou définissez la version de langage sur F# 7. diff --git a/src/Compiler/xlf/FSComp.txt.it.xlf b/src/Compiler/xlf/FSComp.txt.it.xlf index 38976ac7b68..707db3e5b03 100644 --- a/src/Compiler/xlf/FSComp.txt.it.xlf +++ b/src/Compiler/xlf/FSComp.txt.it.xlf @@ -672,11 +672,6 @@ Membri statici nelle interfacce - - Raises errors on incorrect indentation, allows better recovery and analysis during editing - Genera errori di rientro non corretto. Consente un ripristino e un'analisi migliori durante la modifica - - string interpolation interpolazione di stringhe @@ -1122,11 +1117,6 @@ Includere le informazioni sull'interfaccia F#. Il valore predefinito è file. Essential per la distribuzione di librerie. - - Override indentation rules implied by the language version ({0} by default) - Override indentation rules implied by the language version ({0} by default) - - Supported language versions: Versioni del linguaggio supportate: @@ -6638,8 +6628,8 @@ - Unexpected syntax or possible incorrect indentation: this token is offside of context started at position {0}. Try indenting this further.\nTo continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. - Sintassi imprevista o possibile rientro non corretto: questo token è fuori dal contesto avviato nella posizione {0}. Provare a impostare ulteriormente il rientro.\nPer continuare a usare un rientro non conforme, passare il flag '--strict-indentation-' al compilatore, o impostare la versione del linguaggio su F# 7. + Unexpected syntax or possible incorrect indentation: this token is offside of context started at position {0}. Try indenting this further. + Sintassi imprevista o possibile rientro non corretto: questo token è fuori dal contesto avviato nella posizione {0}. Provare a impostare ulteriormente il rientro.\nPer continuare a usare un rientro non conforme, passare il flag '--strict-indentation-' al compilatore, o impostare la versione del linguaggio su F# 7. diff --git a/src/Compiler/xlf/FSComp.txt.ja.xlf b/src/Compiler/xlf/FSComp.txt.ja.xlf index 7887ada006d..c9d11f09c7f 100644 --- a/src/Compiler/xlf/FSComp.txt.ja.xlf +++ b/src/Compiler/xlf/FSComp.txt.ja.xlf @@ -672,11 +672,6 @@ インターフェイス内の静的メンバー - - Raises errors on incorrect indentation, allows better recovery and analysis during editing - 不適切なインデントでエラーが発生し、編集中の回復と分析が向上します - - string interpolation 文字列の補間 @@ -1122,11 +1117,6 @@ F# インターフェイス情報を含めます。既定値は file です。ライブラリの配布に不可欠です。 - - Override indentation rules implied by the language version ({0} by default) - Override indentation rules implied by the language version ({0} by default) - - Supported language versions: サポートされる言語バージョン: @@ -6638,8 +6628,8 @@ - Unexpected syntax or possible incorrect indentation: this token is offside of context started at position {0}. Try indenting this further.\nTo continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. - 予期しない構文またはインデントが正しくない可能性: このトークンは位置 {0} から開始されるコンテキストのオフサイドになります。このトークンのインデントを増やしてみてください。\n非準拠のインデントを引き続き使用するには、'--strict-indent-' フラグをコンパイラに渡すか、言語バージョンを F# 7 に設定してください。 + Unexpected syntax or possible incorrect indentation: this token is offside of context started at position {0}. Try indenting this further. + 予期しない構文またはインデントが正しくない可能性: このトークンは位置 {0} から開始されるコンテキストのオフサイドになります。このトークンのインデントを増やしてみてください。\n非準拠のインデントを引き続き使用するには、'--strict-indent-' フラグをコンパイラに渡すか、言語バージョンを F# 7 に設定してください。 diff --git a/src/Compiler/xlf/FSComp.txt.ko.xlf b/src/Compiler/xlf/FSComp.txt.ko.xlf index a56015989b0..5e46db38bea 100644 --- a/src/Compiler/xlf/FSComp.txt.ko.xlf +++ b/src/Compiler/xlf/FSComp.txt.ko.xlf @@ -672,11 +672,6 @@ 인터페이스의 정적 멤버 - - Raises errors on incorrect indentation, allows better recovery and analysis during editing - 잘못된 들여쓰기에 대한 오류를 제기하고 편집 중에 더 나은 복구 및 분석이 가능합니다. - - string interpolation 문자열 보간 @@ -1122,11 +1117,6 @@ F# 인터페이스 정보를 포함합니다. 기본값은 파일입니다. 라이브러리를 배포하는 데 필수적입니다. - - Override indentation rules implied by the language version ({0} by default) - Override indentation rules implied by the language version ({0} by default) - - Supported language versions: 지원되는 언어 버전: @@ -6638,8 +6628,8 @@ - Unexpected syntax or possible incorrect indentation: this token is offside of context started at position {0}. Try indenting this further.\nTo continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. - 예기치 않은 구문 또는 잘못된 들여쓰기: 이 토큰은 {0} 위치에서 시작된 컨텍스트의 오프 사이드입니다. 이를 더 들여쓰기해 보세요.\n규정을 준수하지 않는 들여쓰기를 계속 사용하려면 '--strict-indentation-' 플래그를 컴파일러에 전달하거나 언어 버전을 F# 7로 설정합니다. + Unexpected syntax or possible incorrect indentation: this token is offside of context started at position {0}. Try indenting this further. + 예기치 않은 구문 또는 잘못된 들여쓰기: 이 토큰은 {0} 위치에서 시작된 컨텍스트의 오프 사이드입니다. 이를 더 들여쓰기해 보세요.\n규정을 준수하지 않는 들여쓰기를 계속 사용하려면 '--strict-indentation-' 플래그를 컴파일러에 전달하거나 언어 버전을 F# 7로 설정합니다. diff --git a/src/Compiler/xlf/FSComp.txt.pl.xlf b/src/Compiler/xlf/FSComp.txt.pl.xlf index 99f0175e0ac..34b78279187 100644 --- a/src/Compiler/xlf/FSComp.txt.pl.xlf +++ b/src/Compiler/xlf/FSComp.txt.pl.xlf @@ -672,11 +672,6 @@ Statyczne składowe w interfejsach - - Raises errors on incorrect indentation, allows better recovery and analysis during editing - Zgłasza błędy w przypadku nieprawidłowego wcięcia, umożliwia lepsze odzyskiwanie i analizę podczas edytowania - - string interpolation interpolacja ciągu @@ -1122,11 +1117,6 @@ Uwzględnij informacje o interfejsie języka F#. Wartość domyślna to plik. Niezbędne do rozpowszechniania bibliotek. - - Override indentation rules implied by the language version ({0} by default) - Override indentation rules implied by the language version ({0} by default) - - Supported language versions: Obsługiwane wersje językowe: @@ -6638,8 +6628,8 @@ - Unexpected syntax or possible incorrect indentation: this token is offside of context started at position {0}. Try indenting this further.\nTo continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. - Nieoczekiwana składnia lub możliwe niepoprawne wcięcie: ten token jest poza kontekstem uruchomionym na pozycji {0}. Spróbuj jeszcze bardziej wciąć to ustawienie.\nAby kontynuować używanie niezgodnych wcięć, przekaż flagę „--strict-indentation-” do kompilatora lub ustaw wersję języka na F# 7. + Unexpected syntax or possible incorrect indentation: this token is offside of context started at position {0}. Try indenting this further. + Nieoczekiwana składnia lub możliwe niepoprawne wcięcie: ten token jest poza kontekstem uruchomionym na pozycji {0}. Spróbuj jeszcze bardziej wciąć to ustawienie.\nAby kontynuować używanie niezgodnych wcięć, przekaż flagę „--strict-indentation-” do kompilatora lub ustaw wersję języka na F# 7. diff --git a/src/Compiler/xlf/FSComp.txt.pt-BR.xlf b/src/Compiler/xlf/FSComp.txt.pt-BR.xlf index 0e9f94e1b47..15708436237 100644 --- a/src/Compiler/xlf/FSComp.txt.pt-BR.xlf +++ b/src/Compiler/xlf/FSComp.txt.pt-BR.xlf @@ -672,11 +672,6 @@ Membros estáticos em interfaces - - Raises errors on incorrect indentation, allows better recovery and analysis during editing - Gera erros de recuo incorreto, permite uma melhor recuperação e análise durante a edição - - string interpolation interpolação da cadeia de caracteres @@ -1122,11 +1117,6 @@ Inclua informações da interface F#, o padrão é file. Essencial para distribuir bibliotecas. - - Override indentation rules implied by the language version ({0} by default) - Override indentation rules implied by the language version ({0} by default) - - Supported language versions: Versões de linguagens com suporte: @@ -6638,8 +6628,8 @@ - Unexpected syntax or possible incorrect indentation: this token is offside of context started at position {0}. Try indenting this further.\nTo continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. - Sintaxe inesperada ou possível recuo incorreto: esse token está fora do contexto iniciado na posição {0}. Tente recuar isso ainda mais.\nPara continuar usando o recuo não compatível, passe o sinalizador '--strict-indentation-' para o compilador ou defina a versão da linguagem como F# 7. + Unexpected syntax or possible incorrect indentation: this token is offside of context started at position {0}. Try indenting this further. + Sintaxe inesperada ou possível recuo incorreto: esse token está fora do contexto iniciado na posição {0}. Tente recuar isso ainda mais.\nPara continuar usando o recuo não compatível, passe o sinalizador '--strict-indentation-' para o compilador ou defina a versão da linguagem como F# 7. diff --git a/src/Compiler/xlf/FSComp.txt.ru.xlf b/src/Compiler/xlf/FSComp.txt.ru.xlf index 917dfd8f862..30dfea1bb89 100644 --- a/src/Compiler/xlf/FSComp.txt.ru.xlf +++ b/src/Compiler/xlf/FSComp.txt.ru.xlf @@ -672,11 +672,6 @@ Статические элементы в интерфейсах - - Raises errors on incorrect indentation, allows better recovery and analysis during editing - Выдает ошибки при неправильном отступе, обеспечивает более эффективное восстановление и анализ во время редактирования - - string interpolation интерполяция строк @@ -1122,11 +1117,6 @@ Включить сведения об интерфейсе F#, по умолчанию используется файл. Необходимо для распространения библиотек. - - Override indentation rules implied by the language version ({0} by default) - Override indentation rules implied by the language version ({0} by default) - - Supported language versions: Поддерживаемые языковые версии: @@ -6638,8 +6628,8 @@ - Unexpected syntax or possible incorrect indentation: this token is offside of context started at position {0}. Try indenting this further.\nTo continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. - Неожиданный синтаксис или, возможно, неправильный отступ: этот токен находится вне контекста, начатого в позиции {0}. Попробуйте увеличить отступ.\nЧтобы продолжить использование несоответствующего отступа, передайте компилятору флаг '--strict-indentation-' или установите версию языка F# 7. + Unexpected syntax or possible incorrect indentation: this token is offside of context started at position {0}. Try indenting this further. + Неожиданный синтаксис или, возможно, неправильный отступ: этот токен находится вне контекста, начатого в позиции {0}. Попробуйте увеличить отступ.\nЧтобы продолжить использование несоответствующего отступа, передайте компилятору флаг '--strict-indentation-' или установите версию языка F# 7. diff --git a/src/Compiler/xlf/FSComp.txt.tr.xlf b/src/Compiler/xlf/FSComp.txt.tr.xlf index 42aa78dda0c..99454daff5e 100644 --- a/src/Compiler/xlf/FSComp.txt.tr.xlf +++ b/src/Compiler/xlf/FSComp.txt.tr.xlf @@ -672,11 +672,6 @@ Arabirimlerdeki statik üyeler - - Raises errors on incorrect indentation, allows better recovery and analysis during editing - Yanlış girinti üzerine hata verir ve düzenleme sırasında daha iyi kurtarma ve analize olanak sağlar - - string interpolation dizede düz metin arasına kod ekleme @@ -1122,11 +1117,6 @@ F# arabirim bilgilerini dahil edin; varsayılan değer dosyadır. Kitaplıkları dağıtmak için gereklidir. - - Override indentation rules implied by the language version ({0} by default) - Override indentation rules implied by the language version ({0} by default) - - Supported language versions: Desteklenen dil sürümleri: @@ -6638,8 +6628,8 @@ - Unexpected syntax or possible incorrect indentation: this token is offside of context started at position {0}. Try indenting this further.\nTo continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. - Beklenmeyen sözdizimi veya olası yanlış girinti: Bu belirteç, {0} konumunda başlayan bağlamın ofsaytıdır. Bunu daha fazla girintilemeyi deneyin.\nUygun olmayan girintiyi kullanmaya devam etmek için '--strict-indentation-' işaretini derleyiciye iletin veya dil sürümünü F# 7 olarak ayarlayın. + Unexpected syntax or possible incorrect indentation: this token is offside of context started at position {0}. Try indenting this further. + Beklenmeyen sözdizimi veya olası yanlış girinti: Bu belirteç, {0} konumunda başlayan bağlamın ofsaytıdır. Bunu daha fazla girintilemeyi deneyin.\nUygun olmayan girintiyi kullanmaya devam etmek için '--strict-indentation-' işaretini derleyiciye iletin veya dil sürümünü F# 7 olarak ayarlayın. diff --git a/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf b/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf index 712bae2f841..d18523ba304 100644 --- a/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf +++ b/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf @@ -672,11 +672,6 @@ 接口中的静态成员 - - Raises errors on incorrect indentation, allows better recovery and analysis during editing - 在缩进不准确时引发错误，以便在编辑期间更好地恢复和分析 - - string interpolation 字符串内插 @@ -1122,11 +1117,6 @@ 包括 F# 接口信息，默认值为文件。对于分发库必不可少。 - - Override indentation rules implied by the language version ({0} by default) - Override indentation rules implied by the language version ({0} by default) - - Supported language versions: 支持的语言版本: @@ -6638,8 +6628,8 @@ - Unexpected syntax or possible incorrect indentation: this token is offside of context started at position {0}. Try indenting this further.\nTo continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. - 意外语法或可能错误的缩进: 此令牌对于 {0} 处开始的上下文来说越位。尝试进一步缩进此内容。\n若要继续使用不符合条件的索引，请将 "--strict-indentation-" 传递给编译器，或者将语言版本设置为 F# 7。 + Unexpected syntax or possible incorrect indentation: this token is offside of context started at position {0}. Try indenting this further. + 意外语法或可能错误的缩进: 此令牌对于 {0} 处开始的上下文来说越位。尝试进一步缩进此内容。\n若要继续使用不符合条件的索引，请将 "--strict-indentation-" 传递给编译器，或者将语言版本设置为 F# 7。 diff --git a/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf b/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf index 1e59d46c405..b20f8216fca 100644 --- a/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf +++ b/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf @@ -672,11 +672,6 @@ 介面中的靜態成員 - - Raises errors on incorrect indentation, allows better recovery and analysis during editing - 縮排不正確時引發錯誤，以便在編輯期間進行更好的復原和分析 - - string interpolation 字串內插補點 @@ -1122,11 +1117,6 @@ 包含 F# 介面資訊，預設值為檔案。發佈程式庫的基本功能。 - - Override indentation rules implied by the language version ({0} by default) - Override indentation rules implied by the language version ({0} by default) - - Supported language versions: 支援的語言版本: @@ -6638,8 +6628,8 @@ - Unexpected syntax or possible incorrect indentation: this token is offside of context started at position {0}. Try indenting this further.\nTo continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. - 未預期的語法或可能不正確的縮排: 此權杖與在位置 {0} 啟動的內容不同步。請嘗試進一步縮排。\n若要繼續使用不符合的縮排，請傳遞 '--strict-indentation-' 旗標給編譯器，或將語言版本設定為 F# 7。 + Unexpected syntax or possible incorrect indentation: this token is offside of context started at position {0}. Try indenting this further. + 未預期的語法或可能不正確的縮排: 此權杖與在位置 {0} 啟動的內容不同步。請嘗試進一步縮排。\n若要繼續使用不符合的縮排，請傳遞 '--strict-indentation-' 旗標給編譯器，或將語言版本設定為 F# 7。 diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Line.fs b/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Line.fs index 51a171b3ac4..6eef92698cd 100644 --- a/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Line.fs +++ b/tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Line.fs @@ -135,7 +135,7 @@ printfn "" PathMap.empty, true ) - let lexbuf = StringAsLexbuf(true, langVersion, None, sourceText) + let lexbuf = StringAsLexbuf(true, langVersion, sourceText) resetLexbufPos "testt.fs" lexbuf let tokenizer _ = let t = Lexer.token lexargs true lexbuf diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/Fsc/UncoveredOptions.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/Fsc/UncoveredOptions.fs index dc0c6e0762f..ef40f3b8159 100644 --- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/Fsc/UncoveredOptions.fs +++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/Fsc/UncoveredOptions.fs @@ -19,8 +19,6 @@ module UncoveredOptions = [] [] [] - [] - [] [] [] [] diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/misc/compiler_help_output.bsl b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/misc/compiler_help_output.bsl index 56df6419a54..fb9b669e05c 100644 --- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/misc/compiler_help_output.bsl +++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/misc/compiler_help_output.bsl @@ -83,7 +83,6 @@ Copyright (c) Microsoft Corporation. All Rights Reserved. --disableLanguageFeature: Disable a specific language feature by name. --checked[+|-] Generate overflow checks (off by default) --define: Define conditional compilation symbols (Short form: -d) ---strict-indentation[+|-] Override indentation rules implied by the language version (off by default) --always-inline[+|-] Always inline 'inline' functions 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 7f4c02ab56f..b8ded929963 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/PermittedLocations.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/PermittedLocations.fs @@ -131,9 +131,9 @@ module AccessibilityAnnotations_PermittedLocations = |> shouldFail |> withDiagnostics [ (Error 531, Line 11, Col 13, Line 11, Col 20, "Accessibility modifiers should come immediately prior to the identifier naming a construct") - (Error 58, Line 12, Col 23, Line 12, Col 26, "Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (11:23). Try indenting this further.\nTo continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7.") + (Error 58, Line 12, Col 23, Line 12, Col 26, "Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (11:23). Try indenting this further.") (Error 531, Line 12, Col 13, Line 12, Col 19, "Accessibility modifiers should come immediately prior to the identifier naming a construct") - (Error 58, Line 13, Col 23, Line 13, Col 26, "Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (12:23). Try indenting this further.\nTo continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7.") + (Error 58, Line 13, Col 23, Line 13, Col 26, "Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (12:23). Try indenting this further.") (Error 531, Line 13, Col 13, Line 13, Col 21, "Accessibility modifiers should come immediately prior to the identifier naming a construct") ] diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/Basic.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/Basic.fs index b59d28cbdd2..0e2ef117ea6 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/Basic.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/Basic.fs @@ -76,7 +76,7 @@ module LetBindings_Basic = |> verifyCompile |> shouldFail |> withDiagnostics [ - (Error 58, Line 10, Col 1, Line 10, Col 5, "Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (8:1). Try indenting this further.\nTo continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7.") + (Error 58, Line 10, Col 1, Line 10, Col 5, "Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (8:1). Try indenting this further.") (Error 10, Line 10, Col 6, Line 10, Col 7, "Unexpected start of structured construct in expression") (Error 583, Line 9, Col 5, Line 9, Col 6, "Unmatched '('") (Error 10, Line 10, Col 16, Line 10, Col 17, "Unexpected symbol ')' in implementation file") diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalFiltering/OffsideExceptions/OffsideExceptions.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalFiltering/OffsideExceptions/OffsideExceptions.fs index 9dc910ba249..39db4d639a8 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalFiltering/OffsideExceptions/OffsideExceptions.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalFiltering/OffsideExceptions/OffsideExceptions.fs @@ -229,7 +229,7 @@ module A EndLine = 4 EndColumn = 6 } Message = - "Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (3:5). Try indenting this further.\nTo continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7." + "Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (3:5). Try indenting this further." } |> ignore [] diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalFiltering/OffsideExceptions/RelaxWhitespace2.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalFiltering/OffsideExceptions/RelaxWhitespace2.fs index ef83e1ba871..4b90ca2988a 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalFiltering/OffsideExceptions/RelaxWhitespace2.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalFiltering/OffsideExceptions/RelaxWhitespace2.fs @@ -3434,7 +3434,7 @@ let c = f' { let d = f' {| X = 2 (* FS0058 Possible incorrect indentation: this token is offside of context started at position (12:11). -Try indenting this further.\nTo continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7 *) +Try indenting this further. *) |} let e = f' {| X = 2 // Indenting further is needed diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/UnionTypes.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/UnionTypes.fs index 7d5db82abde..49c5b41d7cc 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/UnionTypes.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/UnionTypes.fs @@ -608,7 +608,7 @@ module UnionTypes = |> verifyCompile |> shouldFail |> withDiagnostics [ - (Error 58, Line 9, Col 1, Line 9, Col 2, "Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (8:19). Try indenting this further.\nTo continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7.") + (Error 58, Line 9, Col 1, Line 9, Col 2, "Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (8:19). Try indenting this further.") (Error 547, Line 8, Col 24, Line 8, Col 33, "A type definition requires one or more members or other declarations. If you intend to define an empty class, struct or interface, then use 'type ... = class end', 'interface end' or 'struct end'.") (Error 10, Line 9, Col 1, Line 9, Col 2, "Unexpected symbol '|' in implementation file") ] diff --git a/tests/FSharp.Compiler.ComponentTests/Language/CompilerDirectiveTests.fs b/tests/FSharp.Compiler.ComponentTests/Language/CompilerDirectiveTests.fs index 829b56eca14..9db654de7af 100644 --- a/tests/FSharp.Compiler.ComponentTests/Language/CompilerDirectiveTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/Language/CompilerDirectiveTests.fs @@ -44,7 +44,7 @@ let y = x |> compile |> shouldFail |> withSingleDiagnostic - (Error 58, Line 11, Col 1, Line 11, Col 4, "Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (9:5). Try indenting this further.\nTo continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7.") + (Error 58, Line 11, Col 1, Line 11, Col 4, "Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (9:5). Try indenting this further.") module ``Test compiler directives in FSI`` = [] diff --git a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.bsl b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.bsl index cd6be26fa07..e67d7f5fcbe 100644 --- a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.bsl +++ b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.bsl @@ -2265,14 +2265,12 @@ 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 FSharp.Compiler.CodeAnalysis.FSharpParsingOptions: Microsoft.FSharp.Collections.FSharpList`1[System.String] get_ConditionalDefines() -FSharp.Compiler.CodeAnalysis.FSharpParsingOptions: Microsoft.FSharp.Core.FSharpOption`1[System.Boolean] StrictIndentation -FSharp.Compiler.CodeAnalysis.FSharpParsingOptions: Microsoft.FSharp.Core.FSharpOption`1[System.Boolean] get_StrictIndentation() FSharp.Compiler.CodeAnalysis.FSharpParsingOptions: System.String LangVersionText FSharp.Compiler.CodeAnalysis.FSharpParsingOptions: System.String ToString() FSharp.Compiler.CodeAnalysis.FSharpParsingOptions: System.String get_LangVersionText() FSharp.Compiler.CodeAnalysis.FSharpParsingOptions: System.String[] SourceFiles FSharp.Compiler.CodeAnalysis.FSharpParsingOptions: System.String[] get_SourceFiles() -FSharp.Compiler.CodeAnalysis.FSharpParsingOptions: Void .ctor(System.String[], Boolean, Microsoft.FSharp.Collections.FSharpList`1[System.String], FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions, System.String, Boolean, Microsoft.FSharp.Core.FSharpOption`1[System.Boolean], Boolean, Boolean) +FSharp.Compiler.CodeAnalysis.FSharpParsingOptions: Void .ctor(System.String[], Boolean, Microsoft.FSharp.Collections.FSharpList`1[System.String], FSharp.Compiler.Diagnostics.FSharpDiagnosticOptions, System.String, Boolean, Boolean, Boolean) FSharp.Compiler.CodeAnalysis.FSharpProjectContext: FSharp.Compiler.CodeAnalysis.FSharpProjectOptions ProjectOptions FSharp.Compiler.CodeAnalysis.FSharpProjectContext: FSharp.Compiler.CodeAnalysis.FSharpProjectOptions get_ProjectOptions() FSharp.Compiler.CodeAnalysis.FSharpProjectContext: FSharp.Compiler.Symbols.FSharpAccessibilityRights AccessibilityRights @@ -11292,7 +11290,7 @@ FSharp.Compiler.Tokenization.FSharpKeywords: Microsoft.FSharp.Collections.FSharp FSharp.Compiler.Tokenization.FSharpKeywords: Microsoft.FSharp.Collections.FSharpList`1[System.Tuple`2[System.String,System.String]] KeywordsWithDescription FSharp.Compiler.Tokenization.FSharpKeywords: Microsoft.FSharp.Collections.FSharpList`1[System.Tuple`2[System.String,System.String]] get_KeywordsWithDescription() FSharp.Compiler.Tokenization.FSharpKeywords: System.String NormalizeIdentifierBackticks(System.String) -FSharp.Compiler.Tokenization.FSharpLexer: Void Tokenize(FSharp.Compiler.Text.ISourceText, Microsoft.FSharp.Core.FSharpFunc`2[FSharp.Compiler.Tokenization.FSharpToken,Microsoft.FSharp.Core.Unit], Microsoft.FSharp.Core.FSharpOption`1[System.String], Microsoft.FSharp.Core.FSharpOption`1[System.Boolean], Microsoft.FSharp.Core.FSharpOption`1[System.String], Microsoft.FSharp.Core.FSharpOption`1[Microsoft.FSharp.Collections.FSharpList`1[System.String]], Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Tokenization.FSharpLexerFlags], Microsoft.FSharp.Core.FSharpOption`1[Microsoft.FSharp.Collections.FSharpMap`2[System.String,System.String]], Microsoft.FSharp.Core.FSharpOption`1[System.Threading.CancellationToken]) +FSharp.Compiler.Tokenization.FSharpLexer: Void Tokenize(FSharp.Compiler.Text.ISourceText, Microsoft.FSharp.Core.FSharpFunc`2[FSharp.Compiler.Tokenization.FSharpToken,Microsoft.FSharp.Core.Unit], Microsoft.FSharp.Core.FSharpOption`1[System.String], Microsoft.FSharp.Core.FSharpOption`1[System.String], Microsoft.FSharp.Core.FSharpOption`1[Microsoft.FSharp.Collections.FSharpList`1[System.String]], Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Tokenization.FSharpLexerFlags], Microsoft.FSharp.Core.FSharpOption`1[Microsoft.FSharp.Collections.FSharpMap`2[System.String,System.String]], Microsoft.FSharp.Core.FSharpOption`1[System.Threading.CancellationToken]) FSharp.Compiler.Tokenization.FSharpLexerFlags: FSharp.Compiler.Tokenization.FSharpLexerFlags Compiling FSharp.Compiler.Tokenization.FSharpLexerFlags: FSharp.Compiler.Tokenization.FSharpLexerFlags CompilingFSharpCore FSharp.Compiler.Tokenization.FSharpLexerFlags: FSharp.Compiler.Tokenization.FSharpLexerFlags Default @@ -11304,7 +11302,7 @@ FSharp.Compiler.Tokenization.FSharpLineTokenizer: FSharp.Compiler.Tokenization.F FSharp.Compiler.Tokenization.FSharpLineTokenizer: System.Tuple`2[Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Tokenization.FSharpTokenInfo],FSharp.Compiler.Tokenization.FSharpTokenizerLexState] ScanToken(FSharp.Compiler.Tokenization.FSharpTokenizerLexState) FSharp.Compiler.Tokenization.FSharpSourceTokenizer: FSharp.Compiler.Tokenization.FSharpLineTokenizer CreateBufferTokenizer(Microsoft.FSharp.Core.FSharpFunc`2[System.Tuple`3[System.Char[],System.Int32,System.Int32],System.Int32]) FSharp.Compiler.Tokenization.FSharpSourceTokenizer: FSharp.Compiler.Tokenization.FSharpLineTokenizer CreateLineTokenizer(System.String) -FSharp.Compiler.Tokenization.FSharpSourceTokenizer: Void .ctor(Microsoft.FSharp.Collections.FSharpList`1[System.String], Microsoft.FSharp.Core.FSharpOption`1[System.String], Microsoft.FSharp.Core.FSharpOption`1[System.String], Microsoft.FSharp.Core.FSharpOption`1[System.Boolean]) +FSharp.Compiler.Tokenization.FSharpSourceTokenizer: Void .ctor(Microsoft.FSharp.Collections.FSharpList`1[System.String], Microsoft.FSharp.Core.FSharpOption`1[System.String], Microsoft.FSharp.Core.FSharpOption`1[System.String]) FSharp.Compiler.Tokenization.FSharpToken: Boolean IsCommentTrivia FSharp.Compiler.Tokenization.FSharpToken: Boolean IsIdentifier FSharp.Compiler.Tokenization.FSharpToken: Boolean IsKeyword diff --git a/tests/FSharp.Compiler.Service.Tests/HashIfExpression.fs b/tests/FSharp.Compiler.Service.Tests/HashIfExpression.fs index 68015d13271..4bbf2c5fb41 100644 --- a/tests/FSharp.Compiler.Service.Tests/HashIfExpression.fs +++ b/tests/FSharp.Compiler.Service.Tests/HashIfExpression.fs @@ -66,7 +66,7 @@ type public HashIfExpression() = DiagnosticsThreadStatics.DiagnosticsLogger <- diagnosticsLogger let parser (s : string) = - let lexbuf = LexBuffer.FromChars (true, LanguageVersion.Default, None, s.ToCharArray ()) + let lexbuf = LexBuffer.FromChars (true, LanguageVersion.Default, s.ToCharArray ()) lexbuf.StartPos <- startPos lexbuf.EndPos <- startPos let tokenStream = PPLexer.tokenstream args diff --git a/tests/FSharp.Compiler.Service.Tests/PatternMatchCompilationTests.fs b/tests/FSharp.Compiler.Service.Tests/PatternMatchCompilationTests.fs index f3c31f000da..8aa15e83899 100644 --- a/tests/FSharp.Compiler.Service.Tests/PatternMatchCompilationTests.fs +++ b/tests/FSharp.Compiler.Service.Tests/PatternMatchCompilationTests.fs @@ -551,7 +551,7 @@ let z as "(14,6--14,8): Expecting pattern"; "(15,13--15,14): Unexpected symbol '=' in pattern. Expected ')' or other token."; "(15,9--15,10): Unmatched '('"; - "(16,0--16,3): Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (15:1). Try indenting this further. To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7."; + "(16,0--16,3): Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (15:1). Try indenting this further."; "(17,16--17,17): Unexpected identifier in pattern. Expected '(' or other token."; "(19,6--19,8): Expecting pattern"; "(20,0--20,0): Incomplete structured construct at or before this point in binding. Expected '=' or other token."; @@ -688,11 +688,11 @@ let z as = "(14,8--14,10): Unexpected keyword 'as' in binding"; "(15,8--15,10): Unexpected keyword 'as' in pattern. Expected ')' or other token."; "(15,6--15,7): Unmatched '('"; - "(16,0--16,3): Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (15:1). Try indenting this further. To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7."; + "(16,0--16,3): Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (15:1). Try indenting this further."; "(16,0--16,3): Unexpected keyword 'let' or 'use' in binding. Expected incomplete structured construct at or before this point or other token."; "(15,0--15,3): Incomplete value or function definition. If this is in an expression, the body of the expression must be indented to the same column as the 'let' keyword."; "(17,0--17,3): Incomplete structured construct at or before this point in implementation file"; - "(20,0--20,0): Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (19:1). Try indenting this further. To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7."; + "(20,0--20,0): Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (19:1). Try indenting this further."; "(3,13--3,17): This expression was expected to have type 'int' but here has type 'bool'"; "(3,4--3,10): Incomplete pattern matches on this expression. For example, the value '0' may indicate a case not covered by the pattern(s)."; "(4,16--4,17): This expression was expected to have type 'bool' but here has type 'int'"; @@ -875,7 +875,7 @@ let :? z as "(14,9--14,11): Expecting pattern"; "(15,16--15,17): Unexpected symbol '=' in pattern. Expected ')' or other token."; "(15,12--15,13): Unmatched '('"; - "(16,0--16,3): Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (15:1). Try indenting this further. To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7."; + "(16,0--16,3): Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (15:1). Try indenting this further."; "(17,19--17,20): Unexpected identifier in pattern. Expected '(' or other token."; "(19,9--19,11): Expecting pattern"; "(20,0--20,0): Incomplete structured construct at or before this point in binding. Expected '=' or other token."; @@ -1092,13 +1092,13 @@ let as :? z = "(15,13--15,15): Unexpected keyword 'as' in pattern. Expected '(' or other token."; "(16,8--16,10): Unexpected keyword 'as' in pattern. Expected ')' or other token."; "(16,6--16,7): Unmatched '('"; - "(17,0--17,3): Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (16:1). Try indenting this further. To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7."; + "(17,0--17,3): Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (16:1). Try indenting this further."; "(17,0--17,3): Unexpected keyword 'let' or 'use' in binding. Expected incomplete structured construct at or before this point or other token."; "(16,0--16,3): Incomplete value or function definition. If this is in an expression, the body of the expression must be indented to the same column as the 'let' keyword."; "(17,8--17,10): Unexpected keyword 'as' in pattern. Expected ']' or other token."; - "(18,0--18,3): Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (17:1). Try indenting this further. To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7."; - "(19,0--19,3): Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (18:1). Try indenting this further. To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7."; - "(20,0--20,0): Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (19:1). Try indenting this further. To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7."; + "(18,0--18,3): Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (17:1). Try indenting this further."; + "(19,0--19,3): Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (18:1). Try indenting this further."; + "(20,0--20,0): Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (19:1). Try indenting this further."; "(3,12--3,13): The type 'a' is not defined."; "(3,9--3,13): The type 'int' does not have any proper subtypes and cannot be used as the source of a type test or runtime coercion."; "(4,15--4,16): The type 'b' is not defined."; diff --git a/tests/FSharp.Compiler.Service.Tests/TokenizerTests.fs b/tests/FSharp.Compiler.Service.Tests/TokenizerTests.fs index 48dd529b2af..566dc150ce7 100644 --- a/tests/FSharp.Compiler.Service.Tests/TokenizerTests.fs +++ b/tests/FSharp.Compiler.Service.Tests/TokenizerTests.fs @@ -16,7 +16,7 @@ let rec parseLine(line: string, state: FSharpTokenizerLexState ref, tokenizer: F state.Value <- nstate } let tokenizeLines (lines:string[]) = - let sourceTok = FSharpSourceTokenizer([], Some "C:\\test.fsx", None, None) + let sourceTok = FSharpSourceTokenizer([], Some "C:\\test.fsx", None) [ let state = ref FSharpTokenizerLexState.Initial for n, line in lines |> Seq.zip [ 0 .. lines.Length-1 ] do @@ -26,7 +26,7 @@ let tokenizeLines (lines:string[]) = /// Scans every token of a (possibly multi-line) source using a single line tokenizer, /// threading the lex state across embedded newlines (column index resets at each newline). let scanTokens (defines: string list) (source: string) = - let sourceTok = FSharpSourceTokenizer(defines, Some "C:\\test.fsx", None, None) + let sourceTok = FSharpSourceTokenizer(defines, Some "C:\\test.fsx", None) let tokenizer = sourceTok.CreateLineTokenizer(source) let rec loop (state: FSharpTokenizerLexState) acc = match tokenizer.ScanToken(state) with @@ -220,7 +220,7 @@ let ``Tokenizer test - single-line nested string interpolation``() = [] let ``Tokenizer test - elif directive produces HASH_ELIF token``() = let defines = ["DEBUG"] - let sourceTok = FSharpSourceTokenizer(defines, Some "C:\\test.fsx", None, None) + let sourceTok = FSharpSourceTokenizer(defines, Some "C:\\test.fsx", None) let lines = [| "#if DEBUG" "let x = 1" diff --git a/tests/FSharp.Compiler.Service.Tests/expected-help-output.bsl b/tests/FSharp.Compiler.Service.Tests/expected-help-output.bsl index bbcf59bb8f5..134e6313ab8 100644 --- a/tests/FSharp.Compiler.Service.Tests/expected-help-output.bsl +++ b/tests/FSharp.Compiler.Service.Tests/expected-help-output.bsl @@ -128,9 +128,6 @@ default) --define: Define conditional compilation symbols (Short form: -d) ---strict-indentation[+|-] Override indentation rules implied - by the language version (off by - default) --always-inline[+|-] Always inline 'inline' functions diff --git a/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/CompilerServiceBenchmarks.fs b/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/CompilerServiceBenchmarks.fs index aa7f623cad0..912ed142b5a 100644 --- a/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/CompilerServiceBenchmarks.fs +++ b/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/CompilerServiceBenchmarks.fs @@ -84,7 +84,6 @@ type CompilerServiceBenchmarks() = LangVersionText = "default" IsInteractive = false ApplyLineDirectives = false - StrictIndentation = None CompilingFSharpCore = false IsExe = false } diff --git a/tests/fsharp/Compiler/Language/StringInterpolation.fs b/tests/fsharp/Compiler/Language/StringInterpolation.fs index eade5119a44..05f0956081a 100644 --- a/tests/fsharp/Compiler/Language/StringInterpolation.fs +++ b/tests/fsharp/Compiler/Language/StringInterpolation.fs @@ -813,7 +813,7 @@ let TripleInterpolatedInVerbatimInterpolated = $\"123{456}789{$\"\"\"012\"\"\"}3 CompilerAssert.TypeCheckWithErrorsAndOptions [| "--langversion:8.0" |] code [|(FSharpDiagnosticSeverity.Error, 58, (1, 1, 1, 17), - "Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (1:1). Try indenting this further.\nTo continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7."); + "Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (1:1). Try indenting this further."); (FSharpDiagnosticSeverity.Error, 10, (1, 1, 1, 17), "Incomplete structured construct at or before this point in binding"); (FSharpDiagnosticSeverity.Error, 3381, (1, 10, 1, 14), diff --git a/tests/fsharp/typecheck/sigs/neg114.bsl b/tests/fsharp/typecheck/sigs/neg114.bsl index d75d2a8c5ff..8b114a975d0 100644 --- a/tests/fsharp/typecheck/sigs/neg114.bsl +++ b/tests/fsharp/typecheck/sigs/neg114.bsl @@ -4,10 +4,8 @@ neg114.fs(6,38,6,39): parse error FS0010: Unexpected symbol '}' in binding. Expe neg114.fs(6,29,6,31): parse error FS0605: Unmatched '{|' neg114.fs(8,5,8,8): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (6:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg114.fs(10,5,10,9): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (8:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg114.fs(10,5,10,9): parse error FS0010: Unexpected keyword 'type' in binding. Expected incomplete structured construct at or before this point or other token. diff --git a/tests/fsharp/typecheck/sigs/neg114.vsbsl b/tests/fsharp/typecheck/sigs/neg114.vsbsl index ba9c3df9c9b..ae7af779861 100644 --- a/tests/fsharp/typecheck/sigs/neg114.vsbsl +++ b/tests/fsharp/typecheck/sigs/neg114.vsbsl @@ -4,10 +4,8 @@ neg114.fs(6,38,6,39): parse error FS0010: Unexpected symbol '}' in binding. Expe neg114.fs(6,29,6,31): parse error FS0605: Unmatched '{|' neg114.fs(8,5,8,8): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (6:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg114.fs(10,5,10,9): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (8:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg114.fs(10,5,10,9): parse error FS0010: Unexpected keyword 'type' in binding. Expected incomplete structured construct at or before this point or other token. diff --git a/tests/fsharp/typecheck/sigs/neg69.bsl b/tests/fsharp/typecheck/sigs/neg69.bsl index bce5b5cb823..c578bb87bca 100644 --- a/tests/fsharp/typecheck/sigs/neg69.bsl +++ b/tests/fsharp/typecheck/sigs/neg69.bsl @@ -4,93 +4,63 @@ neg69.fsx(88,43,88,44): parse error FS1241: Expected type argument or static arg neg69.fsx(88,44,88,45): parse error FS0010: Unexpected symbol '>' in type definition. Expected '=' or other token. neg69.fsx(94,5,94,8): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (93:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(94,5,94,8): parse error FS0010: Unexpected keyword 'let' or 'use' in implementation file neg69.fsx(95,5,95,8): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (94:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(96,5,96,8): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (95:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(98,5,98,11): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (96:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(98,19,98,20): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (96:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(99,5,99,11): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (96:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(100,5,100,11): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (96:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(101,5,101,11): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (96:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(102,5,102,11): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (96:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(104,5,104,14): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (96:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(113,1,113,5): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (96:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(168,1,168,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (96:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(170,1,170,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (168:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(171,1,171,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (170:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(172,1,172,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (171:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(173,1,173,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (172:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(174,1,174,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (173:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(176,1,176,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (174:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(177,1,177,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (176:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(178,1,178,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (177:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(180,1,180,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (178:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(181,1,181,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (180:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(182,1,182,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (181:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(183,1,183,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (182:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(185,1,185,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (183:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(194,1,194,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (185:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(203,1,203,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (194:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(212,1,212,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (203:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(221,1,221,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (212:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(242,1,242,3): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (221:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. diff --git a/tests/fsharp/typecheck/sigs/neg69.vsbsl b/tests/fsharp/typecheck/sigs/neg69.vsbsl index 75e44001573..e0eea56c1d4 100644 --- a/tests/fsharp/typecheck/sigs/neg69.vsbsl +++ b/tests/fsharp/typecheck/sigs/neg69.vsbsl @@ -4,96 +4,66 @@ neg69.fsx(88,43,88,44): parse error FS1241: Expected type argument or static arg neg69.fsx(88,44,88,45): parse error FS0010: Unexpected symbol '>' in type definition. Expected '=' or other token. neg69.fsx(94,5,94,8): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (93:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(94,5,94,8): parse error FS0010: Unexpected keyword 'let' or 'use' in implementation file neg69.fsx(95,5,95,8): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (94:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(96,5,96,8): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (95:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(98,5,98,11): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (96:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(98,19,98,20): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (96:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(99,5,99,11): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (96:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(100,5,100,11): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (96:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(101,5,101,11): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (96:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(102,5,102,11): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (96:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(104,5,104,14): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (96:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(113,1,113,5): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (96:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(168,1,168,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (96:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(170,1,170,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (168:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(171,1,171,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (170:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(172,1,172,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (171:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(173,1,173,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (172:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(174,1,174,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (173:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(176,1,176,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (174:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(177,1,177,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (176:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(178,1,178,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (177:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(180,1,180,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (178:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(181,1,181,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (180:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(182,1,182,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (181:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(183,1,183,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (182:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(185,1,185,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (183:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(194,1,194,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (185:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(203,1,203,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (194:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(212,1,212,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (203:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(221,1,221,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (212:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(242,1,242,3): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (221:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg69.fsx(87,6,87,12): typecheck error FS0929: This type requires a definition diff --git a/tests/fsharp/typecheck/sigs/neg74.bsl b/tests/fsharp/typecheck/sigs/neg74.bsl index b4917792cfb..f67bcbd38bb 100644 --- a/tests/fsharp/typecheck/sigs/neg74.bsl +++ b/tests/fsharp/typecheck/sigs/neg74.bsl @@ -1,5 +1,4 @@ neg74.fsx(185,1,185,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (183:29). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg74.fsx(183,53,183,54): parse error FS3156: Unexpected token '+' or incomplete expression diff --git a/tests/fsharp/typecheck/sigs/neg74.vsbsl b/tests/fsharp/typecheck/sigs/neg74.vsbsl index b4917792cfb..f67bcbd38bb 100644 --- a/tests/fsharp/typecheck/sigs/neg74.vsbsl +++ b/tests/fsharp/typecheck/sigs/neg74.vsbsl @@ -1,5 +1,4 @@ neg74.fsx(185,1,185,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (183:29). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg74.fsx(183,53,183,54): parse error FS3156: Unexpected token '+' or incomplete expression diff --git a/tests/fsharp/typecheck/sigs/neg75.bsl b/tests/fsharp/typecheck/sigs/neg75.bsl index 11f78e08d29..3d0d6b6409c 100644 --- a/tests/fsharp/typecheck/sigs/neg75.bsl +++ b/tests/fsharp/typecheck/sigs/neg75.bsl @@ -1,5 +1,4 @@ neg75.fsx(154,24,154,27): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (153:38). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg75.fsx(153,79,153,80): parse error FS3156: Unexpected token '+' or incomplete expression diff --git a/tests/fsharp/typecheck/sigs/neg75.vsbsl b/tests/fsharp/typecheck/sigs/neg75.vsbsl index 11f78e08d29..3d0d6b6409c 100644 --- a/tests/fsharp/typecheck/sigs/neg75.vsbsl +++ b/tests/fsharp/typecheck/sigs/neg75.vsbsl @@ -1,5 +1,4 @@ neg75.fsx(154,24,154,27): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (153:38). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg75.fsx(153,79,153,80): parse error FS3156: Unexpected token '+' or incomplete expression diff --git a/tests/fsharp/typecheck/sigs/neg76.bsl b/tests/fsharp/typecheck/sigs/neg76.bsl index 4e96d3f044a..291d5f1d972 100644 --- a/tests/fsharp/typecheck/sigs/neg76.bsl +++ b/tests/fsharp/typecheck/sigs/neg76.bsl @@ -1,5 +1,4 @@ neg76.fsx(154,24,154,27): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (153:38). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg76.fsx(153,79,153,80): parse error FS3156: Unexpected token '*' or incomplete expression diff --git a/tests/fsharp/typecheck/sigs/neg76.vsbsl b/tests/fsharp/typecheck/sigs/neg76.vsbsl index 4e96d3f044a..291d5f1d972 100644 --- a/tests/fsharp/typecheck/sigs/neg76.vsbsl +++ b/tests/fsharp/typecheck/sigs/neg76.vsbsl @@ -1,5 +1,4 @@ neg76.fsx(154,24,154,27): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (153:38). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg76.fsx(153,79,153,80): parse error FS3156: Unexpected token '*' or incomplete expression diff --git a/tests/fsharp/typecheck/sigs/neg77.bsl b/tests/fsharp/typecheck/sigs/neg77.bsl index 8d21e0d775b..0faf3c89199 100644 --- a/tests/fsharp/typecheck/sigs/neg77.bsl +++ b/tests/fsharp/typecheck/sigs/neg77.bsl @@ -1,5 +1,4 @@ neg77.fsx(134,15,134,16): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (133:19). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg77.fsx(134,15,134,16): parse error FS0010: Incomplete structured construct at or before this point in expression diff --git a/tests/fsharp/typecheck/sigs/neg77.vsbsl b/tests/fsharp/typecheck/sigs/neg77.vsbsl index 536ab2db3de..a01edbb5d1e 100644 --- a/tests/fsharp/typecheck/sigs/neg77.vsbsl +++ b/tests/fsharp/typecheck/sigs/neg77.vsbsl @@ -1,6 +1,5 @@ neg77.fsx(134,15,134,16): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (133:19). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg77.fsx(134,15,134,16): parse error FS0010: Incomplete structured construct at or before this point in expression diff --git a/tests/fsharp/typecheck/sigs/neg81.bsl b/tests/fsharp/typecheck/sigs/neg81.bsl index 4e454a3c858..360ad962ff6 100644 --- a/tests/fsharp/typecheck/sigs/neg81.bsl +++ b/tests/fsharp/typecheck/sigs/neg81.bsl @@ -1,5 +1,4 @@ neg81.fsx(8,1,8,5): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (6:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg81.fsx(6,6,6,7): parse error FS3156: Unexpected token '+' or incomplete expression diff --git a/tests/fsharp/typecheck/sigs/neg81.vsbsl b/tests/fsharp/typecheck/sigs/neg81.vsbsl index 4e454a3c858..360ad962ff6 100644 --- a/tests/fsharp/typecheck/sigs/neg81.vsbsl +++ b/tests/fsharp/typecheck/sigs/neg81.vsbsl @@ -1,5 +1,4 @@ neg81.fsx(8,1,8,5): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (6:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg81.fsx(6,6,6,7): parse error FS3156: Unexpected token '+' or incomplete expression diff --git a/tests/fsharp/typecheck/sigs/neg82.bsl b/tests/fsharp/typecheck/sigs/neg82.bsl index 77e03fe479a..c63c76c0845 100644 --- a/tests/fsharp/typecheck/sigs/neg82.bsl +++ b/tests/fsharp/typecheck/sigs/neg82.bsl @@ -2,26 +2,19 @@ neg82.fsx(84,5,84,6): parse error FS0010: Unexpected symbol '|' in expression neg82.fsx(88,1,88,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (81:9). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg82.fsx(90,5,90,8): parse error FS0010: Incomplete structured construct at or before this point in expression. Expected incomplete structured construct at or before this point or other token. neg82.fsx(95,1,95,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (88:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg82.fsx(95,1,95,4): parse error FS0010: Unexpected keyword 'let' or 'use' in implementation file neg82.fsx(96,1,96,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (95:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg82.fsx(97,1,97,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (96:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg82.fsx(100,1,100,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (97:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg82.fsx(102,1,102,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (100:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg82.fsx(138,1,138,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (102:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. diff --git a/tests/fsharp/typecheck/sigs/neg82.vsbsl b/tests/fsharp/typecheck/sigs/neg82.vsbsl index af56fd45ac2..c0d5efe68ea 100644 --- a/tests/fsharp/typecheck/sigs/neg82.vsbsl +++ b/tests/fsharp/typecheck/sigs/neg82.vsbsl @@ -2,29 +2,22 @@ neg82.fsx(84,5,84,6): parse error FS0010: Unexpected symbol '|' in expression neg82.fsx(88,1,88,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (81:9). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg82.fsx(90,5,90,8): parse error FS0010: Incomplete structured construct at or before this point in expression. Expected incomplete structured construct at or before this point or other token. neg82.fsx(95,1,95,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (88:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg82.fsx(95,1,95,4): parse error FS0010: Unexpected keyword 'let' or 'use' in implementation file neg82.fsx(96,1,96,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (95:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg82.fsx(97,1,97,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (96:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg82.fsx(100,1,100,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (97:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg82.fsx(102,1,102,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (100:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg82.fsx(138,1,138,4): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (102:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg82.fsx(76,11,76,13): typecheck error FS0025: Incomplete pattern matches on this expression. For example, the value 'Horizontal (_, _)' may indicate a case not covered by the pattern(s). diff --git a/tests/fsharp/typecheck/sigs/neg83.bsl b/tests/fsharp/typecheck/sigs/neg83.bsl index b8858cfbe11..ebeb901c96b 100644 --- a/tests/fsharp/typecheck/sigs/neg83.bsl +++ b/tests/fsharp/typecheck/sigs/neg83.bsl @@ -2,9 +2,7 @@ neg83.fsx(10,5,10,6): parse error FS0010: Unexpected symbol '|' in expression neg83.fsx(13,1,13,2): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:4). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg83.fsx(13,2,13,5): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:4). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg83.fsx(16,1,16,1): parse error FS0010: Incomplete structured construct at or before this point in expression diff --git a/tests/fsharp/typecheck/sigs/neg83.vsbsl b/tests/fsharp/typecheck/sigs/neg83.vsbsl index 84ee39a23f5..fc217b74fe9 100644 --- a/tests/fsharp/typecheck/sigs/neg83.vsbsl +++ b/tests/fsharp/typecheck/sigs/neg83.vsbsl @@ -2,10 +2,8 @@ neg83.fsx(10,5,10,6): parse error FS0010: Unexpected symbol '|' in expression neg83.fsx(13,1,13,2): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:4). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg83.fsx(13,2,13,5): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:4). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg83.fsx(16,1,16,1): parse error FS0010: Incomplete structured construct at or before this point in expression diff --git a/tests/fsharp/typecheck/sigs/neg_anon_2.bsl b/tests/fsharp/typecheck/sigs/neg_anon_2.bsl index b8c33cdb475..b74cd93bed4 100644 --- a/tests/fsharp/typecheck/sigs/neg_anon_2.bsl +++ b/tests/fsharp/typecheck/sigs/neg_anon_2.bsl @@ -4,10 +4,8 @@ neg_anon_2.fs(6,38,6,39): parse error FS0010: Unexpected symbol '}' in binding. neg_anon_2.fs(6,29,6,31): parse error FS0605: Unmatched '{|' neg_anon_2.fs(8,5,8,8): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (6:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg_anon_2.fs(10,5,10,9): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (8:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg_anon_2.fs(10,5,10,9): parse error FS0010: Unexpected keyword 'type' in binding. Expected incomplete structured construct at or before this point or other token. diff --git a/tests/fsharp/typecheck/sigs/neg_anon_2.vsbsl b/tests/fsharp/typecheck/sigs/neg_anon_2.vsbsl index ca4db6fcfb7..eb34b56bd1f 100644 --- a/tests/fsharp/typecheck/sigs/neg_anon_2.vsbsl +++ b/tests/fsharp/typecheck/sigs/neg_anon_2.vsbsl @@ -4,10 +4,8 @@ neg_anon_2.fs(6,38,6,39): parse error FS0010: Unexpected symbol '}' in binding. neg_anon_2.fs(6,29,6,31): parse error FS0605: Unmatched '{|' neg_anon_2.fs(8,5,8,8): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (6:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg_anon_2.fs(10,5,10,9): parse error FS0058: Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (8:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. neg_anon_2.fs(10,5,10,9): parse error FS0010: Unexpected keyword 'type' in binding. Expected incomplete structured construct at or before this point or other token. 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 145364c43c1..c94a546574d 100644 --- a/tests/service/data/SyntaxTree/Expression/Binary - Plus 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Binary - Plus 02.fs.bsl @@ -23,5 +23,4 @@ ImplFile CodeComments = [] }, set [])) (4,0)-(4,0) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (3:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (3,2)-(3,3) parse error Unexpected token '+' or incomplete expression 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 6deea904868..e36078f80cc 100644 --- a/tests/service/data/SyntaxTree/Expression/Binary - Plus 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Binary - Plus 05.fs.bsl @@ -34,5 +34,4 @@ ImplFile CodeComments = [] }, set [])) (6,0)-(6,1) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (4,6)-(4,7) parse error Unexpected token '+' or incomplete expression diff --git a/tests/service/data/SyntaxTree/Expression/Do 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Do 03.fs.bsl index 4dacefd20d5..7b0614023db 100644 --- a/tests/service/data/SyntaxTree/Expression/Do 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Do 03.fs.bsl @@ -26,5 +26,4 @@ ImplFile CodeComments = [] }, set [])) (6,0)-(6,1) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (3:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (4,6)-(4,6) parse error Expecting expression diff --git a/tests/service/data/SyntaxTree/Expression/Downcast 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Downcast 01.fs.bsl index e090f188cc3..f20132e9a61 100644 --- a/tests/service/data/SyntaxTree/Expression/Downcast 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Downcast 01.fs.bsl @@ -13,5 +13,4 @@ ImplFile CodeComments = [] }, set [])) (4,0)-(4,0) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (3:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (4,0)-(4,0) parse error Incomplete structured construct at or before this point in expression diff --git a/tests/service/data/SyntaxTree/Expression/For 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/For 03.fs.bsl index 1dcae506443..bf587abbeb5 100644 --- a/tests/service/data/SyntaxTree/Expression/For 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/For 03.fs.bsl @@ -28,5 +28,4 @@ ImplFile CodeComments = [] }, set [])) (6,0)-(6,1) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (6,0)-(6,1) parse error Incomplete structured construct at or before this point in expression diff --git a/tests/service/data/SyntaxTree/Expression/If 05.fs.bsl b/tests/service/data/SyntaxTree/Expression/If 05.fs.bsl index b890559871b..eb42079eec0 100644 --- a/tests/service/data/SyntaxTree/Expression/If 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/If 05.fs.bsl @@ -21,5 +21,4 @@ ImplFile CodeComments = [] }, set [])) (5,0)-(5,1) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (3:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (5,0)-(5,1) parse error Expecting expression diff --git a/tests/service/data/SyntaxTree/Expression/If 06.fs.bsl b/tests/service/data/SyntaxTree/Expression/If 06.fs.bsl index e1d1405077e..7c5b1a9491c 100644 --- a/tests/service/data/SyntaxTree/Expression/If 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/If 06.fs.bsl @@ -27,5 +27,4 @@ ImplFile CodeComments = [] }, set [])) (6,0)-(6,4) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (6,0)-(6,4) parse error Expecting expression diff --git a/tests/service/data/SyntaxTree/Expression/If 10.fs.bsl b/tests/service/data/SyntaxTree/Expression/If 10.fs.bsl index edf40c04710..ebf20412664 100644 --- a/tests/service/data/SyntaxTree/Expression/If 10.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/If 10.fs.bsl @@ -33,5 +33,4 @@ ImplFile CodeComments = [] }, set [])) (6,0)-(6,1) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (6,0)-(6,1) parse error Expecting expression diff --git a/tests/service/data/SyntaxTree/Expression/If 11.fs.bsl b/tests/service/data/SyntaxTree/Expression/If 11.fs.bsl index 905054b3f44..1fb569378ca 100644 --- a/tests/service/data/SyntaxTree/Expression/If 11.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/If 11.fs.bsl @@ -37,6 +37,5 @@ ImplFile CodeComments = [] }, set [])) (6,4)-(6,5) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (4,12)-(4,14) parse error Unexpected token '&&' or incomplete expression (4,4)-(4,6) parse error Incomplete conditional. Expected 'if then ' or 'if then else '. diff --git a/tests/service/data/SyntaxTree/Expression/If 12.fs.bsl b/tests/service/data/SyntaxTree/Expression/If 12.fs.bsl index 42d610056cb..0138af46bc4 100644 --- a/tests/service/data/SyntaxTree/Expression/If 12.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/If 12.fs.bsl @@ -33,6 +33,5 @@ ImplFile CodeComments = [] }, set [])) (6,0)-(6,1) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (4,12)-(4,14) parse error Unexpected token '&&' or incomplete expression (4,4)-(4,6) parse error Incomplete conditional. Expected 'if then ' or 'if then else '. diff --git a/tests/service/data/SyntaxTree/Expression/If 14.fs.bsl b/tests/service/data/SyntaxTree/Expression/If 14.fs.bsl index 6a79bb6b7ae..42f6bf18770 100644 --- a/tests/service/data/SyntaxTree/Expression/If 14.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/If 14.fs.bsl @@ -37,6 +37,5 @@ ImplFile CodeComments = [] }, set [])) (6,4)-(6,5) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (4,12)-(4,14) parse error Unexpected token '==' or incomplete expression (4,4)-(4,6) parse error Incomplete conditional. Expected 'if then ' or 'if then else '. 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 db52b133a52..d8985f3c700 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 @@ -22,5 +22,4 @@ ImplFile CodeComments = [] }, set [])) (4,0)-(4,0) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (1:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (3,0)-(3,8) parse error Missing function body diff --git a/tests/service/data/SyntaxTree/Expression/Lazy 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Lazy 03.fs.bsl index 50283d947be..712cdb177e8 100644 --- a/tests/service/data/SyntaxTree/Expression/Lazy 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Lazy 03.fs.bsl @@ -26,5 +26,4 @@ ImplFile CodeComments = [] }, set [])) (6,0)-(6,1) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (6,0)-(6,1) parse error Expecting expression diff --git a/tests/service/data/SyntaxTree/Expression/Let 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Let 02.fs.bsl index 79a7938b21c..16cd84421d7 100644 --- a/tests/service/data/SyntaxTree/Expression/Let 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Let 02.fs.bsl @@ -24,5 +24,4 @@ ImplFile CodeComments = [] }, set [])) (5,0)-(5,1) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (3:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (5,0)-(5,1) parse error Incomplete structured construct at or before this point in binding 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 eeb2063d6ac..af95daa6366 100644 --- a/tests/service/data/SyntaxTree/Expression/Object - Class 11.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Object - Class 11.fs.bsl @@ -63,5 +63,4 @@ ImplFile CodeComments = [] }, set [])) (5,5)-(5,11) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:6). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (5,5)-(5,11) parse error Expecting expression diff --git a/tests/service/data/SyntaxTree/Expression/Set 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/Set 04.fs.bsl index 2224bb7089a..6354b107bfb 100644 --- a/tests/service/data/SyntaxTree/Expression/Set 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Set 04.fs.bsl @@ -27,5 +27,4 @@ ImplFile CodeComments = [] }, set [])) (6,0)-(6,1) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (6,0)-(6,1) parse error Expecting expression 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 9a3f520f603..5329d9bc147 100644 --- a/tests/service/data/SyntaxTree/Expression/Try - Finally 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try - Finally 04.fs.bsl @@ -31,5 +31,4 @@ ImplFile CodeComments = [] }, set [])) (7,0)-(7,1) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (7,0)-(7,1) parse error Expecting expression 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 eb43b43e8ef..963a8538740 100644 --- a/tests/service/data/SyntaxTree/Expression/Try - With 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try - With 04.fs.bsl @@ -36,5 +36,4 @@ ImplFile CodeComments = [] }, set [])) (7,0)-(7,1) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (7,0)-(7,1) parse error Incomplete structured construct at or before this point in pattern matching 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 e07b5e0d1d7..5d7a2825d27 100644 --- a/tests/service/data/SyntaxTree/Expression/Try - With 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try - With 06.fs.bsl @@ -29,5 +29,4 @@ ImplFile CodeComments = [] }, set [])) (7,0)-(7,1) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (7,0)-(7,1) parse error Incomplete structured construct at or before this point in expression diff --git a/tests/service/data/SyntaxTree/Expression/Try 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try 02.fs.bsl index 9c2a801dc89..381de96e340 100644 --- a/tests/service/data/SyntaxTree/Expression/Try 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Try 02.fs.bsl @@ -30,5 +30,4 @@ ImplFile CodeComments = [] }, set [])) (6,0)-(6,1) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (6,0)-(6,1) parse error Expecting expression 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 0ee1ddcecc9..d206b782c0a 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 @@ -24,6 +24,5 @@ ImplFile CodeComments = [] }, set [])) (5,0)-(5,0) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (3:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (5,0)-(5,0) parse error Incomplete structured construct at or before this point in pattern matching (4,0)-(4,4) parse error Expecting expression 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 7fe035f2d55..d2caf41ea24 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 @@ -19,5 +19,4 @@ ImplFile CodeComments = [] }, set [])) (4,0)-(4,0) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (3:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (4,0)-(4,0) parse error Expecting expression 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 4626a7a68a3..eee88a85afd 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 @@ -20,6 +20,5 @@ ImplFile CodeComments = [] }, set [])) (4,0)-(4,0) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (1:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (3,2)-(3,3) parse error Expected an expression after this point (3,0)-(3,1) parse error Unmatched '(' 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 2595dd0fc1a..c763b94b616 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 @@ -28,5 +28,4 @@ ImplFile CodeComments = [] }, set [])) (4,0)-(4,0) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (3:9). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (3,9)-(3,10) parse error Expected an expression after this point diff --git a/tests/service/data/SyntaxTree/Expression/Upcast 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Upcast 01.fs.bsl index 3a61bc5ca0e..1e1e97f753e 100644 --- a/tests/service/data/SyntaxTree/Expression/Upcast 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Upcast 01.fs.bsl @@ -13,5 +13,4 @@ ImplFile CodeComments = [] }, set [])) (4,0)-(4,0) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (3:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (4,0)-(4,0) parse error Incomplete structured construct at or before this point in expression diff --git a/tests/service/data/SyntaxTree/Expression/Upcast 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/Upcast 04.fs.bsl index ea64ddbe559..1398f23dee9 100644 --- a/tests/service/data/SyntaxTree/Expression/Upcast 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Upcast 04.fs.bsl @@ -15,5 +15,4 @@ ImplFile CodeComments = [] }, set [])) (5,0)-(5,1) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (5,0)-(5,1) parse error Incomplete structured construct at or before this point in expression diff --git a/tests/service/data/SyntaxTree/Expression/Upcast 05.fs.bsl b/tests/service/data/SyntaxTree/Expression/Upcast 05.fs.bsl index 78cddea4a93..c881b8e0362 100644 --- a/tests/service/data/SyntaxTree/Expression/Upcast 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/Upcast 05.fs.bsl @@ -14,5 +14,4 @@ ImplFile CodeComments = [] }, set [])) (5,0)-(5,1) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (5,0)-(5,1) parse error Incomplete structured construct at or before this point in expression diff --git a/tests/service/data/SyntaxTree/Expression/While 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/While 03.fs.bsl index 388e60dbb47..5385322d7ea 100644 --- a/tests/service/data/SyntaxTree/Expression/While 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/While 03.fs.bsl @@ -26,5 +26,4 @@ ImplFile CodeComments = [] }, set [])) (6,0)-(6,1) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (6,0)-(6,1) parse error Incomplete structured construct at or before this point in expression diff --git a/tests/service/data/SyntaxTree/Expression/While 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/While 04.fs.bsl index cb31897188d..ecdba40ba92 100644 --- a/tests/service/data/SyntaxTree/Expression/While 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/While 04.fs.bsl @@ -25,5 +25,4 @@ ImplFile CodeComments = [] }, set [])) (5,0)-(5,0) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (5,0)-(5,0) parse error Incomplete structured construct at or before this point in expression diff --git a/tests/service/data/SyntaxTree/Expression/WhileBang 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/WhileBang 03.fs.bsl index c9ce876b390..eceeb3dc1c8 100644 --- a/tests/service/data/SyntaxTree/Expression/WhileBang 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/WhileBang 03.fs.bsl @@ -35,5 +35,4 @@ ImplFile CodeComments = [] }, set [])) (6,0)-(6,1) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (6,0)-(6,1) parse error Incomplete structured construct at or before this point in expression diff --git a/tests/service/data/SyntaxTree/Expression/WhileBang 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/WhileBang 04.fs.bsl index 90038fb639e..e83fa41d384 100644 --- a/tests/service/data/SyntaxTree/Expression/WhileBang 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Expression/WhileBang 04.fs.bsl @@ -34,5 +34,4 @@ ImplFile CodeComments = [] }, set [])) (5,0)-(5,0) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (5,0)-(5,0) parse error Incomplete structured construct at or before this point in expression 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 d3974f75b62..00c9bdae95d 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 @@ -21,9 +21,7 @@ ImplFile CodeComments = [BlockComment (3,5--3,33)] }, set [])) (2,0)-(2,1) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (1:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (2,0)-(2,1) parse error Expecting expression (3,0)-(3,36) parse error Unexpected keyword 'elif' in implementation file (4,0)-(4,1) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (3:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (1,0)-(2,0) parse warning The declarations in this file will be placed in an implicit module 'Comment after else 02' based on the file name 'Comment after else 02.fs'. However this is not a valid F# identifier, so the contents will not be accessible from other files. Consider renaming the file or adding a 'module' or 'namespace' declaration at the top of the file. 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 ad4bd5152d4..abc42c4ee26 100644 --- a/tests/service/data/SyntaxTree/MatchClause/Missing expr 02.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/Missing expr 02.fs.bsl @@ -22,5 +22,4 @@ ImplFile CodeComments = [] }, set [])) (5,0)-(5,0) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (3:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (5,0)-(5,0) parse error Incomplete structured construct at or before this point in pattern matching 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 f84c19d5a60..877848c740b 100644 --- a/tests/service/data/SyntaxTree/MatchClause/Missing expr 05.fs.bsl +++ b/tests/service/data/SyntaxTree/MatchClause/Missing expr 05.fs.bsl @@ -33,5 +33,4 @@ ImplFile CodeComments = [] }, set [])) (7,0)-(7,1) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (7,0)-(7,1) parse error Incomplete structured construct at or before this point in pattern matching 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 2ac250de233..07d51906c13 100644 --- a/tests/service/data/SyntaxTree/Member/Abstract - Property 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Abstract - Property 03.fs.bsl @@ -44,5 +44,4 @@ ImplFile CodeComments = [] }, set [])) (6,0)-(6,1) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (6,0)-(6,1) parse error Incomplete structured construct at or before this point in property definition. Expected identifier, '(', '(*)' or other token. 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 a208af54581..e9388ad2eca 100644 --- a/tests/service/data/SyntaxTree/Member/Abstract - Property 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Abstract - Property 04.fs.bsl @@ -43,5 +43,4 @@ ImplFile CodeComments = [] }, set [])) (6,0)-(6,1) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (4,20)-(4,24) parse error Identifier expected 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 6ad8da57115..453337e9c1d 100644 --- a/tests/service/data/SyntaxTree/Member/Abstract - Property 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Abstract - Property 05.fs.bsl @@ -63,5 +63,4 @@ ImplFile CodeComments = [] }, set [])) (5,4)-(5,12) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (4,21)-(4,25) parse error Identifier expected 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 cd6d84a1903..cea938842b8 100644 --- a/tests/service/data/SyntaxTree/Member/Auto property 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Auto property 02.fs.bsl @@ -46,5 +46,4 @@ ImplFile CodeComments = [] }, set [])) (6,0)-(6,1) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (6,0)-(6,1) parse error Expecting expression 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 499e1c4c6ec..80d0d805119 100644 --- a/tests/service/data/SyntaxTree/Member/Auto property 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Auto property 03.fs.bsl @@ -68,5 +68,4 @@ ImplFile CodeComments = [] }, set [])) (5,4)-(5,10) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (5,4)-(5,10) parse error Expecting expression 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 eff63393708..5f1a9c86844 100644 --- a/tests/service/data/SyntaxTree/Member/Auto property 08.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Auto property 08.fs.bsl @@ -45,5 +45,4 @@ ImplFile CodeComments = [] }, set [])) (6,0)-(6,1) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:22). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (6,0)-(6,1) parse error Incomplete structured construct at or before this point in property definition. Expected identifier, '(', '(*)' or other token. 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 cbb94cfd556..1051d50be3f 100644 --- a/tests/service/data/SyntaxTree/Member/Auto property 09.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Auto property 09.fs.bsl @@ -68,5 +68,4 @@ ImplFile CodeComments = [] }, set [])) (5,4)-(5,10) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:23). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (5,4)-(5,10) parse error Incomplete structured construct at or before this point in property definition. Expected identifier, '(', '(*)' or other token. 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 faddd5d4fdd..3f9146bf5be 100644 --- a/tests/service/data/SyntaxTree/Member/Auto property 10.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Auto property 10.fs.bsl @@ -44,5 +44,4 @@ ImplFile CodeComments = [] }, set [])) (5,0)-(5,0) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:22). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (5,0)-(5,0) parse error Incomplete structured construct at or before this point in property definition. Expected identifier, '(', '(*)' or other token. 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 80e694f5424..4156e496244 100644 --- a/tests/service/data/SyntaxTree/Member/Auto property 12.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Auto property 12.fs.bsl @@ -44,7 +44,5 @@ ImplFile CodeComments = [] }, set [])) (4,21)-(4,25) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (6,0)-(6,1) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (4,21)-(4,25) parse error Identifier expected 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 d6522b75532..9a86d1dabaf 100644 --- a/tests/service/data/SyntaxTree/Member/Auto property 13.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Auto property 13.fs.bsl @@ -67,7 +67,5 @@ ImplFile CodeComments = [] }, set [])) (4,21)-(4,25) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (5,4)-(5,10) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (4,21)-(4,25) parse error Identifier expected diff --git a/tests/service/data/SyntaxTree/Member/Do 03.fs.bsl b/tests/service/data/SyntaxTree/Member/Do 03.fs.bsl index eb75b56a51d..6defeb3fc49 100644 --- a/tests/service/data/SyntaxTree/Member/Do 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Do 03.fs.bsl @@ -48,5 +48,4 @@ ImplFile CodeComments = [] }, set [])) (7,4)-(7,6) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (5:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (5,13)-(5,13) parse error Expecting expression diff --git a/tests/service/data/SyntaxTree/Member/Do 04.fs.bsl b/tests/service/data/SyntaxTree/Member/Do 04.fs.bsl index 2c6ac32e12e..0a32c187243 100644 --- a/tests/service/data/SyntaxTree/Member/Do 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Do 04.fs.bsl @@ -46,5 +46,4 @@ ImplFile CodeComments = [] }, set [])) (7,4)-(7,6) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (5:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (5,6)-(5,6) parse error Expecting expression diff --git a/tests/service/data/SyntaxTree/Member/Interface 02.fs.bsl b/tests/service/data/SyntaxTree/Member/Interface 02.fs.bsl index 7d67643e0fa..a6e8c38de3c 100644 --- a/tests/service/data/SyntaxTree/Member/Interface 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Interface 02.fs.bsl @@ -48,4 +48,3 @@ ImplFile CodeComments = [] }, set [])) (6,4)-(6,21) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. diff --git a/tests/service/data/SyntaxTree/Member/Interface 06.fs.bsl b/tests/service/data/SyntaxTree/Member/Interface 06.fs.bsl index 2552febe621..15fc3f40c4a 100644 --- a/tests/service/data/SyntaxTree/Member/Interface 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Interface 06.fs.bsl @@ -38,4 +38,3 @@ ImplFile CodeComments = [] }, set [])) (6,4)-(6,14) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. diff --git a/tests/service/data/SyntaxTree/Member/Let 02.fs.bsl b/tests/service/data/SyntaxTree/Member/Let 02.fs.bsl index 00844e3bd36..d2e863de852 100644 --- a/tests/service/data/SyntaxTree/Member/Let 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Let 02.fs.bsl @@ -47,5 +47,4 @@ ImplFile CodeComments = [] }, set [])) (7,4)-(7,6) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (5:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (7,4)-(7,6) parse error Incomplete structured construct at or before this point in binding diff --git a/tests/service/data/SyntaxTree/Member/Member 05.fs.bsl b/tests/service/data/SyntaxTree/Member/Member 05.fs.bsl index 9f480a45c60..256a0147888 100644 --- a/tests/service/data/SyntaxTree/Member/Member 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Member 05.fs.bsl @@ -113,5 +113,4 @@ ImplFile CodeComments = [] }, set [])) (6,4)-(6,6) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (5:11). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (6,4)-(6,6) parse error Expecting expression diff --git a/tests/service/data/SyntaxTree/ModuleMember/Do 01.fs.bsl b/tests/service/data/SyntaxTree/ModuleMember/Do 01.fs.bsl index b7e8db2446d..d69a7bbc38d 100644 --- a/tests/service/data/SyntaxTree/ModuleMember/Do 01.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleMember/Do 01.fs.bsl @@ -15,5 +15,4 @@ ImplFile CodeComments = [] }, set [])) (5,0)-(5,1) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (3:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (3,2)-(3,2) parse error Expecting expression diff --git a/tests/service/data/SyntaxTree/ModuleMember/Do 02.fs.bsl b/tests/service/data/SyntaxTree/ModuleMember/Do 02.fs.bsl index 6838d51523f..04b98eb8b7d 100644 --- a/tests/service/data/SyntaxTree/ModuleMember/Do 02.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleMember/Do 02.fs.bsl @@ -15,5 +15,4 @@ ImplFile CodeComments = [] }, set [])) (4,0)-(4,4) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (3:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (4,0)-(4,4) parse error Expecting expression diff --git a/tests/service/data/SyntaxTree/ModuleMember/Let 02.fs.bsl b/tests/service/data/SyntaxTree/ModuleMember/Let 02.fs.bsl index a463512f96a..438b52a84ce 100644 --- a/tests/service/data/SyntaxTree/ModuleMember/Let 02.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleMember/Let 02.fs.bsl @@ -24,5 +24,4 @@ ImplFile CodeComments = [] }, set [])) (5,0)-(5,1) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (3:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (5,0)-(5,1) parse error Incomplete structured construct at or before this point in binding diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 04.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 04.fs.bsl index ec78caa48c3..5a2569e2426 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 04.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Module 04.fs.bsl @@ -12,10 +12,6 @@ ImplFile CodeComments = [] }, set [])) (3,0)-(3,1) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (1:3). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (3,0)-(3,1) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (1:3). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (3,1)-(3,2) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (1:3). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (3,0)-(3,1) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (1:3). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. 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 9724fa99d55..c14ada26001 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 02.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 02.fs.bsl @@ -19,5 +19,4 @@ ImplFile CodeComments = [] }, set [])) (5,0)-(5,1) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (3:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (5,0)-(5,1) parse error Incomplete structured construct at or before this point in definition 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 c4e7b8b3451..e1090ee682a 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 09.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 09.fs.bsl @@ -26,5 +26,4 @@ ImplFile CodeComments = [] }, set [])) (6,4)-(6,5) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (6,4)-(6,5) parse error Incomplete structured construct at or before this point in definition 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 d79064e294f..54c0b7139ae 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 14.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 14.fs.bsl @@ -18,5 +18,4 @@ ImplFile CodeComments = [] }, set [])) (4,0)-(4,0) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (3:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (4,0)-(4,0) parse error Incomplete structured construct at or before this point in definition 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 f837a3cf675..ecfd9b6f223 100644 --- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 15.fs.bsl +++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Nested module 15.fs.bsl @@ -17,5 +17,4 @@ ImplFile CodeComments = [] }, set [])) (4,0)-(4,0) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (3:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (4,0)-(4,0) parse error Incomplete structured construct at or before this point in definition 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 27fbcf69530..14aaac27c2e 100644 --- a/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 01.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 01.fs.bsl @@ -27,7 +27,6 @@ ImplFile CodeComments = [] }, set [])) (5,0)-(5,0) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (3:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (5,0)-(5,0) parse error Incomplete structured construct at or before this point in binding (4,8)-(4,9) parse error Expecting pattern (5,0)-(5,0) parse error Unexpected end of input in value, function or member definition 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 12a43f5fd10..491197add18 100644 --- a/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 02.fs.bsl @@ -28,7 +28,6 @@ ImplFile CodeComments = [] }, set [])) (4,0)-(4,0) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (3:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (4,0)-(4,0) parse error Incomplete structured construct at or before this point in binding (4,0)-(4,0) parse error Unexpected end of input in value, function or member definition (3,0)-(3,3) parse error Incomplete value or function definition. If this is in an expression, the body of the expression must be indented to the same column as the 'let' keyword. diff --git a/tests/service/data/SyntaxTree/Type/And 06.fs.bsl b/tests/service/data/SyntaxTree/Type/And 06.fs.bsl index 88650dda065..d890eff6034 100644 --- a/tests/service/data/SyntaxTree/Type/And 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/And 06.fs.bsl @@ -32,5 +32,4 @@ ImplFile CodeComments = [] }, set [])) (6,0)-(6,0) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (3:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (5,4)-(5,7) parse error A type definition requires one or more members or other declarations. If you intend to define an empty class, struct or interface, then use 'type ... = class end', 'interface end' or 'struct end'. diff --git a/tests/service/data/SyntaxTree/Type/Interface 05.fs.bsl b/tests/service/data/SyntaxTree/Type/Interface 05.fs.bsl index e6801e0c2fc..39d0743692d 100644 --- a/tests/service/data/SyntaxTree/Type/Interface 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Interface 05.fs.bsl @@ -9,6 +9,5 @@ ImplFile CodeComments = [] }, set [])) (7,0)-(7,1) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (3:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (7,0)-(7,1) parse error Unexpected symbol '(' in type definition (4,4)-(4,13) parse error Unmatched 'class', 'interface' or 'struct' diff --git a/tests/service/data/SyntaxTree/Type/Interface 06.fs.bsl b/tests/service/data/SyntaxTree/Type/Interface 06.fs.bsl index fcb667c6f0a..4e8e6f9f31d 100644 --- a/tests/service/data/SyntaxTree/Type/Interface 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Interface 06.fs.bsl @@ -9,6 +9,5 @@ ImplFile CodeComments = [] }, set [])) (6,0)-(6,1) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (3:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (6,0)-(6,1) parse error Unexpected symbol '(' in type definition (3,9)-(3,18) parse error Unmatched 'class', 'interface' or 'struct' 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 057d2f4c5b5..7da848e85d2 100644 --- a/tests/service/data/SyntaxTree/Type/Primary ctor 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Primary ctor 04.fs.bsl @@ -30,5 +30,4 @@ ImplFile CodeComments = [] }, set [])) (4,0)-(4,0) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (3:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (3,5)-(3,7) parse error A type definition requires one or more members or other declarations. If you intend to define an empty class, struct or interface, then use 'type ... = class end', 'interface end' or 'struct end'. diff --git a/tests/service/data/SyntaxTree/Type/Type 06.fs.bsl b/tests/service/data/SyntaxTree/Type/Type 06.fs.bsl index 9fbbe27cb68..8850ddee773 100644 --- a/tests/service/data/SyntaxTree/Type/Type 06.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Type 06.fs.bsl @@ -20,6 +20,5 @@ ImplFile CodeComments = [] }, set [])) (4,0)-(4,0) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (3:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (3,5)-(3,6) parse error Unexpected symbol '=' in type name (3,5)-(3,6) parse error A type definition requires one or more members or other declarations. If you intend to define an empty class, struct or interface, then use 'type ... = class end', 'interface end' or 'struct end'. diff --git a/tests/service/data/SyntaxTree/Type/Union 03.fs.bsl b/tests/service/data/SyntaxTree/Type/Union 03.fs.bsl index 9623dd96ac7..143718f6cae 100644 --- a/tests/service/data/SyntaxTree/Type/Union 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Union 03.fs.bsl @@ -40,5 +40,4 @@ ImplFile CodeComments = [] }, set [])) (5,0)-(5,0) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (5,0)-(5,0) parse error Incomplete structured construct at or before this point in union case diff --git a/tests/service/data/SyntaxTree/Type/Union 04.fs.bsl b/tests/service/data/SyntaxTree/Type/Union 04.fs.bsl index a83e76cb5a0..b2400b2ded9 100644 --- a/tests/service/data/SyntaxTree/Type/Union 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/Union 04.fs.bsl @@ -47,5 +47,4 @@ ImplFile CodeComments = [] }, set [])) (5,0)-(5,0) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (4:5). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (5,0)-(5,0) parse error Incomplete structured construct at or before this point in union case diff --git a/tests/service/data/SyntaxTree/Type/With 02.fs.bsl b/tests/service/data/SyntaxTree/Type/With 02.fs.bsl index f319074e37e..c877d126a1d 100644 --- a/tests/service/data/SyntaxTree/Type/With 02.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/With 02.fs.bsl @@ -20,5 +20,4 @@ ImplFile CodeComments = [] }, set [])) (4,0)-(4,6) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (3:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (4,0)-(4,6) parse error Unexpected keyword 'member' in definition. Expected incomplete structured construct at or before this point or other token. diff --git a/tests/service/data/SyntaxTree/Type/With 03.fs.bsl b/tests/service/data/SyntaxTree/Type/With 03.fs.bsl index 197d6d3efc9..ae8767fd547 100644 --- a/tests/service/data/SyntaxTree/Type/With 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/With 03.fs.bsl @@ -21,4 +21,3 @@ ImplFile CodeComments = [] }, set [])) (5,0)-(5,1) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (3:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. diff --git a/tests/service/data/SyntaxTree/Type/With 05.fs.bsl b/tests/service/data/SyntaxTree/Type/With 05.fs.bsl index 8dedec200dd..80d7ab2967f 100644 --- a/tests/service/data/SyntaxTree/Type/With 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Type/With 05.fs.bsl @@ -27,5 +27,4 @@ ImplFile CodeComments = [] }, set [])) (6,0)-(6,6) parse error Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (3:1). Try indenting this further. -To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7. (6,0)-(6,6) parse error Unexpected keyword 'member' in definition. Expected incomplete structured construct at or before this point or other token. diff --git a/vsintegration/src/FSharp.Editor/AutomaticCompletion/BraceCompletionSessionProvider.fs b/vsintegration/src/FSharp.Editor/AutomaticCompletion/BraceCompletionSessionProvider.fs index c73e85c3a58..a2ed5ad4c35 100644 --- a/vsintegration/src/FSharp.Editor/AutomaticCompletion/BraceCompletionSessionProvider.fs +++ b/vsintegration/src/FSharp.Editor/AutomaticCompletion/BraceCompletionSessionProvider.fs @@ -505,7 +505,6 @@ type EditorBraceCompletionSessionFactory() = Some(document.FilePath), [], None, - None, colorizationData, cancellationToken ) diff --git a/vsintegration/src/FSharp.Editor/Classification/ClassificationService.fs b/vsintegration/src/FSharp.Editor/Classification/ClassificationService.fs index 93cc2cb4a21..738003d5e3a 100644 --- a/vsintegration/src/FSharp.Editor/Classification/ClassificationService.fs +++ b/vsintegration/src/FSharp.Editor/Classification/ClassificationService.fs @@ -166,7 +166,7 @@ type internal FSharpClassificationService [] () = let! cancellationToken = CancellableTask.getCancellationToken () - let defines, langVersion, strictIndentation = document.GetFsharpParsingOptions() + let defines, langVersion = document.GetFsharpParsingOptions() let! sourceText = document.GetTextAsync(cancellationToken) @@ -199,7 +199,6 @@ type internal FSharpClassificationService [] () = Some(document.FilePath), defines, Some langVersion, - strictIndentation, result, cancellationToken ) diff --git a/vsintegration/src/FSharp.Editor/CodeFixes/AddMissingFunKeyword.fs b/vsintegration/src/FSharp.Editor/CodeFixes/AddMissingFunKeyword.fs index adc0cc8db01..6bf20092c36 100644 --- a/vsintegration/src/FSharp.Editor/CodeFixes/AddMissingFunKeyword.fs +++ b/vsintegration/src/FSharp.Editor/CodeFixes/AddMissingFunKeyword.fs @@ -52,7 +52,7 @@ type internal AddMissingFunKeywordCodeFixProvider [] () = let! cancellationToken = CancellableTask.getCancellationToken () let document = context.Document - let! defines, langVersion, strictIndentation = + let! defines, langVersion = document.GetFsharpParsingOptionsAsync(nameof AddMissingFunKeywordCodeFixProvider) let! sourceText = context.GetSourceTextAsync() @@ -69,7 +69,6 @@ type internal AddMissingFunKeywordCodeFixProvider [] () = false, false, Some langVersion, - strictIndentation, cancellationToken ) |> ValueOption.ofOption diff --git a/vsintegration/src/FSharp.Editor/CodeFixes/AddMissingRecToMutuallyRecFunctions.fs b/vsintegration/src/FSharp.Editor/CodeFixes/AddMissingRecToMutuallyRecFunctions.fs index 0a601af0e55..91f796121b5 100644 --- a/vsintegration/src/FSharp.Editor/CodeFixes/AddMissingRecToMutuallyRecFunctions.fs +++ b/vsintegration/src/FSharp.Editor/CodeFixes/AddMissingRecToMutuallyRecFunctions.fs @@ -26,7 +26,7 @@ type internal AddMissingRecToMutuallyRecFunctionsCodeFixProvider [ ValueOption.ofOption diff --git a/vsintegration/src/FSharp.Editor/CodeFixes/AddOpenCodeFixProvider.fs b/vsintegration/src/FSharp.Editor/CodeFixes/AddOpenCodeFixProvider.fs index 77727c18684..57bca908da6 100644 --- a/vsintegration/src/FSharp.Editor/CodeFixes/AddOpenCodeFixProvider.fs +++ b/vsintegration/src/FSharp.Editor/CodeFixes/AddOpenCodeFixProvider.fs @@ -118,7 +118,7 @@ type internal AddOpenCodeFixProvider [] (assemblyContentPr let line = sourceText.Lines.GetLineFromPosition(context.Span.End) let linePos = sourceText.Lines.GetLinePosition(context.Span.End) - let! defines, langVersion, strictIndentation = document.GetFsharpParsingOptionsAsync(nameof AddOpenCodeFixProvider) + let! defines, langVersion = document.GetFsharpParsingOptionsAsync(nameof AddOpenCodeFixProvider) return Tokenizer.getSymbolAtPosition ( @@ -131,7 +131,6 @@ type internal AddOpenCodeFixProvider [] (assemblyContentPr false, false, Some langVersion, - strictIndentation, context.CancellationToken ) |> Option.filter (fun lexerSymbol -> diff --git a/vsintegration/src/FSharp.Editor/CodeFixes/ImplementInterface.fs b/vsintegration/src/FSharp.Editor/CodeFixes/ImplementInterface.fs index 92f0c0077d7..55e58e6d27e 100644 --- a/vsintegration/src/FSharp.Editor/CodeFixes/ImplementInterface.fs +++ b/vsintegration/src/FSharp.Editor/CodeFixes/ImplementInterface.fs @@ -197,7 +197,6 @@ type internal ImplementInterfaceCodeFixProvider [] () = context.Document.FilePath, defines, langVersionOpt, - parsingOptions.StrictIndentation, cancellationToken ) @@ -245,7 +244,6 @@ type internal ImplementInterfaceCodeFixProvider [] () = false, false, langVersionOpt, - parsingOptions.StrictIndentation, cancellationToken ) diff --git a/vsintegration/src/FSharp.Editor/Commands/HelpContextService.fs b/vsintegration/src/FSharp.Editor/Commands/HelpContextService.fs index eefb7eab8df..b68676989de 100644 --- a/vsintegration/src/FSharp.Editor/Commands/HelpContextService.fs +++ b/vsintegration/src/FSharp.Editor/Commands/HelpContextService.fs @@ -112,7 +112,7 @@ type internal FSharpHelpContextService [] () = let! cancellationToken = CancellableTask.getCancellationToken () let! sourceText = document.GetTextAsync(cancellationToken) - let defines, langVersion, strictIndentation = document.GetFsharpParsingOptions() + let defines, langVersion = document.GetFsharpParsingOptions() let textLine = sourceText.Lines.GetLineFromPosition(textSpan.Start) @@ -125,7 +125,6 @@ type internal FSharpHelpContextService [] () = Some document.Name, defines, Some langVersion, - strictIndentation, classifiedSpans, cancellationToken ) diff --git a/vsintegration/src/FSharp.Editor/Completion/CompletionProvider.fs b/vsintegration/src/FSharp.Editor/Completion/CompletionProvider.fs index fa7db6ec835..21e926075c1 100644 --- a/vsintegration/src/FSharp.Editor/Completion/CompletionProvider.fs +++ b/vsintegration/src/FSharp.Editor/Completion/CompletionProvider.fs @@ -129,14 +129,13 @@ type internal FSharpCompletionProvider then false else - let documentId, filePath, defines, langVersion, strictIndentation = getInfo () + let documentId, filePath, defines, langVersion = getInfo () CompletionUtils.shouldProvideCompletion ( documentId, filePath, defines, langVersion, - strictIndentation, sourceText, triggerPosition, cancellationToken @@ -303,9 +302,9 @@ type internal FSharpCompletionProvider let documentId = workspace.GetDocumentIdInCurrentContext(sourceText.Container) let document = workspace.CurrentSolution.GetDocument(documentId) - let defines, langVersion, strictIndentation = document.GetFsharpParsingOptions() + let defines, langVersion = document.GetFsharpParsingOptions() - (documentId, document.FilePath, defines, Some langVersion, strictIndentation) + (documentId, document.FilePath, defines, Some langVersion) FSharpCompletionProvider.ShouldTriggerCompletionAux( sourceText, @@ -336,7 +335,7 @@ type internal FSharpCompletionProvider let! sourceText = context.Document.GetTextAsync(ct) - let defines, langVersion, strictIndentation = document.GetFsharpParsingOptions() + let defines, langVersion = document.GetFsharpParsingOptions() let shouldProvideCompletion = CompletionUtils.shouldProvideCompletion ( @@ -344,7 +343,6 @@ type internal FSharpCompletionProvider document.FilePath, defines, Some langVersion, - strictIndentation, sourceText, context.Position, ct diff --git a/vsintegration/src/FSharp.Editor/Completion/CompletionService.fs b/vsintegration/src/FSharp.Editor/Completion/CompletionService.fs index 450d8ed67ac..38e410b4b90 100644 --- a/vsintegration/src/FSharp.Editor/Completion/CompletionService.fs +++ b/vsintegration/src/FSharp.Editor/Completion/CompletionService.fs @@ -43,7 +43,7 @@ type internal FSharpCompletionService let documentId = workspace.GetDocumentIdInCurrentContext(sourceText.Container) let document = workspace.CurrentSolution.GetDocument(documentId) - let defines, langVersion, strictIndentation = + let defines, langVersion = projectInfoManager.GetCompilationDefinesAndLangVersionForEditingDocument(document) CompletionUtils.getDefaultCompletionListSpan ( @@ -53,7 +53,6 @@ type internal FSharpCompletionService document.FilePath, defines, Some langVersion, - strictIndentation, CancellationToken.None ) diff --git a/vsintegration/src/FSharp.Editor/Completion/CompletionUtils.fs b/vsintegration/src/FSharp.Editor/Completion/CompletionUtils.fs index 1bb5958418c..74d66eac737 100644 --- a/vsintegration/src/FSharp.Editor/Completion/CompletionUtils.fs +++ b/vsintegration/src/FSharp.Editor/Completion/CompletionUtils.fs @@ -96,7 +96,6 @@ module internal CompletionUtils = filePath: string, defines: string list, langVersion: string option, - strictIndentation: bool option, sourceText: SourceText, triggerPosition: int, ct: CancellationToken @@ -113,7 +112,6 @@ module internal CompletionUtils = Some filePath, defines, langVersion, - strictIndentation, classifiedSpans, ct ) @@ -148,7 +146,7 @@ module internal CompletionUtils = /// Indicates the text span to be replaced by a committed completion list item. let getDefaultCompletionListSpan - (sourceText: SourceText, caretIndex, documentId, filePath, defines, langVersion, strictIndentation, ct: CancellationToken) + (sourceText: SourceText, caretIndex, documentId, filePath, defines, langVersion, ct: CancellationToken) = // Gets connected identifier-part characters backward and forward from caret. @@ -193,7 +191,6 @@ module internal CompletionUtils = Some filePath, defines, langVersion, - strictIndentation, classifiedSpans, ct ) diff --git a/vsintegration/src/FSharp.Editor/Completion/HashDirectiveCompletionProvider.fs b/vsintegration/src/FSharp.Editor/Completion/HashDirectiveCompletionProvider.fs index 4e2b31f3ab4..43d05744b42 100644 --- a/vsintegration/src/FSharp.Editor/Completion/HashDirectiveCompletionProvider.fs +++ b/vsintegration/src/FSharp.Editor/Completion/HashDirectiveCompletionProvider.fs @@ -64,7 +64,7 @@ type internal HashDirectiveCompletionProvider let documentId = workspace.GetDocumentIdInCurrentContext(text.Container) let document = workspace.CurrentSolution.GetDocument(documentId) - let defines, langVersion, strictIndentation = + let defines, langVersion = projectInfoManager.GetCompilationDefinesAndLangVersionForEditingDocument(document) let textLines = text.Lines @@ -79,7 +79,6 @@ type internal HashDirectiveCompletionProvider Some document.FilePath, defines, Some langVersion, - strictIndentation, classifiedSpans, CancellationToken.None ) diff --git a/vsintegration/src/FSharp.Editor/Completion/SignatureHelp.fs b/vsintegration/src/FSharp.Editor/Completion/SignatureHelp.fs index f00deaa9250..9842f3f578c 100644 --- a/vsintegration/src/FSharp.Editor/Completion/SignatureHelp.fs +++ b/vsintegration/src/FSharp.Editor/Completion/SignatureHelp.fs @@ -290,7 +290,6 @@ type internal FSharpSignatureHelpProvider [] (serviceProvi documentId: DocumentId, defines: string list, langVersion: string option, - strictIndentation: bool option, documentationBuilder: IDocumentationBuilder, sourceText: SourceText, caretPosition: int, @@ -329,7 +328,6 @@ type internal FSharpSignatureHelpProvider [] (serviceProvi false, false, langVersion, - strictIndentation, ct ) @@ -607,7 +605,6 @@ type internal FSharpSignatureHelpProvider [] (serviceProvi document: Document, defines: string list, langVersion: string option, - strictIndentation: bool option, documentationBuilder: IDocumentationBuilder, caretPosition: int, triggerTypedChar: char option, @@ -660,7 +657,6 @@ type internal FSharpSignatureHelpProvider [] (serviceProvi document.Id, defines, langVersion, - strictIndentation, documentationBuilder, sourceText, caretPosition, @@ -680,7 +676,6 @@ type internal FSharpSignatureHelpProvider [] (serviceProvi document.Id, defines, langVersion, - strictIndentation, documentationBuilder, sourceText, caretPosition, @@ -713,7 +708,7 @@ type internal FSharpSignatureHelpProvider [] (serviceProvi member _.GetItemsAsync(document, position, triggerInfo, cancellationToken) = asyncMaybe { - let defines, langVersion, strictIndentation = document.GetFsharpParsingOptions() + let defines, langVersion = document.GetFsharpParsingOptions() let triggerTypedChar = if @@ -731,7 +726,6 @@ type internal FSharpSignatureHelpProvider [] (serviceProvi document, defines, Some langVersion, - strictIndentation, documentationBuilder, position, triggerTypedChar, diff --git a/vsintegration/src/FSharp.Editor/Debugging/LanguageDebugInfoService.fs b/vsintegration/src/FSharp.Editor/Debugging/LanguageDebugInfoService.fs index 3d815f92343..c3917db51fa 100644 --- a/vsintegration/src/FSharp.Editor/Debugging/LanguageDebugInfoService.fs +++ b/vsintegration/src/FSharp.Editor/Debugging/LanguageDebugInfoService.fs @@ -53,7 +53,7 @@ type internal FSharpLanguageDebugInfoService [] () = (document: Document, position: int, cancellationToken: CancellationToken) : Task = cancellableTask { - let defines, langVersion, strictIndentation = document.GetFsharpParsingOptions() + let defines, langVersion = document.GetFsharpParsingOptions() let! cancellationToken = CancellableTask.getCancellationToken () let! sourceText = document.GetTextAsync(cancellationToken) @@ -68,7 +68,6 @@ type internal FSharpLanguageDebugInfoService [] () = Some(document.Name), defines, Some langVersion, - strictIndentation, classifiedSpans, cancellationToken ) diff --git a/vsintegration/src/FSharp.Editor/Formatting/EditorFormattingService.fs b/vsintegration/src/FSharp.Editor/Formatting/EditorFormattingService.fs index 88aa10e23ab..cb7e2c5a0a6 100644 --- a/vsintegration/src/FSharp.Editor/Formatting/EditorFormattingService.fs +++ b/vsintegration/src/FSharp.Editor/Formatting/EditorFormattingService.fs @@ -57,7 +57,6 @@ type internal FSharpEditorFormattingService [] (settings: filePath, defines, Some parsingOptions.LangVersionText, - parsingOptions.StrictIndentation, cancellationToken ) diff --git a/vsintegration/src/FSharp.Editor/Formatting/IndentationService.fs b/vsintegration/src/FSharp.Editor/Formatting/IndentationService.fs index d874656c176..5c38459d212 100644 --- a/vsintegration/src/FSharp.Editor/Formatting/IndentationService.fs +++ b/vsintegration/src/FSharp.Editor/Formatting/IndentationService.fs @@ -36,7 +36,6 @@ type internal FSharpIndentationService [] () = filePath, defines, Some parsingOptions.LangVersionText, - parsingOptions.StrictIndentation, CancellationToken.None ) diff --git a/vsintegration/src/FSharp.Editor/LanguageService/FSharpProjectOptionsManager.fs b/vsintegration/src/FSharp.Editor/LanguageService/FSharpProjectOptionsManager.fs index d61ba717b4d..08bfbbddaa8 100644 --- a/vsintegration/src/FSharp.Editor/LanguageService/FSharpProjectOptionsManager.fs +++ b/vsintegration/src/FSharp.Editor/LanguageService/FSharpProjectOptionsManager.fs @@ -608,7 +608,7 @@ type internal FSharpProjectOptionsManager(checker: FSharpChecker, workspace: Wor IsInteractive = CompilerEnvironment.IsScriptFile document.Name } - CompilerEnvironment.GetConditionalDefinesForEditing parsingOptions, parsingOptions.LangVersionText, parsingOptions.StrictIndentation + CompilerEnvironment.GetConditionalDefinesForEditing parsingOptions, parsingOptions.LangVersionText member _.TryGetOptionsByProject(project) = reactor.TryGetOptionsByProjectAsync(project) diff --git a/vsintegration/src/FSharp.Editor/LanguageService/SymbolHelpers.fs b/vsintegration/src/FSharp.Editor/LanguageService/SymbolHelpers.fs index aa355c9922e..36319820f80 100644 --- a/vsintegration/src/FSharp.Editor/LanguageService/SymbolHelpers.fs +++ b/vsintegration/src/FSharp.Editor/LanguageService/SymbolHelpers.fs @@ -32,7 +32,7 @@ module internal SymbolHelpers = |> Async.AwaitTask |> liftAsync - let! defines, langVersion, strictIndentation = document.GetFsharpParsingOptionsAsync(userOpName) |> liftAsync + let! defines, langVersion = document.GetFsharpParsingOptionsAsync(userOpName) |> liftAsync let! cancellationToken = Async.CancellationToken |> liftAsync let! sourceText = document.GetTextAsync(cancellationToken) @@ -51,7 +51,6 @@ module internal SymbolHelpers = false, false, Some langVersion, - strictIndentation, cancellationToken ) diff --git a/vsintegration/src/FSharp.Editor/LanguageService/Tokenizer.fs b/vsintegration/src/FSharp.Editor/LanguageService/Tokenizer.fs index 49ac6a4ad8b..fe28df39d98 100644 --- a/vsintegration/src/FSharp.Editor/LanguageService/Tokenizer.fs +++ b/vsintegration/src/FSharp.Editor/LanguageService/Tokenizer.fs @@ -688,14 +688,13 @@ module internal Tokenizer = fileName: string option, defines: string list, langVersion, - strictIndentation, result: ResizeArray, cancellationToken: CancellationToken ) : unit = try let sourceTokenizer = - FSharpSourceTokenizer(defines, fileName, langVersion, strictIndentation) + FSharpSourceTokenizer(defines, fileName, langVersion) let lines = sourceText.Lines let sourceTextData = getSourceTextData (documentKey, defines, lines.Count) @@ -902,13 +901,12 @@ module internal Tokenizer = fileName: string, defines: string list, langVersion, - strictIndentation, cancellationToken ) = let textLinePos = sourceText.Lines.GetLinePosition(position) let sourceTokenizer = - FSharpSourceTokenizer(defines, Some fileName, langVersion, strictIndentation) + FSharpSourceTokenizer(defines, Some fileName, langVersion) // We keep incremental data per-document. When text changes we correlate text line-by-line (by hash codes of lines) let sourceTextData = getSourceTextData (documentKey, defines, sourceText.Lines.Count) @@ -921,7 +919,7 @@ module internal Tokenizer = lineData, textLinePos, contents - let tokenizeLine (documentKey, sourceText, position, fileName, defines, langVersion, strictIndentation, cancellationToken) = + let tokenizeLine (documentKey, sourceText, position, fileName, defines, langVersion, cancellationToken) = try let lineData, _, _ = getCachedSourceLineData ( @@ -931,7 +929,6 @@ module internal Tokenizer = fileName, defines, langVersion, - strictIndentation, cancellationToken ) @@ -951,7 +948,6 @@ module internal Tokenizer = wholeActivePatterns: bool, allowStringToken: bool, langVersion, - strictIndentation, cancellationToken ) : LexerSymbol option = @@ -964,7 +960,6 @@ module internal Tokenizer = fileName, defines, langVersion, - strictIndentation, cancellationToken ) diff --git a/vsintegration/src/FSharp.Editor/LanguageService/WorkspaceExtensions.fs b/vsintegration/src/FSharp.Editor/LanguageService/WorkspaceExtensions.fs index c7eb1e50e41..be47a58f607 100644 --- a/vsintegration/src/FSharp.Editor/LanguageService/WorkspaceExtensions.fs +++ b/vsintegration/src/FSharp.Editor/LanguageService/WorkspaceExtensions.fs @@ -541,8 +541,7 @@ type Document with return CompilerEnvironment.GetConditionalDefinesForEditing parsingOptions, - parsingOptions.LangVersionText, - parsingOptions.StrictIndentation + parsingOptions.LangVersionText } /// Get the instance of the FSharpChecker from the workspace by the given F# document. @@ -571,7 +570,7 @@ type Document with /// This tries to get the defines by looking at an internal cache; if it doesn't exist in the cache it will create an inaccurate but usable form of the defines. member this.GetFSharpQuickDefines() = match this.GetFsharpParsingOptions() with - | defines, _, _ -> defines + | defines, _ -> defines /// Parses the given F# document. member this.GetFSharpParseResultsAsync(userOpName) = @@ -641,7 +640,7 @@ type Document with /// Try to find a F# lexer/token symbol of the given F# document and position. member this.TryFindFSharpLexerSymbolAsync(position, lookupKind, wholeActivePattern, allowStringToken, userOpName) = cancellableTask { - let! defines, langVersion, strictIndentation = this.GetFsharpParsingOptionsAsync(userOpName) + let! defines, langVersion = this.GetFsharpParsingOptionsAsync(userOpName) let! ct = CancellableTask.getCancellationToken () let! sourceText = this.GetTextAsync(ct) @@ -656,7 +655,6 @@ type Document with wholeActivePattern, allowStringToken, Some langVersion, - strictIndentation, ct ) } diff --git a/vsintegration/src/FSharp.Editor/TaskList/TaskListService.fs b/vsintegration/src/FSharp.Editor/TaskList/TaskListService.fs index a82e414e754..b194d1303df 100644 --- a/vsintegration/src/FSharp.Editor/TaskList/TaskListService.fs +++ b/vsintegration/src/FSharp.Editor/TaskList/TaskListService.fs @@ -30,10 +30,9 @@ type internal FSharpTaskListService [] () as this = return CompilerEnvironment.GetConditionalDefinesForEditing parsingOptions, - Some parsingOptions.LangVersionText, - parsingOptions.StrictIndentation + Some parsingOptions.LangVersionText } - |> Async.map (Option.defaultValue ([], None, None)) + |> Async.map (Option.defaultValue ([], None)) let extractContractedComments (tokens: Tokenizer.SavedTokenInfo[]) = let granularTokens = @@ -61,7 +60,6 @@ type internal FSharpTaskListService [] () as this = sourceText: SourceText, defines: string list, langVersion: string option, - strictIndentation: bool option, descriptors: (string * FSharpTaskListDescriptor)[], cancellationToken ) = @@ -78,7 +76,6 @@ type internal FSharpTaskListService [] () as this = doc.FilePath, defines, langVersion, - strictIndentation, cancellationToken ) |> extractContractedComments @@ -120,6 +117,6 @@ type internal FSharpTaskListService [] () as this = backgroundTask { let descriptors = desc |> Seq.map (fun d -> d.Text, d) |> Array.ofSeq let! sourceText = doc.GetTextAsync(cancellationToken) - let! defines, langVersion, strictIndentation = doc |> getDefinesAndLangVersion - return this.GetTaskListItems(doc, sourceText, defines, langVersion, strictIndentation, descriptors, cancellationToken) + let! defines, langVersion = doc |> getDefinesAndLangVersion + return this.GetTaskListItems(doc, sourceText, defines, langVersion, descriptors, cancellationToken) } diff --git a/vsintegration/tests/FSharp.Editor.Tests/CompletionProviderTests.fs b/vsintegration/tests/FSharp.Editor.Tests/CompletionProviderTests.fs index 942701b37b9..ed1e8f3caef 100644 --- a/vsintegration/tests/FSharp.Editor.Tests/CompletionProviderTests.fs +++ b/vsintegration/tests/FSharp.Editor.Tests/CompletionProviderTests.fs @@ -152,7 +152,6 @@ module CompletionProviderTests = filePath, [], None, - None, CancellationToken.None ) diff --git a/vsintegration/tests/FSharp.Editor.Tests/GoToDefinitionServiceTests.fs b/vsintegration/tests/FSharp.Editor.Tests/GoToDefinitionServiceTests.fs index d0e4b5efad1..fe10a42a125 100644 --- a/vsintegration/tests/FSharp.Editor.Tests/GoToDefinitionServiceTests.fs +++ b/vsintegration/tests/FSharp.Editor.Tests/GoToDefinitionServiceTests.fs @@ -35,7 +35,6 @@ module GoToDefinitionServiceTests = false, false, langVersion, - None, System.Threading.CancellationToken.None ) diff --git a/vsintegration/tests/FSharp.Editor.Tests/HelpContextServiceTests.fs b/vsintegration/tests/FSharp.Editor.Tests/HelpContextServiceTests.fs index e8a1588f13b..ad690e1d92f 100644 --- a/vsintegration/tests/FSharp.Editor.Tests/HelpContextServiceTests.fs +++ b/vsintegration/tests/FSharp.Editor.Tests/HelpContextServiceTests.fs @@ -51,7 +51,6 @@ type HelpContextServiceTests() = Some "test.fs", [], None, - None, classifiedSpans, CancellationToken.None ) diff --git a/vsintegration/tests/FSharp.Editor.Tests/LanguageDebugInfoServiceTests.fs b/vsintegration/tests/FSharp.Editor.Tests/LanguageDebugInfoServiceTests.fs index 8b3146ee754..b6ab2381b0a 100644 --- a/vsintegration/tests/FSharp.Editor.Tests/LanguageDebugInfoServiceTests.fs +++ b/vsintegration/tests/FSharp.Editor.Tests/LanguageDebugInfoServiceTests.fs @@ -61,7 +61,6 @@ let main argv = Some(fileName), defines, None, - None, classifiedSpans, CancellationToken.None ) diff --git a/vsintegration/tests/FSharp.Editor.Tests/SignatureHelpProviderTests.fs b/vsintegration/tests/FSharp.Editor.Tests/SignatureHelpProviderTests.fs index 398ece88fa3..8c3af8f90d7 100644 --- a/vsintegration/tests/FSharp.Editor.Tests/SignatureHelpProviderTests.fs +++ b/vsintegration/tests/FSharp.Editor.Tests/SignatureHelpProviderTests.fs @@ -177,7 +177,6 @@ module SignatureHelpProvider = document.Id, [], None, - None, DefaultDocumentationProvider, sourceText, caretPosition, @@ -521,7 +520,6 @@ M.f document.Id, [], None, - None, DefaultDocumentationProvider, sourceText, caretPosition, diff --git a/vsintegration/tests/FSharp.Editor.Tests/SyntacticColorizationServiceTests.fs b/vsintegration/tests/FSharp.Editor.Tests/SyntacticColorizationServiceTests.fs index af0fc3ec4c8..230a96bde80 100644 --- a/vsintegration/tests/FSharp.Editor.Tests/SyntacticColorizationServiceTests.fs +++ b/vsintegration/tests/FSharp.Editor.Tests/SyntacticColorizationServiceTests.fs @@ -34,7 +34,6 @@ type SyntacticClassificationServiceTests() = Some(fileName), defines, langVersion, - None, tokens, CancellationToken.None ) diff --git a/vsintegration/tests/FSharp.Editor.Tests/TaskListServiceTests.fs b/vsintegration/tests/FSharp.Editor.Tests/TaskListServiceTests.fs index d84a049ada6..f342b0e92aa 100644 --- a/vsintegration/tests/FSharp.Editor.Tests/TaskListServiceTests.fs +++ b/vsintegration/tests/FSharp.Editor.Tests/TaskListServiceTests.fs @@ -26,7 +26,7 @@ let assertTasks expectedTasks fileContents = let sourceText = doc.GetTextAsync().Result let t = - service.GetTaskListItems(doc, sourceText, [], (Some "preview"), None, descriptors, ct) + service.GetTaskListItems(doc, sourceText, [], (Some "preview"), descriptors, ct) let tasks = t |> Seq.map (fun t -> t.Message) |> List.ofSeq Assert.Equal(expectedTasks |> List.sort, tasks |> List.sort) diff --git a/vsintegration/tests/Salsa/FSharpLanguageServiceTestable.fs b/vsintegration/tests/Salsa/FSharpLanguageServiceTestable.fs index 37654820814..db86271c8d0 100644 --- a/vsintegration/tests/Salsa/FSharpLanguageServiceTestable.fs +++ b/vsintegration/tests/Salsa/FSharpLanguageServiceTestable.fs @@ -212,7 +212,7 @@ type internal FSharpLanguageServiceTestable() as this = let fileName = VsTextLines.GetFilename buffer let rdt = this.ServiceProvider.RunningDocumentTable let defines = this.ProjectSitesAndFiles.GetDefinesForFile_DEPRECATED(rdt, fileName, this.FSharpChecker) - let sourceTokenizer = FSharpSourceTokenizer(defines,Some(fileName), None, None) + let sourceTokenizer = FSharpSourceTokenizer(defines,Some(fileName), None) sourceTokenizer.CreateLineTokenizer(source)) let colorizer = new FSharpColorizer_DEPRECATED(this.CloseColorizer, buffer, scanner) From 609877f7742a95224394c3514fa1748a856882a6 Mon Sep 17 00:00:00 2001 From: Eugene Auduchinok Date: Fri, 31 Jul 2026 22:42:13 +0200 Subject: [PATCH 2/4] Fantomas --- src/Compiler/Driver/CompilerConfig.fs | 1 + src/Compiler/Facilities/prim-lexing.fs | 3 +-- src/Compiler/Facilities/prim-lexing.fsi | 3 +-- src/Compiler/Interactive/fsi.fs | 12 +++------ src/Compiler/Service/ServiceLexing.fs | 4 +-- .../CodeFixes/AddMissingFunKeyword.fs | 3 +-- .../Completion/CompletionUtils.fs | 22 ++-------------- .../LanguageService/Tokenizer.fs | 26 +++---------------- .../LanguageService/WorkspaceExtensions.fs | 4 +-- .../FSharp.Editor/TaskList/TaskListService.fs | 14 ++-------- .../CompletionProviderTests.fs | 10 +------ 11 files changed, 19 insertions(+), 83 deletions(-) diff --git a/src/Compiler/Driver/CompilerConfig.fs b/src/Compiler/Driver/CompilerConfig.fs index 4e39b4407f8..7e04ef173f6 100644 --- a/src/Compiler/Driver/CompilerConfig.fs +++ b/src/Compiler/Driver/CompilerConfig.fs @@ -1252,6 +1252,7 @@ type TcConfig private (data: TcConfigBuilder, validate: bool) = member _.bufferWidth = data.bufferWidth member _.fsiMultiAssemblyEmit = data.fsiMultiAssemblyEmit member _.FxResolver = data.FxResolver + member _.alwaysInline = data.alwaysInline |> Option.defaultValue ( diff --git a/src/Compiler/Facilities/prim-lexing.fs b/src/Compiler/Facilities/prim-lexing.fs index 795baf0ea3f..21b93b12880 100644 --- a/src/Compiler/Facilities/prim-lexing.fs +++ b/src/Compiler/Facilities/prim-lexing.fs @@ -242,8 +242,7 @@ type internal Position = type internal LexBufferFiller<'Char> = LexBuffer<'Char> -> unit -and [] internal LexBuffer<'Char> - (filler: LexBufferFiller<'Char>, reportLibraryOnlyFeatures: bool, langVersion: LanguageVersion) = +and [] internal LexBuffer<'Char>(filler: LexBufferFiller<'Char>, reportLibraryOnlyFeatures: bool, langVersion: LanguageVersion) = let context = Dictionary(1) let mutable buffer = [||] /// number of valid characters beyond bufferScanStart. diff --git a/src/Compiler/Facilities/prim-lexing.fsi b/src/Compiler/Facilities/prim-lexing.fsi index 99fb259c175..f74d4baa2df 100644 --- a/src/Compiler/Facilities/prim-lexing.fsi +++ b/src/Compiler/Facilities/prim-lexing.fsi @@ -151,8 +151,7 @@ type internal LexBuffer<'Char> = /// Create a lex buffer suitable for Unicode lexing that reads characters from the given array. /// Important: does take ownership of the array. - static member FromChars: - reportLibraryOnlyFeatures: bool * langVersion: LanguageVersion * char[] -> LexBuffer + static member FromChars: reportLibraryOnlyFeatures: bool * langVersion: LanguageVersion * char[] -> LexBuffer /// Create a lex buffer that reads character or byte inputs by using the given function. static member FromFunction: diff --git a/src/Compiler/Interactive/fsi.fs b/src/Compiler/Interactive/fsi.fs index 2e922045602..500045c73f7 100644 --- a/src/Compiler/Interactive/fsi.fs +++ b/src/Compiler/Interactive/fsi.fs @@ -3669,15 +3669,13 @@ type FsiStdinLexerProvider // Create a new lexer to read an "included" script file member _.CreateIncludedScriptLexer(sourceFileName, reader, diagnosticsLogger) = - let lexbuf = - UnicodeLexing.StreamReaderAsLexbuf(true, tcConfigB.langVersion, reader) + let lexbuf = UnicodeLexing.StreamReaderAsLexbuf(true, tcConfigB.langVersion, reader) CreateLexerForLexBuffer(sourceFileName, lexbuf, diagnosticsLogger) // Create a new lexer to read a string member _.CreateStringLexer(sourceFileName, source, diagnosticsLogger) = - let lexbuf = - UnicodeLexing.StringAsLexbuf(true, tcConfigB.langVersion, source) + let lexbuf = UnicodeLexing.StringAsLexbuf(true, tcConfigB.langVersion, source) CreateLexerForLexBuffer(sourceFileName, lexbuf, diagnosticsLogger) @@ -4361,8 +4359,7 @@ type FsiInteractionProcessor use _ = UseDiagnosticsLogger diagnosticsLogger use _scope = SetCurrentUICultureForThread fsiOptions.FsiLCID - let lexbuf = - UnicodeLexing.StringAsLexbuf(true, tcConfigB.langVersion, sourceText) + let lexbuf = UnicodeLexing.StringAsLexbuf(true, tcConfigB.langVersion, sourceText) let tokenizer = fsiStdinLexerProvider.CreateBufferLexer(scriptFileName, lexbuf, diagnosticsLogger) @@ -4383,8 +4380,7 @@ type FsiInteractionProcessor use _unwind2 = UseDiagnosticsLogger diagnosticsLogger use _scope = SetCurrentUICultureForThread fsiOptions.FsiLCID - let lexbuf = - UnicodeLexing.StringAsLexbuf(true, tcConfigB.langVersion, sourceText) + let lexbuf = UnicodeLexing.StringAsLexbuf(true, tcConfigB.langVersion, sourceText) let tokenizer = fsiStdinLexerProvider.CreateBufferLexer(scriptFileName, lexbuf, diagnosticsLogger) diff --git a/src/Compiler/Service/ServiceLexing.fs b/src/Compiler/Service/ServiceLexing.fs index 058ffb37cfa..75729191ee9 100644 --- a/src/Compiler/Service/ServiceLexing.fs +++ b/src/Compiler/Service/ServiceLexing.fs @@ -1792,9 +1792,7 @@ module FSharpLexerImpl = [] type FSharpLexer = - static member Tokenize - (text: ISourceText, tokenCallback, ?langVersion, ?filePath: string, ?conditionalDefines, ?flags, ?pathMap, ?ct) - = + static member Tokenize(text: ISourceText, tokenCallback, ?langVersion, ?filePath: string, ?conditionalDefines, ?flags, ?pathMap, ?ct) = let langVersion = defaultArg langVersion "latestmajor" |> LanguageVersion let flags = defaultArg flags FSharpLexerFlags.Default ignore filePath // can be removed at later point diff --git a/vsintegration/src/FSharp.Editor/CodeFixes/AddMissingFunKeyword.fs b/vsintegration/src/FSharp.Editor/CodeFixes/AddMissingFunKeyword.fs index 6bf20092c36..7b209b757da 100644 --- a/vsintegration/src/FSharp.Editor/CodeFixes/AddMissingFunKeyword.fs +++ b/vsintegration/src/FSharp.Editor/CodeFixes/AddMissingFunKeyword.fs @@ -52,8 +52,7 @@ type internal AddMissingFunKeywordCodeFixProvider [] () = let! cancellationToken = CancellableTask.getCancellationToken () let document = context.Document - let! defines, langVersion = - document.GetFsharpParsingOptionsAsync(nameof AddMissingFunKeywordCodeFixProvider) + let! defines, langVersion = document.GetFsharpParsingOptionsAsync(nameof AddMissingFunKeywordCodeFixProvider) let! sourceText = context.GetSourceTextAsync() let adjustedPosition = adjustPosition sourceText context.Span diff --git a/vsintegration/src/FSharp.Editor/Completion/CompletionUtils.fs b/vsintegration/src/FSharp.Editor/Completion/CompletionUtils.fs index 74d66eac737..aa200d70ce9 100644 --- a/vsintegration/src/FSharp.Editor/Completion/CompletionUtils.fs +++ b/vsintegration/src/FSharp.Editor/Completion/CompletionUtils.fs @@ -105,16 +105,7 @@ module internal CompletionUtils = let classifiedSpans = ResizeArray<_>() - Tokenizer.classifySpans ( - documentId, - sourceText, - triggerLine.Span, - Some filePath, - defines, - langVersion, - classifiedSpans, - ct - ) + Tokenizer.classifySpans (documentId, sourceText, triggerLine.Span, Some filePath, defines, langVersion, classifiedSpans, ct) classifiedSpans.Count = 0 || // we should provide completion at the start of empty line, where there are no tokens at all @@ -184,16 +175,7 @@ module internal CompletionUtils = let classifiedSpans = ResizeArray<_>() - Tokenizer.classifySpans ( - documentId, - sourceText, - line.Span, - Some filePath, - defines, - langVersion, - classifiedSpans, - ct - ) + Tokenizer.classifySpans (documentId, sourceText, line.Span, Some filePath, defines, langVersion, classifiedSpans, ct) let inline isBacktickIdentifier (classifiedSpan: ClassifiedSpan) = classifiedSpan.ClassificationType = ClassificationTypeNames.Identifier diff --git a/vsintegration/src/FSharp.Editor/LanguageService/Tokenizer.fs b/vsintegration/src/FSharp.Editor/LanguageService/Tokenizer.fs index fe28df39d98..6901ceb97b1 100644 --- a/vsintegration/src/FSharp.Editor/LanguageService/Tokenizer.fs +++ b/vsintegration/src/FSharp.Editor/LanguageService/Tokenizer.fs @@ -693,8 +693,7 @@ module internal Tokenizer = ) : unit = try - let sourceTokenizer = - FSharpSourceTokenizer(defines, fileName, langVersion) + let sourceTokenizer = FSharpSourceTokenizer(defines, fileName, langVersion) let lines = sourceText.Lines let sourceTextData = getSourceTextData (documentKey, defines, lines.Count) @@ -905,8 +904,7 @@ module internal Tokenizer = ) = let textLinePos = sourceText.Lines.GetLinePosition(position) - let sourceTokenizer = - FSharpSourceTokenizer(defines, Some fileName, langVersion) + let sourceTokenizer = FSharpSourceTokenizer(defines, Some fileName, langVersion) // We keep incremental data per-document. When text changes we correlate text line-by-line (by hash codes of lines) let sourceTextData = getSourceTextData (documentKey, defines, sourceText.Lines.Count) @@ -922,15 +920,7 @@ module internal Tokenizer = let tokenizeLine (documentKey, sourceText, position, fileName, defines, langVersion, cancellationToken) = try let lineData, _, _ = - getCachedSourceLineData ( - documentKey, - sourceText, - position, - fileName, - defines, - langVersion, - cancellationToken - ) + getCachedSourceLineData (documentKey, sourceText, position, fileName, defines, langVersion, cancellationToken) lineData.SavedTokens with ex -> @@ -953,15 +943,7 @@ module internal Tokenizer = try let lineData, textLinePos, lineContents = - getCachedSourceLineData ( - documentKey, - sourceText, - position, - fileName, - defines, - langVersion, - cancellationToken - ) + getCachedSourceLineData (documentKey, sourceText, position, fileName, defines, langVersion, cancellationToken) getSymbolFromSavedTokens ( fileName, diff --git a/vsintegration/src/FSharp.Editor/LanguageService/WorkspaceExtensions.fs b/vsintegration/src/FSharp.Editor/LanguageService/WorkspaceExtensions.fs index be47a58f607..ef0929a1211 100644 --- a/vsintegration/src/FSharp.Editor/LanguageService/WorkspaceExtensions.fs +++ b/vsintegration/src/FSharp.Editor/LanguageService/WorkspaceExtensions.fs @@ -539,9 +539,7 @@ type Document with async { let! _, _, parsingOptions, _ = this.GetFSharpCompilationOptionsAsync(userOpName) - return - CompilerEnvironment.GetConditionalDefinesForEditing parsingOptions, - parsingOptions.LangVersionText + return CompilerEnvironment.GetConditionalDefinesForEditing parsingOptions, parsingOptions.LangVersionText } /// Get the instance of the FSharpChecker from the workspace by the given F# document. diff --git a/vsintegration/src/FSharp.Editor/TaskList/TaskListService.fs b/vsintegration/src/FSharp.Editor/TaskList/TaskListService.fs index b194d1303df..da01bff2dce 100644 --- a/vsintegration/src/FSharp.Editor/TaskList/TaskListService.fs +++ b/vsintegration/src/FSharp.Editor/TaskList/TaskListService.fs @@ -28,9 +28,7 @@ type internal FSharpTaskListService [] () as this = |> Async.AwaitTask |> liftAsync - return - CompilerEnvironment.GetConditionalDefinesForEditing parsingOptions, - Some parsingOptions.LangVersionText + return CompilerEnvironment.GetConditionalDefinesForEditing parsingOptions, Some parsingOptions.LangVersionText } |> Async.map (Option.defaultValue ([], None)) @@ -69,15 +67,7 @@ type internal FSharpTaskListService [] () as this = for line in sourceText.Lines do let contractedTokens = - Tokenizer.tokenizeLine ( - doc.Id, - sourceText, - line.Span.Start, - doc.FilePath, - defines, - langVersion, - cancellationToken - ) + Tokenizer.tokenizeLine (doc.Id, sourceText, line.Span.Start, doc.FilePath, defines, langVersion, cancellationToken) |> extractContractedComments if contractedTokens |> List.isEmpty then diff --git a/vsintegration/tests/FSharp.Editor.Tests/CompletionProviderTests.fs b/vsintegration/tests/FSharp.Editor.Tests/CompletionProviderTests.fs index ed1e8f3caef..fc5bd6c1037 100644 --- a/vsintegration/tests/FSharp.Editor.Tests/CompletionProviderTests.fs +++ b/vsintegration/tests/FSharp.Editor.Tests/CompletionProviderTests.fs @@ -145,15 +145,7 @@ module CompletionProviderTests = let sourceText = SourceText.From(fileContents) let resultSpan = - CompletionUtils.getDefaultCompletionListSpan ( - sourceText, - caretPosition, - documentId, - filePath, - [], - None, - CancellationToken.None - ) + CompletionUtils.getDefaultCompletionListSpan (sourceText, caretPosition, documentId, filePath, [], None, CancellationToken.None) Assert.Equal(expected, sourceText.ToString(resultSpan)) From 7eca291f3b84d5c476a3c749d8cfe511f3f85bbb Mon Sep 17 00:00:00 2001 From: Eugene Auduchinok Date: Fri, 31 Jul 2026 22:56:37 +0200 Subject: [PATCH 3/4] Fix VS build --- .../src/FSharp.Editor/Completion/CompletionProvider.fs | 2 +- .../tests/FSharp.Editor.Tests/CompletionProviderTests.fs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vsintegration/src/FSharp.Editor/Completion/CompletionProvider.fs b/vsintegration/src/FSharp.Editor/Completion/CompletionProvider.fs index 21e926075c1..45d13b0fef8 100644 --- a/vsintegration/src/FSharp.Editor/Completion/CompletionProvider.fs +++ b/vsintegration/src/FSharp.Editor/Completion/CompletionProvider.fs @@ -104,7 +104,7 @@ type internal FSharpCompletionProvider sourceText: SourceText, caretPosition: int, trigger: CompletionTriggerKind, - getInfo: (unit -> DocumentId * string * string list * string option * bool option), + getInfo: (unit -> DocumentId * string * string list * string option), intelliSenseOptions: IntelliSenseOptions, cancellationToken: CancellationToken ) = diff --git a/vsintegration/tests/FSharp.Editor.Tests/CompletionProviderTests.fs b/vsintegration/tests/FSharp.Editor.Tests/CompletionProviderTests.fs index fc5bd6c1037..f85608e0cf9 100644 --- a/vsintegration/tests/FSharp.Editor.Tests/CompletionProviderTests.fs +++ b/vsintegration/tests/FSharp.Editor.Tests/CompletionProviderTests.fs @@ -20,7 +20,7 @@ module CompletionProviderTests = let filePath = "C:\\test.fs" let mkGetInfo documentId = - fun () -> documentId, filePath, [], (Some "preview"), None + fun () -> documentId, filePath, [], (Some "preview") let formatCompletions (completions: string seq) = "\n\t" + String.Join("\n\t", completions) From d888971ea0f6f6719f241c63cbb3d980440b247c Mon Sep 17 00:00:00 2001 From: Eugene Auduchinok Date: Fri, 31 Jul 2026 22:58:39 +0200 Subject: [PATCH 4/4] Release notes --- docs/release-notes/.FSharp.Compiler.Service/11.0.100.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/release-notes/.FSharp.Compiler.Service/11.0.100.md b/docs/release-notes/.FSharp.Compiler.Service/11.0.100.md index 476df124084..04cf174b2e6 100644 --- a/docs/release-notes/.FSharp.Compiler.Service/11.0.100.md +++ b/docs/release-notes/.FSharp.Compiler.Service/11.0.100.md @@ -160,3 +160,4 @@ ### Breaking Changes * Optimizer: don't inline named functions in debug builds ([PR #19548](https://github.com/dotnet/fsharp/pull/19548) +* LexFilter: drop non-strict mode ([PR #20106](https://github.com/dotnet/fsharp/pull/20106))