MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

notnull

Browse Source
This commit is contained in:
Alexey Kudravtsev
2017-12-14 14:24:03 +03:00
parent 1bd3f49193
commit 55c60b7d62
14 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/psi/impl/source/JavaFileElementType.java
+1 -1
View File
@@ -77,7 +77,7 @@ public class JavaFileElementType extends ILightStubFileElementType<PsiJavaFileSt
}
@Override
public ASTNode parseContents(final ASTNode chameleon) {
public ASTNode parseContents(@NotNull final ASTNode chameleon) {
final PsiBuilder builder = JavaParserUtil.createBuilder(chameleon);
doParse(builder);
return builder.getTreeBuilt().getFirstChildNode();
java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaDocElementType.java
+3 -3
View File
@@ -81,7 +81,7 @@ public interface JavaDocElementType {
@Nullable
@Override
public ASTNode parseContents(final ASTNode chameleon) {
public ASTNode parseContents(@NotNull final ASTNode chameleon) {
return JavaParserUtil.parseFragment(chameleon, myParser, false, LanguageLevel.JDK_1_3);
}
};
@@ -96,7 +96,7 @@ public interface JavaDocElementType {
@Nullable
@Override
public ASTNode parseContents(final ASTNode chameleon) {
public ASTNode parseContents(@NotNull final ASTNode chameleon) {
return JavaParserUtil.parseFragment(chameleon, myParser, false, LanguageLevel.JDK_1_3);
}
};
@@ -116,7 +116,7 @@ public interface JavaDocElementType {
@Nullable
@Override
public ASTNode parseContents(final ASTNode chameleon) {
public ASTNode parseContents(@NotNull final ASTNode chameleon) {
return JavaParserUtil.parseFragment(chameleon, myParser);
}
java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaElementType.java
+6 -6
View File
@@ -164,7 +164,7 @@ public interface JavaElementType {
}
@Override
public ASTNode parseContents(final ASTNode chameleon) {
public ASTNode parseContents(@NotNull final ASTNode chameleon) {
final PsiBuilder builder = JavaParserUtil.createBuilder(chameleon);
JavaParser.INSTANCE.getStatementParser().parseCodeBlockDeep(builder, true);
return builder.getTreeBuilt().getFirstChildNode();
@@ -195,7 +195,7 @@ public interface JavaElementType {
@Nullable
@Override
public ASTNode parseContents(final ASTNode chameleon) {
public ASTNode parseContents(@NotNull final ASTNode chameleon) {
return JavaParserUtil.parseFragment(chameleon, myParser);
}
};
@@ -210,7 +210,7 @@ public interface JavaElementType {
@Nullable
@Override
public ASTNode parseContents(final ASTNode chameleon) {
public ASTNode parseContents(@NotNull final ASTNode chameleon) {
return JavaParserUtil.parseFragment(chameleon, myParser);
}
};
@@ -225,7 +225,7 @@ public interface JavaElementType {
@Nullable
@Override
public ASTNode parseContents(final ASTNode chameleon) {
public ASTNode parseContents(@NotNull final ASTNode chameleon) {
return JavaParserUtil.parseFragment(chameleon, myParser);
}
};
@@ -251,7 +251,7 @@ public interface JavaElementType {
@Nullable
@Override
public ASTNode parseContents(final ASTNode chameleon) {
public ASTNode parseContents(@NotNull final ASTNode chameleon) {
return JavaParserUtil.parseFragment(chameleon, myParser);
}
}
@@ -269,7 +269,7 @@ public interface JavaElementType {
@Nullable
@Override
public ASTNode parseContents(final ASTNode chameleon) {
public ASTNode parseContents(@NotNull final ASTNode chameleon) {
assert chameleon instanceof JavaDummyElement : chameleon;
final JavaDummyElement dummyElement = (JavaDummyElement)chameleon;
return JavaParserUtil.parseFragment(chameleon, dummyElement.getParser(), dummyElement.consumeAll(), dummyElement.getLanguageLevel());
java/java-tests/testSrc/com/intellij/java/parser/JavaParsingTestCase.java
+1 -1
View File
@@ -112,7 +112,7 @@ public abstract class JavaParsingTestCase extends ParsingTestCase {
}
@Override
public ASTNode parseContents(ASTNode chameleon) {
public ASTNode parseContents(@NotNull ASTNode chameleon) {
PsiBuilder builder = createBuilder(chameleon);
PsiBuilder.Marker root = builder.mark();
platform/core-api/src/com/intellij/psi/tree/IFileElementType.java
+1 -1
View File
@@ -43,7 +43,7 @@ public class IFileElementType extends ILazyParseableElementType {
@Nullable
@Override
public ASTNode parseContents(final ASTNode chameleon) {
public ASTNode parseContents(@NotNull final ASTNode chameleon) {
final PsiElement psi = chameleon.getPsi();
assert psi != null : "Bad chameleon: " + chameleon;
return doParseContents(chameleon, psi);
platform/core-api/src/com/intellij/psi/tree/ILazyParseableElementType.java
+1 -1
View File
@@ -74,7 +74,7 @@ public class ILazyParseableElementType extends IElementType implements ILazyPars
* @param chameleon the node to parse.
* @return the parsed contents of the node.
*/
public ASTNode parseContents(ASTNode chameleon) {
public ASTNode parseContents(@NotNull ASTNode chameleon) {
PsiElement parentElement = chameleon.getTreeParent().getPsi();
assert parentElement != null : "parent psi is null: " + chameleon;
return doParseContents(chameleon, parentElement);
platform/core-api/src/com/intellij/psi/tree/ILazyParseableElementTypeBase.java
+3 -1
View File
@@ -16,11 +16,13 @@
package com.intellij.psi.tree;
import com.intellij.lang.ASTNode;
import org.jetbrains.annotations.NotNull;
/**
* An additional interface to be implemented by {@link IElementType} instances for tokens which should be parsed lazily, but
* for some reasons extending {@link ILazyParseableElementType} is impossible.
*/
@FunctionalInterface
public interface ILazyParseableElementTypeBase {
/**
@@ -30,5 +32,5 @@ public interface ILazyParseableElementTypeBase {
* @param chameleon the node to parse.
* @return the parsed contents of the node.
*/
ASTNode parseContents(ASTNode chameleon);
ASTNode parseContents(@NotNull ASTNode chameleon);
}
platform/core-impl/src/com/intellij/openapi/fileTypes/PlainTextParserDefinition.java
+1 -1
View File
@@ -39,7 +39,7 @@ import org.jetbrains.annotations.NotNull;
public class PlainTextParserDefinition implements ParserDefinition {
private static final IFileElementType PLAIN_FILE_ELEMENT_TYPE = new IFileElementType(PlainTextFileType.INSTANCE.getLanguage()) {
@Override
public ASTNode parseContents(ASTNode chameleon) {
public ASTNode parseContents(@NotNull ASTNode chameleon) {
final CharSequence chars = chameleon.getChars();
return ASTFactory.leaf(PlainTextTokenTypes.PLAIN_TEXT, chars);
}
platform/core-impl/src/com/intellij/psi/PlainTextTokenTypes.java
+2 -1
View File
@@ -21,11 +21,12 @@ import com.intellij.lang.ASTNode;
import com.intellij.openapi.fileTypes.PlainTextLanguage;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.tree.IFileElementType;
import org.jetbrains.annotations.NotNull;
public class PlainTextTokenTypes {
public static final IElementType PLAIN_TEXT_FILE = new IFileElementType("PLAIN_TEXT_FILE", PlainTextLanguage.INSTANCE) {
@Override
public ASTNode parseContents(ASTNode chameleon) {
public ASTNode parseContents(@NotNull ASTNode chameleon) {
return ASTFactory.leaf(PLAIN_TEXT, chameleon.getChars());
}
};
platform/lang-impl/src/com/intellij/psi/templateLanguages/TemplateDataElementType.java
+1 -1
View File
@@ -72,7 +72,7 @@ public class TemplateDataElementType extends IFileElementType implements ITempla
}
@Override
public ASTNode parseContents(ASTNode chameleon) {
public ASTNode parseContents(@NotNull ASTNode chameleon) {
final CharTable charTable = SharedImplUtil.findCharTableByTree(chameleon);
final FileElement fileElement = TreeUtil.getFileElement((TreeElement)chameleon);
final PsiFile psiFile = (PsiFile)fileElement.getPsi();
platform/platform-tests/testSrc/com/intellij/lang/PsiBuilderQuickTest.java
+2 -2
View File
@@ -712,7 +712,7 @@ public class PsiBuilderQuickTest extends LightPlatformTestCase {
}
@Override
public ASTNode parseContents(ASTNode chameleon) {
public ASTNode parseContents(@NotNull ASTNode chameleon) {
final PsiBuilder builder = createBuilder(chameleon.getText());
parse(builder);
return builder.getTreeBuilt().getFirstChildNode();
@@ -752,7 +752,7 @@ public class PsiBuilderQuickTest extends LightPlatformTestCase {
}
@Override
public ASTNode parseContents(ASTNode chameleon) {
public ASTNode parseContents(@NotNull ASTNode chameleon) {
final PsiBuilder builder = createBuilder(chameleon.getText());
parse(builder);
return builder.getTreeBuilt().getFirstChildNode();
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/groovydoc/parser/GroovyDocElementTypes.java
+1 -1
View File
@@ -44,7 +44,7 @@ public interface GroovyDocElementTypes {
}
@Override
public ASTNode parseContents(ASTNode chameleon) {
public ASTNode parseContents(@NotNull ASTNode chameleon) {
final PsiElement parentElement = chameleon.getTreeParent().getPsi();
final Project project = JavaPsiFacade.getInstance(parentElement.getProject()).getProject();
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/groovydoc/parser/elements/GroovyDocTagValueTokenType.java
+1 -1
View File
@@ -63,7 +63,7 @@ public class GroovyDocTagValueTokenType extends GroovyDocChameleonElementType im
}
@Override
public ASTNode parseContents(ASTNode chameleon) {
public ASTNode parseContents(@NotNull ASTNode chameleon) {
ASTNode parent = chameleon.getTreeParent();
if (isReferenceElement(parent, chameleon)) {
return parseImpl(chameleon);
python/src/com/jetbrains/python/psi/PyFileElementType.java
+1 -1
View File
@@ -67,7 +67,7 @@ public class PyFileElementType extends IStubFileElementType<PyFileStub> {
@Nullable
@Override
public ASTNode parseContents(ASTNode node) {
public ASTNode parseContents(@NotNull ASTNode node) {
final LanguageLevel languageLevel = getLanguageLevel(node.getPsi());
if (PydevConsoleRunner.isPythonConsole(node)) {
return parseConsoleCode(node, PydevConsoleRunner.getPythonConsoleData(node));