Merge remote-tracking branch 'origin/master'

python/src/com/jetbrains/python/codeInsight/intentions/TypeAssertionIntention.java

@@ -99,7 +99,7 @@ public class TypeAssertionIntention implements IntentionAction {
           if (document.getLineNumber(statementList.getTextOffset()) ==
               document.getLineNumber(statementListParent.getTextOffset())) {
             final String substring =
-              TextRange.create(statementListParent.getTextOffset(), statementList.getTextOffset()).substring(document.getText());
+              TextRange.create(statementListParent.getTextRange().getStartOffset(), statementList.getTextOffset()).substring(document.getText());
             final PyStatement foo =
               elementGenerator.createFromText(LanguageLevel.forElement(problemElement), PyStatement.class, substring + "\n\t" +
                                              text + "\n\t" + statementList.getText());

python/testData/intentions/afterTypeAssertion1.py

@@ -0,0 +1,3 @@
+def foo(a, b):
+    assert isinstance(a, object)
+    a.

python/testData/intentions/beforeTypeAssertion1.py

@@ -0,0 +1 @@
+def foo(a, b): a<caret>.

python/testSrc/com/jetbrains/python/PyIntentionTest.java

@@ -249,6 +249,10 @@ public class PyIntentionTest extends PyTestCase {
     doTest(PyBundle.message("INTN.insert.assertion"));
   }
 
+  public void testTypeAssertion1() { //PY-7089
+    doTest(PyBundle.message("INTN.insert.assertion"));
+  }
+
   public void testDocStub() {
     doDocStubTest();
   }