Skip to content

Commit 4ceb232

Browse files
committed
python: inspections, quick fixes, intentions, completion and refactorings synced with JetBrains
1 parent 5aac7c6 commit 4ceb232

543 files changed

Lines changed: 43863 additions & 15785 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
// Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
2+
package com.jetbrains.numpy.codeInsight;
3+
4+
import com.google.common.collect.Lists;
5+
import com.jetbrains.python.codeInsight.PyCustomMember;
6+
import com.jetbrains.python.psi.PyClass;
7+
import com.jetbrains.python.psi.types.PyClassMembersProviderBase;
8+
import com.jetbrains.python.psi.types.PyClassType;
9+
import com.jetbrains.python.psi.types.TypeEvalContext;
10+
import consulo.annotation.component.ExtensionImpl;
11+
import consulo.language.psi.PsiElement;
12+
import org.jspecify.annotations.Nullable;
13+
14+
import java.util.ArrayList;
15+
import java.util.Collection;
16+
import java.util.Collections;
17+
import java.util.List;
18+
19+
/**
20+
*
21+
* User : ktisha
22+
*/
23+
@ExtensionImpl
24+
public final class NumpyClassMembersProvider extends PyClassMembersProviderBase {
25+
private static final String BUNCH = "sklearn.datasets.base.Bunch";
26+
public static final List<String> BUNCH_MEMBERS = Lists.newArrayList("target", "data", "filenames", "target_names", "DESCR");
27+
28+
@Override
29+
public Collection<PyCustomMember> getMembers(PyClassType clazz, @Nullable PsiElement location, TypeEvalContext context) {
30+
if (location != null) {
31+
PyClass pyClass = clazz.getPyClass();
32+
if (BUNCH.equals(pyClass.getQualifiedName())) {
33+
List<PyCustomMember> result = new ArrayList<>();
34+
for (String member : BUNCH_MEMBERS) {
35+
result.add(new PyCustomMember(member, NumpyDocStringTypeProvider.NDARRAY, true));
36+
}
37+
return result;
38+
}
39+
}
40+
return Collections.emptyList();
41+
}
42+
}

‎python-impl/src/main/java/com/jetbrains/numpy/codeInsight/NumpyDocStringTypeProvider.java‎

Lines changed: 444 additions & 366 deletions
Large diffs are not rendered by default.
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
// Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
2+
package com.jetbrains.numpy.codeInsight;
3+
4+
import com.jetbrains.python.impl.pyi.PyiFile;
5+
import com.jetbrains.python.impl.pyi.PyiStubSuppressor;
6+
import consulo.annotation.component.ExtensionImpl;
7+
import consulo.application.util.registry.Registry;
8+
import consulo.virtualFileSystem.VirtualFile;
9+
10+
/**
11+
* JB file facade: NumpyPyiStubs.kt
12+
*/
13+
@ExtensionImpl
14+
public class NumpyPyiStubsSuppressor implements PyiStubSuppressor {
15+
16+
@Override
17+
public boolean isIgnoredStub(PyiFile file) {
18+
if (Registry.is("enable.numpy.pyi.stubs", true)) {
19+
return false;
20+
}
21+
VirtualFile virtualFile = file.getVirtualFile();
22+
if (virtualFile == null) {
23+
return false;
24+
}
25+
26+
return virtualFile.getPath().contains("/numpy/");
27+
}
28+
}
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
// Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
2+
package com.jetbrains.numpy.codeInsight;
3+
4+
import com.jetbrains.python.PyNames;
5+
import com.jetbrains.python.impl.psi.types.PyLegacyDocstringTypeParser;
6+
import com.jetbrains.python.impl.psi.types.PyTypeChecker;
7+
import com.jetbrains.python.psi.impl.PyResolveResultRaterBase;
8+
import com.jetbrains.python.psi.types.PyType;
9+
import com.jetbrains.python.psi.types.TypeEvalContext;
10+
import consulo.annotation.component.ExtensionImpl;
11+
import consulo.language.psi.PsiElement;
12+
import consulo.language.psi.PsiNamedElement;
13+
14+
@ExtensionImpl
15+
public final class NumpyResolveRater extends PyResolveResultRaterBase {
16+
17+
@Override
18+
public int getMemberRate(PsiElement member, PyType type, TypeEvalContext context) {
19+
if (member instanceof PsiNamedElement) {
20+
PyType ndArray = PyLegacyDocstringTypeParser.getTypeByName(member, NumpyDocStringTypeProvider.NDARRAY, context);
21+
if (ndArray != null && PyTypeChecker.match(ndArray, type, context) &&
22+
PyNames.isRightOperatorName(((PsiNamedElement) member).getName())) {
23+
return 100;
24+
}
25+
}
26+
return 0;
27+
}
28+
}
Lines changed: 95 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -1,122 +1,108 @@
1+
// Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
12
package com.jetbrains.numpy.codeInsight;
23

