diff --git a/src/Compiler/Checking/NameResolution.fs b/src/Compiler/Checking/NameResolution.fs index 1ce55448a7f..0d3c6127251 100644 --- a/src/Compiler/Checking/NameResolution.fs +++ b/src/Compiler/Checking/NameResolution.fs @@ -1564,7 +1564,7 @@ and private AddPartsOfTyconRefToNameEnv bulkAddMode ownDefinition (g: TcGlobals) let ty = generalizedTyconRef g tcref isClassTy g ty || isStructTy g ty || - (g.langVersion.SupportsFeature LanguageFeature.DelegateTypeNameResolutionFix && isDelegateTy g ty)) + isDelegateTy g ty) if mayHaveConstruction then tab.AddOrModify (tcref.DisplayName, (fun prev -> diff --git a/src/Compiler/FSComp.txt b/src/Compiler/FSComp.txt index f357d733f74..3ac171e405d 100644 --- a/src/Compiler/FSComp.txt +++ b/src/Compiler/FSComp.txt @@ -1252,7 +1252,6 @@ featureIndexerNotationWithoutDot,"expr[idx] notation for indexing and slicing" featureRefCellNotationInformationals,"informational messages related to reference cells" featureNonVariablePatternsToRightOfAsPatterns,"non-variable patterns to the right of 'as' patterns" featureAttributesToRightOfModuleKeyword,"attributes to the right of the 'module' keyword" -featureDelegateTypeNameResolutionFix,"fix to resolution of delegate type names, see https://github.com/dotnet/fsharp/issues/10228" 3090,tcIfThenElseMayNotBeUsedWithinQueries,"An if/then/else expression may not be used within queries. Consider using either an if/then expression, or use a sequence expression instead." 3091,ilxgenUnexpectedArgumentToMethodHandleOfDuringCodegen,"Invalid argument to 'methodhandleof' during codegen" 3092,etProvidedTypeReferenceMissingArgument,"A reference to a provided type was missing a value for the static parameter '%s'. You may need to recompile one or more referenced assemblies." diff --git a/src/Compiler/Facilities/LanguageFeatures.fs b/src/Compiler/Facilities/LanguageFeatures.fs index ab6ace19aae..fca3d55f0b1 100644 --- a/src/Compiler/Facilities/LanguageFeatures.fs +++ b/src/Compiler/Facilities/LanguageFeatures.fs @@ -34,7 +34,6 @@ type LanguageFeature = | UnionIsPropertiesVisible | NonVariablePatternsToRightOfAsPatterns | AttributesToRightOfModuleKeyword - | DelegateTypeNameResolutionFix | ReallyLongLists | ErrorOnDeprecatedRequireQualifiedAccess | RequiredPropertiesSupport @@ -154,7 +153,6 @@ type LanguageVersion(versionText, ?disabledFeaturesArray: LanguageFeature array) LanguageFeature.RefCellNotationInformationals, languageVersion60 LanguageFeature.NonVariablePatternsToRightOfAsPatterns, languageVersion60 LanguageFeature.AttributesToRightOfModuleKeyword, languageVersion60 - LanguageFeature.DelegateTypeNameResolutionFix, languageVersion60 // F# 7.0 LanguageFeature.ReallyLongLists, languageVersion70 @@ -351,7 +349,6 @@ type LanguageVersion(versionText, ?disabledFeaturesArray: LanguageFeature array) | LanguageFeature.UnionIsPropertiesVisible -> FSComp.SR.featureUnionIsPropertiesVisible () | LanguageFeature.NonVariablePatternsToRightOfAsPatterns -> FSComp.SR.featureNonVariablePatternsToRightOfAsPatterns () | LanguageFeature.AttributesToRightOfModuleKeyword -> FSComp.SR.featureAttributesToRightOfModuleKeyword () - | LanguageFeature.DelegateTypeNameResolutionFix -> FSComp.SR.featureDelegateTypeNameResolutionFix () | LanguageFeature.ReallyLongLists -> FSComp.SR.featureReallyLongList () | LanguageFeature.ErrorOnDeprecatedRequireQualifiedAccess -> FSComp.SR.featureErrorOnDeprecatedRequireQualifiedAccess () | LanguageFeature.RequiredPropertiesSupport -> FSComp.SR.featureRequiredProperties () diff --git a/src/Compiler/Facilities/LanguageFeatures.fsi b/src/Compiler/Facilities/LanguageFeatures.fsi index f19abbb861e..3b0004eb361 100644 --- a/src/Compiler/Facilities/LanguageFeatures.fsi +++ b/src/Compiler/Facilities/LanguageFeatures.fsi @@ -24,7 +24,6 @@ type LanguageFeature = | UnionIsPropertiesVisible | NonVariablePatternsToRightOfAsPatterns | AttributesToRightOfModuleKeyword - | DelegateTypeNameResolutionFix | ReallyLongLists | ErrorOnDeprecatedRequireQualifiedAccess | RequiredPropertiesSupport diff --git a/src/Compiler/xlf/FSComp.txt.cs.xlf b/src/Compiler/xlf/FSComp.txt.cs.xlf index dc4782c9ed4..785e8c28d2d 100644 --- a/src/Compiler/xlf/FSComp.txt.cs.xlf +++ b/src/Compiler/xlf/FSComp.txt.cs.xlf @@ -362,11 +362,6 @@ využití člena výchozího rozhraní - - fix to resolution of delegate type names, see https://github.com/dotnet/fsharp/issues/10228 - opravit překlad názvů typů delegátů, viz https://github.com/dotnet/fsharp/issues/10228 - - Deprecate places where 'seq' can be omitted Deprecate places where 'seq' can be omitted diff --git a/src/Compiler/xlf/FSComp.txt.de.xlf b/src/Compiler/xlf/FSComp.txt.de.xlf index 4cb29a257b1..f9478cf60aa 100644 --- a/src/Compiler/xlf/FSComp.txt.de.xlf +++ b/src/Compiler/xlf/FSComp.txt.de.xlf @@ -362,11 +362,6 @@ standardmäßige Schnittstellenmembernutzung - - fix to resolution of delegate type names, see https://github.com/dotnet/fsharp/issues/10228 - Informationen zur Problembehebung bezüglich der Auflösung von Delegattypnamen finden Sie unter https://github.com/dotnet/fsharp/issues/10228 - - Deprecate places where 'seq' can be omitted Deprecate places where 'seq' can be omitted diff --git a/src/Compiler/xlf/FSComp.txt.es.xlf b/src/Compiler/xlf/FSComp.txt.es.xlf index 3c9a547190c..9765ba2215c 100644 --- a/src/Compiler/xlf/FSComp.txt.es.xlf +++ b/src/Compiler/xlf/FSComp.txt.es.xlf @@ -362,11 +362,6 @@ consumo de miembros de interfaz predeterminados - - fix to resolution of delegate type names, see https://github.com/dotnet/fsharp/issues/10228 - corrección para la resolución de nombres de tipo de delegado, consulte https://github.com/dotnet/fsharp/issues/10228 - - Deprecate places where 'seq' can be omitted Deprecate places where 'seq' can be omitted diff --git a/src/Compiler/xlf/FSComp.txt.fr.xlf b/src/Compiler/xlf/FSComp.txt.fr.xlf index 4fa634e0bf4..c3c68b7cdad 100644 --- a/src/Compiler/xlf/FSComp.txt.fr.xlf +++ b/src/Compiler/xlf/FSComp.txt.fr.xlf @@ -362,11 +362,6 @@ consommation par défaut des membres d'interface - - fix to resolution of delegate type names, see https://github.com/dotnet/fsharp/issues/10228 - corriger pour résoudre les noms de types délégués, voir https://github.com/dotnet/fsharp/issues/10228 - - Deprecate places where 'seq' can be omitted Deprecate places where 'seq' can be omitted diff --git a/src/Compiler/xlf/FSComp.txt.it.xlf b/src/Compiler/xlf/FSComp.txt.it.xlf index 847a812bca6..9fe5658afaf 100644 --- a/src/Compiler/xlf/FSComp.txt.it.xlf +++ b/src/Compiler/xlf/FSComp.txt.it.xlf @@ -362,11 +362,6 @@ utilizzo predefinito dei membri di interfaccia - - fix to resolution of delegate type names, see https://github.com/dotnet/fsharp/issues/10228 - correggere la risoluzione dei nomi dei tipi delegati, vedere https://github.com/dotnet/fsharp/issues/10228 - - Deprecate places where 'seq' can be omitted Deprecate places where 'seq' can be omitted diff --git a/src/Compiler/xlf/FSComp.txt.ja.xlf b/src/Compiler/xlf/FSComp.txt.ja.xlf index 1984f24be07..409943a3ba6 100644 --- a/src/Compiler/xlf/FSComp.txt.ja.xlf +++ b/src/Compiler/xlf/FSComp.txt.ja.xlf @@ -362,11 +362,6 @@ 既定のインターフェイス メンバーの消費 - - fix to resolution of delegate type names, see https://github.com/dotnet/fsharp/issues/10228 - デリゲート型名の解決を修正するには、https://github.com/dotnet/fsharp/issues/10228 を参照してください - - Deprecate places where 'seq' can be omitted Deprecate places where 'seq' can be omitted diff --git a/src/Compiler/xlf/FSComp.txt.ko.xlf b/src/Compiler/xlf/FSComp.txt.ko.xlf index 1c926d2f636..124fc3edc30 100644 --- a/src/Compiler/xlf/FSComp.txt.ko.xlf +++ b/src/Compiler/xlf/FSComp.txt.ko.xlf @@ -362,11 +362,6 @@ 기본 인터페이스 멤버 사용 - - fix to resolution of delegate type names, see https://github.com/dotnet/fsharp/issues/10228 - 대리자 형식 이름의 해결 방법을 수정합니다. https://github.com/dotnet/fsharp/issues/10228 참조하세요. - - Deprecate places where 'seq' can be omitted Deprecate places where 'seq' can be omitted diff --git a/src/Compiler/xlf/FSComp.txt.pl.xlf b/src/Compiler/xlf/FSComp.txt.pl.xlf index 184e743f9ab..4eaa7dab32e 100644 --- a/src/Compiler/xlf/FSComp.txt.pl.xlf +++ b/src/Compiler/xlf/FSComp.txt.pl.xlf @@ -362,11 +362,6 @@ domyślne użycie składowej interfejsu - - fix to resolution of delegate type names, see https://github.com/dotnet/fsharp/issues/10228 - naprawa rozpoznawania nazw typów delegatów, sprawdź stronę https://github.com/dotnet/fsharp/issues/10228 - - Deprecate places where 'seq' can be omitted Deprecate places where 'seq' can be omitted diff --git a/src/Compiler/xlf/FSComp.txt.pt-BR.xlf b/src/Compiler/xlf/FSComp.txt.pt-BR.xlf index d45561696cc..e787757a042 100644 --- a/src/Compiler/xlf/FSComp.txt.pt-BR.xlf +++ b/src/Compiler/xlf/FSComp.txt.pt-BR.xlf @@ -362,11 +362,6 @@ consumo de membro da interface padrão - - fix to resolution of delegate type names, see https://github.com/dotnet/fsharp/issues/10228 - corrigir para resolução de nomes de tipos delegados, consulte https://github.com/dotnet/fsharp/issues/10228 - - Deprecate places where 'seq' can be omitted Deprecate places where 'seq' can be omitted diff --git a/src/Compiler/xlf/FSComp.txt.ru.xlf b/src/Compiler/xlf/FSComp.txt.ru.xlf index a354c753312..d272c2b1973 100644 --- a/src/Compiler/xlf/FSComp.txt.ru.xlf +++ b/src/Compiler/xlf/FSComp.txt.ru.xlf @@ -362,11 +362,6 @@ использование элемента интерфейса по умолчанию - - fix to resolution of delegate type names, see https://github.com/dotnet/fsharp/issues/10228 - исправить разрешение имен типов делегатов, см. https://github.com/dotnet/fsharp/issues/10228 - - Deprecate places where 'seq' can be omitted Deprecate places where 'seq' can be omitted diff --git a/src/Compiler/xlf/FSComp.txt.tr.xlf b/src/Compiler/xlf/FSComp.txt.tr.xlf index 8eee8e0f00b..e0aa7f61dcb 100644 --- a/src/Compiler/xlf/FSComp.txt.tr.xlf +++ b/src/Compiler/xlf/FSComp.txt.tr.xlf @@ -362,11 +362,6 @@ varsayılan arabirim üyesi tüketimi - - fix to resolution of delegate type names, see https://github.com/dotnet/fsharp/issues/10228 - temsilci türü adlarının çözümlenmesiyle ilgili sorunun çözümü için bkz. https://github.com/dotnet/fsharp/issues/10228 - - Deprecate places where 'seq' can be omitted Deprecate places where 'seq' can be omitted diff --git a/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf b/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf index 8b416bf6648..39bfb13d8e8 100644 --- a/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf +++ b/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf @@ -362,11 +362,6 @@ 默认接口成员消耗 - - fix to resolution of delegate type names, see https://github.com/dotnet/fsharp/issues/10228 - 修复了委托类型名称的解析，请参阅 https://github.com/dotnet/fsharp/issues/10228 - - Deprecate places where 'seq' can be omitted Deprecate places where 'seq' can be omitted diff --git a/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf b/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf index c8848815e00..efceecc6b6e 100644 --- a/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf +++ b/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf @@ -362,11 +362,6 @@ 預設介面成員使用 - - fix to resolution of delegate type names, see https://github.com/dotnet/fsharp/issues/10228 - 修正委派類型名稱的解析，請參閱 https://github.com/dotnet/fsharp/issues/10228 - - Deprecate places where 'seq' can be omitted Deprecate places where 'seq' can be omitted