From efd752290ee80cb66e1470ca008a292064fc049b Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Thu, 27 Mar 2014 15:30:05 +0400 Subject: [PATCH] Minor. Extract method --- .../jet/lang/resolve/ScriptHeaderResolver.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java index 7022aa22876..a3358070f86 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java @@ -103,10 +103,7 @@ public class ScriptHeaderResolver { FqName fqName = file.getPackageFqName(); PackageFragmentDescriptor ns = packageFragmentProvider.getOrCreateFragment(fqName); - Integer priority = script.getUserData(PRIORITY_KEY); - if (priority == null) { - priority = 0; - } + Integer priority = getScriptPriority(script); FqName nameForScript = ScriptNameUtil.classNameForScript((JetFile) script.getContainingFile()); Name className = nameForScript.shortName(); @@ -123,6 +120,11 @@ public class ScriptHeaderResolver { outerScope.addClassifierDescriptor(scriptDescriptor.getClassDescriptor()); } + public static int getScriptPriority(@NotNull JetScript script) { + Integer priority = script.getUserData(PRIORITY_KEY); + return priority == null ? 0 : priority; + } + public void resolveScriptDeclarations(@NotNull TopDownAnalysisContext c) { for (Map.Entry e : c.getScripts().entrySet()) { JetScript declaration = e.getKey();