From a6019cc5fb08df58d7614dd806aa0aef217bf783 Mon Sep 17 00:00:00 2001
From: Natalia Selezneva <natalia.selezneva@jetbrains.com>
Date: Wed, 4 Apr 2018 12:43:15 +0300
Subject: [PATCH] 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
---
 .../kotlin/idea/core/script/ScriptDefinitionsManager.kt         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDefinitionsManager.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDefinitionsManager.kt
index 75323905fd6..b4a1149e18f 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDefinitionsManager.kt
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDefinitionsManager.kt
@@ -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 {