From 9f70364aff57dec8b6d7b0617c8f1bb2bdf81d22 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Tue, 1 Apr 2014 19:49:51 +0400
Subject: [PATCH] Add 'rv' property to getAllDescriptors() in script classes

---
 .../lazy/descriptors/LazyScriptClassMemberScope.java  | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyScriptClassMemberScope.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyScriptClassMemberScope.java
index 9a8cb33ac9c..5c6266e4c42 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyScriptClassMemberScope.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyScriptClassMemberScope.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.lang.resolve.lazy.descriptors;
 
+import kotlin.KotlinPackage;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.*;
@@ -26,6 +27,7 @@ import org.jetbrains.jet.lang.resolve.lazy.data.JetScriptInfo;
 import org.jetbrains.jet.lang.resolve.lazy.declarations.ClassMemberDeclarationProvider;
 import org.jetbrains.jet.lang.resolve.name.Name;
 
+import java.util.Collection;
 import java.util.Set;
 
 // SCRIPT: Members of a script class
@@ -39,6 +41,15 @@ public class LazyScriptClassMemberScope extends LazyClassMemberScope {
         super(resolveSession, declarationProvider, thisClass, trace);
     }
 
+    @NotNull
+    @Override
+    protected Collection<DeclarationDescriptor> computeExtraDescriptors() {
+        return KotlinPackage.plus(
+                super.computeExtraDescriptors(),
+                getProperties(Name.identifier(ScriptDescriptor.LAST_EXPRESSION_VALUE_FIELD_NAME))
+        );
+    }
+
     @Override
     protected void getNonDeclaredProperties(@NotNull Name name, @NotNull Set<VariableDescriptor> result) {
         super.getNonDeclaredProperties(name, result);