Merge pull request #137 from Integration-Automation/dev

Dev

Author: JE-Chen

dev.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "je_editor_dev"
-version = "0.0.186"
+version = "0.0.190"
 authors = [
     { name = "JE-Chen", email = "[email protected]" },
 ]

je_editor/pyside_ui/code/code_process/code_exec.py

@@ -25,7 +25,7 @@ def __init__(
             main_window: Union[EditorWidget, None] = None,
             program_language: str = "python",
             program_encoding: str = "utf-8",
-            program_buffer: int = 8192000,
+            program_buffer: int = 1024,
     ):
         """
         :param main_window: Pyside main window
@@ -83,18 +83,20 @@ def exec_code(self, exec_file_name, exec_prefix: Union[str, list] = None) -> Non
             exec_file = reformat_os_file_path
             # run program
             if exec_prefix is None:
-                execute_program_list = [self.compiler_path, exec_file]
+                execute_program_param = [self.compiler_path, exec_file]
             else:
                 if isinstance(exec_prefix, str):
-                    execute_program_list = [self.compiler_path, exec_prefix, exec_file]
+                    execute_program_param = [self.compiler_path, exec_prefix, exec_file]
                 else:
-                    execute_program_list = list()
-                    execute_program_list.append(self.compiler_path)
+                    execute_program_param = list()
+                    execute_program_param.append(self.compiler_path)
                     for prefix in exec_prefix:
-                        execute_program_list.append(prefix)
-                    execute_program_list.append(exec_file)
+                        execute_program_param.append(prefix)
+                    execute_program_param.append(exec_file)
+            if sys.platform not in ["win32", "cygwin", "msys"]:
+                execute_program_param = " ".join(execute_program_param)
             self.process = subprocess.Popen(
-                execute_program_list,
+                execute_program_param,
                 stdout=subprocess.PIPE,
                 stderr=subprocess.PIPE,
                 stdin=subprocess.PIPE,
@@ -178,12 +180,16 @@ def print_and_clear_queue(self) -> None:
 
     def read_program_output_from_process(self) -> None:
         while self.still_run_program:
-            program_output_data: str = self.process.stdout.raw.read(self.program_buffer).decode(self.program_encoding,
-                                                                                                errors="replace")
+            program_output_data: str = self.process.stdout.read(
+                self.program_buffer).decode(self.program_encoding, "replace")
+            if self.process:
+                self.process.stdout.flush()
             self.run_output_queue.put_nowait(program_output_data)
 
     def read_program_error_output_from_process(self) -> None:
         while self.still_run_program:
-            program_error_output_data: str = self.process.stderr.raw.read(self.program_buffer).decode(
-                self.program_encoding, errors="replace")
+            program_error_output_data: str = self.process.stderr.read(
+                self.program_buffer).decode(self.program_encoding, "replace")
+            if self.process:
+                self.process.stderr.flush()
             self.run_error_queue.put_nowait(program_error_output_data)

je_editor/pyside_ui/code/plaintext_code_edit/code_edit_plaintext.py

@@ -136,7 +136,9 @@ def complete(self) -> None:
         else:
             script = jedi.Script(code=self.toPlainText())
         jedi_complete_list: List[Completion] = script.complete(
-            self.textCursor().blockNumber() + 1, self.textCursor().positionInBlock())
+            self.textCursor().blockNumber() + 1,
+            len(self.textCursor().document().findBlockByLineNumber(self.textCursor().blockNumber()).text())
+        )
         if len(jedi_complete_list) > 0:
             new_complete_list = list()
             for complete_text in jedi_complete_list:

je_editor/pyside_ui/code/shell_process/shell_exec.py

@@ -26,7 +26,7 @@ def __init__(
             self,
             main_window: Union[EditorWidget, None] = None,
             shell_encoding: str = "utf-8",
-            program_buffer: int = 8192000,
+            program_buffer: int = 1024,
             after_done_function: Union[None, Callable] = None
     ):
         """
@@ -165,14 +165,18 @@ def print_and_clear_queue(self) -> None:
 
     def read_program_output_from_process(self) -> None:
         while self.still_run_shell:
-            program_output_data = self.process.stdout.raw.read(
+            program_output_data = self.process.stdout.read(
                 self.program_buffer) \
-                .decode(self.program_encoding)
+                .decode(self.program_encoding, "replace")
+            if self.process:
+                self.process.stdout.flush()
             self.run_output_queue.put_nowait(program_output_data)
 
     def read_program_error_output_from_process(self) -> None:
         while self.still_run_shell:
-            program_error_output_data = self.process.stderr.raw.read(
+            program_error_output_data = self.process.stderr.read(
                 self.program_buffer) \
-                .decode(self.program_encoding)
+                .decode(self.program_encoding, "replace")
+            if self.process:
+                self.process.stderr.flush()
             self.run_error_queue.put_nowait(program_error_output_data)

pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "je_editor"
-version = "0.0.171"
+version = "0.0.175"
 authors = [
     { name = "JE-Chen", email = "[email protected]" },
 ]