Skip to content

Warn on invalided FSI directives. #9601

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
KevinRansom merged 2 commits into from
Jul 6, 2020
Merged

Warn on invalided FSI directives. #9601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d92953
cleanup fsi a bit
KevinRansom Jun 30, 2020
62e51c4
Update baselines
KevinRansom Jun 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/fsharp/FSComp.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'"
1 change: 0 additions & 1 deletion src/fsharp/fsi/FSIstrings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
68 changes: 34 additions & 34 deletions src/fsharp/fsi/fsi.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -2099,19 +2099,19 @@ 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)

| IDefns (defs,_) ->
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

Expand Down Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions src/fsharp/fsi/xlf/FSIstrings.txt.cs.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,6 @@
<target state="translated">Adresář {0} neexistuje.</target>
<note />
</trans-unit>
<trans-unit id="fsiInvalidDirective">
<source>Invalid directive '#{0} {1}'</source>
<target state="translated">Neplatná direktiva #{0} {1}</target>
<note />
</trans-unit>
<trans-unit id="fsiLineTooLong">
<source>Warning: line too long, ignoring some characters\n</source>
<target state="translated">Upozornění: řádek je příliš dlouhý, některé znaky se ignorují.\n</target>
Expand Down
5 changes: 0 additions & 5 deletions src/fsharp/fsi/xlf/FSIstrings.txt.de.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,6 @@
<target state="translated">Das Verzeichnis "{0}" ist nicht vorhanden.</target>
<note />
</trans-unit>
<trans-unit id="fsiInvalidDirective">
<source>Invalid directive '#{0} {1}'</source>
<target state="translated">Ungültige Direktive "#{0} {1}"</target>
<note />
</trans-unit>
<trans-unit id="fsiLineTooLong">
<source>Warning: line too long, ignoring some characters\n</source>
<target state="translated">Warnung: Die Zeile ist zu lang, einige Zeichen werden ignoriert.\n</target>
Expand Down
5 changes: 0 additions & 5 deletions src/fsharp/fsi/xlf/FSIstrings.txt.es.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,6 @@
<target state="translated">El directorio '{0}' no existe.</target>
<note />
</trans-unit>
<trans-unit id="fsiInvalidDirective">
<source>Invalid directive '#{0} {1}'</source>
<target state="translated">Directiva '#{0} {1}' no válida.</target>
<note />
</trans-unit>
<trans-unit id="fsiLineTooLong">
<source>Warning: line too long, ignoring some characters\n</source>
<target state="translated">Advertencia: línea demasiado larga, omitiendo algunos caracteres.\n</target>
Expand Down
5 changes: 0 additions & 5 deletions src/fsharp/fsi/xlf/FSIstrings.txt.fr.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,6 @@
<target state="translated">Le répertoire '{0}' n'existe pas</target>
<note />
</trans-unit>
<trans-unit id="fsiInvalidDirective">
<source>Invalid directive '#{0} {1}'</source>
<target state="translated">Directive non valide '#{0} {1}'</target>
<note />
</trans-unit>
<trans-unit id="fsiLineTooLong">
<source>Warning: line too long, ignoring some characters\n</source>
<target state="translated">Avertissement : ligne trop longue, certains caractères sont ignorés\n</target>
Expand Down
5 changes: 0 additions & 5 deletions src/fsharp/fsi/xlf/FSIstrings.txt.it.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,6 @@
<target state="translated">La directory '{0}' non esiste</target>
<note />
</trans-unit>
<trans-unit id="fsiInvalidDirective">
<source>Invalid directive '#{0} {1}'</source>
<target state="translated">Direttiva '#{0} {1}' non valida</target>
<note />
</trans-unit>
<trans-unit id="fsiLineTooLong">
<source>Warning: line too long, ignoring some characters\n</source>
<target state="translated">Avviso: riga troppo lunga; alcuni caratteri verranno ignorati\n</target>
Expand Down
5 changes: 0 additions & 5 deletions src/fsharp/fsi/xlf/FSIstrings.txt.ja.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,6 @@
<target state="translated">ディレクトリ "{0}" は存在しません</target>
<note />
</trans-unit>
<trans-unit id="fsiInvalidDirective">
<source>Invalid directive '#{0} {1}'</source>
<target state="translated">無効なディレクティブ '#{0} {1}'</target>
<note />
</trans-unit>
<trans-unit id="fsiLineTooLong">
<source>Warning: line too long, ignoring some characters\n</source>
<target state="translated">警告: 行が長すぎます。一部の文字は無視されます\n</target>
Expand Down
5 changes: 0 additions & 5 deletions src/fsharp/fsi/xlf/FSIstrings.txt.ko.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,6 @@
<target state="translated">'{0}' 디렉터리가 없습니다.</target>
<note />
</trans-unit>
<trans-unit id="fsiInvalidDirective">
<source>Invalid directive '#{0} {1}'</source>
<target state="translated">잘못된 지시문 '#{0} {1}'</target>
<note />
</trans-unit>
<trans-unit id="fsiLineTooLong">
<source>Warning: line too long, ignoring some characters\n</source>
<target state="translated">경고: 줄이 너무 길어 일부 문자가 무시됩니다.\n</target>
Expand Down
5 changes: 0 additions & 5 deletions src/fsharp/fsi/xlf/FSIstrings.txt.pl.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,6 @@
<target state="translated">Katalog „{0}” nie istnieje</target>
<note />
</trans-unit>
<trans-unit id="fsiInvalidDirective">
<source>Invalid directive '#{0} {1}'</source>
<target state="translated">Nieprawidłowa dyrektywa „#{0} {1}”</target>
<note />
</trans-unit>
<trans-unit id="fsiLineTooLong">
<source>Warning: line too long, ignoring some characters\n</source>
<target state="translated">Ostrzeżenie: wiersz jest zbyt długi, niektóre znaki zostaną zignorowane\n</target>
Expand Down
5 changes: 0 additions & 5 deletions src/fsharp/fsi/xlf/FSIstrings.txt.pt-BR.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,6 @@
<target state="translated">O diretório '{0}' não existe</target>
<note />
</trans-unit>
<trans-unit id="fsiInvalidDirective">
<source>Invalid directive '#{0} {1}'</source>
<target state="translated">Diretriz inválida '#{0} {1}'</target>
<note />
</trans-unit>
<trans-unit id="fsiLineTooLong">
<source>Warning: line too long, ignoring some characters\n</source>
<target state="translated">Aviso: linha muito longa, ignore alguns caracteres\n</target>
Expand Down
5 changes: 0 additions & 5 deletions src/fsharp/fsi/xlf/FSIstrings.txt.ru.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,6 @@
<target state="translated">Каталог "{0}" не существует</target>
<note />
</trans-unit>
<trans-unit id="fsiInvalidDirective">
<source>Invalid directive '#{0} {1}'</source>
<target state="translated">Недопустимая директива "#{0} {1}"</target>
<note />
</trans-unit>
<trans-unit id="fsiLineTooLong">
<source>Warning: line too long, ignoring some characters\n</source>
<target state="translated">Предупреждение: слишком длинная строка, некоторые знаки игнорируются\n</target>
Expand Down
5 changes: 0 additions & 5 deletions src/fsharp/fsi/xlf/FSIstrings.txt.tr.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,6 @@
<target state="translated">'{0}' dizini yok</target>
<note />
</trans-unit>
<trans-unit id="fsiInvalidDirective">
<source>Invalid directive '#{0} {1}'</source>
<target state="translated">Geçersiz yönerge '#{0} {1}'</target>
<note />
</trans-unit>
<trans-unit id="fsiLineTooLong">
<source>Warning: line too long, ignoring some characters\n</source>
<target state="translated">Uyarı: satır çok uzun, bazı karakterler yok sayılıyor\n</target>
Expand Down
5 changes: 0 additions & 5 deletions src/fsharp/fsi/xlf/FSIstrings.txt.zh-Hans.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,6 @@
<target state="translated">目录“{0}”不存在</target>
<note />
</trans-unit>
<trans-unit id="fsiInvalidDirective">
<source>Invalid directive '#{0} {1}'</source>
<target state="translated">无效的指令“#{0} {1}”</target>
<note />
</trans-unit>
<trans-unit id="fsiLineTooLong">
<source>Warning: line too long, ignoring some characters\n</source>
<target state="translated">警告: 由于行太长，将忽略某些字符\n</target>
Expand Down
5 changes: 0 additions & 5 deletions src/fsharp/fsi/xlf/FSIstrings.txt.zh-Hant.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,6 @@
<target state="translated">目錄 '{0}' 不存在</target>
<note />
</trans-unit>
<trans-unit id="fsiInvalidDirective">
<source>Invalid directive '#{0} {1}'</source>
<target state="translated">無效的指示詞 '#{0} {1}'</target>
<note />
</trans-unit>
<trans-unit id="fsiLineTooLong">
<source>Warning: line too long, ignoring some characters\n</source>
<target state="translated">警告: 行太長，將忽略某些字元\n</target>
Expand Down
5 changes: 5 additions & 0 deletions src/fsharp/xlf/FSComp.txt.cs.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,11 @@
<target state="translated">Vytváření průřezů od konce vyžaduje jazykovou verzi 5.0, použijte /langversion:preview.</target>
<note />
</trans-unit>
<trans-unit id="fsiInvalidDirective">
<source>Invalid directive '#{0} {1}'</source>
<target state="new">Invalid directive '#{0} {1}'</target>
<note />
</trans-unit>
<trans-unit id="nativeResourceFormatError">
<source>Stream does not begin with a null resource and is not in '.RES' format.</source>
<target state="translated">Stream nezačíná zdrojem s hodnotou null a není ve formátu .RES.</target>
Expand Down
5 changes: 5 additions & 0 deletions src/fsharp/xlf/FSComp.txt.de.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,11 @@
<target state="translated">Für das vom Ende ausgehende Slicing ist Sprachversion 5.0 erforderlich. Verwenden Sie /langversion:preview.</target>
<note />
</trans-unit>
<trans-unit id="fsiInvalidDirective">
<source>Invalid directive '#{0} {1}'</source>
<target state="new">Invalid directive '#{0} {1}'</target>
<note />
</trans-unit>
<trans-unit id="nativeResourceFormatError">
<source>Stream does not begin with a null resource and is not in '.RES' format.</source>
<target state="translated">Der Stream beginnt nicht mit einer NULL-Ressource und ist nicht im RES-Format.</target>
Expand Down
5 changes: 5 additions & 0 deletions src/fsharp/xlf/FSComp.txt.es.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,11 @@
<target state="translated">La segmentación desde el final requiere la versión de lenguaje 5.0, use /langversion:preview.</target>
<note />
</trans-unit>
<trans-unit id="fsiInvalidDirective">
<source>Invalid directive '#{0} {1}'</source>
<target state="new">Invalid directive '#{0} {1}'</target>
<note />
</trans-unit>
<trans-unit id="nativeResourceFormatError">
<source>Stream does not begin with a null resource and is not in '.RES' format.</source>
<target state="translated">El flujo no comienza con un recurso nulo ni está en formato ".RES".</target>
Expand Down
5 changes: 5 additions & 0 deletions src/fsharp/xlf/FSComp.txt.fr.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,11 @@
<target state="translated">L'extraction à partir de la fin nécessite la version 5.0 du langage. Utilisez /langversion:preview.</target>
<note />
</trans-unit>
<trans-unit id="fsiInvalidDirective">
<source>Invalid directive '#{0} {1}'</source>
<target state="new">Invalid directive '#{0} {1}'</target>
<note />
</trans-unit>
<trans-unit id="nativeResourceFormatError">
<source>Stream does not begin with a null resource and is not in '.RES' format.</source>
<target state="translated">Le flux ne commence pas par une ressource null et n'est pas au format '.RES'.</target>
Expand Down
5 changes: 5 additions & 0 deletions src/fsharp/xlf/FSComp.txt.it.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,11 @@
<target state="translated">Con il sezionamento dalla fine è richiesta la versione 5.0 del linguaggio. Usare /langversion:preview.</target>
<note />
</trans-unit>
<trans-unit id="fsiInvalidDirective">
<source>Invalid directive '#{0} {1}'</source>
<target state="new">Invalid directive '#{0} {1}'</target>
<note />
</trans-unit>
<trans-unit id="nativeResourceFormatError">
<source>Stream does not begin with a null resource and is not in '.RES' format.</source>
<target state="translated">Il flusso non inizia con una risorsa Null e non è in formato '.RES'.</target>
Expand Down
5 changes: 5 additions & 0 deletions src/fsharp/xlf/FSComp.txt.ja.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,11 @@
<target state="translated">言語バージョン 5.0 が必要な最後からのスライスで、/langversion:preview を使用してください。</target>
<note />
</trans-unit>
<trans-unit id="fsiInvalidDirective">
<source>Invalid directive '#{0} {1}'</source>
<target state="new">Invalid directive '#{0} {1}'</target>
<note />
</trans-unit>
<trans-unit id="nativeResourceFormatError">
<source>Stream does not begin with a null resource and is not in '.RES' format.</source>
<target state="translated">ストリームは null リソースでは始まらず、'RES' 形式でもありません。</target>
Expand Down
Loading