diff --git a/src/Compiler/FSComp.txt b/src/Compiler/FSComp.txt index 26699fa4d9b..ecc5528198d 100644 --- a/src/Compiler/FSComp.txt +++ b/src/Compiler/FSComp.txt @@ -1565,7 +1565,6 @@ nativeResourceHeaderMalformed,"Resource header beginning at offset %s is malform formatDashItem," - %s" featureSingleUnderscorePattern,"single underscore pattern" featureWildCardInForLoop,"wild card in for loop" -featureRelaxWhitespace,"whitespace relaxation" featureNameOf,"nameof" featureImplicitYield,"implicit yield" featureOpenTypeDeclaration,"open type declaration" diff --git a/src/Compiler/Facilities/LanguageFeatures.fs b/src/Compiler/Facilities/LanguageFeatures.fs index ad170712e4a..4a98a2e877a 100644 --- a/src/Compiler/Facilities/LanguageFeatures.fs +++ b/src/Compiler/Facilities/LanguageFeatures.fs @@ -18,7 +18,6 @@ module internal FSharp.Compiler.Features type LanguageFeature = | SingleUnderscorePattern | WildCardInForLoop - | RelaxWhitespace | RelaxWhitespace2 | NameOf | ImplicitYield @@ -154,7 +153,6 @@ type LanguageVersion(versionText, ?disabledFeaturesArray: LanguageFeature array) // F# 4.7 LanguageFeature.SingleUnderscorePattern, languageVersion47 LanguageFeature.WildCardInForLoop, languageVersion47 - LanguageFeature.RelaxWhitespace, languageVersion47 LanguageFeature.ImplicitYield, languageVersion47 // F# 5.0 @@ -366,7 +364,6 @@ type LanguageVersion(versionText, ?disabledFeaturesArray: LanguageFeature array) match feature with | 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 () diff --git a/src/Compiler/Facilities/LanguageFeatures.fsi b/src/Compiler/Facilities/LanguageFeatures.fsi index 8c7ebd7e3c3..beb65bc9340 100644 --- a/src/Compiler/Facilities/LanguageFeatures.fsi +++ b/src/Compiler/Facilities/LanguageFeatures.fsi @@ -8,7 +8,6 @@ module internal FSharp.Compiler.Features type LanguageFeature = | SingleUnderscorePattern | WildCardInForLoop - | RelaxWhitespace | RelaxWhitespace2 | NameOf | ImplicitYield diff --git a/src/Compiler/SyntaxTree/LexFilter.fs b/src/Compiler/SyntaxTree/LexFilter.fs index 8f9267909d7..69a81d44783 100644 --- a/src/Compiler/SyntaxTree/LexFilter.fs +++ b/src/Compiler/SyntaxTree/LexFilter.fs @@ -959,7 +959,6 @@ type LexFilterImpl ( | _, CtxtSeqBlock _ :: CtxtParen(LPAREN, _) :: (CtxtMemberHead _ as limitCtxt) :: _ // 'static member P with get() = ' limited by 'static', likewise others | _, CtxtWithAsLet _ :: (CtxtMemberHead _ as limitCtxt) :: _ - when lexbuf.SupportsFeature LanguageFeature.RelaxWhitespace -> PositionWithColumn(limitCtxt.StartPos, limitCtxt.StartCol + 1) // REVIEW: document these diff --git a/src/Compiler/xlf/FSComp.txt.cs.xlf b/src/Compiler/xlf/FSComp.txt.cs.xlf index 8cb70b4c49e..f27bdcdaa7b 100644 --- a/src/Compiler/xlf/FSComp.txt.cs.xlf +++ b/src/Compiler/xlf/FSComp.txt.cs.xlf @@ -617,11 +617,6 @@ informační zprávy související s referenčními buňkami - - whitespace relaxation - whitespace relaxation - - whitespace relaxation v2 relaxace whitespace v2 diff --git a/src/Compiler/xlf/FSComp.txt.de.xlf b/src/Compiler/xlf/FSComp.txt.de.xlf index 5686312be6b..bd2247b1e43 100644 --- a/src/Compiler/xlf/FSComp.txt.de.xlf +++ b/src/Compiler/xlf/FSComp.txt.de.xlf @@ -617,11 +617,6 @@ Informationsmeldungen im Zusammenhang mit Bezugszellen - - whitespace relaxation - whitespace relaxation - - whitespace relaxation v2 whitespace relaxation v2 diff --git a/src/Compiler/xlf/FSComp.txt.es.xlf b/src/Compiler/xlf/FSComp.txt.es.xlf index a3b4cfce50b..78c495baf1b 100644 --- a/src/Compiler/xlf/FSComp.txt.es.xlf +++ b/src/Compiler/xlf/FSComp.txt.es.xlf @@ -617,11 +617,6 @@ mensajes informativos relacionados con las celdas de referencia - - whitespace relaxation - whitespace relaxation - - whitespace relaxation v2 relajación de espacios en blanco v2 diff --git a/src/Compiler/xlf/FSComp.txt.fr.xlf b/src/Compiler/xlf/FSComp.txt.fr.xlf index bf46f5ee12b..7e6e397b333 100644 --- a/src/Compiler/xlf/FSComp.txt.fr.xlf +++ b/src/Compiler/xlf/FSComp.txt.fr.xlf @@ -617,11 +617,6 @@ messages d’information liés aux cellules de référence - - whitespace relaxation - whitespace relaxation - - whitespace relaxation v2 relaxation des espaces blancs v2 diff --git a/src/Compiler/xlf/FSComp.txt.it.xlf b/src/Compiler/xlf/FSComp.txt.it.xlf index 6d705cdc2d1..72a7d0c6a45 100644 --- a/src/Compiler/xlf/FSComp.txt.it.xlf +++ b/src/Compiler/xlf/FSComp.txt.it.xlf @@ -617,11 +617,6 @@ messaggi informativi relativi alle celle di riferimento - - whitespace relaxation - whitespace relaxation - - whitespace relaxation v2 uso meno restrittivo degli spazi vuoti v2 diff --git a/src/Compiler/xlf/FSComp.txt.ja.xlf b/src/Compiler/xlf/FSComp.txt.ja.xlf index 0b35b8e6dac..93b1019d557 100644 --- a/src/Compiler/xlf/FSComp.txt.ja.xlf +++ b/src/Compiler/xlf/FSComp.txt.ja.xlf @@ -617,11 +617,6 @@ 参照セルに関連する情報メッセージ - - whitespace relaxation - whitespace relaxation - - whitespace relaxation v2 whitespace relaxation v2 diff --git a/src/Compiler/xlf/FSComp.txt.ko.xlf b/src/Compiler/xlf/FSComp.txt.ko.xlf index b00f54bfa76..93d438c484c 100644 --- a/src/Compiler/xlf/FSComp.txt.ko.xlf +++ b/src/Compiler/xlf/FSComp.txt.ko.xlf @@ -617,11 +617,6 @@ 참조 셀과 관련된 정보 메시지 - - whitespace relaxation - whitespace relaxation - - whitespace relaxation v2 공백 relaxation v2 diff --git a/src/Compiler/xlf/FSComp.txt.pl.xlf b/src/Compiler/xlf/FSComp.txt.pl.xlf index b6d4b78a2d8..ee7d42472a5 100644 --- a/src/Compiler/xlf/FSComp.txt.pl.xlf +++ b/src/Compiler/xlf/FSComp.txt.pl.xlf @@ -617,11 +617,6 @@ komunikaty informacyjne związane z odwołaniami do komórek - - whitespace relaxation - whitespace relaxation - - whitespace relaxation v2 łagodzenie odstępów wer 2 diff --git a/src/Compiler/xlf/FSComp.txt.pt-BR.xlf b/src/Compiler/xlf/FSComp.txt.pt-BR.xlf index ba46752a529..d275579eaea 100644 --- a/src/Compiler/xlf/FSComp.txt.pt-BR.xlf +++ b/src/Compiler/xlf/FSComp.txt.pt-BR.xlf @@ -617,11 +617,6 @@ mensagens informativas relacionadas a células de referência - - whitespace relaxation - whitespace relaxation - - whitespace relaxation v2 relaxamento de espaço em branco v2 diff --git a/src/Compiler/xlf/FSComp.txt.ru.xlf b/src/Compiler/xlf/FSComp.txt.ru.xlf index 4a13225bc33..46cc0c16734 100644 --- a/src/Compiler/xlf/FSComp.txt.ru.xlf +++ b/src/Compiler/xlf/FSComp.txt.ru.xlf @@ -617,11 +617,6 @@ информационные сообщения, связанные с ссылочными ячейками - - whitespace relaxation - whitespace relaxation - - whitespace relaxation v2 смягчение требований по использованию пробелов, версия 2 diff --git a/src/Compiler/xlf/FSComp.txt.tr.xlf b/src/Compiler/xlf/FSComp.txt.tr.xlf index 0d880a3f23a..83e55e2fe30 100644 --- a/src/Compiler/xlf/FSComp.txt.tr.xlf +++ b/src/Compiler/xlf/FSComp.txt.tr.xlf @@ -617,11 +617,6 @@ başvuru hücreleriyle ilgili bilgi mesajları - - whitespace relaxation - whitespace relaxation - - whitespace relaxation v2 boşluk ilişkilendirme v2 diff --git a/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf b/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf index ce2c173e893..741b376a034 100644 --- a/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf +++ b/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf @@ -617,11 +617,6 @@ 与引用单元格相关的信息性消息 - - whitespace relaxation - whitespace relaxation - - whitespace relaxation v2 空格放空 v2 diff --git a/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf b/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf index 09d5f37bea9..8aaabd897f0 100644 --- a/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf +++ b/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf @@ -617,11 +617,6 @@ 與參考儲存格相關的資訊訊息 - - whitespace relaxation - whitespace relaxation - - whitespace relaxation v2 空格鍵放鬆 v2