Skip to content
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

Jump to bottom

RFC FS-1108 - Allow more undentations and remove inconsistencies #11772

Merged
merged 28 commits into from
Aug 9, 2021
Merged

RFC FS-1108 - Allow more undentations and remove inconsistencies #11772

Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
be41b8b
Undentation frenzy
Happypig375 Jul 1, 2021
179d63b
Merge branch 'dotnet:main' into patch-10
Happypig375 Jul 2, 2021
30399a4
Update LexFilter.fs
Happypig375 Jul 2, 2021
128c57f
Backcompat
Happypig375 Jul 2, 2021
bdd827a
Fix failures
Happypig375 Jul 3, 2021
53f4c57
Fix errors in tests
Happypig375 Jul 4, 2021
f10397e
Backcompat again
Happypig375 Jul 5, 2021
a3bdeac
Oops
Happypig375 Jul 5, 2021
9f5ef87
More backcompat
Happypig375 Jul 5, 2021
91f7fc4
Merge branch 'dotnet:main' into patch-10
Happypig375 Jul 6, 2021
45d54a4
Fix
Happypig375 Jul 6, 2021
e6c3502
Reduce diff
Happypig375 Jul 6, 2021
4d912cd
Update LexFilter.fs
Happypig375 Jul 6, 2021
02a9880
Attributes do work correctly
Happypig375 Jul 7, 2021
dc423d3
Ooops
Happypig375 Jul 7, 2021
cc39457
Reduce diff
Happypig375 Jul 7, 2021
af7e1cf
Ooops fix
Happypig375 Jul 7, 2021
675f5ba
merge main
Jul 24, 2021
aa49cd8
merge main
Jul 24, 2021
9888944
update xlf
Jul 24, 2021
f405d06
update baseline
Jul 24, 2021
677da81
use 'when'
Jul 24, 2021
8d83d38
Tests pog
Happypig375 Aug 8, 2021
1d76694
Oopsay
Happypig375 Aug 8, 2021
830a2af
Merge branch 'main' into patch-10
vzarytovskii Aug 9, 2021
3f5609f
Update FSComp.txt.es.xlf
dsyme Aug 9, 2021
ad085f2
Update FSComp.txt.fr.xlf
dsyme Aug 9, 2021
f2f5cde
Update FSComp.txt.it.xlf
dsyme Aug 9, 2021
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 @@ -1530,6 +1530,7 @@ featureDefaultInterfaceMemberConsumption,"default interface member consumption"
featureStringInterpolation,"string interpolation"
featureWitnessPassing,"witness passing for trait constraints in F# quotations"
featureStructActivePattern,"struct representation for active patterns"
featureRelaxWhitespace2,"whitespace relaxation v2"
3353,fsiInvalidDirective,"Invalid directive '#%s %s'"
3360,typrelInterfaceWithConcreteAndVariable,"'%s' cannot implement the interface '%s' with the two instantiations '%s' and '%s' because they may unify."
3361,typrelInterfaceWithConcreteAndVariableObjectExpression,"You cannot implement the interface '%s' with the two instantiations '%s' and '%s' because they may unify."
Expand Down
3 changes: 3 additions & 0 deletions src/fsharp/LanguageFeatures.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ type LanguageFeature =
| SingleUnderscorePattern
| WildCardInForLoop
| RelaxWhitespace
| RelaxWhitespace2
| NameOf
| ImplicitYield
| OpenTypeDeclaration
Expand Down Expand Up @@ -78,6 +79,7 @@ type LanguageVersion (specifiedVersionAsString) =
LanguageFeature.StringInterpolation, languageVersion50

