diff --git a/src/Compiler/FSComp.txt b/src/Compiler/FSComp.txt index 429d2e9695c..ff21c378132 100644 --- a/src/Compiler/FSComp.txt +++ b/src/Compiler/FSComp.txt @@ -1564,7 +1564,6 @@ 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." formatDashItem," - %s" -featureRelaxWhitespace,"whitespace relaxation" featureNameOf,"nameof" featureDotlessFloat32Literal,"dotless float32 literal" featurePackageManagement,"package management" diff --git a/src/Compiler/Facilities/LanguageFeatures.fs b/src/Compiler/Facilities/LanguageFeatures.fs index 99f223d1b05..aa455f3acb3 100644 --- a/src/Compiler/Facilities/LanguageFeatures.fs +++ b/src/Compiler/Facilities/LanguageFeatures.fs @@ -16,7 +16,6 @@ module internal FSharp.Compiler.Features [] type LanguageFeature = - | RelaxWhitespace | RelaxWhitespace2 | NameOf | DotlessFloat32Literal @@ -147,9 +146,6 @@ type LanguageVersion(versionText, ?disabledFeaturesArray: LanguageFeature array) static let features = dict [ - // F# 4.7 - LanguageFeature.RelaxWhitespace, languageVersion47 - // F# 5.0 LanguageFeature.FixedIndexSlice3d4d, languageVersion50 LanguageFeature.DotlessFloat32Literal, languageVersion50 @@ -357,7 +353,6 @@ type LanguageVersion(versionText, ?disabledFeaturesArray: LanguageFeature array) /// Get a string name for the given feature. static member GetFeatureString feature = match feature with - | LanguageFeature.RelaxWhitespace -> FSComp.SR.featureRelaxWhitespace () | LanguageFeature.RelaxWhitespace2 -> FSComp.SR.featureRelaxWhitespace2 () | LanguageFeature.NameOf -> FSComp.SR.featureNameOf () | LanguageFeature.DotlessFloat32Literal -> FSComp.SR.featureDotlessFloat32Literal () diff --git a/src/Compiler/Facilities/LanguageFeatures.fsi b/src/Compiler/Facilities/LanguageFeatures.fsi index 161af34ada8..0c06da92e29 100644 --- a/src/Compiler/Facilities/LanguageFeatures.fsi +++ b/src/Compiler/Facilities/LanguageFeatures.fsi @@ -6,7 +6,6 @@ module internal FSharp.Compiler.Features /// LanguageFeature enumeration [] type LanguageFeature = - | RelaxWhitespace | RelaxWhitespace2 | NameOf | DotlessFloat32Literal diff --git a/src/Compiler/SyntaxTree/LexFilter.fs b/src/Compiler/SyntaxTree/LexFilter.fs index 6ee9560058c..ff8aa8c649e 100644 --- a/src/Compiler/SyntaxTree/LexFilter.fs +++ b/src/Compiler/SyntaxTree/LexFilter.fs @@ -964,7 +964,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 d71b3646c8d..b898e7a3800 100644 --- a/src/Compiler/xlf/FSComp.txt.cs.xlf +++ b/src/Compiler/xlf/FSComp.txt.cs.xlf @@ -632,11 +632,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 0d9544eb119..589a35f5a6e 100644 --- a/src/Compiler/xlf/FSComp.txt.de.xlf +++ b/src/Compiler/xlf/FSComp.txt.de.xlf @@ -632,11 +632,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 74c3429cc6b..222b0f9cdd7 100644 --- a/src/Compiler/xlf/FSComp.txt.es.xlf +++ b/src/Compiler/xlf/FSComp.txt.es.xlf @@ -632,11 +632,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 72133297e57..e433626190b 100644 --- a/src/Compiler/xlf/FSComp.txt.fr.xlf +++ b/src/Compiler/xlf/FSComp.txt.fr.xlf @@ -632,11 +632,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 5d314986629..7eba9c9e86e 100644 --- a/src/Compiler/xlf/FSComp.txt.it.xlf +++ b/src/Compiler/xlf/FSComp.txt.it.xlf @@ -632,11 +632,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 80c7433ba7c..59421c85192 100644 --- a/src/Compiler/xlf/FSComp.txt.ja.xlf +++ b/src/Compiler/xlf/FSComp.txt.ja.xlf @@ -632,11 +632,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 6e233678849..e03116ac48f 100644 --- a/src/Compiler/xlf/FSComp.txt.ko.xlf +++ b/src/Compiler/xlf/FSComp.txt.ko.xlf @@ -632,11 +632,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 84926fbc1ab..ef606df18a1 100644 --- a/src/Compiler/xlf/FSComp.txt.pl.xlf +++ b/src/Compiler/xlf/FSComp.txt.pl.xlf @@ -632,11 +632,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 b3069949b5e..6c94d5d189d 100644 --- a/src/Compiler/xlf/FSComp.txt.pt-BR.xlf +++ b/src/Compiler/xlf/FSComp.txt.pt-BR.xlf @@ -632,11 +632,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 db7328a54d1..fc9b54f939f 100644 --- a/src/Compiler/xlf/FSComp.txt.ru.xlf +++ b/src/Compiler/xlf/FSComp.txt.ru.xlf @@ -632,11 +632,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 fb4f4641816..5fa7d66e43b 100644 --- a/src/Compiler/xlf/FSComp.txt.tr.xlf +++ b/src/Compiler/xlf/FSComp.txt.tr.xlf @@ -632,11 +632,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 c6c6ae4aa01..ae8bab0bac3 100644 --- a/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf +++ b/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf @@ -632,11 +632,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 2e61b8fe454..02b9a8f2b88 100644 --- a/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf +++ b/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf @@ -632,11 +632,6 @@ 與參考儲存格相關的資訊訊息 - - whitespace relaxation - whitespace relaxation - - whitespace relaxation v2 空格鍵放鬆 v2