From e5f742376be672fc954d57d9587bc296d90c9f7d Mon Sep 17 00:00:00 2001
From: "Dmitry.Krasilschikov" <kradima@jetbrains.com>
Date: Sun, 26 Apr 2020 20:50:24 +0300
Subject: [PATCH] IDEA-CR-61737 parsing errors for `GeneratedParserUtilBase`

GitOrigin-RevId: ea58ac2dbb5fdf3e2240339dc324e810cb66b035
---
 .../lang-api/resources/messages/LangBundle.properties  |  8 +++++++-
 .../intellij/lang/parser/GeneratedParserUtilBase.java  | 10 +++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/platform/lang-api/resources/messages/LangBundle.properties b/platform/lang-api/resources/messages/LangBundle.properties
index 3b3d4490d7f9..fc392156e1dd 100644
--- a/platform/lang-api/resources/messages/LangBundle.properties
+++ b/platform/lang-api/resources/messages/LangBundle.properties
@@ -303,4 +303,10 @@ tab.title.call.hierarchy=Call Hierarchy
 action.UpDownAction.up.text=Up
 action.UpDownAction.down.text=Down
 button.override=Override
-button.do.not.override=Do Not Override
\ No newline at end of file
+button.do.not.override=Do Not Override
+parsing.error.unmatched.input=unmatched input
+parsing.error.expected=expected
+parsing.error.expected.got=expected, got
+parsing.error.unexpected=unexpected
+parsing.error.and.ellipsis=and ...
+parsing.error.or=or
\ No newline at end of file
diff --git a/platform/lang-impl/src/com/intellij/lang/parser/GeneratedParserUtilBase.java b/platform/lang-impl/src/com/intellij/lang/parser/GeneratedParserUtilBase.java
index d2886fd1d9bd..9e2ee2949ee3 100644
--- a/platform/lang-impl/src/com/intellij/lang/parser/GeneratedParserUtilBase.java
+++ b/platform/lang-impl/src/com/intellij/lang/parser/GeneratedParserUtilBase.java
@@ -780,12 +780,12 @@ public class GeneratedParserUtilBase {
 
     String actual = trim(builder.getTokenText());
     if (isEmpty(actual)) {
-      sb.append(empty ? "unmatched input" : " expected");
+      sb.append(empty ? LangBundle.message("parsing.error.unmatched.input") : " " + LangBundle.message("parsing.error.expected"));
     }
     else {
-      if (!empty) sb.append(" expected, got ");
+      if (!empty) sb.append(" ").append(LangBundle.message("parsing.error.expected.got")).append(" ");
       sb.append("'").append(first(actual, MAX_ERROR_TOKEN_TEXT, true)).append("'");
-      if (empty) sb.append(" unexpected");
+      if (empty) sb.append(" ").append(LangBundle.message("parsing.error.unexpected"));
     }
     String message = sb.toString();
     if (advance) {
@@ -982,7 +982,7 @@ public class GeneratedParserUtilBase {
         if (s.length() == 0) continue;
         if (count++ > 0) {
           if (count > MAX_VARIANTS_TO_DISPLAY) {
-            sb.append(" and ...");
+            sb.append(" ").append(LangBundle.message("parsing.error.and.ellipsis"));
             break;
           }
           else {
@@ -995,7 +995,7 @@ public class GeneratedParserUtilBase {
       }
       if (count > 1 && count < MAX_VARIANTS_TO_DISPLAY) {
         int idx = sb.lastIndexOf(", ");
-        sb.replace(idx, idx + 1, " or");
+        sb.replace(idx, idx + 1, " " + LangBundle.message("parsing.error.or"));
       }
     }