$fieldName resolved

idea/src/org/jetbrains/jet/lang/resolve/JetScope.java

@@ -38,4 +38,11 @@ public interface JetScope {
 
     @NotNull
     Collection<DeclarationDescriptor> getDeclarationsByLabel(String labelName);
+
+    /**
+     * @param fieldName includes the "$"
+     * @return the property declaring this field, if any
+     */
+    @Nullable
+    PropertyDescriptor getPropertyByFieldReference(@NotNull String fieldName);
 }

idea/src/org/jetbrains/jet/lang/resolve/JetScopeAdapter.java

@@ -54,4 +54,9 @@ public class JetScopeAdapter implements JetScope {
     public Collection<DeclarationDescriptor> getDeclarationsByLabel(String labelName) {
         return scope.getDeclarationsByLabel(labelName);
     }
+
+    @Override
+    public PropertyDescriptor getPropertyByFieldReference(@NotNull String fieldName) {
+        return scope.getPropertyByFieldReference(fieldName);
+    }
 }

idea/src/org/jetbrains/jet/lang/resolve/JetScopeImpl.java

@@ -42,4 +42,9 @@ public abstract class JetScopeImpl implements JetScope {
     public Collection<DeclarationDescriptor> getDeclarationsByLabel(String labelName) {
         return Collections.emptyList();
     }
+
+    @Override
+    public PropertyDescriptor getPropertyByFieldReference(@NotNull String fieldName) {
+        return null;
+    }
 }

idea/src/org/jetbrains/jet/lang/resolve/SubstitutingScope.java

@@ -73,4 +73,9 @@ public class SubstitutingScope implements JetScope {
     public Collection<DeclarationDescriptor> getDeclarationsByLabel(String labelName) {
         throw new UnsupportedOperationException(); // TODO
     }
+
+    @Override
+    public PropertyDescriptor getPropertyByFieldReference(@NotNull String fieldName) {
+        throw new UnsupportedOperationException(); // TODO
+    }
 }

idea/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java

@@ -243,6 +243,7 @@ public class TopDownAnalyzer {
         declaringScopes.put(property, declaringScope);
         PropertyDescriptor descriptor = classDescriptorResolver.resolvePropertyDescriptor(declaringScope.getContainingDeclaration(), declaringScope, property);
         declaringScope.addVariableDescriptor(descriptor);
+        declaringScope.addPropertyDescriptorByFieldName("$" + descriptor.getName(), descriptor);
         properties.put(property, descriptor);
     }
 

idea/src/org/jetbrains/jet/lang/resolve/WritableScope.java

@@ -17,6 +17,10 @@ public class WritableScope extends JetScopeAdapter {
     @NotNull
     private final DeclarationDescriptor ownerDeclarationDescriptor;
 
+    // FieldNames include "$"
+    @Nullable
+    private Map<String, PropertyDescriptor> propertyDescriptorsByFieldNames;
+
     @Nullable
     private Map<String, VariableDescriptor> variableDescriptors;
     @Nullable
@@ -270,4 +274,24 @@ public class WritableScope extends JetScopeAdapter {
         }
         this.thisType = thisType;
     }
+
+    @SuppressWarnings({"NullableProblems"})
+    @NotNull
+    private Map<String, PropertyDescriptor> getPropertyDescriptorsByFieldNames() {
+        if (propertyDescriptorsByFieldNames == null) {
+            propertyDescriptorsByFieldNames = new HashMap<String, PropertyDescriptor>();
+        }
+        return propertyDescriptorsByFieldNames;
+    }
+
+    public void addPropertyDescriptorByFieldName(@NotNull String fieldName, PropertyDescriptor propertyDescriptor) {
+        getPropertyDescriptorsByFieldNames().put(fieldName, propertyDescriptor);
+    }
+
+    @Override
+    public PropertyDescriptor getPropertyByFieldReference(@NotNull String fieldName) {
+        PropertyDescriptor descriptor = getPropertyDescriptorsByFieldNames().get(fieldName);
+        if (descriptor != null) return descriptor;
+        return super.getPropertyByFieldReference(fieldName);
+    }
 }

