Merge pull request #189 from janpfeifer/fixPctPct

Fixed "%% <flags...>"

Author: janpfeifer

examples/tests/hello.ipynb

@@ -70,19 +70,40 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "%exec worked for x=17\n"
+      "Got x=17\n"
      ]
     }
    ],
    "source": [
-    "// Test %exec and flags\n",
+    "// Test flags\n",
     "var x = flag.Int(\"x\", 0, \"value of x to feed f()\")\n",
     "\n",
     "func f() {\n",
-    "    fmt.Printf(\"%%exec worked for x=%d\\n\", *x)\n",
+    "    fmt.Printf(\"Got x=%d\\n\", *x)\n",
     "}\n",
     "\n",
-    "//gonb:%exec f -x=17"
+    "%% -x=17\n",
+    "f()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 5,
+   "id": "748bf745-247f-4c94-90d2-07dc68cd7dd5",
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "Got x=13\n"
+     ]
+    }
+   ],
+   "source": [
+    "// Test %exec\n",
+    "\n",
+    "//gonb:%exec f -x=13"
    ]
   }
  ],
@@ -99,7 +120,7 @@
    "name": "go",
    "nbconvert_exporter": "",
    "pygments_lexer": "",
-   "version": "go1.25.3"
+   "version": "go1.25.4"
   }
  },
  "nbformat": 4,

internal/goexec/composer.go

@@ -380,7 +380,7 @@ func (s *State) createGoFileFromLines(filePath string, cellId int, lines []strin
 	var needsClosingMain bool
 	for ii, line := range lines {
 		trimmedLine := TrimGonbCommentPrefix(line)
-		if strings.HasPrefix(trimmedLine, "%main") || trimmedLine == "%%" {
+		if strings.HasPrefix(trimmedLine, "%main") || (strings.HasPrefix(trimmedLine, "%%") && (len(trimmedLine) == 2 || trimmedLine[2] == ' ' || trimmedLine[2] == '\t')) {
 			// Write preamble of func main() and associate to the "%%" line:
 			fileToCellLines[w.Line] = ii
 			fileToCellLines[w.Line+1] = ii

internal/nbtests/nbtests_test.go

@@ -12,17 +12,18 @@ package nbtests
 import (
 	"flag"
 	"fmt"
+	"os"
+	"os/exec"
+	"path"
+	"strings"
+	"testing"
+
 	"github.com/janpfeifer/gonb/common"
 	"github.com/janpfeifer/gonb/internal/goexec"
 	"github.com/janpfeifer/gonb/internal/kernel"
 	"github.com/janpfeifer/must"
 	"github.com/stretchr/testify/require"
 	"k8s.io/klog/v2"
-	"os"
-	"os/exec"
-	"path"
-	"strings"
-	"testing"
 )
 
 var panicf = common.Panicf
@@ -227,7 +228,11 @@ func TestHello(t *testing.T) {
 				Separator),
 			Match(OutputLine(4),
 				Separator,
-				"%exec worked for x=17",
+				"Got x=17",
+				Separator),
+			Match(OutputLine(5),
+				Separator,
+				"Got x=13",
 				Separator),
 		),
 		*flagPrintNotebook)

internal/specialcmd/cellmagic.go

@@ -34,7 +34,8 @@ func IsGoCell(firstLine string) bool {
 	return !CellSpecialCommands.Has(parts[0])
 }
 
-// ExecuteSpecialCell checks whether it is a special cell (see [CellSpecialCommands]), and if so it executes the special cell command.
+// ExecuteSpecialCell checks whether it is a special cell (see [CellSpecialCommands]), and if so it executes the
+// special cell command.
 //
 // It returns if this was a special cell (if true it executes it), and potentially an execution error, if one happened.
 func ExecuteSpecialCell(msg kernel.Message, goExec *goexec.State, lines []string) (isSpecialCell bool, err error) {