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

json schema: correct file type definition, modify tests

Browse Source
This commit is contained in:
irengrig
2016-07-26 19:32:06 +02:00
parent 8074135fd4
commit 6720fdc856
2 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
json/src/com/jetbrains/jsonSchema/JsonSchemaFileTypeFactory.java
+1 -1
View File
@@ -25,6 +25,6 @@ import org.jetbrains.annotations.NotNull;
public class JsonSchemaFileTypeFactory extends FileTypeFactory {
@Override
public void createFileTypes(@NotNull FileTypeConsumer consumer) {
consumer.consume(JsonSchemaFileType.INSTANCE);
consumer.consume(JsonSchemaFileType.INSTANCE, (String) null);
}
}
json/tests/test/com/jetbrains/jsonSchema/JsonSchemaCrossReferencesTest.java
+27 -21
View File
@@ -217,13 +217,13 @@ public class JsonSchemaCrossReferencesTest extends CompletionTestCase {
instance.addSchema(inherited);
testIsSchemaFile(moduleFile, "localRefSchema.json");
testIsSchemaFile(moduleFile, "referencingSchema.json");
try {
ApplicationManager.getApplication().runWriteAction(() -> myFileTypeManager.associatePattern(JsonSchemaFileType.INSTANCE, "*Schema.json"));
JsonSchemaService.Impl.get(getProject()).reset();
testIsSchemaFile(moduleFile, "localRefSchema.json");
testIsSchemaFile(moduleFile, "referencingSchema.json");
int offset = myEditor.getCaretModel().getPrimaryCaret().getOffset();
final PsiReference referenceAt = myFile.findReferenceAt(offset);
Assert.assertNotNull(referenceAt);
@@ -316,24 +316,30 @@ public class JsonSchemaCrossReferencesTest extends CompletionTestCase {
instance.addSchema(inherited);
JsonSchemaService.Impl.get(getProject()).reset();
int offset = myEditor.getCaretModel().getPrimaryCaret().getOffset();
PsiElement element = myFile.findElementAt(offset);
boolean found = false;
while (element.getTextRange().contains(offset)) {
if (JsonBySchemaObjectReferenceContributor.REF_PATTERN.accepts(element)) {
found = true;
break;
}
element = element.getParent();
}
Assert.assertTrue(found);
final PsiReference referenceAt = myFile.findReferenceAt(offset);
Assert.assertNotNull(referenceAt);
final PsiElement resolve = referenceAt.resolve();
Assert.assertNotNull(resolve);
Assert.assertEquals("\"baseEnum\"", resolve.getText());
Assert.assertEquals("baseProperties.json", resolve.getContainingFile().getName());
ApplicationManager.getApplication().runWriteAction(() -> myFileTypeManager.associatePattern(JsonSchemaFileType.INSTANCE, "*Schema.json"));
try {
instance.removeSchema(inherited);
int offset = myEditor.getCaretModel().getPrimaryCaret().getOffset();
PsiElement element = myFile.findElementAt(offset);
boolean found = false;
while (element.getTextRange().contains(offset)) {
if (JsonBySchemaObjectReferenceContributor.REF_PATTERN.accepts(element)) {
found = true;
break;
}
element = element.getParent();
}
Assert.assertTrue(found);
final PsiReference referenceAt = myFile.findReferenceAt(offset);
Assert.assertNotNull(referenceAt);
final PsiElement resolve = referenceAt.resolve();
Assert.assertNotNull(resolve);
Assert.assertEquals("\"baseEnum\"", resolve.getText());
Assert.assertEquals("baseProperties.json", resolve.getContainingFile().getName());
} finally {
instance.removeSchema(inherited);
ApplicationManager.getApplication().runWriteAction(() -> myFileTypeManager.removeAssociatedExtension(JsonSchemaFileType.INSTANCE, "*Schema.json"));
}
}
}