Merge remote-tracking branch 'origin/master'

diff --git a/python/psi-api/src/com/jetbrains/python/psi/impl/PyKeywordArgumentProvider.java b/python/psi-api/src/com/jetbrains/python/psi/impl/PyKeywordArgumentProvider.java
index 90ce67d4434a88d26c0381341dd427ee08f3dc33..2697305e2e9137d45e1b531d2c93a8bca35bf735 100644 (file)
--- a/python/psi-api/src/com/jetbrains/python/psi/impl/PyKeywordArgumentProvider.java
+++ b/python/psi-api/src/com/jetbrains/python/psi/impl/PyKeywordArgumentProvider.java
@@ -18,6 +18,7 @@ package com.jetbrains.python.psi.impl;
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.jetbrains.python.psi.PyCallExpression;
 import com.jetbrains.python.psi.PyFunction;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 
@@ -29,5 +30,6 @@ import java.util.List;
 public interface PyKeywordArgumentProvider {
   ExtensionPointName<PyKeywordArgumentProvider> EP_NAME = ExtensionPointName.create("Pythonid.keywordArgumentProvider");
 
+  @NotNull
   List<String> getKeywordArguments(PyFunction function, PyCallExpression callExpr);
 }

diff --git a/python/src/com/jetbrains/python/packaging/setupPy/SetupKeywordArgumentProvider.java b/python/src/com/jetbrains/python/packaging/setupPy/SetupKeywordArgumentProvider.java
index 57fad0e56f70ae5e2565037ca6fc5faaa42b7828..7d5296a21f52b7ce5f3d2c57b36fb7134b165cfa 100644 (file)
--- a/python/src/com/jetbrains/python/packaging/setupPy/SetupKeywordArgumentProvider.java
+++ b/python/src/com/jetbrains/python/packaging/setupPy/SetupKeywordArgumentProvider.java
@@ -19,6 +19,7 @@ import com.intellij.psi.util.PsiTreeUtil;
 import com.jetbrains.python.codeInsight.controlflow.ScopeOwner;
 import com.jetbrains.python.psi.*;
 import com.jetbrains.python.psi.impl.PyKeywordArgumentProvider;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Collections;
@@ -28,6 +29,7 @@ import java.util.List;
  * @author yole
  */
 public class SetupKeywordArgumentProvider implements PyKeywordArgumentProvider {
+  @NotNull
   @Override
   public List<String> getKeywordArguments(PyFunction function, PyCallExpression callExpr) {
     if ("setup".equals(function.getName())) {