Merge remote-tracking branch 'origin/master'

Conflicts: python/src/com/jetbrains/python/codeInsight/intentions/TypeIntention.java
2026-09-27 10:03:11 +07:00 · 2013-02-12 18:09:24 +04:00
parent 07b93b3d4b 0f4a97b408
commit 0b41a2b921
152 changed files with 672 additions and 392 deletions
@@ -1,5 +1,6 @@
 def foo(a, b):
  """
+
  :type a: object
  """
  a.
@@ -1,5 +1,6 @@
 def foo(a, b):
  """
+
  :rtype : object
  """
  b = 1
@@ -1,5 +1,6 @@
 def func1(x):
  """
+
  :rtype : object
  """
  return x
@@ -1,5 +1,6 @@
 def foo3(x, y, z, aa): #comment
  """
+
  :type y: object
  """
  i = xx + y + z
@@ -2,5 +2,6 @@ class ProjectElement(object):
    def __init__(self, project_name='', info_source='',
                 project_id=None, has_revisions=True):
        """
+
        :type project_name: object
        """
@@ -1,5 +1,6 @@
 def foo3(param):
  """
+
  :type param: object
  """
  i = param.unresolved()