liveConsole 1.7.1__tar.gz → 1.7.3__tar.gz

{liveconsole-1.7.1/src/liveConsole.egg-info → liveconsole-1.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: liveConsole
-Version: 1.7.1
+Version: 1.7.3
 Summary: An IDLE-like debugger to allow for real-time command injection for debugging and testing python code
 Author-email: Tzur Soffer <tzur.soffer@gmail.com>
 License: MIT

{liveconsole-1.7.1 → liveconsole-1.7.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "liveConsole"
-version = "1.7.1"
+version = "1.7.3"
 description = "An IDLE-like debugger to allow for real-time command injection for debugging and testing python code"
 authors = [{ name="Tzur Soffer", email="tzur.soffer@gmail.com" }]
 license = {text = "MIT"}

{liveconsole-1.7.1 → liveconsole-1.7.3/src/liveConsole.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: liveConsole
-Version: 1.7.1
+Version: 1.7.3
 Summary: An IDLE-like debugger to allow for real-time command injection for debugging and testing python code
 Author-email: Tzur Soffer <tzur.soffer@gmail.com>
 License: MIT

{liveconsole-1.7.1 → liveconsole-1.7.3}/src/pysole/mainConsole.py

@@ -50,6 +50,10 @@ class InteractiveConsoleText(StyledTextWindow):
         self.bind("<Up>", self.onUp)
         self.bind("<Down>", self.onDown)
 
+    def getPromptPosition(self):
+        """Get the position right after the prompt on current command line."""
+        return(f"{self.currentCommandLine}.{self.PROMPT_LENGTH}")
+
     def getCurrentLineNumber(self):
         """Get the line number where current command starts."""
         return(int(self.index("end-1c").split(".")[0]))
@@ -60,30 +64,35 @@ class InteractiveConsoleText(StyledTextWindow):
     def getCommandStartPosition(self):
         """Get the starting position of the current command."""
         return(f"{self.currentCommandLine}.0")
+    
+    def writeToPrompt(self, text):
+        """Write text to the prompt of the console"""
+        if self.isExecuting:
+            return
+
+        if text:
+            self.insert("end", text)
+        self.mark_set("insert", "end")
+        self.see("end")
+        self.updateStyling(start=self.getPromptPosition())    #< Ensure styling/lexer applied after programmatic change:
 
     def replaceCurrentCommand(self, newCommand):
         """Replace the current command with new text."""
-        if self.isExecuting:
-            return
-        
         start = self.getPromptPosition()
         end = "end-1c"
-        
         self.delete(start, end)
-        if newCommand:
-            self.insert(start, newCommand)
-        self.mark_set("insert", "end")
-        self.see("end")
-        # Ensure styling/lexer applied after programmatic change:
-        self.updateStyling(start=self.getPromptPosition())
+        self.writeToPrompt(newCommand)
 
-    def runCommand(self, command, printCommand=False):
+    def runCommand(self, command, printCommand=False, clearPrompt=True):
         """Insert code into the console prompt and execute it as if Enter was pressed."""
         if self.isExecuting:
             return(False)
         if printCommand:
-            self.replaceCurrentCommand(command)  #< Replace current command with the new code
-            self.onEnter(None)  #< Simulate pressing Enter to run the command
+            if clearPrompt:
+                self.replaceCurrentCommand(command)  #< Replace current command with the new code
+            else:
+                self.writeToPrompt(command)
+            self.onEnter(None, insertWhitespace=False)                       #< Simulate pressing Enter to run the command
         else:
             self.executeCommandThreaded(command, addPrompt=False)
 
@@ -98,7 +107,7 @@ class InteractiveConsoleText(StyledTextWindow):
         return((cursorLine >= self.currentCommandLine and 
                 (cursorLine > self.currentCommandLine or cursorCol >= self.PROMPT_LENGTH)))
 
-    def onEnter(self, event):
+    def onEnter(self, event, insertWhitespace=True):
         """Handle Enter key - execute command."""
         self.suggestionManager.hideSuggestions()
         
@@ -119,9 +128,8 @@ class InteractiveConsoleText(StyledTextWindow):
             return("break")
 
         # Check if statement is incomplete
-        if self.isIncompleteStatement(command):
+        if self.isIncompleteStatement(command) and insertWhitespace:
             return(self.onShiftEnter(event))
-
         # Execute the command
         self.history.add(command)
         self.mark_set("insert", "end")
@@ -351,10 +359,6 @@ class InteractiveConsoleText(StyledTextWindow):
         """Insert a newline at the end."""
         self.writeOutput("")
 
-    def getPromptPosition(self):
-        """Get the position right after the prompt on current command line."""
-        return(f"{self.currentCommandLine}.{self.PROMPT_LENGTH}")
-
     def getCurrentCommand(self):
         """Extract the current command text (without prompt)."""
         start = self.getPromptPosition()

{liveconsole-1.7.1 → liveconsole-1.7.3}/src/pysole/pysole.py

@@ -96,8 +96,11 @@ class InteractiveConsole(ctk.CTk):
             with open(filename, "r", encoding="utf-8") as f:
                 lines = f.readlines()
 
-            startLine = callerFrame.f_lineno
-            self.startupCode = lines[startLine:]
+            startLineIndex = callerFrame.f_lineno
+            startLine = lines[startLineIndex - 1]
+            leadingWhitespaceLen = len(startLine) - len(startLine.lstrip())
+            self.startupCode = lines[startLineIndex:]
+            self.startupCode = [line.rstrip()[leadingWhitespaceLen:] for line in self.startupCode]
 
     def _createMenu(self):
         """Create a menu bar using CTkOptionMenu."""
@@ -257,44 +260,70 @@ class InteractiveConsole(ctk.CTk):
         sys.stdout = sys.__stdout__
         sys.stderr = sys.__stderr__
         self.destroy()
+    
+    def _printWaterMark(self):
+        m = (
+            "Welcome to Pysole, if you find me useful, please star me on GitHub:\n"
+            "https://github.com/TzurSoffer/Pysole"
+        )
+        stdPrint(m)
+        self.console.newline()
+        self.console.writeOutput(m, "instruction")
+        time.sleep(0.1)
+        if self.runRemainingCode:
+            if self.printStartupCode:
+                self.console.addPrompt()
+            else:
+                self.console.newline()
+        else:
+            self.console.addPrompt()
+    
+    def _splitCodeIntoChunks(self):
+        codeChunks = []
+        currentChunk = []
+
+        for line in self.startupCode:
+            strippedLine = line.lstrip()
+            indentLevel = len(line) - len(strippedLine)
+
+            if not strippedLine:  #< Blank line, keep it in current chunk
+                currentChunk.append(line)
+                continue
+
+            if indentLevel != 0:
+                currentChunk.append(line)
+            else:
+                codeChunks.append(currentChunk)
+                currentChunk = [line]
+
+        if currentChunk:
+            codeChunks.append(currentChunk)
+
+        return(["\n".join(chunk).strip() for chunk in codeChunks if any(line.strip() for line in chunk)])
+
+    
+    def _runStartup(self):
+        if self.removeWaterMark == False:
+            self._printWaterMark()
+
+        if self.runRemainingCode == False:
+            return
+
+        if self.printStartupCode == False:
+            self.console.newline()
+            code = "\n".join(self.startupCode)
+            self.console.executeCommandThreaded(code, addPrompt=True)
+            return
+        
+        chunks = self._splitCodeIntoChunks()
+        for chunk in chunks:
+            while self.console.isExecuting:
+                time.sleep(0.01)
+            self.console.runCommand(chunk, printCommand=True, clearPrompt=True)
 
     def probe(self, *args, **kwargs):
         """Start the console main loop."""
-        def runStartup():
-            if not self.removeWaterMark:
-                m = (
-                    "Welcome to Pysole, if you find me useful, please star me on GitHub:\n"
-                    "https://github.com/TzurSoffer/Pysole"
-                )
-                stdPrint(m)
-                self.console.newline()
-                self.console.writeOutput(m, "instruction")
-                time.sleep(0.1)
-                if self.runRemainingCode:
-                    if self.printStartupCode:
-                        self.console.addPrompt()
-                    else:
-                        self.console.newline()
-                else:
-                    self.console.addPrompt()
-            elif self.runRemainingCode == True and self.printStartupCode == False:
-                self.console.newline()
-
-            for line in self.startupCode:
-                line = line.rstrip()
-                while self.console.isExecuting:
-                    time.sleep(0.01)
-                if self.printStartupCode:
-                    # self.console.writeOutput(line)
-                    self.console.runCommand(line, printCommand=True)
-                else:
-                    # self.console.writeOutput(line)
-                    self.console.runCommand(line, printCommand=False)
-
-            if self.runRemainingCode == True and self.printStartupCode == False:
-                self.console.resetCurrentLineNumber()
-                self.console.addPrompt()
-        threading.Thread(target=runStartup).start()
+        self.after(0, threading.Thread(target=self._runStartup).start)
         self.mainloop(*args, **kwargs)
 
 def probe(userGlobals=None, userLocals=None, callerFrame=None,

{liveconsole-1.7.1 → liveconsole-1.7.3}/src/pysole/settings.json

@@ -11,7 +11,7 @@
         "OUTPUT": "#ffffff",
         "ERROR": "#ff0000",
         "RESULT": "#66ccff",
-        "INSTRUCTION": "#ffff00",
+        "INSTRUCTION": "#ffccdd",
         "SUGGESTION_BOX_BG": "#2d2d2d",
         "SUGGESTION_BOX_SELECTION_BG": "#0066cc",
         "FONT": {

{liveconsole-1.7.1 → liveconsole-1.7.3}/src/pysole/themes.json

@@ -11,7 +11,7 @@
         "OUTPUT": "#ffffff",
         "ERROR": "#ff0000",
         "RESULT": "#66ccff",
-        "INSTRUCTION": "#ffff00",
+        "INSTRUCTION": "#ffccdd",
         "SUGGESTION_BOX_BG": "#2d2d2d",
         "SUGGESTION_BOX_SELECTION_BG": "#0066cc",
         "FONT": {
@@ -31,7 +31,7 @@
         "OUTPUT": "#000000",
         "ERROR": "#ff0000",
         "RESULT": "#0066cc",
-        "INSTRUCTION": "#ffff00",
+        "INSTRUCTION": "#ffccdd",
         "SUGGESTION_BOX_BG": "#f0f0f0",
         "SUGGESTION_BOX_SELECTION_BG": "#cce6ff",
         "FONT": {
@@ -51,7 +51,7 @@
         "OUTPUT": "#586e75",
         "ERROR": "#dc322f",
         "RESULT": "#2aa198",
-        "INSTRUCTION": "#ffff00",
+        "INSTRUCTION": "#ffccdd",
         "SUGGESTION_BOX_BG": "#eee8d5",
         "SUGGESTION_BOX_SELECTION_BG": "#b58900",
         "FONT": {
@@ -71,7 +71,7 @@
         "OUTPUT": "#f8f8f2",
         "ERROR": "#ff5555",
         "RESULT": "#8be9fd",
-        "INSTRUCTION": "#ffff00",
+        "INSTRUCTION": "#ffccdd",
         "SUGGESTION_BOX_BG": "#44475a",
         "SUGGESTION_BOX_SELECTION_BG": "#6272a4",
         "FONT": {