Initialize tokenKindToText when DiagnosticsProvider is loaded

Author: TysonAndre

src/DiagnosticsProvider.php

@@ -10,23 +10,24 @@
 
 class DiagnosticsProvider {
 
+    /**
+     * @var string[] maps the token kind to the corresponding name
+     */
     private static $tokenKindToText;
 
     /**
      * @param int $kind (must be a valid token kind)
      * @return string
      */
     public static function getTextForTokenKind($kind) {
-        if (!isset(self::$tokenKindToText)) {
-            self::initTokenKindToText();
-        }
         return self::$tokenKindToText[$kind];
     }
 
     /**
-     * @return string[]
+     * This is called when this class is loaded, at the bottom of this file.
+     * @return void
      */
-    private static function initTokenKindToText() {
+    public static function initTokenKindToText() {
         self::$tokenKindToText = \array_flip(\array_merge(
             TokenStringMaps::OPERATORS_AND_PUNCTUATORS,
             TokenStringMaps::KEYWORDS,
@@ -58,9 +59,6 @@ public static function checkDiagnostics($node) {
      * @return Diagnostic|null
      */
     private static function checkDiagnosticForUnexpectedToken($token) {
-        if (!isset(self::$tokenKindToText)) {
-            self::initTokenKindToText();
-        }
         if ($token instanceof SkippedToken) {
             // TODO - consider also attaching parse context information to skipped tokens
             // this would allow us to provide more helpful error messages that inform users what to do
@@ -107,3 +105,5 @@ public static function getDiagnostics(Node $n) : array {
         return $diagnostics;
     }
 }
+
+DiagnosticsProvider::initTokenKindToText();