* fixed bug when adding schema (by DiBo33)

* added jscript highlighter (by DiBo33)
* sorted highlighters in all unit to se if one is missing

git-svn-id: trunk@13352 -
This commit is contained in:
marc 2007-12-16 18:08:29 +00:00
parent 01a69573e1
commit f2da39fdce
4 changed files with 1900 additions and 12 deletions

1
.gitattributes vendored
View File

@ -978,6 +978,7 @@ components/synedit/synhighlightercss.pas svneol=native#text/pascal
components/synedit/synhighlighterhashentries.pas svneol=native#text/pascal
components/synedit/synhighlighterhtml.pp svneol=native#text/pascal
components/synedit/synhighlighterjava.pas svneol=native#text/pascal
components/synedit/synhighlighterjscript.pas svneol=native#text/pascal
components/synedit/synhighlighterlfm.pas svneol=native#text/pascal
components/synedit/synhighlightermulti.pas svneol=native#text/pascal
components/synedit/synhighlighterpas.pp svneol=native#text/pascal

View File

@ -16,15 +16,27 @@ interface
uses
SynTextDrawer, SynEditKeyCmds, SynEditTypes, SynEditStrConst,
SynEditSearch, SynEditMiscProcs, SynEditmiscClasses, SynEditTextbuffer,
SynEdit, SynEditHighlighter, SynhighlighterPas, SynCompletion,
SynEditAutoComplete, SynhighlighterHTML, SynhighlighterCPP, SynHighlighterXML,
SynHighlighterLFM, SynHighlighterPerl, SynHighlighterMulti, SynRegExpr,
SynEditExport, SynExportHTML, SynMemo, SynMacroRecorder, SynEditPlugins,
SynEditRegexSearch, SynHighlighterPosition, SynHighlighterJava,
SynHighlighterUNIXShellScript, SynHighlighterCss, SynHighlighterPHP,
SynHighlighterTeX, SynHighlighterHashEntries, SynHighlighterSQL,
SynHighlighterPython, SynHighlighterVB, SynHighlighterAny,
SynEditLazDsgn;
SynEdit, SynEditHighlighter, SynCompletion, SynEditAutoComplete,
SynEditLazDsgn, SynRegExpr, SynEditRegexSearch, SynEditExport,
SynExportHTML, SynMemo, SynMacroRecorder, SynEditPlugins,
SynHighlighterAny,
SynhighlighterCPP,
SynHighlighterCss,
SynHighlighterHashEntries,
SynhighlighterHTML,
SynHighlighterJava,
SynHighlighterJScript,
SynHighlighterLFM,
SynHighlighterMulti,
SynHighlighterPerl,
SynHighlighterPHP,
SynHighlighterPosition,
SynHighlighterPython,
SynHighlighterSQL,
SynHighlighterTeX,
SynHighlighterUNIXShellScript,
SynHighlighterVB,
SynHighlighterXML;
implementation

File diff suppressed because it is too large Load Diff

View File

@ -276,7 +276,9 @@ end;
function TSynMultiSyn.GetAttribCount: integer;
begin
Result := inherited GetAttribCount + Schemes.Count;
Result := Schemes.Count;
if DefaultHighlighter <> nil then
Inc( Result, inherited GetAttribCount );
end;
function TSynMultiSyn.GetAttribute(
@ -530,7 +532,10 @@ begin
fCurrScheme := -1;
fTmpRange := nil;
//GBN 31/02/2002 - From Flavio
DefaultHighlighter.ResetRange;
if DefaultHighlighter <> nil then begin
DefaultHighlighter.ResetRange;
fTmpRange := DefaultHighlighter.GetRange;
end;
end;
procedure TSynMultiSyn.SetDefaultHighlighter(
@ -736,7 +741,7 @@ end;
constructor TgmScheme.Create(TheCollection: TCollection);
begin
inherited Create(Collection);
inherited Create(TheCollection);
fCaseSensitive := True;
fMarkerAttri := TSynHighlighterAttributes.Create(SYNS_AttrMarker);
fMarkerAttri.OnChange := {$IFDEF FPC}@{$ENDIF}MarkerAttriChanged;