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

Force loading Kotlin classes used in the delegated properties API from the platform classloader

Browse Source 
This allows the platform to expose APIs using Kotlin delegated properties to plugins
This commit is contained in:
Dmitry Jemerov
2018-07-16 14:42:20 +02:00
parent e1550be35c
commit f9f63d2f1b
1 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/ide/plugins/cl/PluginClassLoader.java
+6 -17
View File
@@ -1,18 +1,4 @@
/*
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// 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 com.intellij.ide.plugins.cl;
import com.intellij.diagnostic.PluginException;
@@ -94,14 +80,17 @@ public class PluginClassLoader extends UrlClassLoader {
"kotlin.Pair",
"kotlin.Triple",
"kotlin.jvm.internal.DefaultConstructorMarker",
"kotlin.reflect.KDeclarationContainer"
"kotlin.properties.ReadWriteProperty",
"kotlin.properties.ReadOnlyProperty"
);
private static boolean mustBeLoadedByPlatform(String className) {
//some commonly used classes from kotlin-runtime must be loaded by the platform classloader. Otherwise if a plugin bundles its own version
// of kotlin-runtime.jar it won't be possible to call platform's methods with these types in signatures from such a plugin.
//We assume that these classes don't change between Kotlin versions so it's safe to always load them from platform's kotlin-runtime.
return className.startsWith("kotlin.") && (className.startsWith("kotlin.jvm.functions.") || KOTLIN_STDLIB_CLASSES_USED_IN_SIGNATURES.contains(className));
return className.startsWith("kotlin.") && (className.startsWith("kotlin.jvm.functions.") ||
className.startsWith("kotlin.reflect.KProperty") ||
KOTLIN_STDLIB_CLASSES_USED_IN_SIGNATURES.contains(className));
}
@Nullable