IJPL-162853 better name for Production#getTokenType -> getNodeType

GitOrigin-RevId: 12a6f8b8bf2337c342f9b97eb1c4884d84448ca2
JetBrains · Feb 26, 2025 · 1d8c08c · 1d8c08c
1 parent 8b8dc25
commit 1d8c08c
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/platform/syntax/syntax-api/api-dump-experimental.txt b/platform/syntax/syntax-api/api-dump-experimental.txt
@@ -94,9 +94,9 @@
 - a:getEndOffset():I
 - a:getEndTokenIndex():I
 - a:getErrorMessage():java.lang.String
+- a:getNodeType():com.intellij.platform.syntax.SyntaxElementType
 - a:getStartOffset():I
 - a:getStartTokenIndex():I
-- a:getTokenType():com.intellij.platform.syntax.SyntaxElementType
 - a:isCollapsed():Z
 - a:isErrorMarker():Z
 *f:com.intellij.platform.syntax.parser.SyntaxTreeBuilderFactory

diff --git a/platform/syntax/syntax-api/src/com/intellij/platform/syntax/impl/builder/CompositeMarker.kt b/platform/syntax/syntax-api/src/com/intellij/platform/syntax/impl/builder/CompositeMarker.kt
@@ -42,9 +42,9 @@ internal class CompositeMarker(
   override fun getEndTokenIndex(): Int = endIndex
 
   override fun getErrorMessage(): String? =
-    if (getTokenType() == SyntaxTokenTypes.ERROR_ELEMENT) builder.myOptionalData.getDoneError(markerId) else null
+    if (getNodeType() == SyntaxTokenTypes.ERROR_ELEMENT) builder.myOptionalData.getDoneError(markerId) else null
 
-  override fun getTokenType(): SyntaxElementType =
+  override fun getNodeType(): SyntaxElementType =
     type
 
   override fun precede(): SyntaxTreeBuilder.Marker {

diff --git a/platform/syntax/syntax-api/src/com/intellij/platform/syntax/impl/builder/ErrorMarker.kt b/platform/syntax/syntax-api/src/com/intellij/platform/syntax/impl/builder/ErrorMarker.kt
@@ -29,7 +29,7 @@ internal class ErrorMarker(
 
   override fun getEndOffset(): Int = getStartOffset()
 
-  override fun getTokenType(): SyntaxElementType = SyntaxTokenTypes.ERROR_ELEMENT
+  override fun getNodeType(): SyntaxElementType = SyntaxTokenTypes.ERROR_ELEMENT
 
   override fun getEndTokenIndex(): Int = startIndex
 

diff --git a/platform/syntax/syntax-api/src/com/intellij/platform/syntax/impl/builder/MarkerProduction.kt b/platform/syntax/syntax-api/src/com/intellij/platform/syntax/impl/builder/MarkerProduction.kt
@@ -169,7 +169,7 @@ internal class MarkerProduction(
       val m = getDoneMarkerAt(i)
       if (m != null && m.getStartTokenIndex() <= pivot.getStartTokenIndex() && indexOf(m) < pivotIndex) {
         throw AssertionError(
-          "There's a marker of type '${m.getTokenType()}' that starts before and finishes after the current marker. See cause for its allocation trace.",
+          "There's a marker of type '${m.getNodeType()}' that starts before and finishes after the current marker. See cause for its allocation trace.",
           myOptionalData.getAllocationTrace(m)
         )
       }

diff --git a/...orm/syntax/syntax-api/src/com/intellij/platform/syntax/impl/builder/ParsingTreeBuilder.kt b/...orm/syntax/syntax-api/src/com/intellij/platform/syntax/impl/builder/ParsingTreeBuilder.kt
@@ -299,7 +299,7 @@ internal class ParsingTreeBuilder(
     }
 
     val doneLexeme = before?.getStartTokenIndex() ?: myCurrentLexeme
-    if (whitespaceOrCommentBindingPolicy.isLeftBound(marker.getTokenType()) && isEmpty(marker.getStartTokenIndex(), doneLexeme)) {
+    if (whitespaceOrCommentBindingPolicy.isLeftBound(marker.getNodeType()) && isEmpty(marker.getStartTokenIndex(), doneLexeme)) {
       marker.setCustomEdgeTokenBinders(WhitespacesBinders.defaultRightBinder(), null)
     }
     marker.endIndex = doneLexeme
@@ -354,7 +354,7 @@ internal class ParsingTreeBuilder(
     if (rootMarker.getEndTokenIndex() < lexemeCount) {
       val missed = arrayOfNulls<SyntaxElementType>(this.lexemeCount - rootMarker.getEndTokenIndex())
       result.copyTokenTypesToArray(missed, rootMarker.getEndTokenIndex(), 0, missed.size)
-      logger.error("Tokens ${missed.contentToString()} are outside of root element \"${rootMarker.getTokenType()}\".",
+      logger.error("Tokens ${missed.contentToString()} are outside of root element \"${rootMarker.getNodeType()}\".",
                    Attachment("outsideTokensFragment.txt", text.toString()))
     }
 

diff --git a/platform/syntax/syntax-api/src/com/intellij/platform/syntax/parser/SyntaxTreeBuilder.kt b/platform/syntax/syntax-api/src/com/intellij/platform/syntax/parser/SyntaxTreeBuilder.kt
@@ -183,7 +183,7 @@ interface SyntaxTreeBuilder {
     /**
      * The token type of this production
      */
-    fun getTokenType(): SyntaxElementType
+    fun getNodeType(): SyntaxElementType
 
     /**
      * The start offset of the production in the char sequence

diff --git a/platform/syntax/syntax-psi/src/com/intellij/platform/syntax/psi/impl/PsiSyntaxBuilderImpl.kt b/platform/syntax/syntax-psi/src/com/intellij/platform/syntax/psi/impl/PsiSyntaxBuilderImpl.kt
@@ -153,7 +153,7 @@ internal class PsiSyntaxBuilderImpl(
     }
     return CompositeNode(
       markerId = markedId,
-      myType = tokenConverter.convertNotNull(productionMarker.getTokenType()),
+      myType = tokenConverter.convertNotNull(productionMarker.getNodeType()),
       startIndex = productionMarker.getStartTokenIndex(),
       myEndIndex = productionMarker.getEndTokenIndex(),
       data = nodeData,