liujianjun
/
tslediter
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

编辑器 

修正js语法高亮问题
This commit is contained in:
JianjunLiu 2023-02-22 11:09:00 +08:00
parent fc0eb3e1cd
commit bfb0e7edb0
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
designer/utslsynmemo.tsf
View File

@ -607,7 +607,8 @@ type TTslSynHighLighter = class(TSynHighLighter)
begin begin
vi := s[idx]; vi := s[idx];
viod := ord(vi); 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 begin
//FindRightChars //FindRightChars
SetJsToken(tokens,"<!--",idx+3,"/*"); SetJsToken(tokens,"<!--",idx+3,"/*");

26
funcext/tvclib/tslvcl.tsf
View File

@ -168,25 +168,25 @@ type tapplication=class(tcomponent)
end end
inherited; inherited;
end end
function createform(classname,varable); function createform(classname,variable);
begin begin
{** {**
@explan(说明) 构造主窗口%% @explan(说明) 构造主窗口%%
@param(classname)(class of TVCForm) 主窗口类 %% @param(classname)(class of TVCForm) 主窗口类 %%
@param(varable)() tsl变量返回ClassName 构造的窗口对象 %% @param(variable)() tsl变量返回ClassName 构造的窗口对象 %%
**} **}
if paramcount<2 then exit; //变量不够 if paramcount<2 then exit; //变量不够
if classname is class(tcomponent)then if classname is class(tcomponent)then
begin begin
//if not(FApplicationWindow)then //if not(FApplicationWindow)then
initialize(); initialize();
varable := createobject(classname,FApplicationWindow); variable := createobject(classname,FApplicationWindow);
if varable is class(TVCForm)then if variable is class(TVCForm)then
begin begin
varable.parent := FApplicationWindow; variable.parent := FApplicationWindow;
if not Fmainform then if not Fmainform then
begin begin
SetMainForm(varable); SetMainForm(variable);
end end
end end
end end
@ -207,7 +207,6 @@ type tapplication=class(tcomponent)
**} **}
CallMessgeFunction(Foldforminfo["minimize"],o,e); CallMessgeFunction(Foldforminfo["minimize"],o,e);
end end
//procedure cef_do_message_loop_work();external "libcef.dll" name "cef_do_message_loop_work";
function run(); function run();
begin begin
{** {**
@ -221,6 +220,17 @@ type tapplication=class(tcomponent)
ptr := FMessageObj._getptr_; ptr := FMessageObj._getptr_;
while true do while true do
begin 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 if(_wapi.PeekMessageA(ptr,0,0,0,0x1))then
begin begin
if FMessageObj.message=0x12 then if FMessageObj.message=0x12 then
@ -230,7 +240,6 @@ type tapplication=class(tcomponent)
begin begin
_wapi.TranslateMessage(ptr); _wapi.TranslateMessage(ptr);
_wapi.DispatchMessageA(ptr); _wapi.DispatchMessageA(ptr);
//cef_do_message_loop_work();
end end
end else end else
begin begin
@ -238,6 +247,7 @@ type tapplication=class(tcomponent)
RunWorkerThreadLoop(); RunWorkerThreadLoop();
_wapi.WaitMessage(); _wapi.WaitMessage();
end end
end end
{while (_wapi.GetMessageA(ptr, 0, 0, 0)) do {while (_wapi.GetMessageA(ptr, 0, 0, 0)) do
begin begin