Expand statement templates whenever they are mentioned at the beginning of line

idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java

@@ -18,10 +18,9 @@ package org.jetbrains.jet.plugin.liveTemplates;
 
 import com.intellij.codeInsight.template.EverywhereContextType;
 import com.intellij.codeInsight.template.TemplateContextType;
-import com.intellij.psi.PsiComment;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiWhiteSpace;
+import com.intellij.lang.ASTNode;
+import com.intellij.openapi.util.Condition;
+import com.intellij.psi.*;
 import com.intellij.psi.impl.source.tree.LeafPsiElement;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.util.PsiTreeUtil;
@@ -33,6 +32,8 @@ import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lexer.JetTokens;
 import org.jetbrains.jet.plugin.JetLanguage;
 
+import java.util.Arrays;
+
 public abstract class JetTemplateContextType extends TemplateContextType {
     protected JetTemplateContextType(@NotNull @NonNls String id, @NotNull String presentableName, @Nullable java.lang.Class<? extends TemplateContextType> baseContextType) {
         super(id, presentableName, baseContextType);
@@ -143,15 +144,17 @@ public abstract class JetTemplateContextType extends TemplateContextType {
 
         @Override
         protected boolean isInContext(@NotNull PsiElement element) {
-            PsiElement parent = element.getParent();
-            if (parent instanceof JetSimpleNameExpression) {
-                parent = parent.getParent();
-            }
-            if (parent instanceof JetBinaryExpression) {
-                // Example: sout<caret> foo()
-                parent = parent.getParent();
-            }
-            return parent instanceof JetBlockExpression;
+            PsiElement parentStatement = PsiTreeUtil.findFirstParent(element, new Condition<PsiElement>() {
+                @Override
+                public boolean value(PsiElement element) {
+                    return element instanceof JetExpression && (element.getParent() instanceof JetBlockExpression);
+                }
+            });
+
+            if (parentStatement == null) return false;
+
+            // We are in the leftmost position in parentStatement
+            return element.getTextOffset() == parentStatement.getTextOffset();
         }
     }
 

idea/testData/templates/sout_AfterSemicolon.exp.kt

@@ -0,0 +1,3 @@
+fun main(args : Array<String>) {
+    foo; println(<caret>)
+}

idea/testData/templates/sout_AfterSemicolon.kt

@@ -0,0 +1,3 @@
+fun main(args : Array<String>) {
+    foo; <caret>
+}

idea/testData/templates/sout_BeforeBinary.exp.kt

@@ -0,0 +1,3 @@
+fun main(args : Array<String>) {
+    println(<caret>)1 + 1
+}

idea/testData/templates/sout_BeforeBinary.kt

@@ -0,0 +1,3 @@
+fun main(args : Array<String>) {
+    <caret>1 + 1
+}

idea/testData/templates/sout_BeforeCall.exp.kt

@@ -0,0 +1,3 @@
+fun main(args : Array<String>) {
+    println(<caret>)foo()
+}

idea/testData/templates/sout_BeforeCall.kt

@@ -0,0 +1,3 @@
+fun main(args : Array<String>) {
+    <caret>foo()
+}

idea/testData/templates/sout_BeforeCallSpace.exp.kt

@@ -0,0 +1,3 @@
+fun main(args : Array<String>) {
+    println(<caret>) foo()
+}

idea/testData/templates/sout_BeforeCallSpace.kt

@@ -0,0 +1,3 @@
+fun main(args : Array<String>) {
+    <caret> foo()
+}

idea/testData/templates/sout_BeforeQualifiedCall.exp.kt

@@ -0,0 +1,3 @@
+fun main(args : Array<String>) {
+    println(<caret>)x.foo()
+}

idea/testData/templates/sout_BeforeQualifiedCall.kt

@@ -0,0 +1,3 @@
+fun main(args : Array<String>) {
+    <caret>x.foo()
+}

idea/testData/templates/sout_InCallArguments.exp.kt

@@ -0,0 +1,5 @@
+fun main(args : Array<String>) {
+    foo(
+            sout<caret>
+    )
+}

idea/testData/templates/sout_InCallArguments.kt

@@ -0,0 +1,5 @@
+fun main(args : Array<String>) {
+    foo(
+            <caret>
+    )
+}

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

@@ -59,6 +59,30 @@ public class LiveTemplatesTest extends LightCodeInsightFixtureTestCase {
         paremeterless();
     }
 
+    public void testSout_BeforeCall() {
+        paremeterless();
+    }
+
+    public void testSout_BeforeCallSpace() {
+        paremeterless();
+    }
+
+    public void testSout_BeforeBinary() {
+        paremeterless();
+    }
+
+    public void testSout_InCallArguments() {
+        paremeterless();
+    }
+
+    public void testSout_BeforeQualifiedCall() {
+        paremeterless();
+    }
+
+    public void testSout_AfterSemicolon() {
+        paremeterless();
+    }
+
     public void testSerr() {
         paremeterless();
     }