diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/editorActions/LineEndWithSelectionHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/editorActions/LineEndWithSelectionHandler.java
new file mode 100644
index 000000000000..2c6ae0e7caeb
--- /dev/null
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/editorActions/LineEndWithSelectionHandler.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.codeInsight.template.impl.editorActions;
+
+import com.intellij.openapi.editor.actionSystem.EditorActionHandler;
+
+/**
+ * User: anna
+ * Date: 2/22/11
+ */
+public class LineEndWithSelectionHandler extends LineStartEndWithSelectionHandler {
+ public LineEndWithSelectionHandler(final EditorActionHandler originalHandler) {
+ super(originalHandler, false);
+ }
+}
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/editorActions/LineStartEndWithSelectionHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/editorActions/LineStartEndWithSelectionHandler.java
new file mode 100644
index 000000000000..c0b832f9e479
--- /dev/null
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/editorActions/LineStartEndWithSelectionHandler.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.intellij.codeInsight.template.impl.editorActions;
+
+import com.intellij.codeInsight.template.impl.TemplateManagerImpl;
+import com.intellij.codeInsight.template.impl.TemplateState;
+import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.editor.actionSystem.EditorActionHandler;
+import com.intellij.openapi.util.TextRange;
+
+public abstract class LineStartEndWithSelectionHandler extends EditorActionHandler {
+ private final EditorActionHandler myOriginalHandler;
+ boolean myIsHomeHandler;
+
+ public LineStartEndWithSelectionHandler(final EditorActionHandler originalHandler, boolean isHomeHandler) {
+ myOriginalHandler = originalHandler;
+ myIsHomeHandler = isHomeHandler;
+ }
+
+ public void execute(Editor editor, DataContext dataContext) {
+ final TemplateState templateState = TemplateManagerImpl.getTemplateState(editor);
+ if (templateState != null && !templateState.isFinished()) {
+ final TextRange range = templateState.getCurrentVariableRange();
+ final int caretOffset = editor.getCaretModel().getOffset();
+ if (range != null && range.getStartOffset() <= caretOffset && caretOffset <= range.getEndOffset()) {
+ int offsetToMove = myIsHomeHandler ? range.getStartOffset() : range.getEndOffset();
+ editor.getCaretModel().moveToOffset(offsetToMove);
+ editor.getSelectionModel().setSelection(myIsHomeHandler ? offsetToMove : caretOffset, myIsHomeHandler ? caretOffset : offsetToMove);
+ return;
+ }
+ }
+ myOriginalHandler.execute(editor, dataContext);
+ }
+}
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/editorActions/LineStartWithSelectionHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/editorActions/LineStartWithSelectionHandler.java
new file mode 100644
index 000000000000..fe390b8fc842
--- /dev/null
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/editorActions/LineStartWithSelectionHandler.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.codeInsight.template.impl.editorActions;
+
+import com.intellij.openapi.editor.actionSystem.EditorActionHandler;
+
+/**
+ * User: anna
+ * Date: 2/22/11
+ */
+public class LineStartWithSelectionHandler extends LineStartEndWithSelectionHandler {
+ public LineStartWithSelectionHandler(final EditorActionHandler originalHandler) {
+ super(originalHandler, true);
+ }
+}
diff --git a/platform/platform-resources/src/META-INF/LangExtensions.xml b/platform/platform-resources/src/META-INF/LangExtensions.xml
index 81efbfedb9da..1b99e6df7bad 100644
--- a/platform/platform-resources/src/META-INF/LangExtensions.xml
+++ b/platform/platform-resources/src/META-INF/LangExtensions.xml
@@ -504,7 +504,9 @@
+
+