disable mixed mode warning; fixes processing#491, introduces processing#519

benfry · benfry · commit caf1ba90b63d · 2022-07-30T19:39:15.000-04:00
diff --git a/java/src/processing/mode/java/preproc/Processing.g4 b/java/src/processing/mode/java/preproc/Processing.g4
@@ -23,7 +23,7 @@ processingSketch
     : javaProcessingSketch
     | staticProcessingSketch
     | activeProcessingSketch
-    | warnMixedModes
+//    | warnMixedModes
     ;
 
 // java mode, is a compilation unit
diff --git a/todo.txt b/todo.txt
@@ -6,6 +6,11 @@ X   just need to do 'ant clean-jogl' inside core
 X update wiki with recent changes (i.e. separating sketch folder)
 X   https://github.com/processing/processing4/wiki/Processing-4
 X check Windows for any visual artifacts with FlatLaf
+X code completion seems to have broken between beta 4 and beta 5
+X   https://github.com/processing/processing4/issues/491
+X   git bisect good ccc62c6 / git bisect bad f583eef
+X   https://github.com/processing/processing4/commit/0f9b290398aac86ef56fe3c4e9c3ff88fdd53466
+X   introduces https://github.com/processing/processing4/issues/519
 
 export application
 X fix Export to Application on macOS with Apple Silicon
@@ -220,6 +225,11 @@ o   launch4j may be all set, but double-check
 X   um, no--we should use the embedded version, b/c who knows what happens
 
 
+known issues
+_ mixed mode warning now broken
+_   https://github.com/processing/processing4/issues/519
+
+
 fixes/changes before beta 9
 _ dialog formatting fixes
 _   move all (formerly Lucida) dialog formatting into Messages
@@ -238,10 +248,6 @@ _ visual fixes for tab sizes, etc (with Paul)
 _   weirdness with gaps in tabs (editor too big, manager too small)
 _   contrib mgr: filter/dropdown vertical centering is too high
 _   fake bold being used for tab name? (Windows only?)
-_ code completion seems to have broken between beta 4 and beta 5
-_   https://github.com/processing/processing4/issues/491
-_   git bisect good ccc62c6 / git bisect bad f583eef
-_   https://github.com/processing/processing4/commit/0f9b290398aac86ef56fe3c4e9c3ff88fdd53466
 
 
 during release of beta 9

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ processingSketch`
`23`	`23`	`: javaProcessingSketch`
`24`	`24`	`\| staticProcessingSketch`
`25`	`25`	`\| activeProcessingSketch`
`26`		`- \| warnMixedModes`
	`26`	`+// \| warnMixedModes`
`27`	`27`	`;`
`28`	`28`
`29`	`29`	`// java mode, is a compilation unit`