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

PY-18029 Move auto-generated Thrift structures to com.jetbrains.python.console.protocol package

Browse Source
This commit is contained in:
Alexander Koshevoy
2018-08-22 23:16:40 +03:00
parent efd4a11b12
commit 51c5586d97
16 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/helpers/pydev/pydev_console/console.thrift
+1 -1
View File
@@ -1,4 +1,4 @@
namespace java com.jetbrains.python.console
namespace java com.jetbrains.python.console.protocol
/**
* `com.jetbrains.python.console.PydevConsoleCommunication`
python/python-console/gen/com/jetbrains/python/console/ArrayData.java → python/python-console/gen/com/jetbrains/python/console/protocol/ArrayData.java
+2 -2
View File
@@ -4,10 +4,10 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
*/
package com.jetbrains.python.console;
package com.jetbrains.python.console.protocol;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)", date = "2018-05-18")
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)", date = "2018-08-07")
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/python-console/gen/com/jetbrains/python/console/ArrayHeaders.java → python/python-console/gen/com/jetbrains/python/console/protocol/ArrayHeaders.java
+2 -2
View File
@@ -4,10 +4,10 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
*/
package com.jetbrains.python.console;
package com.jetbrains.python.console.protocol;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)", date = "2018-05-18")
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)", date = "2018-08-07")
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/python-console/gen/com/jetbrains/python/console/ColHeader.java → python/python-console/gen/com/jetbrains/python/console/protocol/ColHeader.java
+2 -2
View File
@@ -4,10 +4,10 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
*/
package com.jetbrains.python.console;
package com.jetbrains.python.console.protocol;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)", date = "2018-05-18")
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)", date = "2018-08-07")
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/python-console/gen/com/jetbrains/python/console/CompletionOption.java → python/python-console/gen/com/jetbrains/python/console/protocol/CompletionOption.java
+4 -4
View File
@@ -4,10 +4,10 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
*/
package com.jetbrains.python.console;
package com.jetbrains.python.console.protocol;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)", date = "2018-05-18")
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)", date = "2018-08-07")
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");
@@ -623,7 +623,7 @@ public class CompletionOption implements org.apache.thrift.TBase<CompletionOptio
break;
case 4: // TYPE
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
struct.type = com.jetbrains.python.console.CompletionOptionType.findByValue(iprot.readI32());
struct.type = com.jetbrains.python.console.protocol.CompletionOptionType.findByValue(iprot.readI32());
struct.setTypeIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -748,7 +748,7 @@ public class CompletionOption implements org.apache.thrift.TBase<CompletionOptio
struct.setArgumentsIsSet(true);
}
if (incoming.get(3)) {
struct.type = com.jetbrains.python.console.CompletionOptionType.findByValue(iprot.readI32());
struct.type = com.jetbrains.python.console.protocol.CompletionOptionType.findByValue(iprot.readI32());
struct.setTypeIsSet(true);
}
}
python/python-console/gen/com/jetbrains/python/console/CompletionOptionType.java → python/python-console/gen/com/jetbrains/python/console/protocol/CompletionOptionType.java
+1 -1
View File
@@ -4,7 +4,7 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
*/
package com.jetbrains.python.console;
package com.jetbrains.python.console.protocol;
/**
python/python-console/gen/com/jetbrains/python/console/DebugValue.java → python/python-console/gen/com/jetbrains/python/console/protocol/DebugValue.java
+2 -2
View File
@@ -4,13 +4,13 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
*/
package com.jetbrains.python.console;
package com.jetbrains.python.console.protocol;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
/**
* Corresponds to `PyDebugValue`.
*/
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)", date = "2018-05-18")
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)", date = "2018-08-07")
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");
python/python-console/gen/com/jetbrains/python/console/GetArrayResponse.java → python/python-console/gen/com/jetbrains/python/console/protocol/GetArrayResponse.java
+2 -2
View File
@@ -4,14 +4,14 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
*/
package com.jetbrains.python.console;
package com.jetbrains.python.console.protocol;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
/**
* Corresponds to `ArrayChunk`.
*
*/
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)", date = "2018-07-02")
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)", date = "2018-08-07")
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/python-console/gen/com/jetbrains/python/console/PythonConsoleBackendService.java → python/python-console/gen/com/jetbrains/python/console/protocol/PythonConsoleBackendService.java
+2 -2
View File
@@ -4,10 +4,10 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
*/
package com.jetbrains.python.console;
package com.jetbrains.python.console.protocol;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)", date = "2018-07-24")
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)", date = "2018-08-07")
public class PythonConsoleBackendService {
public interface Iface {
python/python-console/gen/com/jetbrains/python/console/PythonConsoleFrontendService.java → python/python-console/gen/com/jetbrains/python/console/protocol/PythonConsoleFrontendService.java
+2 -2
View File
@@ -4,10 +4,10 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
*/
package com.jetbrains.python.console;
package com.jetbrains.python.console.protocol;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)", date = "2018-07-09")
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)", date = "2018-08-07")
public class PythonConsoleFrontendService {
public interface Iface {
python/python-console/gen/com/jetbrains/python/console/RowHeader.java → python/python-console/gen/com/jetbrains/python/console/protocol/RowHeader.java
+2 -2
View File
@@ -4,10 +4,10 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
*/
package com.jetbrains.python.console;
package com.jetbrains.python.console.protocol;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)", date = "2018-05-18")
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)", date = "2018-08-07")
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/python-console/gen/com/jetbrains/python/console/UnsupportedArrayTypeException.java → python/python-console/gen/com/jetbrains/python/console/protocol/UnsupportedArrayTypeException.java
+2 -2
View File
@@ -4,10 +4,10 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
*/
package com.jetbrains.python.console;
package com.jetbrains.python.console.protocol;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)", date = "2018-07-24")
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)", date = "2018-08-07")
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/src/com/jetbrains/python/console/PydevConsoleCommunication.java
+1
View File
@@ -22,6 +22,7 @@ import com.intellij.xdebugger.frame.XCompositeNode;
import com.intellij.xdebugger.frame.XValueChildrenList;
import com.intellij.xdebugger.frame.XValueNode;
import com.jetbrains.python.console.parsing.PythonConsoleData;
import com.jetbrains.python.console.protocol.*;
import com.jetbrains.python.console.pydev.AbstractConsoleCommunication;
import com.jetbrains.python.console.pydev.InterpreterResponse;
import com.jetbrains.python.console.pydev.PydevCompletionVariant;
python/src/com/jetbrains/python/console/PydevConsoleCommunicationUtil.kt
+2
View File
@@ -4,6 +4,8 @@
package com.jetbrains.python.console
import com.intellij.xdebugger.frame.XValueChildrenList
import com.jetbrains.python.console.protocol.DebugValue
import com.jetbrains.python.console.protocol.GetArrayResponse
import com.jetbrains.python.debugger.ArrayChunk
import com.jetbrains.python.debugger.ArrayChunkBuilder
import com.jetbrains.python.debugger.PyDebugValue
python/src/com/jetbrains/python/console/PythonConsoleBackendServiceDisposable.kt
+2
View File
@@ -1,6 +1,8 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.jetbrains.python.console
import com.jetbrains.python.console.protocol.PythonConsoleBackendService
/**
* Not really [com.intellij.openapi.Disposable] as [dispose] method is expected
* to be called directly.
python/src/com/jetbrains/python/console/PythonConsoleClientUtil.kt
+3 -1
View File
@@ -4,6 +4,7 @@
package com.jetbrains.python.console
import com.intellij.util.ConcurrencyUtil
import com.jetbrains.python.console.protocol.PythonConsoleBackendService
import java.lang.reflect.InvocationHandler
import java.lang.reflect.InvocationTargetException
import java.lang.reflect.Method
@@ -20,7 +21,8 @@ fun synchronizedPythonConsoleClient(loader: ClassLoader,
pythonConsoleProcess: Process): PythonConsoleBackendServiceDisposable {
val executorService = ConcurrencyUtil.newSingleThreadExecutor(PYTHON_CONSOLE_COMMAND_THREAD_FACTORY_NAME)
// make the `PythonConsoleBackendService.Iface` process-aware and thread-safe
val proxy = Proxy.newProxyInstance(loader, arrayOf<Class<*>>(PythonConsoleBackendService.Iface::class.java),
val proxy = Proxy.newProxyInstance(loader, arrayOf<Class<*>>(
PythonConsoleBackendService.Iface::class.java),
InvocationHandler { _, method, args ->
// we evaluate the original method in the other thread in order to control it
val future = executorService.submit(Callable {