// F# preview
LanguageFeature.RelaxWhitespace2, previewVersion
LanguageFeature.OverloadsForCustomOperations, previewVersion
LanguageFeature.ExpandedMeasurables, previewVersion
LanguageFeature.FromEndSlicing, previewVersion
Expand Down Expand Up @@ -145,6 +147,7 @@ type LanguageVersion (specifiedVersionAsString) =
| LanguageFeature.SingleUnderscorePattern -> FSComp.SR.featureSingleUnderscorePattern()
| LanguageFeature.WildCardInForLoop -> FSComp.SR.featureWildCardInForLoop()
| LanguageFeature.RelaxWhitespace -> FSComp.SR.featureRelaxWhitespace()
| LanguageFeature.RelaxWhitespace2 -> FSComp.SR.featureRelaxWhitespace2()
| LanguageFeature.NameOf -> FSComp.SR.featureNameOf()
| LanguageFeature.ImplicitYield -> FSComp.SR.featureImplicitYield()
| LanguageFeature.OpenTypeDeclaration -> FSComp.SR.featureOpenTypeDeclaration()
Expand Down
1 change: 1 addition & 0 deletions src/fsharp/LanguageFeatures.fsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ type LanguageFeature =
| SingleUnderscorePattern
| WildCardInForLoop
| RelaxWhitespace
| RelaxWhitespace2
| NameOf
| ImplicitYield
| OpenTypeDeclaration
Expand Down
204 changes: 155 additions & 49 deletions src/fsharp/LexFilter.fs
View file
Open in desktop

