Add utility InlineUtil.isInline instead of interface method in SimpleFunctionDescriptor

Also fix some warnings and reformat along the way

idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/CompletionUtils.kt

@@ -23,6 +23,7 @@ import com.intellij.openapi.util.Key
 import com.intellij.patterns.ElementPattern
 import com.intellij.patterns.StandardPatterns
 import com.intellij.util.PlatformIcons
+import org.jetbrains.kotlin.builtins.InlineUtil
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.idea.caches.resolve.ResolutionFacade
@@ -252,8 +253,7 @@ fun returnExpressionItems(bindingContext: BindingContext, position: JetElement):
 
                 // check if the current function literal is inlined and stop processing outer declarations if it's not
                 val callee = call?.getCalleeExpression() as? JetReferenceExpression ?: break // not inlined
-                val target = bindingContext[BindingContext.REFERENCE_TARGET, callee] as? SimpleFunctionDescriptor ?: break // not inlined
-                if (!target.getInlineStrategy().isInline()) break // not inlined
+                if (!InlineUtil.isInline(bindingContext[BindingContext.REFERENCE_TARGET, callee])) break // not inlined
             }
             else {
                 if (parent.hasBlockBody()) {

idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt

@@ -16,13 +16,14 @@
 
 package org.jetbrains.kotlin.idea.debugger
 
+import com.intellij.debugger.MultiRequestPositionManager
 import com.intellij.debugger.NoDataException
 import com.intellij.debugger.SourcePosition
 import com.intellij.debugger.engine.DebugProcess
 import com.intellij.debugger.requests.ClassPrepareRequestor
+import com.intellij.find.findUsages.FindUsagesOptions
 import com.intellij.openapi.project.DumbService
 import com.intellij.openapi.roots.libraries.LibraryUtil
-import com.intellij.openapi.util.Pair
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
 import com.intellij.psi.search.GlobalSearchScope
@@ -32,35 +33,31 @@ import com.sun.jdi.Location
 import com.sun.jdi.ReferenceType
 import com.sun.jdi.request.ClassPrepareRequest
 import org.jetbrains.annotations.TestOnly
+import org.jetbrains.kotlin.builtins.InlineUtil
 import org.jetbrains.kotlin.codegen.AsmUtil
 import org.jetbrains.kotlin.codegen.ClassBuilderFactories
+import org.jetbrains.kotlin.codegen.binding.CodegenBinding
 import org.jetbrains.kotlin.codegen.state.GenerationState
 import org.jetbrains.kotlin.codegen.state.JetTypeMapper
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.PropertyDescriptor
-import org.jetbrains.kotlin.psi.*
-import org.jetbrains.kotlin.resolve.BindingContext
-import org.jetbrains.kotlin.resolve.calls.callUtil.*
-import org.jetbrains.kotlin.resolve.extension.InlineAnalyzerExtension
-import org.jetbrains.kotlin.resolve.jvm.JvmClassName
+import org.jetbrains.kotlin.idea.caches.resolve.analyzeAndGetResult
+import org.jetbrains.kotlin.idea.caches.resolve.analyzeFullyAndGetResult
+import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils
+import org.jetbrains.kotlin.idea.findUsages.toSearchTarget
+import org.jetbrains.kotlin.idea.search.usagesSearch.DefaultSearchHelper
+import org.jetbrains.kotlin.idea.search.usagesSearch.search
+import org.jetbrains.kotlin.idea.util.DebuggerUtils
+import org.jetbrains.kotlin.idea.util.application.runReadAction
 import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils
 import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.builtins.InlineUtil
-import org.jetbrains.kotlin.idea.caches.resolve.*
-import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils
-import org.jetbrains.kotlin.idea.util.DebuggerUtils
-import org.jetbrains.kotlin.idea.search.usagesSearch.DefaultSearchHelper
-import com.intellij.find.findUsages.FindUsagesOptions
-import org.jetbrains.kotlin.idea.findUsages.toSearchTarget
-import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor
-import org.jetbrains.kotlin.idea.search.usagesSearch.search
-import java.util.WeakHashMap
-import org.jetbrains.kotlin.idea.util.application.runReadAction
-import org.jetbrains.kotlin.idea.stubindex.PackageIndexUtil
+import org.jetbrains.kotlin.psi.*
+import org.jetbrains.kotlin.resolve.BindingContext
+import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
+import org.jetbrains.kotlin.resolve.extension.InlineAnalyzerExtension
+import org.jetbrains.kotlin.resolve.jvm.JvmClassName
 import java.util.ArrayList
-import org.jetbrains.kotlin.codegen.binding.CodegenBinding
-import com.intellij.debugger.MultiRequestPositionManager
-import java.util.Collections
+import java.util.WeakHashMap
 
 class PositionedElement(val className: String?, val element: PsiElement?)
 
@@ -439,22 +436,20 @@ public class JetPositionManager(private val myDebugProcess: DebugProcess) : Mult
             val typeMapper = if (!isInLibrary) prepareTypeMapper(jetFile) else createTypeMapperForLibraryFile(element, jetFile)
             val psiElement = getInternalClassNameForElement(element, typeMapper, jetFile, isInLibrary).element;
 
-            if (psiElement is JetNamedFunction) {
-                val descriptor = typeMapper.getBindingContext().get(BindingContext.DECLARATION_TO_DESCRIPTOR, psiElement)
+            if (psiElement is JetNamedFunction &&
+                InlineUtil.isInline(typeMapper.getBindingContext().get(BindingContext.DECLARATION_TO_DESCRIPTOR, psiElement))
+            ) {
+                val project = myDebugProcess.getProject()
+                val usagesSearchTarget = FindUsagesOptions(project).toSearchTarget(psiElement, true)
 
-                if (descriptor is SimpleFunctionDescriptor && descriptor.getInlineStrategy().isInline()) {
-                    val project = myDebugProcess.getProject()
-                    val usagesSearchTarget = FindUsagesOptions(project).toSearchTarget(psiElement, true)
-
-                    val usagesSearchRequest = DefaultSearchHelper<JetNamedFunction>(true).newRequest(usagesSearchTarget)
-                    usagesSearchRequest.search().forEach {
-                        val psiElement = it.getElement()
-                        if (psiElement is JetElement) {
-                            //TODO recursive search
-                            val name = classNameForPosition(psiElement)
-                            if (name != null) {
-                                result.add(name)
-                            }
+                val usagesSearchRequest = DefaultSearchHelper<JetNamedFunction>(true).newRequest(usagesSearchTarget)
+                usagesSearchRequest.search().forEach {
+                    val psiElement = it.getElement()
+                    if (psiElement is JetElement) {
+                        //TODO recursive search
+                        val name = classNameForPosition(psiElement)
+                        if (name != null) {
+                            result.add(name)
                         }
                     }
                 }

idea/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.java

@@ -40,13 +40,13 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.analyzer.AnalysisResult;
 import org.jetbrains.kotlin.backend.common.output.OutputFile;
 import org.jetbrains.kotlin.backend.common.output.OutputFileCollection;
+import org.jetbrains.kotlin.builtins.InlineUtil;
 import org.jetbrains.kotlin.codegen.ClassBuilderFactories;
 import org.jetbrains.kotlin.codegen.CompilationErrorHandler;
 import org.jetbrains.kotlin.codegen.KotlinCodegenFacade;
 import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.kotlin.codegen.state.Progress;
 import org.jetbrains.kotlin.descriptors.CallableDescriptor;
-import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor;
 import org.jetbrains.kotlin.diagnostics.DiagnosticSink;
 import org.jetbrains.kotlin.idea.caches.resolve.KotlinCacheService;
 import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage;
@@ -116,7 +116,7 @@ public class KotlinBytecodeToolWindow extends JPanel implements Disposable {
             try {
                 AnalysisResult result = ResolvePackage.analyzeFullyAndGetResult(jetFile);
                 boolean disableInline = !enableInline.isSelected();
-                Ref<Set<JetElement>> ref = new Ref();
+                Ref<Set<JetElement>> ref = Ref.create();
                 if (!disableInline) {
                     result = processInlinedDeclarations(jetFile.getProject(), result, Collections.<JetElement>singleton(jetFile), 1, ref);
                 }
@@ -199,17 +199,12 @@ public class KotlinBytecodeToolWindow extends JPanel implements Disposable {
             Set<JetElement> collectedElements = new HashSet<JetElement>();
             collectedElements.addAll(originalElements);
             Map<Call, ResolvedCall<?>> contents = result.getBindingContext().getSliceContents(BindingContext.RESOLVED_CALL);
-            Collection<ResolvedCall<?>> values = contents.values();
-            for (ResolvedCall call : values) {
+            for (ResolvedCall call : contents.values()) {
                 CallableDescriptor descriptor = call.getResultingDescriptor();
-                if (!(descriptor instanceof DeserializedSimpleFunctionDescriptor)) {
-                    if (descriptor instanceof SimpleFunctionDescriptor &&
-                        ((SimpleFunctionDescriptor) descriptor).getInlineStrategy().isInline()) {
-                        PsiElement declaration =
-                                DescriptorToSourceUtilsIde.INSTANCE$.getAnyDeclaration(project, descriptor);
-                        if (declaration != null && declaration instanceof JetElement) {
-                            collectedElements.add((JetElement) declaration);
-                        }
+                if (!(descriptor instanceof DeserializedSimpleFunctionDescriptor) && InlineUtil.isInline(descriptor)) {
+                    PsiElement declaration = DescriptorToSourceUtilsIde.INSTANCE$.getAnyDeclaration(project, descriptor);
+                    if (declaration != null && declaration instanceof JetElement) {
+                        collectedElements.add((JetElement) declaration);
                     }
                 }
             }
@@ -381,7 +376,7 @@ public class KotlinBytecodeToolWindow extends JPanel implements Disposable {
 
     public static class Factory implements ToolWindowFactory {
         @Override
-        public void createToolWindowContent(Project project, ToolWindow toolWindow) {
+        public void createToolWindowContent(@NotNull Project project, @NotNull ToolWindow toolWindow) {
             ContentManager contentManager = toolWindow.getContentManager();
             ContentFactory contentFactory = ContentFactory.SERVICE.getInstance();
             contentManager.addContent(contentFactory.createContent(