From bfb0e7edb002d30e46c0ab38c2e9e337cf676ea0 Mon Sep 17 00:00:00 2001
From: JianjunLiu <cqljj123@126.com>
Date: Wed, 22 Feb 2023 11:09:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修正js语法高亮问题
---
 designer/utslsynmemo.tsf  |  3 ++-
 funcext/tvclib/tslvcl.tsf | 26 ++++++++++++++++++--------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/designer/utslsynmemo.tsf b/designer/utslsynmemo.tsf
index e335e4f..eee4823 100644
--- a/designer/utslsynmemo.tsf
+++ b/designer/utslsynmemo.tsf
@@ -607,7 +607,8 @@ type TTslSynHighLighter = class(TSynHighLighter)
         begin 
             vi := s[idx];
             viod := ord(vi);
-            if vi="<" and ( e-b)>2 and s[idx+1:idx+3]="!--" then 
+            //if vi="<" and ( e-b)>2 and s[idx+1:idx+3]="!--" then 
+            if vi="<" and ( e-idx)>2 and s[idx+1:idx+3]="!--" then 
             begin
                 //FindRightChars   
                  SetJsToken(tokens,"<!--",idx+3,"/*");   
diff --git a/funcext/tvclib/tslvcl.tsf b/funcext/tvclib/tslvcl.tsf
index 55cf4ae..2791ce9 100644
--- a/funcext/tvclib/tslvcl.tsf
+++ b/funcext/tvclib/tslvcl.tsf
@@ -168,25 +168,25 @@ type tapplication=class(tcomponent)
         end 
         inherited;
     end 
-    function createform(classname,varable);
+    function createform(classname,variable);
     begin
         {**
         @explan(˵Ã÷) ¹¹ÔìÖ÷´°¿Ú%%
         @param(classname)(class of TVCForm) Ö÷´°¿ÚÀà %%
-        @param(varable)() tsl±äÁ¿·µ»ØClassName ¹¹ÔìµÄ´°¿Ú¶ÔÏó %%
+        @param(variable)() tsl±äÁ¿·µ»ØClassName ¹¹ÔìµÄ´°¿Ú¶ÔÏó %%
         **}
         if paramcount<2 then exit; //±äÁ¿²»¹»			
         if classname is class(tcomponent)then
         begin
             //if not(FApplicationWindow)then 
             initialize();
-            varable := createobject(classname,FApplicationWindow);
-            if varable is class(TVCForm)then
+            variable := createobject(classname,FApplicationWindow);
+            if variable is class(TVCForm)then
             begin
-                varable.parent := FApplicationWindow;
+                variable.parent := FApplicationWindow;
                 if not Fmainform then
                 begin
-                    SetMainForm(varable);
+                    SetMainForm(variable);
                 end
             end
         end
@@ -207,7 +207,6 @@ type tapplication=class(tcomponent)
         **}
         CallMessgeFunction(Foldforminfo["minimize"],o,e);
     end
-    //procedure cef_do_message_loop_work();external "libcef.dll" name "cef_do_message_loop_work";
     function run();
     begin
         {**
@@ -221,6 +220,17 @@ type tapplication=class(tcomponent)
         ptr := FMessageObj._getptr_;
         while true do
         begin
+            {if (_wapi.PeekMessageA(ptr,0,0,0,0)) then 
+            begin
+                if FMessageObj.message=0x12 then return 1;
+            end else 
+            begin                
+                RunWorkerThreadLoop();
+                
+            end  
+            tslprocessmessages();   
+            sleep(1); 
+            }      
             if(_wapi.PeekMessageA(ptr,0,0,0,0x1))then
             begin
                 if FMessageObj.message=0x12 then
@@ -230,7 +240,6 @@ type tapplication=class(tcomponent)
                 begin
                     _wapi.TranslateMessage(ptr);
                     _wapi.DispatchMessageA(ptr);
-                    //cef_do_message_loop_work();
                 end
             end else
             begin
@@ -238,6 +247,7 @@ type tapplication=class(tcomponent)
                 RunWorkerThreadLoop();
                 _wapi.WaitMessage();
             end
+            
         end
         {while (_wapi.GetMessageA(ptr, 0, 0, 0)) do
         begin