diff --git a/python/src/META-INF/python-core.xml b/python/src/META-INF/python-core.xml
index 35255369d2ed..bc7c48d106ff 100644
--- a/python/src/META-INF/python-core.xml
+++ b/python/src/META-INF/python-core.xml
@@ -548,6 +548,7 @@
+
diff --git a/python/src/com/jetbrains/python/validation/StarAnnotator.java b/python/src/com/jetbrains/python/validation/StarAnnotator.java
new file mode 100644
index 000000000000..b801343494e1
--- /dev/null
+++ b/python/src/com/jetbrains/python/validation/StarAnnotator.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2000-2013 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.jetbrains.python.validation;
+
+import com.jetbrains.python.psi.PyStarExpression;
+import com.jetbrains.python.psi.PyTargetExpression;
+
+/**
+ * @author yole
+ */
+public class StarAnnotator extends PyAnnotator {
+ @Override
+ public void visitPyStarExpression(PyStarExpression node) {
+ super.visitPyStarExpression(node);
+ if (!(node.getExpression() instanceof PyTargetExpression)) {
+ getHolder().createErrorAnnotation(node, "can use starred expression only as assignment target");
+ }
+ }
+}
diff --git a/python/testData/highlighting/starInGenerator.py b/python/testData/highlighting/starInGenerator.py
new file mode 100644
index 000000000000..a5f9979baaa9
--- /dev/null
+++ b/python/testData/highlighting/starInGenerator.py
@@ -0,0 +1 @@
+y = (*() for _ in ())
\ No newline at end of file
diff --git a/python/testSrc/com/jetbrains/python/PythonHighlightingTest.java b/python/testSrc/com/jetbrains/python/PythonHighlightingTest.java
index 9e62c7f18074..7ac138765b00 100644
--- a/python/testSrc/com/jetbrains/python/PythonHighlightingTest.java
+++ b/python/testSrc/com/jetbrains/python/PythonHighlightingTest.java
@@ -183,6 +183,10 @@ public class PythonHighlightingTest extends PyTestCase {
doTest(false, false);
}
+ public void testStarInGenerator() { // PY-10177
+ doTest(LanguageLevel.PYTHON33, false, false);
+ }
+
public void testStarArgs() { // PY-6456
doTest(LanguageLevel.PYTHON32, true, false);
}