Jelajahi Sumber

Squashed 'src/ted2go/' changes from 89ba48bbc..ae66ba141

ae66ba141 Fixed parsing modules - it didn't parse in latest release.

git-subtree-dir: src/ted2go
git-subtree-split: ae66ba14182a5c85a0f570679049461e8de0e7fd
Mark Sibly 8 tahun lalu
induk
melakukan
1f5cbf5ee8

+ 17 - 17
ProcessReader.monkey2

@@ -41,17 +41,17 @@ Class ProcessReader
 	#end
 	Function Obtain:ProcessReader( tag:String )
 	
-		Local r:ProcessReader
-		If _recycled.Empty
-			r=New ProcessReader
-		Else
-			r=_recycled[0]
-			_recycled.Remove( r )
-			r.Finished=Null
-			r.PortionRead=Null
-			r.Error=Null
-			r._running=False
-		Endif
+		Local r:=New ProcessReader
+'		If _recycled.Empty
+'			r=New ProcessReader
+'		Else
+'			r=_recycled[0]
+'			_recycled.Remove( r )
+'			r.Finished=Null
+'			r.PortionRead=Null
+'			r.Error=Null
+'			r._running=False
+'		Endif
 		r.Tag=tag
 		_items.Add( r )
 		Return r
@@ -62,8 +62,8 @@ Class ProcessReader
 	Function Recycle( r:ProcessReader )
 	
 		_items.Remove( r )
-		r.Stop()
-		_recycled.Add( r )
+		'r.Stop()
+		'_recycled.Add( r )
 	End
 	
 	#rem monkeydoc Stops all obtained readers if them are running and not recycled.
@@ -119,10 +119,10 @@ Class ProcessReader
 	Method Stop()
 		
 		If Not _procOpen
-			If _stdoutWaiting
-				_stdoutWaiting.Set( False )
-				_stdoutWaiting=Null
-			Endif
+'			If _stdoutWaiting
+'				_stdoutWaiting.Set( False )
+'				_stdoutWaiting=Null
+'			Endif
 			Return
 		Endif
 		

+ 0 - 1
Ted2.monkey2

@@ -115,7 +115,6 @@
 #Import "Prefs"
 #Import "ProcessReader"
 #Import "LiveTemplates"
-#Import "SystemCursor"
 #Import "DraggableTabs"
 #Import "MainWindow"
 

+ 3 - 3
parser/Monkey2Parser.monkey2

@@ -47,7 +47,7 @@ Class Monkey2Parser Extends CodeParserPlugin
 		
 		_modsPath=MainWindow.ModsPath
 		_mx2ccPath=MainWindow.Mx2ccPath
-				
+		
 		New Fiber( Lambda()
 			
 			Local time:=Millisecs()
@@ -112,9 +112,9 @@ Class Monkey2Parser Extends CodeParserPlugin
 		
 		If last = 0 Or time > last
 			_filesTime[filePath]=time
-			'Print "parse file: "+filePath.Replace( "C:/proj/monkey/monkey2fork/","" )+"  "+pathOnDisk.Replace( "C:/proj/monkey/monkey2fork/","" )+"  mod:"+Int(isModule)
+			'Print "parse file: "+filePath.Replace( "C:/proj/monkey2/monkey2fork/","" )+"  "+pathOnDisk.Replace( "C:/proj/monkey/monkey2fork/","" )+"  mod:"+Int(isModule)
 		Else
-			'Print "parse file, not modified: "+filePath.Replace( "C:/proj/monkey/monkey2fork/","" )+"  "+pathOnDisk.Replace( "C:/proj/monkey/monkey2fork/","" )+"  mod:"+Int(isModule)
+			'Print "parse file, not modified: "+filePath.Replace( "C:/proj/monkey2/monkey2fork/","" )+"  "+pathOnDisk.Replace( "C:/proj/monkey/monkey2fork/","" )+"  mod:"+Int(isModule)
 			Return Null
 		Endif
 		

+ 5 - 2
testing/ParserTests.monkey2

@@ -2,16 +2,19 @@
 Namespace test2go
 
 
+Private
+
 Struct Vec2i Extension
 	
 	Const One := New Vec2i( 1,1 )
 End
 
-Private
-
 Function vTest( v:Vec2i,e:Entity )
 	
 	v*=Vec2i.One
+	
+	Local ok:=RequestOkay()
+	
 End
 
 

+ 11 - 11
view/ConsoleViewExt.monkey2

@@ -244,17 +244,17 @@ Class ConsoleExt Extends TextView
 		'Super.OnKeyEvent( event )
 	End
 	
-	Method OnContentMouseEvent( event:MouseEvent ) Override
-		
-		'select whole line by double click
-		If event.Type = EventType.MouseDoubleClick
-			Local line:=Document.FindLine( Cursor )
-			SelectText( Document.StartOfLine( line ),Document.EndOfLine( line ) )
-			Return
-		Endif
-		
-		Super.OnContentMouseEvent( event )
-	End
+'	Method OnContentMouseEvent( event:MouseEvent ) Override
+'		
+'		'select whole line by double click
+'		If event.Type = EventType.MouseDoubleClick
+'			Local line:=Document.FindLine( Cursor )
+'			SelectText( Document.StartOfLine( line ),Document.EndOfLine( line ) )
+'			Return
+'		Endif
+'		
+'		Super.OnContentMouseEvent( event )
+'	End
 	
 	
 	Private

+ 2 - 0
view/HintView.monkey2

@@ -6,6 +6,8 @@ Function ShowHint( hint:String,location:Vec2i,sender:View,durationMs:Int=3000 )
 
 	If Not _hint Then _hint=New HintView
 	
+	HideHint()
+	
 	NeedShow( hint,location,sender,durationMs )
 End