From 7d92953639fd3b6f6ed78f0c5dae92aed9f467c5 Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Mon, 29 Jun 2020 18:00:18 -0700 Subject: [PATCH 1/2] cleanup fsi a bit --- src/fsharp/FSComp.txt | 1 + src/fsharp/fsi/FSIstrings.txt | 1 - src/fsharp/fsi/fsi.fs | 68 +++++++++---------- src/fsharp/fsi/xlf/FSIstrings.txt.cs.xlf | 5 -- src/fsharp/fsi/xlf/FSIstrings.txt.de.xlf | 5 -- src/fsharp/fsi/xlf/FSIstrings.txt.es.xlf | 5 -- src/fsharp/fsi/xlf/FSIstrings.txt.fr.xlf | 5 -- src/fsharp/fsi/xlf/FSIstrings.txt.it.xlf | 5 -- src/fsharp/fsi/xlf/FSIstrings.txt.ja.xlf | 5 -- src/fsharp/fsi/xlf/FSIstrings.txt.ko.xlf | 5 -- src/fsharp/fsi/xlf/FSIstrings.txt.pl.xlf | 5 -- src/fsharp/fsi/xlf/FSIstrings.txt.pt-BR.xlf | 5 -- src/fsharp/fsi/xlf/FSIstrings.txt.ru.xlf | 5 -- src/fsharp/fsi/xlf/FSIstrings.txt.tr.xlf | 5 -- src/fsharp/fsi/xlf/FSIstrings.txt.zh-Hans.xlf | 5 -- src/fsharp/fsi/xlf/FSIstrings.txt.zh-Hant.xlf | 5 -- src/fsharp/xlf/FSComp.txt.cs.xlf | 5 ++ src/fsharp/xlf/FSComp.txt.de.xlf | 5 ++ src/fsharp/xlf/FSComp.txt.es.xlf | 5 ++ src/fsharp/xlf/FSComp.txt.fr.xlf | 5 ++ src/fsharp/xlf/FSComp.txt.it.xlf | 5 ++ src/fsharp/xlf/FSComp.txt.ja.xlf | 5 ++ src/fsharp/xlf/FSComp.txt.ko.xlf | 5 ++ src/fsharp/xlf/FSComp.txt.pl.xlf | 5 ++ src/fsharp/xlf/FSComp.txt.pt-BR.xlf | 5 ++ src/fsharp/xlf/FSComp.txt.ru.xlf | 5 ++ src/fsharp/xlf/FSComp.txt.tr.xlf | 5 ++ src/fsharp/xlf/FSComp.txt.zh-Hans.xlf | 5 ++ src/fsharp/xlf/FSComp.txt.zh-Hant.xlf | 5 ++ 29 files changed, 100 insertions(+), 100 deletions(-) diff --git a/src/fsharp/FSComp.txt b/src/fsharp/FSComp.txt index e8d7455b50..dece87e5ee 100644 --- a/src/fsharp/FSComp.txt +++ b/src/fsharp/FSComp.txt @@ -1513,3 +1513,4 @@ featureAndBang,"applicative computation expressions" featureNullableOptionalInterop,"nullable optional interop" featureDefaultInterfaceMemberConsumption,"default interface member consumption" featureWitnessPassing,"witness passing for trait constraints in F# quotations" +3353,fsiInvalidDirective,"Invalid directive '#%s %s'" diff --git a/src/fsharp/fsi/FSIstrings.txt b/src/fsharp/fsi/FSIstrings.txt index c151f7b30e..a32a2cfd3f 100644 --- a/src/fsharp/fsi/FSIstrings.txt +++ b/src/fsharp/fsi/FSIstrings.txt @@ -21,7 +21,6 @@ fsiBanner3,"For help type #help;;" fsiConsoleProblem,"A problem occurred starting the F# Interactive process. This may be due to a known problem with background process console support for Unicode-enabled applications on some Windows systems. Try selecting Tools->Options->F# Interactive for Visual Studio and enter '--fsi-server-no-unicode'." 2301,fsiInvalidAssembly,"'%s' is not a valid assembly name" 2302,fsiDirectoryDoesNotExist,"Directory '%s' doesn't exist" -fsiInvalidDirective,"Invalid directive '#%s %s'" fsiLineTooLong,"Warning: line too long, ignoring some characters\n" fsiTimeInfoMainString,"Real: %s, CPU: %s, GC %s" fsiTimeInfoGCGenerationLabelSomeShorthandForTheWordGeneration,"gen" diff --git a/src/fsharp/fsi/fsi.fs b/src/fsharp/fsi/fsi.fs index ddb338a308..8bbf592c3f 100644 --- a/src/fsharp/fsi/fsi.fs +++ b/src/fsharp/fsi/fsi.fs @@ -2053,7 +2053,7 @@ type internal FsiInteractionProcessor f istate with e -> stopProcessingRecovery e range0 - istate,CompletedWithReportedError e + istate, CompletedWithReportedError e let isFeatureSupported featureId = tcConfigB.langVersion.SupportsFeature featureId @@ -2099,11 +2099,11 @@ type internal FsiInteractionProcessor let ExecInteraction (ctok, tcConfig:TcConfig, istate, action:ParsedFsiInteraction, errorLogger: ErrorLogger) = istate |> InteractiveCatch errorLogger (fun istate -> match action with - | IDefns ([ ],_) -> + | IDefns ([], _) -> let istate = fsiDynamicCompiler.CommitDependencyManagerText(ctok, istate, lexResourceManager, errorLogger) istate,Completed None - | IDefns ([ SynModuleDecl.DoExpr(_,expr,_)],_) -> + | IDefns ([SynModuleDecl.DoExpr(_, expr, _)], _) -> let istate = fsiDynamicCompiler.CommitDependencyManagerText(ctok, istate, lexResourceManager, errorLogger) fsiDynamicCompiler.EvalParsedExpression(ctok, errorLogger, istate, expr) @@ -2111,7 +2111,7 @@ type internal FsiInteractionProcessor let istate = fsiDynamicCompiler.CommitDependencyManagerText(ctok, istate, lexResourceManager, errorLogger) fsiDynamicCompiler.EvalParsedDefinitions (ctok, errorLogger, istate, true, false, defs) - | IHash (ParsedHashDirective("load",sourceFiles,m),_) -> + | IHash (ParsedHashDirective("load", sourceFiles, m), _) -> let istate = fsiDynamicCompiler.CommitDependencyManagerText(ctok, istate, lexResourceManager, errorLogger) fsiDynamicCompiler.EvalSourceFiles (ctok, istate, m, sourceFiles, lexResourceManager, errorLogger),Completed None @@ -2161,69 +2161,69 @@ type internal FsiInteractionProcessor fsiConsoleOutput.uprintnfnn "%s" format) istate,Completed None - | IHash (ParsedHashDirective("I",[path],m),_) -> - tcConfigB.AddIncludePath (m,path, tcConfig.implicitIncludeDir) + | IHash (ParsedHashDirective("I", [path], m), _) -> + tcConfigB.AddIncludePath (m, path, tcConfig.implicitIncludeDir) fsiConsoleOutput.uprintnfnn "%s" (FSIstrings.SR.fsiDidAHashI(tcConfig.MakePathAbsolute path)) - istate,Completed None + istate, Completed None - | IHash (ParsedHashDirective("cd",[path],m),_) -> + | IHash (ParsedHashDirective("cd", [path], m), _) -> ChangeDirectory path m - istate,Completed None + istate, Completed None - | IHash (ParsedHashDirective("silentCd",[path],m),_) -> + | IHash (ParsedHashDirective("silentCd", [path], m), _) -> ChangeDirectory path m fsiConsolePrompt.SkipNext() (* "silent" directive *) - istate,Completed None + istate, Completed None - | IHash (ParsedHashDirective("dbgbreak",[],_),_) -> - {istate with debugBreak = true},Completed None + | IHash (ParsedHashDirective("dbgbreak", [], _), _) -> + {istate with debugBreak = true}, Completed None - | IHash (ParsedHashDirective("time",[],_),_) -> + | IHash (ParsedHashDirective("time", [], _), _) -> if istate.timing then fsiConsoleOutput.uprintnfnn "%s" (FSIstrings.SR.fsiTurnedTimingOff()) else fsiConsoleOutput.uprintnfnn "%s" (FSIstrings.SR.fsiTurnedTimingOn()) - {istate with timing = not istate.timing},Completed None + {istate with timing = not istate.timing}, Completed None - | IHash (ParsedHashDirective("time",[("on" | "off") as v],_),_) -> + | IHash (ParsedHashDirective("time", [("on" | "off") as v], _), _) -> if v <> "on" then fsiConsoleOutput.uprintnfnn "%s" (FSIstrings.SR.fsiTurnedTimingOff()) else fsiConsoleOutput.uprintnfnn "%s" (FSIstrings.SR.fsiTurnedTimingOn()) - {istate with timing = (v = "on")},Completed None + {istate with timing = (v = "on")}, Completed None - | IHash (ParsedHashDirective("nowarn",numbers,m),_) -> - List.iter (fun (d:string) -> tcConfigB.TurnWarningOff(m,d)) numbers - istate,Completed None + | IHash (ParsedHashDirective("nowarn", numbers, m), _) -> + List.iter (fun (d:string) -> tcConfigB.TurnWarningOff(m, d)) numbers + istate, Completed None - | IHash (ParsedHashDirective("terms",[],_),_) -> + | IHash (ParsedHashDirective("terms", [], _), _) -> tcConfigB.showTerms <- not tcConfig.showTerms - istate,Completed None + istate, Completed None - | IHash (ParsedHashDirective("types",[],_),_) -> + | IHash (ParsedHashDirective("types", [], _), _) -> fsiOptions.ShowTypes <- not fsiOptions.ShowTypes - istate,Completed None + istate, Completed None #if DEBUG - | IHash (ParsedHashDirective("ilcode",[],_m),_) -> + | IHash (ParsedHashDirective("ilcode", [], _m), _) -> fsiOptions.ShowILCode <- not fsiOptions.ShowILCode; - istate,Completed None + istate, Completed None - | IHash (ParsedHashDirective("info",[],_m),_) -> + | IHash (ParsedHashDirective("info", [], _m), _) -> PrintOptionInfo tcConfigB - istate,Completed None + istate, Completed None #endif - | IHash (ParsedHashDirective(("q" | "quit"),[],_),_) -> + | IHash (ParsedHashDirective(("q" | "quit"), [], _), _) -> fsiInterruptController.Exit() - | IHash (ParsedHashDirective("help",[],_),_) -> + | IHash (ParsedHashDirective("help", [], _), _) -> fsiOptions.ShowHelp() - istate,Completed None + istate, Completed None - | IHash (ParsedHashDirective(c,arg,_),_) -> - fsiConsoleOutput.uprintfn "%s" (FSIstrings.SR.fsiInvalidDirective(c, String.concat " " arg)) // REVIEW: uprintnfnn - like other directives above - istate,Completed None (* REVIEW: cont = CompletedWithReportedError *) + | IHash (ParsedHashDirective(c, arg, m), _) -> + warning(Error((FSComp.SR.fsiInvalidDirective(c, String.concat " " arg)), m)) + istate, Completed None ) /// Execute a single parsed interaction which may contain multiple items to be executed diff --git a/src/fsharp/fsi/xlf/FSIstrings.txt.cs.xlf b/src/fsharp/fsi/xlf/FSIstrings.txt.cs.xlf index 2d4481919d..3fb6c4c42c 100644 --- a/src/fsharp/fsi/xlf/FSIstrings.txt.cs.xlf +++ b/src/fsharp/fsi/xlf/FSIstrings.txt.cs.xlf @@ -122,11 +122,6 @@ Adresář {0} neexistuje. - - Invalid directive '#{0} {1}' - Neplatná direktiva #{0} {1} - - Warning: line too long, ignoring some characters\n Upozornění: řádek je příliš dlouhý, některé znaky se ignorují.\n diff --git a/src/fsharp/fsi/xlf/FSIstrings.txt.de.xlf b/src/fsharp/fsi/xlf/FSIstrings.txt.de.xlf index 80ec70245d..3a439ace8e 100644 --- a/src/fsharp/fsi/xlf/FSIstrings.txt.de.xlf +++ b/src/fsharp/fsi/xlf/FSIstrings.txt.de.xlf @@ -122,11 +122,6 @@ Das Verzeichnis "{0}" ist nicht vorhanden. - - Invalid directive '#{0} {1}' - Ungültige Direktive "#{0} {1}" - - Warning: line too long, ignoring some characters\n Warnung: Die Zeile ist zu lang, einige Zeichen werden ignoriert.\n diff --git a/src/fsharp/fsi/xlf/FSIstrings.txt.es.xlf b/src/fsharp/fsi/xlf/FSIstrings.txt.es.xlf index d5ec3bf213..ce48111e7a 100644 --- a/src/fsharp/fsi/xlf/FSIstrings.txt.es.xlf +++ b/src/fsharp/fsi/xlf/FSIstrings.txt.es.xlf @@ -122,11 +122,6 @@ El directorio '{0}' no existe. - - Invalid directive '#{0} {1}' - Directiva '#{0} {1}' no válida. - - Warning: line too long, ignoring some characters\n Advertencia: línea demasiado larga, omitiendo algunos caracteres.\n diff --git a/src/fsharp/fsi/xlf/FSIstrings.txt.fr.xlf b/src/fsharp/fsi/xlf/FSIstrings.txt.fr.xlf index 963d52c650..205b4ee29d 100644 --- a/src/fsharp/fsi/xlf/FSIstrings.txt.fr.xlf +++ b/src/fsharp/fsi/xlf/FSIstrings.txt.fr.xlf @@ -122,11 +122,6 @@ Le répertoire '{0}' n'existe pas - - Invalid directive '#{0} {1}' - Directive non valide '#{0} {1}' - - Warning: line too long, ignoring some characters\n Avertissement : ligne trop longue, certains caractères sont ignorés\n diff --git a/src/fsharp/fsi/xlf/FSIstrings.txt.it.xlf b/src/fsharp/fsi/xlf/FSIstrings.txt.it.xlf index aa030eb6b3..a80011624b 100644 --- a/src/fsharp/fsi/xlf/FSIstrings.txt.it.xlf +++ b/src/fsharp/fsi/xlf/FSIstrings.txt.it.xlf @@ -122,11 +122,6 @@ La directory '{0}' non esiste - - Invalid directive '#{0} {1}' - Direttiva '#{0} {1}' non valida - - Warning: line too long, ignoring some characters\n Avviso: riga troppo lunga; alcuni caratteri verranno ignorati\n diff --git a/src/fsharp/fsi/xlf/FSIstrings.txt.ja.xlf b/src/fsharp/fsi/xlf/FSIstrings.txt.ja.xlf index ad4b06f0fd..1d2d4ef1a0 100644 --- a/src/fsharp/fsi/xlf/FSIstrings.txt.ja.xlf +++ b/src/fsharp/fsi/xlf/FSIstrings.txt.ja.xlf @@ -122,11 +122,6 @@ ディレクトリ "{0}" は存在しません - - Invalid directive '#{0} {1}' - 無効なディレクティブ '#{0} {1}' - - Warning: line too long, ignoring some characters\n 警告: 行が長すぎます。一部の文字は無視されます\n diff --git a/src/fsharp/fsi/xlf/FSIstrings.txt.ko.xlf b/src/fsharp/fsi/xlf/FSIstrings.txt.ko.xlf index 53f9f27608..c6f84506f1 100644 --- a/src/fsharp/fsi/xlf/FSIstrings.txt.ko.xlf +++ b/src/fsharp/fsi/xlf/FSIstrings.txt.ko.xlf @@ -122,11 +122,6 @@ '{0}' 디렉터리가 없습니다. - - Invalid directive '#{0} {1}' - 잘못된 지시문 '#{0} {1}' - - Warning: line too long, ignoring some characters\n 경고: 줄이 너무 길어 일부 문자가 무시됩니다.\n diff --git a/src/fsharp/fsi/xlf/FSIstrings.txt.pl.xlf b/src/fsharp/fsi/xlf/FSIstrings.txt.pl.xlf index 3666ea478e..4cb9444fb6 100644 --- a/src/fsharp/fsi/xlf/FSIstrings.txt.pl.xlf +++ b/src/fsharp/fsi/xlf/FSIstrings.txt.pl.xlf @@ -122,11 +122,6 @@ Katalog „{0}” nie istnieje - - Invalid directive '#{0} {1}' - Nieprawidłowa dyrektywa „#{0} {1}” - - Warning: line too long, ignoring some characters\n Ostrzeżenie: wiersz jest zbyt długi, niektóre znaki zostaną zignorowane\n diff --git a/src/fsharp/fsi/xlf/FSIstrings.txt.pt-BR.xlf b/src/fsharp/fsi/xlf/FSIstrings.txt.pt-BR.xlf index 9adafa2f09..e5000c692a 100644 --- a/src/fsharp/fsi/xlf/FSIstrings.txt.pt-BR.xlf +++ b/src/fsharp/fsi/xlf/FSIstrings.txt.pt-BR.xlf @@ -122,11 +122,6 @@ O diretório '{0}' não existe - - Invalid directive '#{0} {1}' - Diretriz inválida '#{0} {1}' - - Warning: line too long, ignoring some characters\n Aviso: linha muito longa, ignore alguns caracteres\n diff --git a/src/fsharp/fsi/xlf/FSIstrings.txt.ru.xlf b/src/fsharp/fsi/xlf/FSIstrings.txt.ru.xlf index 9cbfe6ff50..a43adbec0d 100644 --- a/src/fsharp/fsi/xlf/FSIstrings.txt.ru.xlf +++ b/src/fsharp/fsi/xlf/FSIstrings.txt.ru.xlf @@ -122,11 +122,6 @@ Каталог "{0}" не существует - - Invalid directive '#{0} {1}' - Недопустимая директива "#{0} {1}" - - Warning: line too long, ignoring some characters\n Предупреждение: слишком длинная строка, некоторые знаки игнорируются\n diff --git a/src/fsharp/fsi/xlf/FSIstrings.txt.tr.xlf b/src/fsharp/fsi/xlf/FSIstrings.txt.tr.xlf index 65042521c7..d409fb44ff 100644 --- a/src/fsharp/fsi/xlf/FSIstrings.txt.tr.xlf +++ b/src/fsharp/fsi/xlf/FSIstrings.txt.tr.xlf @@ -122,11 +122,6 @@ '{0}' dizini yok - - Invalid directive '#{0} {1}' - Geçersiz yönerge '#{0} {1}' - - Warning: line too long, ignoring some characters\n Uyarı: satır çok uzun, bazı karakterler yok sayılıyor\n diff --git a/src/fsharp/fsi/xlf/FSIstrings.txt.zh-Hans.xlf b/src/fsharp/fsi/xlf/FSIstrings.txt.zh-Hans.xlf index a97b57363e..4ad4e4161e 100644 --- a/src/fsharp/fsi/xlf/FSIstrings.txt.zh-Hans.xlf +++ b/src/fsharp/fsi/xlf/FSIstrings.txt.zh-Hans.xlf @@ -122,11 +122,6 @@ 目录“{0}”不存在 - - Invalid directive '#{0} {1}' - 无效的指令“#{0} {1}” - - Warning: line too long, ignoring some characters\n 警告: 由于行太长，将忽略某些字符\n diff --git a/src/fsharp/fsi/xlf/FSIstrings.txt.zh-Hant.xlf b/src/fsharp/fsi/xlf/FSIstrings.txt.zh-Hant.xlf index 936f04dd78..458e547a00 100644 --- a/src/fsharp/fsi/xlf/FSIstrings.txt.zh-Hant.xlf +++ b/src/fsharp/fsi/xlf/FSIstrings.txt.zh-Hant.xlf @@ -122,11 +122,6 @@ 目錄 '{0}' 不存在 - - Invalid directive '#{0} {1}' - 無效的指示詞 '#{0} {1}' - - Warning: line too long, ignoring some characters\n 警告: 行太長，將忽略某些字元\n diff --git a/src/fsharp/xlf/FSComp.txt.cs.xlf b/src/fsharp/xlf/FSComp.txt.cs.xlf index a176f81a80..93b25fc149 100644 --- a/src/fsharp/xlf/FSComp.txt.cs.xlf +++ b/src/fsharp/xlf/FSComp.txt.cs.xlf @@ -152,6 +152,11 @@ Vytváření průřezů od konce vyžaduje jazykovou verzi 5.0, použijte /langversion:preview. + + Invalid directive '#{0} {1}' + Invalid directive '#{0} {1}' + + Stream does not begin with a null resource and is not in '.RES' format. Stream nezačíná zdrojem s hodnotou null a není ve formátu .RES. diff --git a/src/fsharp/xlf/FSComp.txt.de.xlf b/src/fsharp/xlf/FSComp.txt.de.xlf index 13a70ff59e..21d4e0495f 100644 --- a/src/fsharp/xlf/FSComp.txt.de.xlf +++ b/src/fsharp/xlf/FSComp.txt.de.xlf @@ -152,6 +152,11 @@ Für das vom Ende ausgehende Slicing ist Sprachversion 5.0 erforderlich. Verwenden Sie /langversion:preview. + + Invalid directive '#{0} {1}' + Invalid directive '#{0} {1}' + + Stream does not begin with a null resource and is not in '.RES' format. Der Stream beginnt nicht mit einer NULL-Ressource und ist nicht im RES-Format. diff --git a/src/fsharp/xlf/FSComp.txt.es.xlf b/src/fsharp/xlf/FSComp.txt.es.xlf index 48bcbb8252..d569c0710a 100644 --- a/src/fsharp/xlf/FSComp.txt.es.xlf +++ b/src/fsharp/xlf/FSComp.txt.es.xlf @@ -152,6 +152,11 @@ La segmentación desde el final requiere la versión de lenguaje 5.0, use /langversion:preview. + + Invalid directive '#{0} {1}' + Invalid directive '#{0} {1}' + + Stream does not begin with a null resource and is not in '.RES' format. El flujo no comienza con un recurso nulo ni está en formato ".RES". diff --git a/src/fsharp/xlf/FSComp.txt.fr.xlf b/src/fsharp/xlf/FSComp.txt.fr.xlf index ed34481d69..abb9324ac2 100644 --- a/src/fsharp/xlf/FSComp.txt.fr.xlf +++ b/src/fsharp/xlf/FSComp.txt.fr.xlf @@ -152,6 +152,11 @@ L'extraction à partir de la fin nécessite la version 5.0 du langage. Utilisez /langversion:preview. + + Invalid directive '#{0} {1}' + Invalid directive '#{0} {1}' + + Stream does not begin with a null resource and is not in '.RES' format. Le flux ne commence pas par une ressource null et n'est pas au format '.RES'. diff --git a/src/fsharp/xlf/FSComp.txt.it.xlf b/src/fsharp/xlf/FSComp.txt.it.xlf index 28af1801f1..63466b5862 100644 --- a/src/fsharp/xlf/FSComp.txt.it.xlf +++ b/src/fsharp/xlf/FSComp.txt.it.xlf @@ -152,6 +152,11 @@ Con il sezionamento dalla fine è richiesta la versione 5.0 del linguaggio. Usare /langversion:preview. + + Invalid directive '#{0} {1}' + Invalid directive '#{0} {1}' + + Stream does not begin with a null resource and is not in '.RES' format. Il flusso non inizia con una risorsa Null e non è in formato '.RES'. diff --git a/src/fsharp/xlf/FSComp.txt.ja.xlf b/src/fsharp/xlf/FSComp.txt.ja.xlf index 7251c15f4b..edae43da49 100644 --- a/src/fsharp/xlf/FSComp.txt.ja.xlf +++ b/src/fsharp/xlf/FSComp.txt.ja.xlf @@ -152,6 +152,11 @@ 言語バージョン 5.0 が必要な最後からのスライスで、/langversion:preview を使用してください。 + + Invalid directive '#{0} {1}' + Invalid directive '#{0} {1}' + + Stream does not begin with a null resource and is not in '.RES' format. ストリームは null リソースでは始まらず、'RES' 形式でもありません。 diff --git a/src/fsharp/xlf/FSComp.txt.ko.xlf b/src/fsharp/xlf/FSComp.txt.ko.xlf index 197d8985f0..b2d2fdd5c2 100644 --- a/src/fsharp/xlf/FSComp.txt.ko.xlf +++ b/src/fsharp/xlf/FSComp.txt.ko.xlf @@ -152,6 +152,11 @@ 언어 버전 5.0이 필요한 끝 조각화에서는 /langversion:preview를 사용하세요. + + Invalid directive '#{0} {1}' + Invalid directive '#{0} {1}' + + Stream does not begin with a null resource and is not in '.RES' format. 스트림은 null 리소스로 시작되지 않으며 '.RES' 형식이 아닙니다. diff --git a/src/fsharp/xlf/FSComp.txt.pl.xlf b/src/fsharp/xlf/FSComp.txt.pl.xlf index 790649874e..2f0990cee6 100644 --- a/src/fsharp/xlf/FSComp.txt.pl.xlf +++ b/src/fsharp/xlf/FSComp.txt.pl.xlf @@ -152,6 +152,11 @@ Wycinanie od końca wymaga języka w wersji 5.0, użyj parametru /langversion:preview. + + Invalid directive '#{0} {1}' + Invalid directive '#{0} {1}' + + Stream does not begin with a null resource and is not in '.RES' format. Strumień nie zaczyna się od zasobu o wartości null i nie jest w formacie „.RES”. diff --git a/src/fsharp/xlf/FSComp.txt.pt-BR.xlf b/src/fsharp/xlf/FSComp.txt.pt-BR.xlf index dd5d94d1b9..22edbadb5d 100644 --- a/src/fsharp/xlf/FSComp.txt.pt-BR.xlf +++ b/src/fsharp/xlf/FSComp.txt.pt-BR.xlf @@ -152,6 +152,11 @@ A opção 'Divisão começando no final' requer a versão de idioma 5.0. Use /langversion:preview. + + Invalid directive '#{0} {1}' + Invalid directive '#{0} {1}' + + Stream does not begin with a null resource and is not in '.RES' format. Stream não começa com um recurso nulo e não está no formato '.RES'. diff --git a/src/fsharp/xlf/FSComp.txt.ru.xlf b/src/fsharp/xlf/FSComp.txt.ru.xlf index 33533871d5..484bd79d7e 100644 --- a/src/fsharp/xlf/FSComp.txt.ru.xlf +++ b/src/fsharp/xlf/FSComp.txt.ru.xlf @@ -152,6 +152,11 @@ Для конечного среза, для которого требуется версия языка 5.0, используйте параметр /langversion:preview. + + Invalid directive '#{0} {1}' + Invalid directive '#{0} {1}' + + Stream does not begin with a null resource and is not in '.RES' format. Поток не начинается с нулевого ресурса и не соответствует формату ".RES". diff --git a/src/fsharp/xlf/FSComp.txt.tr.xlf b/src/fsharp/xlf/FSComp.txt.tr.xlf index 17cd35566d..e4ec2c2c68 100644 --- a/src/fsharp/xlf/FSComp.txt.tr.xlf +++ b/src/fsharp/xlf/FSComp.txt.tr.xlf @@ -152,6 +152,11 @@ Sondan dilimleme, 5.0 dil sürümünü gerektirir, /langversion:preview kullanın. + + Invalid directive '#{0} {1}' + Invalid directive '#{0} {1}' + + Stream does not begin with a null resource and is not in '.RES' format. Akış null kaynakla başlamıyor ve '.RES' biçiminde değil. diff --git a/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf b/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf index 301dcb082a..93cef3ca98 100644 --- a/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf +++ b/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf @@ -152,6 +152,11 @@ 需要语言版本 5.0 才能从末尾切片，请使用 /langversion:preview。 + + Invalid directive '#{0} {1}' + Invalid directive '#{0} {1}' + + Stream does not begin with a null resource and is not in '.RES' format. 流应以空资源开头并且应采用 .RES 格式。 diff --git a/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf b/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf index 39a787c710..5f209869ff 100644 --- a/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf +++ b/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf @@ -152,6 +152,11 @@ 從結尾處切割需要語言版本 5.0，請使用 /langversion:preview。 + + Invalid directive '#{0} {1}' + Invalid directive '#{0} {1}' + + Stream does not begin with a null resource and is not in '.RES' format. 資料流未以 null 資源開頭，並且未使用 '.RES' 格式。 From 62e51c4996e3923c723d2dc03f595b2e8bb3adfa Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Tue, 30 Jun 2020 01:13:11 -0700 Subject: [PATCH 2/2] Update baselines --- tests/fsharp/core/printing/test.fsx | 2 +- tests/fsharp/core/printing/z.output.test.1000.stderr.bsl | 6 ++++++ tests/fsharp/core/printing/z.output.test.1000.stdout.bsl | 1 - tests/fsharp/core/printing/z.output.test.200.stderr.bsl | 6 ++++++ tests/fsharp/core/printing/z.output.test.200.stdout.bsl | 1 - tests/fsharp/core/printing/z.output.test.default.stderr.bsl | 6 ++++++ tests/fsharp/core/printing/z.output.test.default.stdout.bsl | 1 - tests/fsharp/core/printing/z.output.test.off.stderr.bsl | 6 ++++++ tests/fsharp/core/printing/z.output.test.off.stdout.bsl | 1 - tests/fsharp/core/printing/z.output.test.quiet.stderr.bsl | 6 ++++++ 10 files changed, 31 insertions(+), 5 deletions(-) diff --git a/tests/fsharp/core/printing/test.fsx b/tests/fsharp/core/printing/test.fsx index 60b36a00ea..63dd02878e 100644 --- a/tests/fsharp/core/printing/test.fsx +++ b/tests/fsharp/core/printing/test.fsx @@ -217,7 +217,7 @@ module RepeatedModule = begin let repeatedByteLiteral = [| 12uy; 13uy; 14uy |] e (* no eval in between, since time can vary and look like a regression *) #time;; (* time off *) "Check #unknown command";; -#blaaaaaa;; // blaaaaaa is not a known command +#blaaaaaa // blaaaaaa is not a known command;; "Check #I with a known directory (to avoid a warning, which includes the location of this file, which is fragile...)";; #I "/";; diff --git a/tests/fsharp/core/printing/z.output.test.1000.stderr.bsl b/tests/fsharp/core/printing/z.output.test.1000.stderr.bsl index 386c625eef..3253446641 100644 --- a/tests/fsharp/core/printing/z.output.test.1000.stderr.bsl +++ b/tests/fsharp/core/printing/z.output.test.1000.stderr.bsl @@ -1,4 +1,10 @@ + #blaaaaaa // blaaaaaa is not a known command;; + ^ + +stdin(220,1): warning FS3353: Invalid directive '#blaaaaaa ' + + type Regression4319_T0 = static member (+-+-+) = "0 arguments";; -----------------------------------------^^^^^ diff --git a/tests/fsharp/core/printing/z.output.test.1000.stdout.bsl b/tests/fsharp/core/printing/z.output.test.1000.stdout.bsl index 03b6e6467d..bbbe0f4d1f 100644 --- a/tests/fsharp/core/printing/z.output.test.1000.stdout.bsl +++ b/tests/fsharp/core/printing/z.output.test.1000.stdout.bsl @@ -1130,7 +1130,6 @@ end > val it : string = "Check #unknown command" -> Invalid directive '#blaaaaaa ' > val it : string = "Check #I with a known directory (to avoid a warning, which includes the location of this file, which is fragile...)" diff --git a/tests/fsharp/core/printing/z.output.test.200.stderr.bsl b/tests/fsharp/core/printing/z.output.test.200.stderr.bsl index 386c625eef..3253446641 100644 --- a/tests/fsharp/core/printing/z.output.test.200.stderr.bsl +++ b/tests/fsharp/core/printing/z.output.test.200.stderr.bsl @@ -1,4 +1,10 @@ + #blaaaaaa // blaaaaaa is not a known command;; + ^ + +stdin(220,1): warning FS3353: Invalid directive '#blaaaaaa ' + + type Regression4319_T0 = static member (+-+-+) = "0 arguments";; -----------------------------------------^^^^^ diff --git a/tests/fsharp/core/printing/z.output.test.200.stdout.bsl b/tests/fsharp/core/printing/z.output.test.200.stdout.bsl index 681b7a7aaf..002ecebf27 100644 --- a/tests/fsharp/core/printing/z.output.test.200.stdout.bsl +++ b/tests/fsharp/core/printing/z.output.test.200.stdout.bsl @@ -450,7 +450,6 @@ end > val it : string = "Check #unknown command" -> Invalid directive '#blaaaaaa ' > val it : string = "Check #I with a known directory (to avoid a warning, which includes the location of this file, which is fragile...)" diff --git a/tests/fsharp/core/printing/z.output.test.default.stderr.bsl b/tests/fsharp/core/printing/z.output.test.default.stderr.bsl index 386c625eef..3253446641 100644 --- a/tests/fsharp/core/printing/z.output.test.default.stderr.bsl +++ b/tests/fsharp/core/printing/z.output.test.default.stderr.bsl @@ -1,4 +1,10 @@ + #blaaaaaa // blaaaaaa is not a known command;; + ^ + +stdin(220,1): warning FS3353: Invalid directive '#blaaaaaa ' + + type Regression4319_T0 = static member (+-+-+) = "0 arguments";; -----------------------------------------^^^^^ diff --git a/tests/fsharp/core/printing/z.output.test.default.stdout.bsl b/tests/fsharp/core/printing/z.output.test.default.stdout.bsl index b9872ed5e3..9d5d95917b 100644 --- a/tests/fsharp/core/printing/z.output.test.default.stdout.bsl +++ b/tests/fsharp/core/printing/z.output.test.default.stdout.bsl @@ -4089,7 +4089,6 @@ end > val it : string = "Check #unknown command" -> Invalid directive '#blaaaaaa ' > val it : string = "Check #I with a known directory (to avoid a warning, which includes the location of this file, which is fragile...)" diff --git a/tests/fsharp/core/printing/z.output.test.off.stderr.bsl b/tests/fsharp/core/printing/z.output.test.off.stderr.bsl index 386c625eef..3253446641 100644 --- a/tests/fsharp/core/printing/z.output.test.off.stderr.bsl +++ b/tests/fsharp/core/printing/z.output.test.off.stderr.bsl @@ -1,4 +1,10 @@ + #blaaaaaa // blaaaaaa is not a known command;; + ^ + +stdin(220,1): warning FS3353: Invalid directive '#blaaaaaa ' + + type Regression4319_T0 = static member (+-+-+) = "0 arguments";; -----------------------------------------^^^^^ diff --git a/tests/fsharp/core/printing/z.output.test.off.stdout.bsl b/tests/fsharp/core/printing/z.output.test.off.stdout.bsl index 9c90f3e2fa..5dc10d6bfe 100644 --- a/tests/fsharp/core/printing/z.output.test.off.stdout.bsl +++ b/tests/fsharp/core/printing/z.output.test.off.stdout.bsl @@ -277,7 +277,6 @@ end > val it : string = "Check #unknown command" -> Invalid directive '#blaaaaaa ' > val it : string = "Check #I with a known directory (to avoid a warning, which includes the location of this file, which is fragile...)" diff --git a/tests/fsharp/core/printing/z.output.test.quiet.stderr.bsl b/tests/fsharp/core/printing/z.output.test.quiet.stderr.bsl index 386c625eef..3253446641 100644 --- a/tests/fsharp/core/printing/z.output.test.quiet.stderr.bsl +++ b/tests/fsharp/core/printing/z.output.test.quiet.stderr.bsl @@ -1,4 +1,10 @@ + #blaaaaaa // blaaaaaa is not a known command;; + ^ + +stdin(220,1): warning FS3353: Invalid directive '#blaaaaaa ' + + type Regression4319_T0 = static member (+-+-+) = "0 arguments";; -----------------------------------------^^^^^