3-
import java.util.ArrayList;
4-
import java.util.List;
5-
64
import org.jspecify.annotations.Nullable;
75

8-
public class NumpyUfuncs
9-
{
10-
private static final List<String> UFUNC_LIST = new ArrayList<>();
11-
public static final List<String> UFUNC_METHODS = new ArrayList<>();
6+
import java.util.ArrayList;
7+
import java.util.List;
128

13-
public static boolean isUFunc(@Nullable String name)
14-
{
15-
return UFUNC_LIST.contains(name);
16-
}
9+
public final class NumpyUfuncs {
10+
private static final List<String> UFUNC_LIST = new ArrayList<>();
1711

18-
static
19-
{
20-
//Math operations
21-
UFUNC_LIST.add("add");
22-
UFUNC_LIST.add("subtract");
23-
UFUNC_LIST.add("multiply");
24-
UFUNC_LIST.add("divide");
25-
UFUNC_LIST.add("logaddexp");
26-
UFUNC_LIST.add("logaddexp2");
27-
UFUNC_LIST.add("true_divide");
28-
UFUNC_LIST.add("floor_divide");
29-
UFUNC_LIST.add("negative");
30-
UFUNC_LIST.add("power");
31-
UFUNC_LIST.add("remainder");
32-
UFUNC_LIST.add("mod");
33-
UFUNC_LIST.add("fmod");
34-
UFUNC_LIST.add("absolute");
35-
UFUNC_LIST.add("rint");
36-
UFUNC_LIST.add("sign");
37-
UFUNC_LIST.add("conj");
38-
UFUNC_LIST.add("exp");
39-
UFUNC_LIST.add("exp2");
40-
UFUNC_LIST.add("log");
41-
UFUNC_LIST.add("log2");
42-
UFUNC_LIST.add("log10");
43-
UFUNC_LIST.add("expm1");
44-
UFUNC_LIST.add("log1p");
45-
UFUNC_LIST.add("sqrt");
46-
UFUNC_LIST.add("square");
47-
UFUNC_LIST.add("reciprocal");
48-
UFUNC_LIST.add("ones_like");
12+
public static boolean isUFunc(@Nullable String name) {
13+
return UFUNC_LIST.contains(name);
14+
}
4915

50-
//Trigonometric
51-
UFUNC_LIST.add("sin");
52-
UFUNC_LIST.add("cos");
53-
UFUNC_LIST.add("tan");
54-
UFUNC_LIST.add("arcsin");
55-
UFUNC_LIST.add("arccos");
56-
UFUNC_LIST.add("arctan");
57-
UFUNC_LIST.add("arctan2");
58-
UFUNC_LIST.add("hypot");
59-
UFUNC_LIST.add("sinh");
60-
UFUNC_LIST.add("cosh");
61-
UFUNC_LIST.add("tanh");
62-
UFUNC_LIST.add("arcsinh");
63-
UFUNC_LIST.add("arccosh");
64-
UFUNC_LIST.add("arctanh");
65-
UFUNC_LIST.add("deg2rad");
66-
UFUNC_LIST.add("rad2deg");
16+
static {
17+
//Math operations
18+
UFUNC_LIST.add("add");
19+
UFUNC_LIST.add("subtract");
20+
UFUNC_LIST.add("multiply");
21+
UFUNC_LIST.add("divide");
22+
UFUNC_LIST.add("logaddexp");
23+
UFUNC_LIST.add("logaddexp2");
24+
UFUNC_LIST.add("true_divide");
25+
UFUNC_LIST.add("floor_divide");
26+
UFUNC_LIST.add("negative");
27+
UFUNC_LIST.add("power");
28+
UFUNC_LIST.add("remainder");
29+
UFUNC_LIST.add("mod");
30+
UFUNC_LIST.add("fmod");
31+
UFUNC_LIST.add("absolute");
32+
UFUNC_LIST.add("rint");
33+
UFUNC_LIST.add("sign");
34+
UFUNC_LIST.add("conj");
35+
UFUNC_LIST.add("exp");
36+
UFUNC_LIST.add("exp2");
37+
UFUNC_LIST.add("log");
38+
UFUNC_LIST.add("log2");
39+
UFUNC_LIST.add("log10");
40+
UFUNC_LIST.add("expm1");
41+
UFUNC_LIST.add("log1p");
42+
UFUNC_LIST.add("sqrt");
43+
UFUNC_LIST.add("square");
44+
UFUNC_LIST.add("reciprocal");
45+
UFUNC_LIST.add("ones_like");
6746

68-
//Bit-twiddling functions
69-
UFUNC_LIST.add("bitwise_and");
70-
UFUNC_LIST.add("bitwise_or");
71-
UFUNC_LIST.add("bitwise_xor");
72-
UFUNC_LIST.add("invert");
73-
UFUNC_LIST.add("left_shift");
74-
UFUNC_LIST.add("right_shift");
47+
//Trigonometric
48+
UFUNC_LIST.add("sin");
49+
UFUNC_LIST.add("cos");
50+
UFUNC_LIST.add("tan");
51+
UFUNC_LIST.add("arcsin");
52+
UFUNC_LIST.add("arccos");
53+
UFUNC_LIST.add("arctan");
54+
UFUNC_LIST.add("arctan2");
55+
UFUNC_LIST.add("hypot");
56+
UFUNC_LIST.add("sinh");
57+
UFUNC_LIST.add("cosh");
58+
UFUNC_LIST.add("tanh");
59+
UFUNC_LIST.add("arcsinh");
60+
UFUNC_LIST.add("arccosh");
61+
UFUNC_LIST.add("arctanh");
62+
UFUNC_LIST.add("deg2rad");
63+
UFUNC_LIST.add("rad2deg");
7564

76-
//Comparison functions
77-
UFUNC_LIST.add("greater");
78-
UFUNC_LIST.add("greater_equal");
79-
UFUNC_LIST.add("less");
80-
UFUNC_LIST.add("less_equal");
81-
UFUNC_LIST.add("not_equal");
82-
UFUNC_LIST.add("equal");
83-
UFUNC_LIST.add("logical_and");
84-
UFUNC_LIST.add("logical_or");
85-
UFUNC_LIST.add("logical_xor");
86-
UFUNC_LIST.add("logical_not");
87-
UFUNC_LIST.add("maximum");
88-
UFUNC_LIST.add("minimum");
89-
UFUNC_LIST.add("fmax");
90-
UFUNC_LIST.add("fmin");
65+
//Bit-twiddling functions
66+
UFUNC_LIST.add("bitwise_and");
67+
UFUNC_LIST.add("bitwise_or");
68+
UFUNC_LIST.add("bitwise_xor");
69+
UFUNC_LIST.add("invert");
70+
UFUNC_LIST.add("left_shift");
71+
UFUNC_LIST.add("right_shift");
9172

92-
///Floating functions
93-
UFUNC_LIST.add("isreal");
94-
UFUNC_LIST.add("iscomplex");
95-
UFUNC_LIST.add("isfinite");
96-
UFUNC_LIST.add("isinf");
97-
UFUNC_LIST.add("isnan");
98-
UFUNC_LIST.add("signbit");
99-
UFUNC_LIST.add("copysign");
100-
UFUNC_LIST.add("nextafter");
101-
UFUNC_LIST.add("modf");
102-
UFUNC_LIST.add("ldexp");
103-
UFUNC_LIST.add("frexp");
104-
UFUNC_LIST.add("fmod");
105-
UFUNC_LIST.add("floor");
106-
UFUNC_LIST.add("ceil");
107-
UFUNC_LIST.add("trunc");
73+
//Comparison functions
74+
UFUNC_LIST.add("greater");
75+
UFUNC_LIST.add("greater_equal");
76+
UFUNC_LIST.add("less");
77+
UFUNC_LIST.add("less_equal");
78+
UFUNC_LIST.add("not_equal");
79+
UFUNC_LIST.add("equal");
80+
UFUNC_LIST.add("logical_and");
81+
UFUNC_LIST.add("logical_or");
82+
UFUNC_LIST.add("logical_xor");
83+
UFUNC_LIST.add("logical_not");
84+
UFUNC_LIST.add("maximum");
85+
UFUNC_LIST.add("minimum");
86+
UFUNC_LIST.add("fmax");
87+
UFUNC_LIST.add("fmin");
10888

109-
UFUNC_LIST.add("fabs");
89+
///Floating functions
90+
UFUNC_LIST.add("isreal");
91+
UFUNC_LIST.add("iscomplex");
92+
UFUNC_LIST.add("isfinite");
93+
UFUNC_LIST.add("isinf");
94+
UFUNC_LIST.add("isnan");
95+
UFUNC_LIST.add("signbit");
96+
UFUNC_LIST.add("copysign");
97+
UFUNC_LIST.add("nextafter");
98+
UFUNC_LIST.add("modf");
99+
UFUNC_LIST.add("ldexp");
100+
UFUNC_LIST.add("frexp");
101+
UFUNC_LIST.add("fmod");
102+
UFUNC_LIST.add("floor");
103+
UFUNC_LIST.add("ceil");
104+
UFUNC_LIST.add("trunc");
110105

111-
UFUNC_METHODS.add("nin");
112-
UFUNC_METHODS.add("nout");
113-
UFUNC_METHODS.add("nargs");
114-
UFUNC_METHODS.add("identity");
115-
UFUNC_METHODS.add("ntypes");
116-
UFUNC_METHODS.add("accumulate");
117-
UFUNC_METHODS.add("reduce");
118-
UFUNC_METHODS.add("reduceat");
119-
UFUNC_METHODS.add("outer");
120-
UFUNC_METHODS.add("at");
121-
}
106+
UFUNC_LIST.add("fabs");
107+
}
122108
}

‎python-impl/src/main/java/com/jetbrains/python/impl/PythonUiServiceImpl.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
package com.jetbrains.python.impl;
1919

2020
import com.jetbrains.python.impl.codeInsight.intentions.DeclarationConflictChecker;
21+
import com.jetbrains.python.impl.codeInsight.intentions.PyAnnotateTypesIntention;
2122
import com.jetbrains.python.impl.inspections.PyRenameElementQuickFix;
2223
import com.jetbrains.python.impl.inspections.quickfix.PyImplementMethodsQuickFix;
2324
import com.jetbrains.python.psi.PyCallExpression;
@@ -153,7 +154,7 @@ public void runRenameProcessor(
153154

154155
@Override
155156
public void annotateTypesIntention(Editor editor, PyFunction function) {
156-
// TODO consulo: PyAnnotateTypesIntention missing - JB: PyAnnotateTypesIntention.annotateTypes(editor, function);
157+
PyAnnotateTypesIntention.annotateTypes(editor, function);
157158
}
158159

159160
/**
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
/*
2+
* Copyright 2013-2026 consulo.io
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package com.jetbrains.python.impl.actions.internal;
17+
18+
import consulo.annotation.component.ExtensionImpl;
19+
import consulo.localize.LocalizeValue;
20+
import consulo.project.ui.notification.NotificationGroup;
21+
import consulo.project.ui.notification.NotificationGroupContributor;
22+
23+
import java.util.function.Consumer;
24+
25+
/**
26+
* Consulo registration of JB's {@code Python.Internal} notification group (intellij.python.psi.impl.xml).
27+
*/
28+
@ExtensionImpl
29+
public class PyPsiInternalNotificationGroupContributor implements NotificationGroupContributor {
30+
public static final NotificationGroup PYTHON_INTERNAL =
31+
NotificationGroup.balloonGroup("Python.Internal", LocalizeValue.localizeTODO("Python Internal"));
32+
33+
@Override
34+
public void contribute(Consumer<NotificationGroup> registrator) {
35+
registrator.accept(PYTHON_INTERNAL);
36+
}
37+
}

0 commit comments

Comments
 (0)