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

[yaml, kubernetes] corrections upon review IDEA-CR-29807

Browse Source
This commit is contained in:
Sergey.Anchipolevsky
2018-02-26 16:57:26 +03:00
parent e912c49937
commit ea3520e4df
3 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/yaml/src/org/jetbrains/yaml/meta/impl/YamlDocumentationProviderBase.java
+4 -3
View File
@@ -16,6 +16,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.yaml.YAMLLanguage;
import org.jetbrains.yaml.meta.model.Field;
import org.jetbrains.yaml.meta.model.TypeFieldPair;
import org.jetbrains.yaml.meta.model.YamlMetaType;
import org.jetbrains.yaml.meta.model.YamlMetaType.ForcedCompletionPath;
import org.jetbrains.yaml.psi.YAMLKeyValue;
@@ -57,8 +58,8 @@ public abstract class YamlDocumentationProviderBase extends AbstractDocumentatio
if (object instanceof ForcedCompletionPath) { // deep completion
return createFromCompletionPath((ForcedCompletionPath)object, contextElement);
}
else if (object instanceof YamlMetaTypeProvider.MetaTypeProxy) { // basic completion with Field object
return createFromField((YamlMetaTypeProvider.MetaTypeProxy)object, contextElement);
else if (object instanceof TypeFieldPair) { // basic completion with Field object
return createFromField((TypeFieldPair)object, contextElement);
}
else if (object instanceof String) { // basic completion with plain string
return createFromString((String)object, contextElement);
@@ -184,7 +185,7 @@ public abstract class YamlDocumentationProviderBase extends AbstractDocumentatio
}
@NotNull
private DocumentationElement createFromField(YamlMetaTypeProvider.MetaTypeProxy field, @NotNull PsiElement contextElement) {
private DocumentationElement createFromField(@NotNull TypeFieldPair field, @NotNull PsiElement contextElement) {
return new DocumentationElement(contextElement.getManager(), field.getMetaType(), field.getField());
}
plugins/yaml/src/org/jetbrains/yaml/meta/model/Field.java
+1 -16
View File
@@ -11,7 +11,6 @@ import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.yaml.meta.impl.YamlMetaTypeProvider;
import org.jetbrains.yaml.psi.YAMLKeyValue;
import javax.swing.*;
@@ -223,21 +222,7 @@ public class Field {
return Collections.emptyList();
}
final YamlMetaTypeProvider.MetaTypeProxy lookupObject = new YamlMetaTypeProvider.MetaTypeProxy() {
@NotNull
@Override
public YamlMetaType getMetaType() {
return ownerClass;
}
@NotNull
@Override
public Field getField() {
return Field.this;
}
};
LookupElementBuilder lookup = LookupElementBuilder.create(lookupObject, getName())
LookupElementBuilder lookup = LookupElementBuilder.create(new TypeFieldPair(ownerClass, this), getName())
.withTypeText(myMainType.getDisplayName(), true)
.withIcon(getLookupIcon())
.withStrikeoutness(isDeprecated());
plugins/yaml/src/org/jetbrains/yaml/meta/model/TypeFieldPair.java
+26
View File
@@ -0,0 +1,26 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package org.jetbrains.yaml.meta.model;
import org.jetbrains.annotations.NotNull;
public class TypeFieldPair {
@NotNull
private final Field myField;
@NotNull
private final YamlMetaClass myOwnerClass;
public TypeFieldPair(@NotNull YamlMetaClass ownerClass, @NotNull Field field) {
myField = field;
myOwnerClass = ownerClass;
}
@NotNull
public YamlMetaType getMetaType() {
return myOwnerClass;
}
@NotNull
public Field getField() {
return myField;
}
}