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

fixes after review IDEA-CR-22788

Browse Source
This commit is contained in:
Leonid Shalupov
2017-08-14 19:06:06 +03:00
parent 6781d9e837
commit cf1073e973
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/yaml/src/org/jetbrains/yaml/YAMLFindUsagesProvider.java
+6 -7
View File
@@ -3,14 +3,12 @@ package org.jetbrains.yaml;
import com.intellij.lang.HelpID;
import com.intellij.lang.cacheBuilder.WordsScanner;
import com.intellij.lang.findUsages.FindUsagesProvider;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiNamedElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.yaml.psi.YAMLMapping;
import org.jetbrains.yaml.psi.YAMLScalar;
import org.jetbrains.yaml.psi.YAMLScalarText;
import org.jetbrains.yaml.psi.YAMLSequence;
import org.jetbrains.yaml.psi.*;
/**
* @author shalupov
@@ -42,6 +40,8 @@ public class YAMLFindUsagesProvider implements FindUsagesProvider {
return "sequence";
} else if (element instanceof YAMLMapping) {
return "mapping";
} else if (element instanceof YAMLKeyValue) {
return "key-value";
} else {
return "";
}
@@ -50,9 +50,8 @@ public class YAMLFindUsagesProvider implements FindUsagesProvider {
@NotNull
@Override
public String getDescriptiveName(@NotNull PsiElement element) {
final String name = element instanceof PsiNamedElement ? ((PsiNamedElement)element).getName() : null;
if (name != null) {
return name;
if (element instanceof PsiNamedElement) {
return StringUtil.notNullize(((PsiNamedElement)element).getName(), "<unnamed>");
}
if (element instanceof YAMLScalar) {
plugins/yaml/src/org/jetbrains/yaml/YAMLWordsScanner.java
+2 -5
View File
@@ -11,12 +11,9 @@ public class YAMLWordsScanner extends DefaultWordsScanner {
public YAMLWordsScanner() {
super(
new YAMLFlexLexer(),
TokenSet.create(
YAMLElementTypes.SCALAR_TEXT_VALUE,
YAMLElementTypes.SCALAR_PLAIN_VALUE,
YAMLElementTypes.SCALAR_QUOTED_STRING),
TokenSet.create(YAMLTokenTypes.SCALAR_KEY),
TokenSet.create(YAMLTokenTypes.COMMENT),
TokenSet.EMPTY);
YAMLElementTypes.SCALAR_VALUES);
setMayHaveFileRefsInLiterals(true);
}
}