Merge branch 'master' of ssh://git.labs.intellij.net/jet

2011-11-07 19:47:10 +04:00
parent c71d9796a2 2c43bbd210
commit 5adbd82557
6 changed files with 130 additions and 6 deletions
@@ -0,0 +1,5 @@
+fun box(): String {
+    var s = "s"
+    s += 1
+    return if (s == "s1") "OK" else "fail"
+}
@@ -0,0 +1,13 @@
+open class A
+
+open class AB private {
+    fun foo() {}
+}
+
+class A1 {
+
+}
+
+open class B<T : A> private () {
+
+}
@@ -0,0 +1,87 @@
+JetFile: PrimaryConstructorModifiers_ERR.jet
+  NAMESPACE
+    CLASS
+      MODIFIER_LIST
+        PsiElement(open)('open')
+      PsiWhiteSpace(' ')
+      PsiElement(class)('class')
+      PsiWhiteSpace(' ')
+      PsiElement(IDENTIFIER)('A')
+      PsiWhiteSpace('\n\n')
+      TYPE_PARAMETER_LIST
+        <empty list>
+    CLASS
+      MODIFIER_LIST
+        PsiElement(open)('open')
+      PsiWhiteSpace(' ')
+      PsiElement(class)('class')
+      PsiWhiteSpace(' ')
+      PsiElement(IDENTIFIER)('AB')
+      PsiWhiteSpace(' ')
+      TYPE_PARAMETER_LIST
+        <empty list>
+      PRIMARY_CONSTRUCTOR_MODIFIER_LIST
+        PsiElement(private)('private')
+      PsiErrorElement:Expecting primary constructor parameter list
+        <empty list>
+      PsiWhiteSpace(' ')
+      CLASS_BODY
+        PsiElement(LBRACE)('{')
+        PsiWhiteSpace('\n    ')
+        FUN
+          PsiElement(fun)('fun')
+          PsiWhiteSpace(' ')
+          PsiElement(IDENTIFIER)('foo')
+          VALUE_PARAMETER_LIST
+            PsiElement(LPAR)('(')
+            PsiElement(RPAR)(')')
+          PsiWhiteSpace(' ')
+          BLOCK
+            PsiElement(LBRACE)('{')
+            PsiElement(RBRACE)('}')
+        PsiWhiteSpace('\n')
+        PsiElement(RBRACE)('}')
+    PsiWhiteSpace('\n\n')
+    CLASS
+      PsiElement(class)('class')
+      PsiWhiteSpace(' ')
+      PsiElement(IDENTIFIER)('A1')
+      PsiWhiteSpace(' ')
+      TYPE_PARAMETER_LIST
+        <empty list>
+      CLASS_BODY
+        PsiElement(LBRACE)('{')
+        PsiWhiteSpace('\n\n')
+        PsiElement(RBRACE)('}')
+    PsiWhiteSpace('\n\n')
+    CLASS
+      MODIFIER_LIST
+        PsiElement(open)('open')
+      PsiWhiteSpace(' ')
+      PsiElement(class)('class')
+      PsiWhiteSpace(' ')
+      PsiElement(IDENTIFIER)('B')
+      TYPE_PARAMETER_LIST
+        PsiElement(LT)('<')
+        TYPE_PARAMETER
+          PsiElement(IDENTIFIER)('T')
+          PsiWhiteSpace(' ')
+          PsiElement(COLON)(':')
+          PsiWhiteSpace(' ')
+          TYPE_REFERENCE
+            USER_TYPE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('A')
+        PsiElement(GT)('>')
+      PsiWhiteSpace(' ')
+      PRIMARY_CONSTRUCTOR_MODIFIER_LIST
+        PsiElement(private)('private')
+      PsiWhiteSpace(' ')
+      VALUE_PARAMETER_LIST
+        PsiElement(LPAR)('(')
+        PsiElement(RPAR)(')')
+      PsiWhiteSpace(' ')
+      CLASS_BODY
+        PsiElement(LBRACE)('{')
+        PsiWhiteSpace('\n\n')
+        PsiElement(RBRACE)('}')