idea/src/org/jetbrains/jet/lang/resolve/java/JavaClassMembersScope.java

@@ -37,6 +37,11 @@ public class JavaClassMembersScope implements JetScope {
         throw new UnsupportedOperationException(); // TODO
     }
 
+    @Override
+    public PropertyDescriptor getPropertyByFieldReference(@NotNull String fieldName) {
+        return null;
+    }
+
     @Override
     public ClassifierDescriptor getClassifier(@NotNull String name) {
         for (PsiClass innerClass : psiClass.getAllInnerClasses()) {

idea/src/org/jetbrains/jet/lang/types/ErrorUtils.java

@@ -53,6 +53,11 @@ public class ErrorUtils {
             return Collections.emptyList();
         }
 
+        @Override
+        public PropertyDescriptor getPropertyByFieldReference(@NotNull String fieldName) {
+            return null; // TODO : review
+        }
+
     };
 
     private static final FunctionGroup ERROR_FUNCTION_GROUP = new FunctionGroup() {

idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java

@@ -440,25 +440,38 @@ public class JetTypeInferrer {
         public void visitSimpleNameExpression(JetSimpleNameExpression expression) {
             // TODO : other members
             // TODO : type substitutions???
-            String referencedName = expression.getReferencedName();
+            if (expression.getReferencedNameElementType() == JetTokens.FIELD_IDENTIFIER) {
-            if (referencedName != null) {
+                PropertyDescriptor property = scope.getPropertyByFieldReference(expression.getReferencedName());
-                VariableDescriptor variable = scope.getVariable(referencedName);
+                if (property == null) {
-                if (variable != null) {
+                    semanticServices.getErrorHandler().unresolvedReference(expression);
-                    trace.recordReferenceResolution(expression, variable);
+                }
-                    result = variable.getOutType();
+                else {
-                    if (result == null) {
+                    trace.recordReferenceResolution(expression, property);
-                        semanticServices.getErrorHandler().genericError(expression.getNode(), "This variable is not readable in this context");
+                    result = property.getOutType();
-                    }
+                }
-                    return;
+            }
-                } else {
+            else {
-                    NamespaceDescriptor namespace = scope.getNamespace(referencedName);
+                assert  expression.getReferencedNameElementType() == JetTokens.IDENTIFIER;
-                    if (namespace != null) {
+                String referencedName = expression.getReferencedName();
-                        trace.recordReferenceResolution(expression, namespace);
+                if (referencedName != null) {
-                        result = namespace.getNamespaceType();
+                    VariableDescriptor variable = scope.getVariable(referencedName);
-                        return;
+                    if (variable != null) {
-                    }
+                        trace.recordReferenceResolution(expression, variable);
+                        result = variable.getOutType();
+                        if (result == null) {
+                            semanticServices.getErrorHandler().genericError(expression.getNode(), "This variable is not readable in this context");
+                        }
+                        return;
+                    } else {
+                        NamespaceDescriptor namespace = scope.getNamespace(referencedName);
+                        if (namespace != null) {
+                            trace.recordReferenceResolution(expression, namespace);
+                            result = namespace.getNamespaceType();
+                            return;
+                        }
+                    }
+                    semanticServices.getErrorHandler().unresolvedReference(expression);
                 }
-                semanticServices.getErrorHandler().unresolvedReference(expression);
             }
         }
 

idea/testData/checker/Properties.jet

@@ -1,6 +1,9 @@
  var x : Int = 1 + x
    get() : Int = 1
-   set(<error>ref</error> value : <error>Long</error>) {$x = value}
+   set(<error>ref</error> value : <error>Long</error>) {
+      $x = value.int
+      $x = <error>1.lng</error>
+    }
 
  val xx : Int = 1 + x
    get() : Int = 1