Rearrange script definition contributors to avoid old EP appear before new EP

Fix highlighting of build.gradle.kts files with LivePlugin enabled
^KT-23571 Fixed
This commit is contained in:
Natalia Selezneva
2018-04-04 12:43:15 +03:00
parent e05b54a2b4
commit a6019cc5fb
@@ -91,7 +91,7 @@ class ScriptDefinitionsManager(private val project: Project): ScriptDefinitionPr
val fromDeprecatedEP = Extensions.getArea(project).getExtensionPoint(ScriptTemplatesProvider.EP_NAME).extensions.toList()
.map(::ScriptTemplatesProviderAdapter)
val fromNewEp = Extensions.getArea(project).getExtensionPoint(ScriptDefinitionContributor.EP_NAME).extensions.toList()
return fromDeprecatedEP + fromNewEp
return fromNewEp.dropLast(1) + fromDeprecatedEP + fromNewEp.last()
}
fun reloadScriptDefinitions() = lock.write {