Issue 13549. Tweaks for arguments list completion.

editor/tools/plugins/com.google.dart.engine.services/src/com/google/dart/engine/services/completion/CompletionEngine.java

 /*
  * Copyright (c) 2013, the Dart project authors.
  * 
  * Licensed under the Eclipse Public License v1.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  * 
  * http://www.eclipse.org/legal/epl-v10.html
  * 
  * Unless required by applicable law or agreed to in writing, software distributed under the License
  * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
 package com.google.dart.engine.services.completion;
 
+import com.google.common.base.Objects;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import com.google.dart.engine.ast.ASTNode;
 import com.google.dart.engine.ast.Annotation;
 import com.google.dart.engine.ast.ArgumentList;
 import com.google.dart.engine.ast.AsExpression;
 import com.google.dart.engine.ast.AssertStatement;
 import com.google.dart.engine.ast.AssignmentExpression;
 import com.google.dart.engine.ast.BinaryExpression;
 import com.google.dart.engine.ast.Block;
@@ skipping 790 matching lines @@
           ProposalCollector proposalRequestor = new ProposalCollector(requestor);
           try {
             requestor = proposalRequestor;
             dispatchPrefixAnalysis(invokeNode);
           } finally {
             requestor = proposalRequestor.getRequestor();
           }
           int offset = methodName.getOffset();
           int len = node.getRightParenthesis().getEnd() - offset;
           for (CompletionProposal proposal : proposalRequestor.getProposals()) {
-            pArgumentList(proposal, offset, len);
+            if (Objects.equal(proposal.getElement(), invokeNode.getStaticElement())) {
+              pArgumentList(proposal, offset, len);
+            }
           }
         }
         analyzeLocalName(new Ident(node));
       }
       return null;
     }
 
     @Override
     public Void visitAsExpression(AsExpression node) {
       if (isCompletionAfter(node.getAsOperator().getEnd())) {
@@ skipping 1528 matching lines @@
         if (name.equals(conflict)) {
           count += 1;
           continue loop;
         }
       }
       return name;
     }
   }
 
   private void pArgumentList(CompletionProposal proposal, int offset, int len) {
+    // prepare parameters
+    String[] parameterNames = proposal.getParameterNames();
+    if (parameterNames.length == 0) {
+      return;
+    }
+    // fill arguments proposal
     CompletionProposal prop = createProposal(ProposalKind.ARGUMENT_LIST);
+    prop.setElement(proposal.getElement());
     prop.setCompletion(proposal.getCompletion()).setReturnType(proposal.getReturnType());
-    prop.setParameterNames(proposal.getParameterNames());
+    prop.setParameterNames(parameterNames);
     prop.setParameterTypes(proposal.getParameterTypes());
     prop.setParameterStyle(
         proposal.getPositionalParameterCount(),
         proposal.hasNamed(),
         proposal.hasPositional());
     prop.setReplacementLength(0).setLocation(completionLocation());
     prop.setRelevance(10);
     requestor.accept(prop);
   }
 
@@ skipping 456 matching lines @@
       return null;
     }
     Iterator<Type> iter = matches.iterator();
     Type result = iter.next();
     while (iter.hasNext()) {
       result = result.getLeastUpperBound(iter.next());
     }
     return result;
   }
 }