Large diffs are not rendered by default.

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 @@ -177,6 +177,11 @@
<target state="translated">uvolnění prázdných znaků</target>
<note />
</trans-unit>
<trans-unit id="featureRelaxWhitespace2">
<source>whitespace relaxation v2</source>
<target state="new">whitespace relaxation v2</target>
<note />
</trans-unit>
<trans-unit id="featureResumableStateMachines">
<source>resumable state machines</source>
<target state="translated">obnovitelné stavové stroje</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 @@ -177,6 +177,11 @@
<target state="translated">Lockerung für Leerraum</target>
<note />
</trans-unit>
<trans-unit id="featureRelaxWhitespace2">
<source>whitespace relaxation v2</source>
<target state="new">whitespace relaxation v2</target>
<note />
</trans-unit>
<trans-unit id="featureResumableStateMachines">
<source>resumable state machines</source>
<target state="translated">Fortsetzbarer Zustand-Maschinen</target>
Expand Down
7 changes: 6 additions & 1 deletion src/fsharp/xlf/FSComp.txt.es.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,14 @@
<target state="translated">relajación de espacio en blanco</target>
<note />
</trans-unit>
<trans-unit id="featureRelaxWhitespace2">
<source>whitespace relaxation v2</source>
<target state="new">whitespace relaxation v2</target>
<note />
</trans-unit>
<trans-unit id="featureResumableStateMachines">
<source>resumable state machines</source>
<target state="translated">máquinas de estado reanudables</target>
dsyme marked this conversation as resolved.
Show resolved Hide resolved
<target state="new">resumable state machines</target>
<note />
</trans-unit>
<trans-unit id="featureSingleUnderscorePattern">
Expand Down
7 changes: 6 additions & 1 deletion src/fsharp/xlf/FSComp.txt.fr.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,14 @@
<target state="translated">assouplissement de la mise en retrait avec des espaces blancs</target>
<note />
</trans-unit>
<trans-unit id="featureRelaxWhitespace2">
<source>whitespace relaxation v2</source>
<target state="new">whitespace relaxation v2</target>
<note />
</trans-unit>
<trans-unit id="featureResumableStateMachines">
<source>resumable state machines</source>
<target state="translated">ordinateurs d’état pouvant être repris</target>
<target state="new">resumable state machines</target>
<note />
</trans-unit>
<trans-unit id="featureSingleUnderscorePattern">
Expand Down
7 changes: 6 additions & 1 deletion src/fsharp/xlf/FSComp.txt.it.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,14 @@
<target state="translated">uso meno restrittivo degli spazi vuoti</target>
<note />
</trans-unit>
<trans-unit id="featureRelaxWhitespace2">
<source>whitespace relaxation v2</source>
<target state="new">whitespace relaxation v2</target>
<note />
</trans-unit>
<trans-unit id="featureResumableStateMachines">
<source>resumable state machines</source>
<target state="translated">macchine a stati ripristinabili</target>
<target state="new">resumable state machines</target>
<note />
</trans-unit>
<trans-unit id="featureSingleUnderscorePattern">
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 @@ -177,6 +177,11 @@
<target state="translated">空白の緩和</target>
<note />
</trans-unit>
<trans-unit id="featureRelaxWhitespace2">
<source>whitespace relaxation v2</source>
<target state="new">whitespace relaxation v2</target>
<note />
</trans-unit>
<trans-unit id="featureResumableStateMachines">
<source>resumable state machines</source>
<target state="translated">再開可能なステート マシン</target>
Expand Down
5 changes: 5 additions & 0 deletions src/fsharp/xlf/FSComp.txt.ko.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,11 @@
<target state="translated">공백 완화</target>
<note />
</trans-unit>
<trans-unit id="featureRelaxWhitespace2">
<source>whitespace relaxation v2</source>
<target state="new">whitespace relaxation v2</target>
<note />
</trans-unit>
<trans-unit id="featureResumableStateMachines">
<source>resumable state machines</source>
<target state="translated">다시 시작 가능한 상태 시스템</target>
Expand Down
5 changes: 5 additions & 0 deletions src/fsharp/xlf/FSComp.txt.pl.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,11 @@
<target state="translated">rozluźnianie reguł dotyczących odstępów</target>
<note />
</trans-unit>
<trans-unit id="featureRelaxWhitespace2">
<source>whitespace relaxation v2</source>
<target state="new">whitespace relaxation v2</target>
<note />
</trans-unit>
<trans-unit id="featureResumableStateMachines">
<source>resumable state machines</source>
<target state="translated">automaty stanów z możliwością wznowienia</target>
Expand Down
5 changes: 5 additions & 0 deletions src/fsharp/xlf/FSComp.txt.pt-BR.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,11 @@
<target state="translated">atenuação de espaço em branco</target>
<note />
</trans-unit>
<trans-unit id="featureRelaxWhitespace2">
<source>whitespace relaxation v2</source>
<target state="new">whitespace relaxation v2</target>
<note />
</trans-unit>
<trans-unit id="featureResumableStateMachines">
<source>resumable state machines</source>
<target state="translated">máquinas de estado retomável</target>
Expand Down
5 changes: 5 additions & 0 deletions src/fsharp/xlf/FSComp.txt.ru.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,11 @@
<target state="translated">уменьшение строгости для пробелов</target>
<note />
</trans-unit>
<trans-unit id="featureRelaxWhitespace2">
<source>whitespace relaxation v2</source>
<target state="new">whitespace relaxation v2</target>
<note />
</trans-unit>
<trans-unit id="featureResumableStateMachines">
<source>resumable state machines</source>
<target state="translated">возобновляемые конечные автоматы</target>
Expand Down
5 changes: 5 additions & 0 deletions src/fsharp/xlf/FSComp.txt.tr.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,11 @@
<target state="translated">boşluk genişlemesi</target>
<note />
</trans-unit>
<trans-unit id="featureRelaxWhitespace2">
<source>whitespace relaxation v2</source>
<target state="new">whitespace relaxation v2</target>
<note />
</trans-unit>
<trans-unit id="featureResumableStateMachines">
<source>resumable state machines</source>
<target state="translated">sürdürülebilir durum makineleri</target>
Expand Down
5 changes: 5 additions & 0 deletions src/fsharp/xlf/FSComp.txt.zh-Hans.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,11 @@
<target state="translated">空格松弛法</target>
<note />
</trans-unit>
<trans-unit id="featureRelaxWhitespace2">
<source>whitespace relaxation v2</source>
<target state="new">whitespace relaxation v2</target>
<note />
</trans-unit>
<trans-unit id="featureResumableStateMachines">
<source>resumable state machines</source>
<target state="translated">可恢复状态机</target>
Expand Down
5 changes: 5 additions & 0 deletions src/fsharp/xlf/FSComp.txt.zh-Hant.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,11 @@
<target state="translated">空白字元放寬</target>
<note />
</trans-unit>
<trans-unit id="featureRelaxWhitespace2">
<source>whitespace relaxation v2</source>
<target state="new">whitespace relaxation v2</target>
<note />
</trans-unit>
<trans-unit id="featureResumableStateMachines">
<source>resumable state machines</source>
<target state="translated">可繼續的狀態機器</target>
Expand Down
Loading