fix(parser): change diagnostic to "modifier cannot be used here" (#3853)

oxc-project · Jun 23, 2024 · 13754cb · 13754cb
1 parent 97d59fc
commit 13754cb
Show file tree

Hide file tree

Showing 7 changed files with 65 additions and 68 deletions.
diff --git a/crates/oxc_parser/src/diagnostics.rs b/crates/oxc_parser/src/diagnostics.rs
@@ -410,9 +410,6 @@ pub fn jsx_element_no_match(span0: Span, span1: Span, name: &str) -> OxcDiagnost
 }
 
 #[cold]
-pub fn modifiers_cannot_appear(span: Span, name: &str) -> OxcDiagnostic {
-    OxcDiagnostic::error(format!(
-        "TS1044: '{name}' modifier cannot appear on a module or namespace element."
-    ))
-    .with_label(span)
+pub fn modifier_cannot_be_used_here(span: Span, name: &str) -> OxcDiagnostic {
+    OxcDiagnostic::error(format!("'{name}' modifier cannot be used here.")).with_label(span)
 }
diff --git a/crates/oxc_parser/src/js/class.rs b/crates/oxc_parser/src/js/class.rs
@@ -88,7 +88,7 @@ impl<'a> ParserImpl<'a> {
 
         for modifier in modifiers.iter() {
             if !matches!(modifier.kind, ModifierKind::Declare | ModifierKind::Abstract) {
-                self.error(diagnostics::modifiers_cannot_appear(
+                self.error(diagnostics::modifier_cannot_be_used_here(
                     modifier.span,
                     modifier.kind.as_str(),
                 ));

diff --git a/crates/oxc_parser/src/js/declaration.rs b/crates/oxc_parser/src/js/declaration.rs
@@ -74,7 +74,7 @@ impl<'a> ParserImpl<'a> {
 
         for modifier in modifiers.iter() {
             if modifier.kind != ModifierKind::Declare {
-                self.error(diagnostics::modifiers_cannot_appear(
+                self.error(diagnostics::modifier_cannot_be_used_here(
                     modifier.span,
                     modifier.kind.as_str(),
                 ));

diff --git a/crates/oxc_parser/src/js/function.rs b/crates/oxc_parser/src/js/function.rs
@@ -110,7 +110,7 @@ impl<'a> ParserImpl<'a> {
 
         for modifier in modifiers.iter() {
             if !matches!(modifier.kind, ModifierKind::Declare | ModifierKind::Async) {
-                self.error(diagnostics::modifiers_cannot_appear(
+                self.error(diagnostics::modifier_cannot_be_used_here(
                     modifier.span,
                     modifier.kind.as_str(),
                 ));

diff --git a/crates/oxc_parser/src/ts/statement.rs b/crates/oxc_parser/src/ts/statement.rs
@@ -34,7 +34,7 @@ impl<'a> ParserImpl<'a> {
 
         for modifier in modifiers.iter() {
             if !matches!(modifier.kind, ModifierKind::Declare | ModifierKind::Const) {
-                self.error(diagnostics::modifiers_cannot_appear(
+                self.error(diagnostics::modifier_cannot_be_used_here(
                     modifier.span,
                     modifier.kind.as_str(),
                 ));
@@ -119,7 +119,7 @@ impl<'a> ParserImpl<'a> {
 
         for modifier in modifiers.iter() {
             if modifier.kind != ModifierKind::Declare {
-                self.error(diagnostics::modifiers_cannot_appear(
+                self.error(diagnostics::modifier_cannot_be_used_here(
                     modifier.span,
                     modifier.kind.as_str(),
                 ));
@@ -151,7 +151,7 @@ impl<'a> ParserImpl<'a> {
 
         for modifier in modifiers.iter() {
             if modifier.kind != ModifierKind::Declare {
-                self.error(diagnostics::modifiers_cannot_appear(
+                self.error(diagnostics::modifier_cannot_be_used_here(
                     modifier.span,
                     modifier.kind.as_str(),
                 ));
@@ -293,7 +293,7 @@ impl<'a> ParserImpl<'a> {
 
         for modifier in modifiers.iter() {
             if modifier.kind != ModifierKind::Declare {
-                self.error(diagnostics::modifiers_cannot_appear(
+                self.error(diagnostics::modifier_cannot_be_used_here(
                     modifier.span,
                     modifier.kind.as_str(),
                 ));

diff --git a/tasks/coverage/parser_babel.snap b/tasks/coverage/parser_babel.snap
@@ -10137,7 +10137,7 @@ Expect to Parse: "typescript/types/const-type-parameters-babel-7/input.ts"
    ·       ──
    ╰────
 
-  × TS1044: 'abstract' modifier cannot appear on a module or namespace element.
+  × 'abstract' modifier cannot be used here.
    ╭─[typescript/interface/abstract/input.ts:1:1]
  1 │ abstract interface Foo {
    · ────────
@@ -10152,7 +10152,7 @@ Expect to Parse: "typescript/types/const-type-parameters-babel-7/input.ts"
    ╰────
   help: Try insert a semicolon here
 
-  × TS1044: 'abstract' modifier cannot appear on a module or namespace element.
+  × 'abstract' modifier cannot be used here.
    ╭─[typescript/interface/export-abstract-interface/input.ts:1:8]
  1 │ export abstract interface I {
    ·        ────────