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: do not keep schema virtual file(s) in static fields...

Browse Source 
... of schema providers factories: different project-related user data (including project reference) could (and is actually) cached on this file objects, which leads to leaks
This commit is contained in:
Irina.Chernushina
2017-10-24 17:18:07 +02:00
parent 135852019c
commit b959825091
5 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
json/src/com/jetbrains/jsonSchema/extension/JsonSchemaFileProvider.java
+3
View File
@@ -3,6 +3,7 @@ package com.jetbrains.jsonSchema.extension;
import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public interface JsonSchemaFileProvider {
boolean isAvailable(@NotNull VirtualFile file);
@@ -10,7 +11,9 @@ public interface JsonSchemaFileProvider {
@NotNull
String getName();
@Nullable
VirtualFile getSchemaFile();
@NotNull
SchemaType getSchemaType();
}
json/src/com/jetbrains/jsonSchema/extension/JsonSchemaProjectSelfProviderFactory.java
+11 -6
View File
@@ -20,6 +20,7 @@ import com.intellij.openapi.util.Pair;
import com.intellij.openapi.vfs.VirtualFile;
import com.jetbrains.jsonSchema.ide.JsonSchemaService;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Collections;
import java.util.List;
@@ -29,8 +30,6 @@ import java.util.List;
*/
public class JsonSchemaProjectSelfProviderFactory implements JsonSchemaProviderFactory {
public static final String SCHEMA_JSON_FILE_NAME = "schema.json";
private final static VirtualFile SCHEMA_FILE = JsonSchemaProviderFactory.getResourceFile(
JsonSchemaProjectSelfProviderFactory.class, "/jsonSchema/schema.json");
@NotNull
@Override
@@ -40,10 +39,14 @@ public class JsonSchemaProjectSelfProviderFactory implements JsonSchemaProviderF
private static class MyJsonSchemaFileProvider implements JsonSchemaFileProvider {
public static final Pair<SchemaType, Object> KEY = Pair.create(SchemaType.schema, SchemaType.schema);
@NotNull
private final Project myProject;
@NotNull private final Project myProject;
@Nullable private final VirtualFile mySchemaFile;
private MyJsonSchemaFileProvider(@NotNull final Project project) {myProject = project;}
private MyJsonSchemaFileProvider(@NotNull final Project project) {
myProject = project;
// schema file can not be static here, because in schema's user data we cache project-scope objects (i.e. which can refer to project)
mySchemaFile = JsonSchemaProviderFactory.getResourceFile(JsonSchemaProjectSelfProviderFactory.class, "/jsonSchema/schema.json");
}
@Override
public boolean isAvailable(@NotNull VirtualFile file) {
@@ -56,11 +59,13 @@ public class JsonSchemaProjectSelfProviderFactory implements JsonSchemaProviderF
return SCHEMA_JSON_FILE_NAME;
}
@Nullable
@Override
public VirtualFile getSchemaFile() {
return SCHEMA_FILE;
return mySchemaFile;
}
@NotNull
@Override
public SchemaType getSchemaType() {
return SchemaType.schema;
json/src/com/jetbrains/jsonSchema/extension/JsonSchemaUserDefinedProviderFactory.java
+5
View File
@@ -9,6 +9,7 @@ import com.jetbrains.jsonSchema.JsonSchemaMappingsProjectConfiguration;
import com.jetbrains.jsonSchema.UserDefinedJsonSchemaConfiguration;
import com.jetbrains.jsonSchema.ide.JsonSchemaService;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.File;
import java.util.Collections;
@@ -50,6 +51,7 @@ public class JsonSchemaUserDefinedProviderFactory implements JsonSchemaProviderF
myPatterns = patterns;
}
@Nullable
@Override
public VirtualFile getSchemaFile() {
if (myVirtualFile != null && myVirtualFile.isValid()) return myVirtualFile;
@@ -61,6 +63,7 @@ public class JsonSchemaUserDefinedProviderFactory implements JsonSchemaProviderF
return myVirtualFile;
}
@NotNull
@Override
public SchemaType getSchemaType() {
return SchemaType.userSchema;
@@ -74,6 +77,7 @@ public class JsonSchemaUserDefinedProviderFactory implements JsonSchemaProviderF
@Override
public boolean isAvailable(@NotNull VirtualFile file) {
//noinspection SimplifiableIfStatement
if (myPatterns.isEmpty() || file.isDirectory() || !file.isValid() || getSchemaFile() == null ||
JsonSchemaService.Impl.get(myProject).isSchemaFile(file)) return false;
return myPatterns.stream().anyMatch(processor -> processor.process(myProject, file));
@@ -87,6 +91,7 @@ public class JsonSchemaUserDefinedProviderFactory implements JsonSchemaProviderF
MyProvider provider = (MyProvider)o;
if (!myName.equals(provider.myName)) return false;
//noinspection RedundantIfStatement
if (!FileUtil.filesEqual(myFile, provider.myFile)) return false;
return true;
json/tests/test/com/jetbrains/jsonSchema/JsonSchemaTestProvider.java
+3
View File
@@ -7,6 +7,7 @@ import com.intellij.openapi.vfs.VirtualFile;
import com.jetbrains.jsonSchema.extension.JsonSchemaFileProvider;
import com.jetbrains.jsonSchema.extension.SchemaType;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public class JsonSchemaTestProvider implements JsonSchemaFileProvider {
private final VirtualFile mySchemaFile;
@@ -26,11 +27,13 @@ public class JsonSchemaTestProvider implements JsonSchemaFileProvider {
return "test";
}
@Nullable
@Override
public VirtualFile getSchemaFile() {
return mySchemaFile;
}
@NotNull
@Override
public SchemaType getSchemaType() {
return SchemaType.userSchema;
platform/platform-resources/src/META-INF/JsonPlugin.xml
-1
View File
@@ -75,7 +75,6 @@
implementationClass="com.jetbrains.jsonSchema.impl.JsonSchemaDocumentationProvider"/>
<refactoring.elementListenerProvider implementation="com.jetbrains.jsonSchema.JsonSchemaRefactoringListenerProvider"/>
<editorNotificationProvider implementation="com.jetbrains.jsonSchema.impl.JsonSchemaConflictNotificationProvider"/>
<projectService serviceImplementation="com.jetbrains.jsonSchema.extension.JsonSchemaProjectSelfProviderFactory"/>
<psi.referenceContributor language="JSON" implementation="com.jetbrains.jsonSchema.impl.JsonSchemaReferenceContributor"/>
</extensions>