From 0a2ba69824b72918ccd765ea61f32a894b2b9fe4 Mon Sep 17 00:00:00 2001 From: "Maxim.Mossienko" Date: Wed, 22 Dec 2010 17:21:57 +0300 Subject: [PATCH] better names for new api methods --- .../src/com/intellij/lang/java/parser/JavaParserUtil.java | 8 ++++---- platform/lang-api/src/com/intellij/lang/PsiBuilder.java | 4 ++-- .../src/com/intellij/lang/impl/PsiBuilderImpl.java | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/java/java-impl/src/com/intellij/lang/java/parser/JavaParserUtil.java b/java/java-impl/src/com/intellij/lang/java/parser/JavaParserUtil.java index 851bc1d9e65a..5f7105e29f22 100644 --- a/java/java-impl/src/com/intellij/lang/java/parser/JavaParserUtil.java +++ b/java/java-impl/src/com/intellij/lang/java/parser/JavaParserUtil.java @@ -335,13 +335,13 @@ public class JavaParserUtil { } @Override - public IElementType justLookup(int steps) { - return myDelegate.justLookup(steps); + public IElementType rawLookup(int steps) { + return myDelegate.rawLookup(steps); } @Override - public int tokenTypeStart(int steps) { - return myDelegate.tokenTypeStart(steps); + public int rawTokenTypeStart(int steps) { + return myDelegate.rawTokenTypeStart(steps); } @Nullable @NonNls diff --git a/platform/lang-api/src/com/intellij/lang/PsiBuilder.java b/platform/lang-api/src/com/intellij/lang/PsiBuilder.java index d6fe505f9cca..9e3b685c2444 100644 --- a/platform/lang-api/src/com/intellij/lang/PsiBuilder.java +++ b/platform/lang-api/src/com/intellij/lang/PsiBuilder.java @@ -93,7 +93,7 @@ public interface PsiBuilder extends UserDataHolder, UserDataHolderUnprotected { * @return type element ahead or behind, including whitespace / comment tokens */ @Nullable - IElementType justLookup(int steps); + IElementType rawLookup(int steps); /** * See what token type is in steps ahead / behind current position @@ -101,7 +101,7 @@ public interface PsiBuilder extends UserDataHolder, UserDataHolderUnprotected { * @return offset type element ahead or behind, including whitespace / comment tokens, -1 if first token, * getOriginalText().getLength() at end */ - int tokenTypeStart(int steps); + int rawTokenTypeStart(int steps); /** * Returns the text of the current token from the lexer. diff --git a/platform/lang-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java b/platform/lang-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java index dcb4cc0c7864..cd5362dac2a8 100644 --- a/platform/lang-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java +++ b/platform/lang-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java @@ -635,13 +635,13 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder { } @Override - public IElementType justLookup(int steps) { + public IElementType rawLookup(int steps) { int cur = myCurrentLexeme + steps; return cur < myLexemeCount && cur >= 0 ? myLexTypes[cur] : null; } @Override - public int tokenTypeStart(int steps) { + public int rawTokenTypeStart(int steps) { int cur = myCurrentLexeme + steps; if (cur < 0) return -1; if (cur >= myLexemeCount) return getOriginalText().length();