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

WEB-37864 Support JSON-schema based code completion for all linters/tools we support for yaml/plain js formats

Browse Source
This commit is contained in:
Anton Lobov
2019-03-20 10:50:24 +01:00
parent c9380139ed
commit 62f95b942d
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
json/src/com/jetbrains/jsonSchema/extension/JsonLikePsiWalker.java
+1
View File
@@ -37,6 +37,7 @@ public interface JsonLikePsiWalker {
boolean requiresNameQuotes();
default boolean requiresValueQuotes() { return true; }
boolean allowsSingleQuotes();
default boolean isValidIdentifier(String string, Project project) { return true; }
boolean hasMissingCommaAfter(@NotNull PsiElement element);
json/src/com/jetbrains/jsonSchema/impl/JsonSchemaCompletionContributor.java
+8 -3
View File
@@ -160,7 +160,7 @@ public class JsonSchemaCompletionContributor extends CompletionContributor {
myResultConsumer = resultConsumer;
myVariants = new HashSet<>();
myWalker = JsonLikePsiWalker.getWalker(myPosition, myRootSchema);
myWrapInQuotes = myWalker != null && myWalker.requiresNameQuotes() && !(position.getParent() instanceof JsonStringLiteral);
myWrapInQuotes = !(position.getParent() instanceof JsonStringLiteral);
myInsideStringLiteral = position.getParent() instanceof JsonStringLiteral;
}
@@ -392,7 +392,8 @@ public class JsonSchemaCompletionContributor extends CompletionContributor {
@SuppressWarnings("SameParameterValue") @Nullable final String description,
@Nullable final String altText,
@Nullable InsertHandler<LookupElement> handler) {
LookupElementBuilder builder = LookupElementBuilder.create(!myWrapInQuotes ? StringUtil.unquoteString(key) : key);
String unquoted = StringUtil.unquoteString(key);
LookupElementBuilder builder = LookupElementBuilder.create(!shouldWrapInQuotes(unquoted) ? unquoted : key);
if (altText != null) {
builder = builder.withPresentableText(altText);
}
@@ -405,13 +406,17 @@ public class JsonSchemaCompletionContributor extends CompletionContributor {
myVariants.add(builder);
}
private boolean shouldWrapInQuotes(String key) {
return myWrapInQuotes && myWalker != null && (myWalker.requiresNameQuotes() || !myWalker.isValidIdentifier(key, myProject));
}
private void addPropertyVariant(@NotNull String key,
@NotNull JsonSchemaObject jsonSchemaObject,
boolean hasValue,
boolean insertComma) {
final Collection<JsonSchemaObject> variants = new JsonSchemaResolver(myProject, jsonSchemaObject).resolve();
jsonSchemaObject = ObjectUtils.coalesce(ContainerUtil.getFirstItem(variants), jsonSchemaObject);
key = !myWrapInQuotes ? key : StringUtil.wrapWithDoubleQuote(key);
key = !shouldWrapInQuotes(key) ? key : StringUtil.wrapWithDoubleQuote(key);
LookupElementBuilder builder = LookupElementBuilder.create(key);
final String typeText = JsonSchemaDocumentationProvider.getBestDocumentation(true, jsonSchemaObject);
json/tests/test/com/jetbrains/jsonSchema/JsonSchemaPerformanceTest.java
+1 -1
View File
@@ -28,7 +28,7 @@ public class JsonSchemaPerformanceTest extends JsonSchemaHeavyAbstractTest {
}
public void testSwaggerHighlighting() {
doPerformanceTest(8000, "swagger");
doPerformanceTest(8300, "swagger");
}
public void testTsLintSchema() {