MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[pycharm] PY-80392 Debugger: add data type as a new field

Browse Source 
Merge-request: IJ-MR-164102
Merged-by: Ekaterina Itsenko <ekaterina.itsenko@jetbrains.com>

GitOrigin-RevId: 7ac37c987ddd7cde6b0429eff3b0f7fd9d69fcd5
This commit is contained in:
ekaterina.itsenko
2025-06-05 23:01:02 +00:00
committed by intellij-monorepo-bot
parent 1b34589d35
commit 0948645483
26 changed files with 231 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/gen/com/jetbrains/python/console/protocol/ArrayData.java
+1 -1
View File
@@ -7,7 +7,7 @@
package com.jetbrains.python.console.protocol;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.20.0)", date = "2025-04-23")
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.20.0)", date = "2025-06-03")
public class ArrayData implements org.apache.thrift.TBase<ArrayData, ArrayData._Fields>, java.io.Serializable, Cloneable, Comparable<ArrayData> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ArrayData");
python/gen/com/jetbrains/python/console/protocol/ArrayHeaders.java
+1 -1
View File
@@ -7,7 +7,7 @@
package com.jetbrains.python.console.protocol;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.20.0)", date = "2025-04-23")
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.20.0)", date = "2025-06-03")
public class ArrayHeaders implements org.apache.thrift.TBase<ArrayHeaders, ArrayHeaders._Fields>, java.io.Serializable, Cloneable, Comparable<ArrayHeaders> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ArrayHeaders");
python/gen/com/jetbrains/python/console/protocol/ColHeader.java
+1 -1
View File
@@ -7,7 +7,7 @@
package com.jetbrains.python.console.protocol;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.20.0)", date = "2025-04-23")
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.20.0)", date = "2025-06-03")
public class ColHeader implements org.apache.thrift.TBase<ColHeader, ColHeader._Fields>, java.io.Serializable, Cloneable, Comparable<ColHeader> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ColHeader");
python/gen/com/jetbrains/python/console/protocol/CompletionOption.java
+1 -1
View File
@@ -7,7 +7,7 @@
package com.jetbrains.python.console.protocol;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.20.0)", date = "2025-04-23")
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.20.0)", date = "2025-06-03")
public class CompletionOption implements org.apache.thrift.TBase<CompletionOption, CompletionOption._Fields>, java.io.Serializable, Cloneable, Comparable<CompletionOption> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CompletionOption");
python/gen/com/jetbrains/python/console/protocol/CompletionOptionType.java
+1 -1
View File
@@ -10,7 +10,7 @@ package com.jetbrains.python.console.protocol;
/**
* Corresponds to completion types declared in "_pydev_bundle/_pydev_imports_tipper.py".
*/
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.20.0)", date = "2025-04-23")
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.20.0)", date = "2025-06-03")
public enum CompletionOptionType implements org.apache.thrift.TEnum {
IMPORT(0),
CLASS(1),
python/gen/com/jetbrains/python/console/protocol/DebugValue.java
+131 -26
View File
@@ -10,7 +10,7 @@ package com.jetbrains.python.console.protocol;
* Corresponds to `PyDebugValue`.
*/
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.20.0)", date = "2025-04-23")
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.20.0)", date = "2025-06-03")
public class DebugValue implements org.apache.thrift.TBase<DebugValue, DebugValue._Fields>, java.io.Serializable, Cloneable, Comparable<DebugValue> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DebugValue");
@@ -20,10 +20,11 @@ public class DebugValue implements org.apache.thrift.TBase<DebugValue, DebugValu
private static final org.apache.thrift.protocol.TField VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("value", org.apache.thrift.protocol.TType.STRING, (short)4);
private static final org.apache.thrift.protocol.TField IS_CONTAINER_FIELD_DESC = new org.apache.thrift.protocol.TField("isContainer", org.apache.thrift.protocol.TType.BOOL, (short)5);
private static final org.apache.thrift.protocol.TField SHAPE_FIELD_DESC = new org.apache.thrift.protocol.TField("shape", org.apache.thrift.protocol.TType.STRING, (short)6);
private static final org.apache.thrift.protocol.TField IS_RETURNED_VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("isReturnedValue", org.apache.thrift.protocol.TType.BOOL, (short)7);
private static final org.apache.thrift.protocol.TField IS_IPYTHON_HIDDEN_FIELD_DESC = new org.apache.thrift.protocol.TField("isIPythonHidden", org.apache.thrift.protocol.TType.BOOL, (short)8);
private static final org.apache.thrift.protocol.TField IS_ERROR_ON_EVAL_FIELD_DESC = new org.apache.thrift.protocol.TField("isErrorOnEval", org.apache.thrift.protocol.TType.BOOL, (short)9);
private static final org.apache.thrift.protocol.TField TYPE_RENDERER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("typeRendererId", org.apache.thrift.protocol.TType.STRING, (short)10);
private static final org.apache.thrift.protocol.TField ARRAY_ELEMENT_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("arrayElementType", org.apache.thrift.protocol.TType.STRING, (short)7);
private static final org.apache.thrift.protocol.TField IS_RETURNED_VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("isReturnedValue", org.apache.thrift.protocol.TType.BOOL, (short)8);
private static final org.apache.thrift.protocol.TField IS_IPYTHON_HIDDEN_FIELD_DESC = new org.apache.thrift.protocol.TField("isIPythonHidden", org.apache.thrift.protocol.TType.BOOL, (short)9);
private static final org.apache.thrift.protocol.TField IS_ERROR_ON_EVAL_FIELD_DESC = new org.apache.thrift.protocol.TField("isErrorOnEval", org.apache.thrift.protocol.TType.BOOL, (short)10);
private static final org.apache.thrift.protocol.TField TYPE_RENDERER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("typeRendererId", org.apache.thrift.protocol.TType.STRING, (short)11);
private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new DebugValueStandardSchemeFactory();
private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new DebugValueTupleSchemeFactory();
@@ -34,6 +35,7 @@ public class DebugValue implements org.apache.thrift.TBase<DebugValue, DebugValu
public @org.apache.thrift.annotation.Nullable java.lang.String value; // required
public boolean isContainer; // required
public @org.apache.thrift.annotation.Nullable java.lang.String shape; // required
public @org.apache.thrift.annotation.Nullable java.lang.String arrayElementType; // required
public boolean isReturnedValue; // required
public boolean isIPythonHidden; // required
public boolean isErrorOnEval; // required
@@ -47,10 +49,11 @@ public class DebugValue implements org.apache.thrift.TBase<DebugValue, DebugValu
VALUE((short)4, "value"),
IS_CONTAINER((short)5, "isContainer"),
SHAPE((short)6, "shape"),
IS_RETURNED_VALUE((short)7, "isReturnedValue"),
IS_IPYTHON_HIDDEN((short)8, "isIPythonHidden"),
IS_ERROR_ON_EVAL((short)9, "isErrorOnEval"),
TYPE_RENDERER_ID((short)10, "typeRendererId");
ARRAY_ELEMENT_TYPE((short)7, "arrayElementType"),
IS_RETURNED_VALUE((short)8, "isReturnedValue"),
IS_IPYTHON_HIDDEN((short)9, "isIPythonHidden"),
IS_ERROR_ON_EVAL((short)10, "isErrorOnEval"),
TYPE_RENDERER_ID((short)11, "typeRendererId");
private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -78,13 +81,15 @@ public class DebugValue implements org.apache.thrift.TBase<DebugValue, DebugValu
return IS_CONTAINER;
case 6: // SHAPE
return SHAPE;
case 7: // IS_RETURNED_VALUE
case 7: // ARRAY_ELEMENT_TYPE
return ARRAY_ELEMENT_TYPE;
case 8: // IS_RETURNED_VALUE
return IS_RETURNED_VALUE;
case 8: // IS_IPYTHON_HIDDEN
case 9: // IS_IPYTHON_HIDDEN
return IS_IPYTHON_HIDDEN;
case 9: // IS_ERROR_ON_EVAL
case 10: // IS_ERROR_ON_EVAL
return IS_ERROR_ON_EVAL;
case 10: // TYPE_RENDERER_ID
case 11: // TYPE_RENDERER_ID
return TYPE_RENDERER_ID;
default:
return null;
@@ -149,6 +154,8 @@ public class DebugValue implements org.apache.thrift.TBase<DebugValue, DebugValu
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
tmpMap.put(_Fields.SHAPE, new org.apache.thrift.meta_data.FieldMetaData("shape", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.ARRAY_ELEMENT_TYPE, new org.apache.thrift.meta_data.FieldMetaData("arrayElementType", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.IS_RETURNED_VALUE, new org.apache.thrift.meta_data.FieldMetaData("isReturnedValue", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
tmpMap.put(_Fields.IS_IPYTHON_HIDDEN, new org.apache.thrift.meta_data.FieldMetaData("isIPythonHidden", org.apache.thrift.TFieldRequirementType.DEFAULT,
@@ -171,6 +178,7 @@ public class DebugValue implements org.apache.thrift.TBase<DebugValue, DebugValu
java.lang.String value,
boolean isContainer,
java.lang.String shape,
java.lang.String arrayElementType,
boolean isReturnedValue,
boolean isIPythonHidden,
boolean isErrorOnEval,
@@ -184,6 +192,7 @@ public class DebugValue implements org.apache.thrift.TBase<DebugValue, DebugValu
this.isContainer = isContainer;
setIsContainerIsSet(true);
this.shape = shape;
this.arrayElementType = arrayElementType;
this.isReturnedValue = isReturnedValue;
setIsReturnedValueIsSet(true);
this.isIPythonHidden = isIPythonHidden;
@@ -214,6 +223,9 @@ public class DebugValue implements org.apache.thrift.TBase<DebugValue, DebugValu
if (other.isSetShape()) {
this.shape = other.shape;
}
if (other.isSetArrayElementType()) {
this.arrayElementType = other.arrayElementType;
}
this.isReturnedValue = other.isReturnedValue;
this.isIPythonHidden = other.isIPythonHidden;
this.isErrorOnEval = other.isErrorOnEval;
@@ -236,6 +248,7 @@ public class DebugValue implements org.apache.thrift.TBase<DebugValue, DebugValu
setIsContainerIsSet(false);
this.isContainer = false;
this.shape = null;
this.arrayElementType = null;
setIsReturnedValueIsSet(false);
this.isReturnedValue = false;
setIsIPythonHiddenIsSet(false);
@@ -393,6 +406,31 @@ public class DebugValue implements org.apache.thrift.TBase<DebugValue, DebugValu
}
}
@org.apache.thrift.annotation.Nullable
public java.lang.String getArrayElementType() {
return this.arrayElementType;
}
public DebugValue setArrayElementType(@org.apache.thrift.annotation.Nullable java.lang.String arrayElementType) {
this.arrayElementType = arrayElementType;
return this;
}
public void unsetArrayElementType() {
this.arrayElementType = null;
}
/** Returns true if field arrayElementType is set (has been assigned a value) and false otherwise */
public boolean isSetArrayElementType() {
return this.arrayElementType != null;
}
public void setArrayElementTypeIsSet(boolean value) {
if (!value) {
this.arrayElementType = null;
}
}
public boolean isIsReturnedValue() {
return this.isReturnedValue;
}
@@ -538,6 +576,14 @@ public class DebugValue implements org.apache.thrift.TBase<DebugValue, DebugValu
}
break;
case ARRAY_ELEMENT_TYPE:
if (value == null) {
unsetArrayElementType();
} else {
setArrayElementType((java.lang.String)value);
}
break;
case IS_RETURNED_VALUE:
if (value == null) {
unsetIsReturnedValue();
@@ -595,6 +641,9 @@ public class DebugValue implements org.apache.thrift.TBase<DebugValue, DebugValu
case SHAPE:
return getShape();
case ARRAY_ELEMENT_TYPE:
return getArrayElementType();
case IS_RETURNED_VALUE:
return isIsReturnedValue();
@@ -631,6 +680,8 @@ public class DebugValue implements org.apache.thrift.TBase<DebugValue, DebugValu
return isSetIsContainer();
case SHAPE:
return isSetShape();
case ARRAY_ELEMENT_TYPE:
return isSetArrayElementType();
case IS_RETURNED_VALUE:
return isSetIsReturnedValue();
case IS_IPYTHON_HIDDEN:
@@ -710,6 +761,15 @@ public class DebugValue implements org.apache.thrift.TBase<DebugValue, DebugValu
return false;
}
boolean this_present_arrayElementType = true && this.isSetArrayElementType();
boolean that_present_arrayElementType = true && that.isSetArrayElementType();
if (this_present_arrayElementType || that_present_arrayElementType) {
if (!(this_present_arrayElementType && that_present_arrayElementType))
return false;
if (!this.arrayElementType.equals(that.arrayElementType))
return false;
}
boolean this_present_isReturnedValue = true;
boolean that_present_isReturnedValue = true;
if (this_present_isReturnedValue || that_present_isReturnedValue) {
@@ -775,6 +835,10 @@ public class DebugValue implements org.apache.thrift.TBase<DebugValue, DebugValu
if (isSetShape())
hashCode = hashCode * 8191 + shape.hashCode();
hashCode = hashCode * 8191 + ((isSetArrayElementType()) ? 131071 : 524287);
if (isSetArrayElementType())
hashCode = hashCode * 8191 + arrayElementType.hashCode();
hashCode = hashCode * 8191 + ((isReturnedValue) ? 131071 : 524287);
hashCode = hashCode * 8191 + ((isIPythonHidden) ? 131071 : 524287);
@@ -856,6 +920,16 @@ public class DebugValue implements org.apache.thrift.TBase<DebugValue, DebugValu
return lastComparison;
}
}
lastComparison = java.lang.Boolean.compare(isSetArrayElementType(), other.isSetArrayElementType());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetArrayElementType()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.arrayElementType, other.arrayElementType);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = java.lang.Boolean.compare(isSetIsReturnedValue(), other.isSetIsReturnedValue());
if (lastComparison != 0) {
return lastComparison;
@@ -964,6 +1038,14 @@ public class DebugValue implements org.apache.thrift.TBase<DebugValue, DebugValu
}
first = false;
if (!first) sb.append(", ");
sb.append("arrayElementType:");
if (this.arrayElementType == null) {
sb.append("null");
} else {
sb.append(this.arrayElementType);
}
first = false;
if (!first) sb.append(", ");
sb.append("isReturnedValue:");
sb.append(this.isReturnedValue);
first = false;
@@ -1078,7 +1160,15 @@ public class DebugValue implements org.apache.thrift.TBase<DebugValue, DebugValu
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
case 7: // IS_RETURNED_VALUE
case 7: // ARRAY_ELEMENT_TYPE
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.arrayElementType = iprot.readString();
struct.setArrayElementTypeIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
case 8: // IS_RETURNED_VALUE
if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
struct.isReturnedValue = iprot.readBool();
struct.setIsReturnedValueIsSet(true);
@@ -1086,7 +1176,7 @@ public class DebugValue implements org.apache.thrift.TBase<DebugValue, DebugValu
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
case 8: // IS_IPYTHON_HIDDEN
case 9: // IS_IPYTHON_HIDDEN
if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
struct.isIPythonHidden = iprot.readBool();
struct.setIsIPythonHiddenIsSet(true);
@@ -1094,7 +1184,7 @@ public class DebugValue implements org.apache.thrift.TBase<DebugValue, DebugValu
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
case 9: // IS_ERROR_ON_EVAL
case 10: // IS_ERROR_ON_EVAL
if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
struct.isErrorOnEval = iprot.readBool();
struct.setIsErrorOnEvalIsSet(true);
@@ -1102,7 +1192,7 @@ public class DebugValue implements org.apache.thrift.TBase<DebugValue, DebugValu
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
case 10: // TYPE_RENDERER_ID
case 11: // TYPE_RENDERER_ID
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.typeRendererId = iprot.readString();
struct.setTypeRendererIdIsSet(true);
@@ -1154,6 +1244,11 @@ public class DebugValue implements org.apache.thrift.TBase<DebugValue, DebugValu
oprot.writeString(struct.shape);
oprot.writeFieldEnd();
}
if (struct.arrayElementType != null) {
oprot.writeFieldBegin(ARRAY_ELEMENT_TYPE_FIELD_DESC);
oprot.writeString(struct.arrayElementType);
oprot.writeFieldEnd();
}
oprot.writeFieldBegin(IS_RETURNED_VALUE_FIELD_DESC);
oprot.writeBool(struct.isReturnedValue);
oprot.writeFieldEnd();
@@ -1205,19 +1300,22 @@ public class DebugValue implements org.apache.thrift.TBase<DebugValue, DebugValu
if (struct.isSetShape()) {
optionals.set(5);
}
if (struct.isSetIsReturnedValue()) {
if (struct.isSetArrayElementType()) {
optionals.set(6);
}
if (struct.isSetIsIPythonHidden()) {
if (struct.isSetIsReturnedValue()) {
optionals.set(7);
}
if (struct.isSetIsErrorOnEval()) {
if (struct.isSetIsIPythonHidden()) {
optionals.set(8);
}
if (struct.isSetTypeRendererId()) {
if (struct.isSetIsErrorOnEval()) {
optionals.set(9);
}
oprot.writeBitSet(optionals, 10);
if (struct.isSetTypeRendererId()) {
optionals.set(10);
}
oprot.writeBitSet(optionals, 11);
if (struct.isSetName()) {
oprot.writeString(struct.name);
}
@@ -1236,6 +1334,9 @@ public class DebugValue implements org.apache.thrift.TBase<DebugValue, DebugValu
if (struct.isSetShape()) {
oprot.writeString(struct.shape);
}
if (struct.isSetArrayElementType()) {
oprot.writeString(struct.arrayElementType);
}
if (struct.isSetIsReturnedValue()) {
oprot.writeBool(struct.isReturnedValue);
}
@@ -1253,7 +1354,7 @@ public class DebugValue implements org.apache.thrift.TBase<DebugValue, DebugValu
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, DebugValue struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
java.util.BitSet incoming = iprot.readBitSet(10);
java.util.BitSet incoming = iprot.readBitSet(11);
if (incoming.get(0)) {
struct.name = iprot.readString();
struct.setNameIsSet(true);
@@ -1279,18 +1380,22 @@ public class DebugValue implements org.apache.thrift.TBase<DebugValue, DebugValu
struct.setShapeIsSet(true);
}
if (incoming.get(6)) {
struct.arrayElementType = iprot.readString();
struct.setArrayElementTypeIsSet(true);
}
if (incoming.get(7)) {
struct.isReturnedValue = iprot.readBool();
struct.setIsReturnedValueIsSet(true);
}
if (incoming.get(7)) {
if (incoming.get(8)) {
struct.isIPythonHidden = iprot.readBool();
struct.setIsIPythonHiddenIsSet(true);
}
if (incoming.get(8)) {
if (incoming.get(9)) {
struct.isErrorOnEval = iprot.readBool();
struct.setIsErrorOnEvalIsSet(true);
}
if (incoming.get(9)) {
if (incoming.get(10)) {
struct.typeRendererId = iprot.readString();
struct.setTypeRendererIdIsSet(true);
}
python/gen/com/jetbrains/python/console/protocol/ExceedingArrayDimensionsException.java
+1 -1
View File
@@ -11,7 +11,7 @@ package com.jetbrains.python.console.protocol;
*
*/
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.20.0)", date = "2025-04-23")
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.20.0)", date = "2025-06-03")
public class ExceedingArrayDimensionsException extends org.apache.thrift.TException implements org.apache.thrift.TBase<ExceedingArrayDimensionsException, ExceedingArrayDimensionsException._Fields>, java.io.Serializable, Cloneable, Comparable<ExceedingArrayDimensionsException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExceedingArrayDimensionsException");
python/gen/com/jetbrains/python/console/protocol/GetArrayResponse.java
+1 -1
View File
@@ -11,7 +11,7 @@ package com.jetbrains.python.console.protocol;
*
*/
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.20.0)", date = "2025-04-23")
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.20.0)", date = "2025-06-03")
public class GetArrayResponse implements org.apache.thrift.TBase<GetArrayResponse, GetArrayResponse._Fields>, java.io.Serializable, Cloneable, Comparable<GetArrayResponse> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetArrayResponse");
python/gen/com/jetbrains/python/console/protocol/KeyboardInterruptException.java
+1 -1
View File
@@ -7,7 +7,7 @@
package com.jetbrains.python.console.protocol;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.20.0)", date = "2025-04-23")
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.20.0)", date = "2025-06-03")
public class KeyboardInterruptException extends org.apache.thrift.TException implements org.apache.thrift.TBase<KeyboardInterruptException, KeyboardInterruptException._Fields>, java.io.Serializable, Cloneable, Comparable<KeyboardInterruptException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("KeyboardInterruptException");
python/gen/com/jetbrains/python/console/protocol/PythonConsoleBackendService.java
+1 -1
View File
@@ -6,7 +6,7 @@
*/
package com.jetbrains.python.console.protocol;
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.20.0)", date = "2025-04-23")
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.20.0)", date = "2025-06-03")
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
public class PythonConsoleBackendService {
python/gen/com/jetbrains/python/console/protocol/PythonConsoleFrontendService.java
+1 -1
View File
@@ -6,7 +6,7 @@
*/
package com.jetbrains.python.console.protocol;
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.20.0)", date = "2025-04-23")
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.20.0)", date = "2025-06-03")
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
public class PythonConsoleFrontendService {
python/gen/com/jetbrains/python/console/protocol/PythonTableException.java
+1 -1
View File
@@ -7,7 +7,7 @@
package com.jetbrains.python.console.protocol;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.20.0)", date = "2025-04-23")
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.20.0)", date = "2025-06-03")
public class PythonTableException extends org.apache.thrift.TException implements org.apache.thrift.TBase<PythonTableException, PythonTableException._Fields>, java.io.Serializable, Cloneable, Comparable<PythonTableException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PythonTableException");
python/gen/com/jetbrains/python/console/protocol/PythonUnhandledException.java
+1 -1
View File
@@ -7,7 +7,7 @@
package com.jetbrains.python.console.protocol;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.20.0)", date = "2025-04-23")
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.20.0)", date = "2025-06-03")
public class PythonUnhandledException extends org.apache.thrift.TException implements org.apache.thrift.TBase<PythonUnhandledException, PythonUnhandledException._Fields>, java.io.Serializable, Cloneable, Comparable<PythonUnhandledException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PythonUnhandledException");
python/gen/com/jetbrains/python/console/protocol/RowHeader.java
+1 -1
View File
@@ -7,7 +7,7 @@
package com.jetbrains.python.console.protocol;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.20.0)", date = "2025-04-23")
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.20.0)", date = "2025-06-03")
public class RowHeader implements org.apache.thrift.TBase<RowHeader, RowHeader._Fields>, java.io.Serializable, Cloneable, Comparable<RowHeader> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RowHeader");
python/gen/com/jetbrains/python/console/protocol/UnsupportedArrayTypeException.java
+1 -1
View File
@@ -7,7 +7,7 @@
package com.jetbrains.python.console.protocol;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.20.0)", date = "2025-04-23")
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.20.0)", date = "2025-06-03")
public class UnsupportedArrayTypeException extends org.apache.thrift.TException implements org.apache.thrift.TBase<UnsupportedArrayTypeException, UnsupportedArrayTypeException._Fields>, java.io.Serializable, Cloneable, Comparable<UnsupportedArrayTypeException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UnsupportedArrayTypeException");
python/gen/com/jetbrains/python/console/protocol/package-info.java
+5
View File
@@ -0,0 +1,5 @@
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
@Internal
package com.jetbrains.python.console.protocol;
import org.jetbrains.annotations.ApiStatus.Internal;
python/helpers/pydev/_pydevd_bundle/pydevd_thrift.py
+8
View File
@@ -341,6 +341,14 @@ def var_to_struct(val, name, format='%s', do_trim=True, evaluate_full_value=True
except:
pass
# data type info to xml (for arrays and tensors)
debug_value.arrayElementType = ''
try:
if hasattr(v, 'dtype') and hasattr(v.dtype, 'name'):
debug_value.arrayElementType = v.dtype.name
except:
pass
# additional info to struct
if is_exception_on_eval:
debug_value.isErrorOnEval = True
python/helpers/pydev/_pydevd_bundle/pydevd_xml.py
+10 -1
View File
@@ -353,6 +353,15 @@ def var_to_xml(val, name, do_trim=True, additional_in_xml='', evaluate_full_valu
except:
pass
# data type info to xml (for arrays and tensors)
# we use it for view as image
xml_data_type = ''
try:
if hasattr(v, 'dtype') and hasattr(v.dtype, 'name'):
xml_data_type = ' arrayElementType="%s"' % make_valid_xml_value(v.dtype.name)
except:
pass
# additional info to xml
if is_exception_on_eval:
xml_container = ' isErrorOnEval="True"'
@@ -362,7 +371,7 @@ def var_to_xml(val, name, do_trim=True, additional_in_xml='', evaluate_full_valu
else:
xml_container = ''
return ''.join((xml, xml_qualifier, xml_value, xml_container, xml_shape, xml_type_renderer_id, additional_in_xml, ' />\n'))
return ''.join((xml, xml_qualifier, xml_value, xml_container, xml_shape, xml_data_type, xml_type_renderer_id, additional_in_xml, ' />\n'))
def _do_quote(elem):
python/helpers/pydev/_pydevd_bundle/tables/images/pydevd_numpy_based_image.py
+1 -1
View File
@@ -34,7 +34,7 @@ def create_image(arr):
arr_to_convert = arr_to_convert.numpy()
arr_to_convert = np.where(arr_to_convert == None, 0, arr_to_convert)
arr_to_convert = np.nan_to_num(arr_to_convert, nan=0)
arr_to_convert = np.nan_to_num(arr_to_convert, nan=0, posinf=255, neginf=0)
if np.iscomplexobj(arr_to_convert) or np.issubdtype(arr_to_convert.dtype, np.timedelta64):
raise ValueError("Only non-complex numeric array types are supported.")
python/helpers/pydev/_pydevd_bundle/tables/images/pydevd_numpy_image.py
+1 -1
View File
@@ -13,7 +13,7 @@ def create_image(arr):
arr_to_convert = arr
arr_to_convert = np.where(arr_to_convert == None, 0, arr_to_convert)
arr_to_convert = np.nan_to_num(arr_to_convert, nan=0)
arr_to_convert = np.nan_to_num(arr_to_convert, nan=0, posinf=255, neginf=0)
if np.iscomplexobj(arr_to_convert) or np.issubdtype(arr_to_convert.dtype, np.timedelta64):
raise ValueError("Only non-complex numeric array types are supported.")
python/helpers/pydev/pydev_console/console.thrift
+5 -4
View File
@@ -18,10 +18,11 @@ struct DebugValue {
4: string value,
5: bool isContainer,
6: string shape,
7: bool isReturnedValue,
8: bool isIPythonHidden,
9: bool isErrorOnEval,
10: string typeRendererId
7: string arrayElementType,
8: bool isReturnedValue,
9: bool isIPythonHidden,
10: bool isErrorOnEval,
11: string typeRendererId
}
typedef list<DebugValue> GetFrameResponse
python/pydevSrc/src/com/jetbrains/python/debugger/PyDebugValue.java
+46 -3
View File
@@ -65,6 +65,7 @@ public class PyDebugValue extends XNamedValue {
protected @Nullable String myValue;
private final boolean myContainer;
private final @Nullable String myShape;
private final @Nullable String myArrayElementType;
private final boolean myIsReturnedVal;
private final boolean myIsIPythonHidden;
private @Nullable PyDebugValue myParent;
@@ -129,12 +130,47 @@ public class PyDebugValue extends XNamedValue {
@Nullable String typeRendererId,
final @Nullable PyDebugValue parent,
final @NotNull PyFrameAccessor frameAccessor) {
this(name, type, typeQualifier, value, container, shape, null, isReturnedVal, isIPythonHidden, errorOnEval, typeRendererId, parent, frameAccessor);
}
public PyDebugValue(final @NotNull String name,
final @Nullable String type,
@Nullable String typeQualifier,
final @Nullable String value,
final boolean container,
@Nullable String shape,
@Nullable String arrayElementType,
boolean isReturnedVal,
boolean isIPythonHidden,
boolean errorOnEval,
@Nullable String typeRendererId,
final @NotNull PyFrameAccessor frameAccessor) {
this(name, type, typeQualifier, value, container, shape, arrayElementType, isReturnedVal, isIPythonHidden, errorOnEval, typeRendererId,
null, frameAccessor);
}
public PyDebugValue(final @NotNull String name,
final @Nullable String type,
@Nullable String typeQualifier,
final @Nullable String value,
final boolean container,
@Nullable String shape,
@Nullable String arrayElementType,
boolean isReturnedVal,
boolean isIPythonHidden,
boolean errorOnEval,
@Nullable String typeRendererId,
final @Nullable PyDebugValue parent,
final @NotNull PyFrameAccessor frameAccessor) {
super(name);
myType = type;
myTypeQualifier = Strings.isNullOrEmpty(typeQualifier) ? null : typeQualifier;
myValue = value;
myContainer = container;
myShape = shape;
myArrayElementType = arrayElementType;
myIsReturnedVal = isReturnedVal;
myIsIPythonHidden = isIPythonHidden;
myErrorOnEval = errorOnEval;
@@ -149,7 +185,7 @@ public class PyDebugValue extends XNamedValue {
}
public PyDebugValue(@NotNull PyDebugValue value, @NotNull String newName) {
this(newName, value.getType(), value.getTypeQualifier(), value.getValue(), value.isContainer(), value.getShape(), value.isReturnedVal(),
this(newName, value.getType(), value.getTypeQualifier(), value.getValue(), value.isContainer(), value.getShape(), value.getArrayElementType(), value.isReturnedVal(),
value.isIPythonHidden(), value.isErrorOnEval(), value.getTypeRendererId(), value.getParent(), value.getFrameAccessor());
myOffset = value.getOffset();
setLoadValuePolicy(value.getLoadValuePolicy());
@@ -204,6 +240,10 @@ public class PyDebugValue extends XNamedValue {
return myTypeRendererId;
}
public @Nullable String getArrayElementType() {
return myArrayElementType;
}
public @Nullable PyDebugValue getParent() {
return myParent;
}
@@ -538,7 +578,10 @@ public class PyDebugValue extends XNamedValue {
case NodeTypes.NDARRAY_NODE_TYPE, NodeTypes.EAGER_TENSOR_NODE_TYPE, NodeTypes.RESOURCE_VARIABLE_NODE_TYPE,
NodeTypes.SPARSE_TENSOR_NODE_TYPE, NodeTypes.TENSOR_NODE_TYPE -> {
int[] shape = extractShape(debugValue);
yield isValidArrayShape(shape);
String arrayElementType = debugValue.getArrayElementType();
boolean isConvertibleDataType = arrayElementType != null && !arrayElementType.isEmpty() &&
(arrayElementType.contains("float") || arrayElementType.contains("bool") || arrayElementType.contains("int"));
yield isConvertibleDataType && isConvertibleArrayShape(shape);
}
case NodeTypes.IMAGE_NODE_TYPE, NodeTypes.PNG_IMAGE_NODE_TYPE, NodeTypes.JPEG_IMAGE_NODE_TYPE, NodeTypes.FIGURE_NODE_TYPE -> true;
default -> false;
@@ -561,7 +604,7 @@ public class PyDebugValue extends XNamedValue {
.toArray();
}
private static boolean isValidArrayShape(int[] shape) {
private static boolean isConvertibleArrayShape(int[] shape) {
if (shape == null || shape.length == 0) {
return false;
}
python/pydevSrc/src/com/jetbrains/python/debugger/pydev/ProtocolParser.java
+6 -4
View File
@@ -273,8 +273,8 @@ public final class ProtocolParser {
final String name = readString(reader, "name", null);
final String isErrorOnEval = readString(reader, "isErrorOnEval", "");
if (HIDDEN_TYPES.contains(name)) {
return new PyDebugValue(name, null, "", "", false, null, false,
false, "True".equals(isErrorOnEval), null, frameAccessor);
return new PyDebugValue(name, null, "", "", false, null, null, false,
false, "True".equals(isErrorOnEval), null, null, frameAccessor);
}
final String type = readString(reader, "type", null);
@@ -286,17 +286,19 @@ public final class ProtocolParser {
final String isIPythonHidden = readString(reader, "isIPythonHidden", "");
String typeRendererId = readString(reader, "typeRendererId", "");
String shape = readString(reader, "shape", "");
String arrayElementType = readString(reader, "arrayElementType", "");
if (value.startsWith(type + ": ")) { // drop unneeded prefix
value = value.substring(type.length() + 2);
}
if (shape.isEmpty()) shape = null;
if (arrayElementType.isEmpty()) arrayElementType = null;
if (typeRendererId.isEmpty()) typeRendererId = null;
if (type.equals(DataFrameDebugValue.pyDataFrameType)) {
return new DataFrameDebugValue(name, type, qualifier, value, "True".equals(isContainer), shape, "True".equals(isReturnedValue),
"True".equals(isIPythonHidden), "True".equals(isErrorOnEval), typeRendererId, frameAccessor);
}
return new PyDebugValue(name, type, qualifier, value, "True".equals(isContainer), shape, "True".equals(isReturnedValue),
return new PyDebugValue(name, type, qualifier, value, "True".equals(isContainer), shape, arrayElementType, "True".equals(isReturnedValue),
"True".equals(isIPythonHidden), "True".equals(isErrorOnEval), typeRendererId, frameAccessor);
}
@@ -316,7 +318,7 @@ public final class ProtocolParser {
result.setType(readString(reader, "type", null));
result.setMax(readString(reader, "max", null));
result.setMin(readString(reader, "min", null));
result.setValue(new PyDebugValue(slice, null, null, null, false, null, false, false, false, null, frameAccessor));
result.setValue(new PyDebugValue(slice, null, null, null, false, null, null,false, false, false, null, null, frameAccessor));
reader.moveUp();
}
if ("headerdata".equals(reader.peekNextChild())) {
python/pydevSrc/src/com/jetbrains/python/debugger/values/DataFrameDebugValue.java
+1 -1
View File
@@ -32,7 +32,7 @@ public final class DataFrameDebugValue extends PyDebugValue {
boolean errorOnEval,
@Nullable String typeRendererId,
@NotNull PyFrameAccessor frameAccessor) {
super(name, type, typeQualifier, value, container, shape, isReturnedVal, isIPythonHidden, errorOnEval, typeRendererId, frameAccessor);
super(name, type, typeQualifier, value, container, shape, null, isReturnedVal, isIPythonHidden, errorOnEval, typeRendererId, null, frameAccessor);
}
public DataFrameDebugValue(@NotNull String name,
python/src/com/jetbrains/python/console/PydevConsoleCommunicationUtil.kt
+2 -2
View File
@@ -39,8 +39,8 @@ fun createPyDebugValue(value: DebugValue, frameAccessor: PyFrameAccessor): PyDeb
dataFrameDebugValue
}
else PyDebugValue(value.name, value.type, value.qualifier, value.value ?: "",
value.isContainer, value.shape, value.isReturnedValue, value.isIPythonHidden, value.isErrorOnEval,
value.typeRendererId, frameAccessor)
value.isContainer, value.shape, value.arrayElementType, value.isReturnedValue, value.isIPythonHidden,
value.isErrorOnEval, value.typeRendererId, frameAccessor)
}
fun createArrayChunk(response: GetArrayResponse, frameAccessor: PyFrameAccessor): ArrayChunk {
python/src/com/jetbrains/python/debugger/PyDebuggerEvaluator.java
+1 -1
View File
@@ -28,7 +28,7 @@ public class PyDebuggerEvaluator extends XDebuggerEvaluator {
}
private PyDebugValue getNone() {
return new PyDebugValue("", "NoneType", null, "None", false, null, false, false, false, null, null, myDebugProcess);
return new PyDebugValue("", "NoneType", null, "None", false, null, null, false, false, false, null, null, myDebugProcess);
}
private void doEvaluate(final String expr, final XEvaluationCallback callback, final boolean doTrunc) {