Merge remote-tracking branch 'origin/master'

idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java

@@ -104,12 +104,15 @@ public abstract class OverrideImplementMethodsHandler implements LanguageCodeIns
         if (!returnType.equals(stdlib.getTuple0Type())) {
             bodyBuilder.append(": ").append(returnType.toString());
         }
-        bodyBuilder.append("{");
+
         final String initializer = defaultInitializer(returnType, stdlib);
         if (initializer != null) {
-            bodyBuilder.append("return " ).append(initializer);
+            bodyBuilder.append(" = ").append(initializer);
         }
-        bodyBuilder.append("}");
+        else {
+            bodyBuilder.append("{").append("throw UnsupportedOperationException()").append("}");
+        }
+
         return JetPsiFactory.createFunction(project, bodyBuilder.toString());
     }
 

idea/src/org/jetbrains/jet/plugin/completion/JetCompletionContributor.java

@@ -4,10 +4,15 @@ import com.intellij.codeInsight.completion.*;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.patterns.PlatformPatterns;
 import com.intellij.psi.PsiElement;
+import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.Consumer;
 import com.intellij.util.ProcessingContext;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.psi.JetFile;
+import org.jetbrains.jet.lang.psi.JetQualifiedExpression;
+import org.jetbrains.jet.lang.psi.JetSimpleNameExpression;
+import org.jetbrains.jet.lang.psi.JetUserType;
+import org.jetbrains.jet.lexer.JetTokens;
 
 /**
  * @author Nikolay Krasko
@@ -30,46 +35,44 @@ public class JetCompletionContributor extends CompletionContributor {
                        }
 
                        CompletionResultSet result = _result.withPrefixMatcher(CompletionUtil.findReferenceOrAlphanumericPrefix(parameters));
-                       JavaClassNameCompletionContributor.addAllClasses(parameters, JavaCompletionSorting.addJavaSorting(
+
+                       if (shouldRunClassNameCompletion(parameters, context)) {
+                           JavaClassNameCompletionContributor.addAllClasses(parameters, JavaCompletionSorting.addJavaSorting(
                                parameters, result), parameters.getInvocationCount() <= 1, new Consumer<LookupElement>() {
-                           @Override
-                           public void consume(LookupElement element) {
-                               _result.addElement(element);
-                           }
-                       });
+
+                               @Override
+                               public void consume(LookupElement element) {
+                                   _result.addElement(element);
+
+                               }
+                           });
+                       }
                    }
                });
     }
 
-//    @Override
-//    public void beforeCompletion(@NotNull CompletionInitializationContext context) {
-//        final PsiFile file = context.getFile();
-//
-//        if (file instanceof JetFile) {
-//            autoImport(file, context.getStartOffset() - 1, context.getEditor());
-//        }
-//    }
-//
-//    private static void autoImport(final PsiFile file, int offset, final Editor editor) {
-//        final CharSequence text = editor.getDocument().getCharsSequence();
-//        while (offset > 0 && Character.isJavaIdentifierPart(text.charAt(offset))) offset--;
-//        if (offset <= 0) return;
-//
-//        while (offset > 0 && Character.isWhitespace(text.charAt(offset))) offset--;
-//        if (offset <= 0 || text.charAt(offset) != '.') return;
-//
-//        offset--;
-//
-//        while (offset > 0 && Character.isWhitespace(text.charAt(offset))) offset--;
-//        if (offset <= 0) return;
-//
-//        final JetSimpleNameExpression nameExpression =
-//                PsiTreeUtil.findElementOfClassAtOffset(file, offset, JetSimpleNameExpression.class, false);
-//        if (nameExpression == null) return;
-//
-//        final ImportClassFix importClassFix = new ImportClassFix(nameExpression);
-//        if (importClassFix.isAvailable(file.getProject(), editor, file)) {
-//            new ImportClassFix(nameExpression).invoke(file.getProject(), editor, file);
-//        }
-//    }
+    private static boolean shouldRunClassNameCompletion(@NotNull CompletionParameters parameters, ProcessingContext context) {
+        final PsiElement element = parameters.getPosition();
+
+        if (parameters.getInvocationCount() > 1) {
+            return true;
+        }
+        
+        if (element.getNode().getElementType() == JetTokens.IDENTIFIER) {
+            if (element.getParent() instanceof JetSimpleNameExpression) {
+                JetSimpleNameExpression nameExpression = (JetSimpleNameExpression) element.getParent();
+                if (PsiTreeUtil.getParentOfType(nameExpression, JetQualifiedExpression.class) != null) {
+                    return false;
+                }
+
+                if (PsiTreeUtil.getParentOfType(nameExpression, JetUserType.class) != null) {
+                    return true;
+                }
+
+                return parameters.getInvocationCount() == 1;
+            }
+        }
+
+        return false;
+    }
 }

idea/testData/codeInsight/overrideImplement/genericMethod.kt.after

@@ -4,7 +4,5 @@ trait G<T> {
 
 class GC() : G<Int> {
 
-    override fun foo(t: Int): Int {
-        return 0
-    }
+    override fun foo(t: Int): Int = 0
 }

idea/testData/codeInsight/overrideImplement/javaInterfaceMethod/foo/Impl.kt.after

@@ -2,7 +2,5 @@ import foo.Intf
 
 class Impl(): Intf {
 
-    override fun getFooBar(): String? {
-        return null
-    }
+    override fun getFooBar(): String? = null
 }

idea/testData/codeInsight/overrideImplement/javaParameters/foo/Impl.kt.after

@@ -3,5 +3,6 @@ import foo.Intf
 class Impl(): Intf {
 
     override fun fooBar(i: Int, s: Array<String?>?, foo: Any?) {
+        throw UnsupportedOperationException()
     }
 }

idea/testData/codeInsight/overrideImplement/traitGenericOverride.kt

@@ -0,0 +1,7 @@
+trait G<T> {
+    fun foo(t : T) : T
+}
+
+class GC<T>() : G<T> {
+    <caret>
+}

idea/testData/codeInsight/overrideImplement/traitGenericOverride.kt.after

@@ -0,0 +1,10 @@
+trait G<T> {
+    fun foo(t : T) : T
+}
+
+class GC<T>() : G<T> {
+
+    override fun foo(t: T): T {
+        throw UnsupportedOperationException()
+    }
+}

idea/testData/codeInsight/overrideImplement/traitNullableFunction.kt

@@ -0,0 +1,7 @@
+trait Some {
+    fun foo(some : Int?) : Int
+}
+
+class SomeOther : Some {
+    <caret>
+}

idea/testData/codeInsight/overrideImplement/traitNullableFunction.kt.after

@@ -0,0 +1,8 @@
+trait Some {
+    fun foo(some : Int?) : Int
+}
+
+class SomeOther : Some {
+
+    override fun foo(some: Int?): Int = 0
+}

idea/testData/completion/basic/JavaClassNames.kt

@@ -0,0 +1,10 @@
+package testing
+
+// Should show java names by short name
+class Hello() {
+   fun test() {
+       val a : S<caret>
+   }
+}
+
+// EXIST: SortedMap, Short, Socket

idea/tests/org/jetbrains/jet/plugin/codeInsight/OverrideImplementTest.java

@@ -46,6 +46,14 @@ public class OverrideImplementTest extends LightCodeInsightFixtureTestCase {
         doFileTest();
     }
 
+    public void testTraitGenericOverride() {
+        doFileTest();
+    }
+
+    public void testTraitNullableFunction() {
+        doFileTest();
+    }
+
     private void doFileTest() {
         myFixture.configureByFile(getTestName(true) + ".kt");
         doImplement();