exception fix

git-svn-id: http://bashsupport.googlecode.com/svn/trunk@110 91dd7c56-102c-11df-9f54-17e475596acb

Author: wallaby.pouch

bashsupport/BashSupport.iml

@@ -18,7 +18,6 @@
       <excludeFolder url="file://$MODULE_DIR$/generated_src" />
       <excludeFolder url="file://$MODULE_DIR$/javadoc" />
     </content>
-    <orderEntry type="library" name="Clover IDEA Plugin" level="application" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Google collections" level="project" />

bashsupport/BashSupport.iws

@@ -1,3 +1,6 @@
+2010-07-23:
+ - Fixed exception which occured while adding a REPL console
+ 
 2010-07-22:
  - Lexer improvements
 

bashsupport/Changelog.txt

@@ -1,7 +1,7 @@
 /*
  * Copyright 2010 Joachim Ansorg, [email protected]
  * File: AddReplAction.java, Class: AddReplAction
- * Last modified: 2010-06-03
+ * Last modified: 2010-07-23
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,11 +43,13 @@ public AddReplAction() {
     @Override
     public void update(AnActionEvent e) {
         final Module m = getModule(e);
+
         final Presentation presentation = e.getPresentation();
         if (m == null) {
             presentation.setEnabled(false);
             return;
         }
+
         presentation.setEnabled(true);
 
         super.update(e);
@@ -90,11 +92,13 @@ static Module getModule(AnActionEvent e) {
                         break;
                     }
                 }
-                if (module == null) {
+
+                if (module == null && modules.length > 0) {
                     module = modules[0];
                 }
             }
         }
+
         return module;
     }
 }

bashsupport/src/com/ansorgit/plugins/bash/actions/AddReplAction.java

@@ -19,9 +19,7 @@
 package com.ansorgit.plugins.bash.lang.parser.arithmetic;
 
 import com.ansorgit.plugins.bash.lang.parser.BashPsiBuilder;
-import com.ansorgit.plugins.bash.lang.parser.Parsing;
 import com.ansorgit.plugins.bash.lang.parser.util.ParserUtil;
-import com.ansorgit.plugins.bash.lang.psi.util.BashPsiUtils;
 import com.intellij.lang.PsiBuilder;
 import com.intellij.psi.tree.TokenSet;
 
@@ -31,13 +29,11 @@
  * Time: 6:31:03 PM
  */
 class AbstractAssignment implements ArithmeticParsingFunction {
-    private String description;
     private final ArithmeticParsingFunction next;
     private final TokenSet acceptedEqualTokens;
     private TokenSet acceptedWords = TokenSet.create(WORD, ASSIGNMENT_WORD);
 
-    public AbstractAssignment(String description, ArithmeticParsingFunction next, TokenSet acceptedEqualTokens) {
-        this.description = description;
+    public AbstractAssignment(ArithmeticParsingFunction next, TokenSet acceptedEqualTokens) {
         this.next = next;
         this.acceptedEqualTokens = acceptedEqualTokens;
     }

bashsupport/src/com/ansorgit/plugins/bash/lang/parser/arithmetic/AbstractAssignment.java

@@ -50,8 +50,8 @@ private ArithmeticFactory() {
     private static ArithmeticParsingFunction logicalAnd = repeated(bitwiseOr, AND_AND, ARITH_LOGIC_AND_ELEMENT);
     private static ArithmeticParsingFunction logicalOr = repeated(logicalAnd, OR_OR, ARITH_LOGIC_OR_ELEMENT);
     private static TernaryExpression ternary = new TernaryExpression(logicalOr);
-    private static ArithmeticParsingFunction simpleAssignment = new AbstractAssignment("simple assignment", ternary, TokenSet.create(EQ));
-    private static ArithmeticParsingFunction assignmentCombination = new AbstractAssignment("assignment combination", simpleAssignment, arithmeticAssign);
+    private static ArithmeticParsingFunction simpleAssignment = new AbstractAssignment(ternary, TokenSet.create(EQ));
+    private static ArithmeticParsingFunction assignmentCombination = new AbstractAssignment(simpleAssignment, arithmeticAssign);
     private static ArithmeticParsingFunction assignmentChain = repeated(assignmentCombination, COMMA, ARITH_ASSIGNMENT_CHAIN_ELEMENT);
 
     public static ArithmeticParsingFunction entryPoint() {

bashsupport/src/com/ansorgit/plugins/bash/lang/parser/arithmetic/ArithmeticFactory.java

@@ -18,9 +18,7 @@
 
 package com.ansorgit.plugins.bash.lang.parser.arithmetic;
 
-import com.ansorgit.plugins.bash.lang.parser.BashPsiBuilder;
 import com.ansorgit.plugins.bash.lang.parser.ParsingFunction;
-import com.intellij.lang.PsiBuilder;
 
 /**
  * Extended parsing function for parsing of arithmetic expressions.

bashsupport/src/com/ansorgit/plugins/bash/lang/parser/arithmetic/ArithmeticParsingFunction.java

@@ -21,7 +21,6 @@
 import com.ansorgit.plugins.bash.lang.parser.BashPsiBuilder;
 import com.ansorgit.plugins.bash.lang.parser.util.ParserUtil;
 import com.intellij.lang.PsiBuilder;
-import com.intellij.psi.tree.IElementType;
 
 /**
  * Parses an optional parantheses expression. If not found it delegates to another function.

bashsupport/src/com/ansorgit/plugins/bash/lang/parser/arithmetic/ParenExpr.java

@@ -91,6 +91,7 @@ public boolean isReferenceTo(PsiElement element) {
         return element == this;
     }
 
+    @NotNull
     public Object[] getVariants() {
         return new Object[0];
     }

bashsupport/src/com/ansorgit/plugins/bash/lang/psi/impl/BashKeywordDefaultImpl.java

@@ -20,7 +20,6 @@
 
 import com.ansorgit.plugins.bash.lang.psi.api.arithmetic.ArithmeticExpression;
 import com.ansorgit.plugins.bash.lang.psi.api.arithmetic.AssignmentChain;
-import com.ansorgit.plugins.bash.lang.psi.api.arithmetic.AssignmentExpression;
 import com.intellij.lang.ASTNode;
 import com.intellij.psi.tree.IElementType;