MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 06:50:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

EA-926314: Fix IllegalArgumentException

Browse Source 
(cherry picked from commit 99659628ac1514c83a1ac4820ef53558b10d6526)

IJ-CR-149566

GitOrigin-RevId: 94bd1112772f6d479c299456f691825a026410bb
This commit is contained in:
Irina Fediaeva
2024-10-21 13:52:06 +02:00
committed by intellij-monorepo-bot
parent 92900c401a
commit 5e6cc9697d
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
python/python-psi-impl/src/com/jetbrains/python/documentation/PyTypeModelBuilder.java
View File

@@ -9,6 +9,7 @@ import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.Ref;
import com.intellij.openapi.util.text.HtmlBuilder;
import com.intellij.openapi.util.text.HtmlChunk;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.PsiElement;
import com.intellij.util.containers.ContainerUtil;
import com.jetbrains.python.PyNames;
@@ -439,12 +440,12 @@ public class PyTypeModelBuilder {
private static class TypeToStringVisitor extends TypeNameVisitor {
@Override
protected @NotNull HtmlChunk styled(@Nls String text, @NotNull TextAttributesKey style) {
return HtmlChunk.raw(text);
return HtmlChunk.raw(StringUtil.notNullize(text));
}
@Override
protected @NotNull HtmlChunk escaped(@Nls String text) {
return HtmlChunk.raw(text);
return HtmlChunk.raw(StringUtil.notNullize(text));
}
@Override
@@ -454,7 +455,7 @@ public class PyTypeModelBuilder {
@Override
protected @NotNull HtmlChunk styledExpression(@Nls String expressionText, @NotNull PyExpression expression) {
return HtmlChunk.raw(expressionText);
return HtmlChunk.raw(StringUtil.notNullize(expressionText));
}
public String getString() {
@@ -550,12 +551,12 @@ public class PyTypeModelBuilder {
private static class TypeToDescriptionVisitor extends TypeNameVisitor {
@Override
protected @NotNull HtmlChunk styled(@Nls String text, @NotNull TextAttributesKey style) {
return HtmlChunk.raw(text);
return HtmlChunk.raw(StringUtil.notNullize(text));
}
@Override
protected @NotNull HtmlChunk escaped(@Nls String text) {
return HtmlChunk.raw(text);
return HtmlChunk.raw(StringUtil.notNullize(text));
}
@Override
@@ -565,7 +566,7 @@ public class PyTypeModelBuilder {
@Override
protected @NotNull HtmlChunk styledExpression(@Nls String expressionText, @NotNull PyExpression expression) {
return HtmlChunk.raw(expressionText);
return HtmlChunk.raw(StringUtil.notNullize(expressionText));
}
@NotNull
@@ -659,9 +660,11 @@ public class PyTypeModelBuilder {
switchBuiltinToTyping = collectionOf.useTypingAlias;
if (collectionOf.isTypeIs == null) {
collectionOf.collectionType.accept(this);
} else if (collectionOf.isTypeIs) {
}
else if (collectionOf.isTypeIs) {
add(styled("TypeIs", PyHighlighter.PY_CLASS_DEFINITION));
} else {
}
else {
add(styled("TypeGuard", PyHighlighter.PY_CLASS_DEFINITION));
}
switchBuiltinToTyping = prevSwitchBuiltinToTyping;