Skip to content

Commit

Permalink
fixed: tests are fixed
Browse files Browse the repository at this point in the history
Resolves: #355
  • Loading branch information
Dmitry Kochik committed Aug 4, 2021
1 parent 33e30b0 commit 8bfe953
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions testData/psi/UseIncomplete.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ SnakemakeFile: UseIncomplete.smk
SmkImportedRulesNames
SmkReferenceExpression: a
PsiElement(Py:IDENTIFIER)('a')
PsiErrorElement:Unexpected token in comma separated list of rules within 'use rule' statement.
PsiErrorElement:Unexpected token in comma separated list of rules within 'use rule' statement
<empty list>
PyStatementList
<empty list>
Expand All @@ -38,7 +38,7 @@ SnakemakeFile: UseIncomplete.smk
PsiElement(Py:IDENTIFIER)('b')
PsiWhiteSpace(' ')
PsiElement(Py:SMK_FROM_KEYWORD)('from')
PsiErrorElement:Expecting module name after 'from' keyword in 'use rule' statement.
PsiErrorElement:Expecting module name after 'from' keyword in 'use rule' statement
<empty list>
PyStatementList
<empty list>
Expand All @@ -62,7 +62,7 @@ SnakemakeFile: UseIncomplete.smk
PsiElement(Py:IDENTIFIER)('module_name2')
PsiWhiteSpace(' ')
PsiElement(Py:SMK_WITH_KEYWORD)('with')
PsiErrorElement:Expecting colon after 'with' keyword in 'use rule' statement.
PsiErrorElement:Expecting colon after 'with' keyword in 'use rule' statement
<empty list>
PyStatementList
<empty list>
Expand Down
16 changes: 8 additions & 8 deletions testData/psi/UseInvalid.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ SnakemakeFile: UseInvalid.smk
PsiElement(Py:IDENTIFIER)('rule')
PsiWhiteSpace(' ')
PsiElement(Py:SMK_FROM_KEYWORD)('from')
PsiErrorElement:Expecting module name after 'from' keyword in 'use rule' statement.
PsiErrorElement:Expecting module name after 'from' keyword in 'use rule' statement
<empty list>
PsiWhiteSpace(' ')
PsiElement(Py:SMK_AS_KEYWORD)('as')
Expand Down Expand Up @@ -92,11 +92,11 @@ SnakemakeFile: UseInvalid.smk
SmkImportedRulesNames
SmkReferenceExpression: NAME
PsiElement(Py:IDENTIFIER)('NAME')
PsiErrorElement:Unexpected token in comma separated list of rules within 'use rule' statement.
PsiErrorElement:Unexpected token in comma separated list of rules within 'use rule' statement
<empty list>
PsiWhiteSpace(' ')
PyStatementList
PsiErrorElement:Expecting either 'as', 'with' or end of line in 'use rule' statement.
PsiErrorElement:Expecting either 'as', 'with' or end of line in 'use rule' statement
<empty list>
SmkUseArgsSection
PsiElement(Py:IDENTIFIER)('frm')
Expand Down Expand Up @@ -126,7 +126,7 @@ SnakemakeFile: UseInvalid.smk
PsiWhiteSpace(' ')
SmkReferenceExpression: MODULE
PsiElement(Py:IDENTIFIER)('MODULE')
PsiErrorElement:Keyword 'with' in 'use rule' statement is not allowed in combination with rule pattern '*'.
PsiErrorElement:Keyword 'with' in 'use rule' statement is not allowed in combination with rule pattern '*'
<empty list>
PsiWhiteSpace(' ')
PsiElement(Py:SMK_WITH_KEYWORD)('with')
Expand Down Expand Up @@ -196,7 +196,7 @@ SnakemakeFile: UseInvalid.smk
PsiWhiteSpace(' ')
SmkImportedRulesNames
PsiElement(Py:MULT)('*')
PsiErrorElement:Expecting list of rules in 'use rule' statement to end with keyword 'from'.
PsiErrorElement:Expecting list of rules in 'use rule' statement to end with keyword 'from'
<empty list>
PsiWhiteSpace(' ')
PsiElement(Py:SMK_AS_KEYWORD)('as')
Expand Down Expand Up @@ -256,7 +256,7 @@ SnakemakeFile: UseInvalid.smk
PsiElement(Py:SMK_AS_KEYWORD)('as')
PsiWhiteSpace(' ')
PsiElement(Py:IDENTIFIER)('N1')
PsiErrorElement:Multiple rules in 'use rule' statement but name modification ('as' statement) does not contain a wildcard '*'.
PsiErrorElement:Multiple rules in 'use rule' statement but name modification ('as' statement) does not contain a wildcard '*'
<empty list>
PsiWhiteSpace(' ')
PsiElement(Py:SMK_WITH_KEYWORD)('with')
Expand Down Expand Up @@ -316,7 +316,7 @@ SnakemakeFile: UseInvalid.smk
SmkReferenceExpression: M
PsiElement(Py:IDENTIFIER)('M')
PyStatementList
PsiErrorElement:Expecting either 'as', 'with' or end of line in 'use rule' statement.
PsiErrorElement:Expecting either 'as', 'with' or end of line in 'use rule' statement
<empty list>
PsiWhiteSpace('\n ')
SmkUseArgsSection
Expand All @@ -342,7 +342,7 @@ SnakemakeFile: UseInvalid.smk
PsiElement(Py:IDENTIFIER)('M')
PsiWhiteSpace(' ')
PyStatementList
PsiErrorElement:Expecting either 'as', 'with' or end of line in 'use rule' statement.
PsiErrorElement:Expecting either 'as', 'with' or end of line in 'use rule' statement
<empty list>
SmkUseArgsSection
PsiElement(Py:IDENTIFIER)('input')
Expand Down

0 comments on commit 8bfe953

Please sign in to comment.