diff --git a/TSLInterp.dll b/TSLInterp.dll index 72d791e..ef4533d 100644 Binary files a/TSLInterp.dll and b/TSLInterp.dll differ diff --git a/designer/tslvcldesigner.tsf b/designer/tslvcldesigner.tsf index 8359b81..57fcc78 100644 --- a/designer/tslvcldesigner.tsf +++ b/designer/tslvcldesigner.tsf @@ -2040,6 +2040,8 @@ begin begin dir := static getdesignerpath()+"dcmps"+ioFileseparator(); nf := dir+kn+".tsf"; + sysclearfunc(kn,"system"); + sysclearfunc(n,"system"); filedelete("",nf); end end diff --git a/designer/utslsynmemo.tsf b/designer/utslsynmemo.tsf index b5e96fc..494de61 100644 --- a/designer/utslsynmemo.tsf +++ b/designer/utslsynmemo.tsf @@ -657,6 +657,11 @@ type TTslSynHighLighter = class(TSynHighLighter) isjsfh := true; if ttk then SetJsToken(tokens,ttk,idx-1); + end else + if vi='"' or vi="'" then + begin + if ttk then + SetJsToken(tokens,ttk,idx-1); end if vi="[" then begin @@ -761,7 +766,7 @@ type TTslSynHighLighter = class(TSynHighLighter) end else if {pos(vi,jsfh)}isjsfh then begin - if vi<>" " or vi="\t" then + if not(vi=" " or vi="\t") then begin td := SetJsToken(tokens,vi,idx); if td and hightercolor then diff --git a/designer/utslvcldcomponents.tsf b/designer/utslvcldcomponents.tsf index 4cf681a..ddad5ad 100644 --- a/designer/utslvcldcomponents.tsf +++ b/designer/utslvcldcomponents.tsf @@ -47,7 +47,11 @@ type TDComponent = class() if (v is class(TDComponent) ) then begin o := createobject(v); + try n := o.dclassname(); + except + continue; + end if n and ifstring(n) then begin n := lowercase(n); @@ -62,6 +66,7 @@ type TDComponent = class() begin if not fdcomponentobjectsext then return 0; reindex(fdcomponentobjectsext,array(n:nil)); + reindex(fdcomponentobjects,array(n:nil)); end private fisiherted; diff --git a/plugin/TSLCPLUGIN.DLL b/plugin/TSLCPLUGIN.DLL index 3cb756d..2697aa5 100644 Binary files a/plugin/TSLCPLUGIN.DLL and b/plugin/TSLCPLUGIN.DLL differ diff --git a/tslkrnl.dll b/tslkrnl.dll index ab41c7d..59766f2 100644 Binary files a/tslkrnl.dll and b/tslkrnl.dll differ