diff --git a/src/Compiler/Checking/CheckFormatStrings.fs b/src/Compiler/Checking/CheckFormatStrings.fs index 02b37369500..261753bf2ac 100644 --- a/src/Compiler/Checking/CheckFormatStrings.fs +++ b/src/Compiler/Checking/CheckFormatStrings.fs @@ -245,8 +245,6 @@ let parseFormatStringInternal // there are no accurate intra-string ranges available for exact error message locations within the string. // The 'm' range passed as an input is however accurate and covers the whole string. // - let escapeFormatStringEnabled = g.langVersion.SupportsFeature Features.LanguageFeature.EscapeDotnetFormattableStrings - let fmt, fragments, delimLen = match context with | Some context when fragRanges.Length > 0 -> @@ -265,7 +263,7 @@ let parseFormatStringInternal | _ -> // Don't muck with the fmt when there is no source code context to go get the original // source code (i.e. when compiling or background checking) - (if escapeFormatStringEnabled then escapeDotnetFormatString fmt else fmt), [ (0, 1, m) ], 1 + escapeDotnetFormatString fmt, [ (0, 1, m) ], 1 let len = fmt.Length diff --git a/src/Compiler/FSComp.txt b/src/Compiler/FSComp.txt index f357d733f74..e2a7a66a020 100644 --- a/src/Compiler/FSComp.txt +++ b/src/Compiler/FSComp.txt @@ -1707,7 +1707,6 @@ reprStateMachineInvalidForm,"The state machine has an unexpected form" 3548,matchNotAllowedForUnionCaseWithNoData,"Pattern discard is not allowed for union case that takes no data." 3549,tcSynTypeOrInvalidInDeclaration,"SynType.Or is not permitted in this declaration" 3550,chkDuplicatedMethodParameter,"Duplicate parameter. The parameter '%s' has been used more that once in this method." -featureEscapeBracesInFormattableString,"Escapes curly braces before calling FormattableStringFactory.Create when interpolated string literal is typed as FormattableString" 3551,buildDuplicateFile,"The source file '%s' (at position %d/%d) already appeared in the compilation list (at position %d/%d). Please verify that it is included only once in the project file." 3552,chkConstructorWithArgumentsOnStaticClasses,"If a type uses both [] and [] attributes, it means it is static. Constructor with arguments is not allowed." 3553,chkAdditionalConstructorOnStaticClasses,"If a type uses both [] and [] attributes, it means it is static. Additional constructor is not allowed." diff --git a/src/Compiler/Facilities/LanguageFeatures.fs b/src/Compiler/Facilities/LanguageFeatures.fs index ab6ace19aae..4a0c2a0c4ae 100644 --- a/src/Compiler/Facilities/LanguageFeatures.fs +++ b/src/Compiler/Facilities/LanguageFeatures.fs @@ -44,7 +44,6 @@ type LanguageFeature = | MatchNotAllowedForUnionCaseWithNoData | CSharpExtensionAttributeNotRequired | ErrorForNonVirtualMembersOverrides - | EscapeDotnetFormattableStrings | ArithmeticInLiterals | ErrorReportingOnStaticClasses | WarningWhenCopyAndUpdateRecordChangesAllFields @@ -168,7 +167,6 @@ type LanguageVersion(versionText, ?disabledFeaturesArray: LanguageFeature array) LanguageFeature.MatchNotAllowedForUnionCaseWithNoData, languageVersion80 LanguageFeature.CSharpExtensionAttributeNotRequired, languageVersion80 LanguageFeature.ErrorForNonVirtualMembersOverrides, languageVersion80 - LanguageFeature.EscapeDotnetFormattableStrings, languageVersion80 LanguageFeature.ArithmeticInLiterals, languageVersion80 LanguageFeature.ErrorReportingOnStaticClasses, languageVersion80 LanguageFeature.WarningWhenCopyAndUpdateRecordChangesAllFields, languageVersion80 @@ -361,7 +359,6 @@ type LanguageVersion(versionText, ?disabledFeaturesArray: LanguageFeature array) | LanguageFeature.MatchNotAllowedForUnionCaseWithNoData -> FSComp.SR.featureMatchNotAllowedForUnionCaseWithNoData () | LanguageFeature.CSharpExtensionAttributeNotRequired -> FSComp.SR.featureCSharpExtensionAttributeNotRequired () | LanguageFeature.ErrorForNonVirtualMembersOverrides -> FSComp.SR.featureErrorForNonVirtualMembersOverrides () - | LanguageFeature.EscapeDotnetFormattableStrings -> FSComp.SR.featureEscapeBracesInFormattableString () | LanguageFeature.ArithmeticInLiterals -> FSComp.SR.featureArithmeticInLiterals () | LanguageFeature.ErrorReportingOnStaticClasses -> FSComp.SR.featureErrorReportingOnStaticClasses () | LanguageFeature.WarningWhenCopyAndUpdateRecordChangesAllFields -> diff --git a/src/Compiler/Facilities/LanguageFeatures.fsi b/src/Compiler/Facilities/LanguageFeatures.fsi index f19abbb861e..7c6b3ef3e86 100644 --- a/src/Compiler/Facilities/LanguageFeatures.fsi +++ b/src/Compiler/Facilities/LanguageFeatures.fsi @@ -34,7 +34,6 @@ type LanguageFeature = | MatchNotAllowedForUnionCaseWithNoData | CSharpExtensionAttributeNotRequired | ErrorForNonVirtualMembersOverrides - | EscapeDotnetFormattableStrings | ArithmeticInLiterals | ErrorReportingOnStaticClasses | WarningWhenCopyAndUpdateRecordChangesAllFields diff --git a/src/Compiler/xlf/FSComp.txt.cs.xlf b/src/Compiler/xlf/FSComp.txt.cs.xlf index dc4782c9ed4..a407112eb51 100644 --- a/src/Compiler/xlf/FSComp.txt.cs.xlf +++ b/src/Compiler/xlf/FSComp.txt.cs.xlf @@ -422,11 +422,6 @@ Vytváření sestav chyb u statických tříd - - Escapes curly braces before calling FormattableStringFactory.Create when interpolated string literal is typed as FormattableString - Uvede složené závorky před voláním formattableStringFactory.Create, pokud je interpolovaný řetězcový literál zadán jako FormattableString. - - more types support units of measure více typů podporuje měrné jednotky diff --git a/src/Compiler/xlf/FSComp.txt.de.xlf b/src/Compiler/xlf/FSComp.txt.de.xlf index 4cb29a257b1..686ac9faaf0 100644 --- a/src/Compiler/xlf/FSComp.txt.de.xlf +++ b/src/Compiler/xlf/FSComp.txt.de.xlf @@ -422,11 +422,6 @@ Fehlerberichterstattung für statische Klassen - - Escapes curly braces before calling FormattableStringFactory.Create when interpolated string literal is typed as FormattableString - Escapezeichen mit geschweiften Klammern, bevor FormattableStringFactory.Create aufgerufen wird, wenn ein interpoliertes Zeichenfolgenliteral als FormattableString eingegeben wird. - - more types support units of measure Maßeinheitenunterstützung durch weitere Typen diff --git a/src/Compiler/xlf/FSComp.txt.es.xlf b/src/Compiler/xlf/FSComp.txt.es.xlf index 3c9a547190c..c616373f0af 100644 --- a/src/Compiler/xlf/FSComp.txt.es.xlf +++ b/src/Compiler/xlf/FSComp.txt.es.xlf @@ -422,11 +422,6 @@ Informe de errores en clases estáticas - - Escapes curly braces before calling FormattableStringFactory.Create when interpolated string literal is typed as FormattableString - Crea un escape de llaves antes de llamar a FormattableStringFactory.Create cuando el literal de cadena interpolado se escribe como FormattableString. - - more types support units of measure más tipos admiten las unidades de medida diff --git a/src/Compiler/xlf/FSComp.txt.fr.xlf b/src/Compiler/xlf/FSComp.txt.fr.xlf index 4fa634e0bf4..68f1876919a 100644 --- a/src/Compiler/xlf/FSComp.txt.fr.xlf +++ b/src/Compiler/xlf/FSComp.txt.fr.xlf @@ -422,11 +422,6 @@ Rapport d’erreurs sur les classes statiques - - Escapes curly braces before calling FormattableStringFactory.Create when interpolated string literal is typed as FormattableString - Échappe les accolades avant d’appeler FormattableStringFactory.Create lorsque le littéral de chaîne interpolé est tapé en tant que FormattableString. - - more types support units of measure d'autres types prennent en charge les unités de mesure diff --git a/src/Compiler/xlf/FSComp.txt.it.xlf b/src/Compiler/xlf/FSComp.txt.it.xlf index 847a812bca6..389611b6715 100644 --- a/src/Compiler/xlf/FSComp.txt.it.xlf +++ b/src/Compiler/xlf/FSComp.txt.it.xlf @@ -422,11 +422,6 @@ Segnalazione errori nelle classi statiche - - Escapes curly braces before calling FormattableStringFactory.Create when interpolated string literal is typed as FormattableString - Trasferisce le parentesi graffe prima di chiamare FormattableStringFactory.Create quando il valore letterale stringa interpolato viene digitato come FormattableString - - more types support units of measure più tipi supportano le unità di misura diff --git a/src/Compiler/xlf/FSComp.txt.ja.xlf b/src/Compiler/xlf/FSComp.txt.ja.xlf index 1984f24be07..d32bc25264a 100644 --- a/src/Compiler/xlf/FSComp.txt.ja.xlf +++ b/src/Compiler/xlf/FSComp.txt.ja.xlf @@ -422,11 +422,6 @@ 静的クラスに関するエラー報告 - - Escapes curly braces before calling FormattableStringFactory.Create when interpolated string literal is typed as FormattableString - 挿入文字列リテラルが FormattableString として型指定されている場合は、FormattableStringFactory.Create を呼び出す前に波かっこをエスケープします - - more types support units of measure 単位をサポートするその他の型 diff --git a/src/Compiler/xlf/FSComp.txt.ko.xlf b/src/Compiler/xlf/FSComp.txt.ko.xlf index 1c926d2f636..41e875f21d2 100644 --- a/src/Compiler/xlf/FSComp.txt.ko.xlf +++ b/src/Compiler/xlf/FSComp.txt.ko.xlf @@ -422,11 +422,6 @@ 정적 클래스에 대한 오류 보고 - - Escapes curly braces before calling FormattableStringFactory.Create when interpolated string literal is typed as FormattableString - 보간된 문자열 리터럴이 FormattableString으로 형식화된 경우 FormattableStringFactory.Create를 호출하기 전에 중괄호를 이스케이프합니다. - - more types support units of measure 더 많은 형식이 측정 단위를 지원함 diff --git a/src/Compiler/xlf/FSComp.txt.pl.xlf b/src/Compiler/xlf/FSComp.txt.pl.xlf index 184e743f9ab..b6e7c8f1a29 100644 --- a/src/Compiler/xlf/FSComp.txt.pl.xlf +++ b/src/Compiler/xlf/FSComp.txt.pl.xlf @@ -422,11 +422,6 @@ Raportowanie błędów dla klas statycznych - - Escapes curly braces before calling FormattableStringFactory.Create when interpolated string literal is typed as FormattableString - Uniknie nawiasów klamrowych przed wywołaniem metody FormattableStringFactory.Create, gdy interpolowany literał ciągu jest wpisywany jako FormattableString - - more types support units of measure więcej typów obsługuje jednostki miary diff --git a/src/Compiler/xlf/FSComp.txt.pt-BR.xlf b/src/Compiler/xlf/FSComp.txt.pt-BR.xlf index d45561696cc..4fa96b8c651 100644 --- a/src/Compiler/xlf/FSComp.txt.pt-BR.xlf +++ b/src/Compiler/xlf/FSComp.txt.pt-BR.xlf @@ -422,11 +422,6 @@ Relatório de erros em classes estáticas - - Escapes curly braces before calling FormattableStringFactory.Create when interpolated string literal is typed as FormattableString - Sai das chaves antes de chamar FormattableStringFactory.Create quando o literal de cadeia de caracteres é digitado como FormattableString - - more types support units of measure mais tipos dão suporte para unidades de medida diff --git a/src/Compiler/xlf/FSComp.txt.ru.xlf b/src/Compiler/xlf/FSComp.txt.ru.xlf index a354c753312..38ab7b7dd77 100644 --- a/src/Compiler/xlf/FSComp.txt.ru.xlf +++ b/src/Compiler/xlf/FSComp.txt.ru.xlf @@ -422,11 +422,6 @@ Отчеты об ошибках для статических классов - - Escapes curly braces before calling FormattableStringFactory.Create when interpolated string literal is typed as FormattableString - Экранирует фигурные скобки перед вызовом FormattableStringFactory.Create, когда интерполированный строковый литерал введен как FormattableString - - more types support units of measure другие типы поддерживают единицы измерения diff --git a/src/Compiler/xlf/FSComp.txt.tr.xlf b/src/Compiler/xlf/FSComp.txt.tr.xlf index 8eee8e0f00b..16e5a1a72b0 100644 --- a/src/Compiler/xlf/FSComp.txt.tr.xlf +++ b/src/Compiler/xlf/FSComp.txt.tr.xlf @@ -422,11 +422,6 @@ Statik sınıflarda hata bildirimi - - Escapes curly braces before calling FormattableStringFactory.Create when interpolated string literal is typed as FormattableString - İçe eklenmiş dize sabit değerinin türü FormattableString olduğunda FormattableStringFactory.Create çağrılmadan önce küme ayraçlarını atlar - - more types support units of measure tür daha ölçü birimlerini destekler diff --git a/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf b/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf index 8b416bf6648..d35d57f1ff6 100644 --- a/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf +++ b/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf @@ -422,11 +422,6 @@ 有关静态类的错误报告 - - Escapes curly braces before calling FormattableStringFactory.Create when interpolated string literal is typed as FormattableString - 当内插字符串文本键入为 FormattableString 时，在调用 FormattableStringFactory.Create 之前转义大括号 - - more types support units of measure 更多类型支持度量单位 diff --git a/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf b/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf index c8848815e00..20b825fdcf4 100644 --- a/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf +++ b/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf @@ -422,11 +422,6 @@ 報告靜態類別時發生錯誤 - - Escapes curly braces before calling FormattableStringFactory.Create when interpolated string literal is typed as FormattableString - 當差補字串常值輸入為 FormattableString 時，在呼叫 FormattableStringFactory.Create 之前先逸出大括弧 - - more types support units of measure 更多支援測量單位的類型