sambuc/Rust-BBEdit
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't start number/identifier runs halfway through a word

Browse Source
This commit is contained in:
Ben S
2014-11-05 12:02:17 +00:00
parent b9aefd8d32
commit 5ad537f261
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rust.mm
View File

@@ -423,6 +423,7 @@ OSErr calculateRuns(BBLMParamBlock &params, const BBLMCallbackBlock *callbacks)
SInt32 runLen;
UniChar ch;
bool wordchr = false;
while ((ch = iter.GetNextChar()))
{
if (ch == '"')
@@ -527,7 +528,7 @@ OSErr calculateRuns(BBLMParamBlock &params, const BBLMCallbackBlock *callbacks)
runStart = iter.Offset();
}
else if (isupper(ch))
else if (!wordchr && isupper(ch))
{
iter--;
if (!makeCodeRun(iter, runStart, *callbacks)) return noErr;
@@ -537,7 +538,7 @@ OSErr calculateRuns(BBLMParamBlock &params, const BBLMCallbackBlock *callbacks)
runStart = iter.Offset();
}
else if (isdigit(ch))
else if (!wordchr && isdigit(ch))
{
iter--;
if (!makeCodeRun(iter, runStart, *callbacks)) return noErr;
@@ -546,6 +547,8 @@ OSErr calculateRuns(BBLMParamBlock &params, const BBLMCallbackBlock *callbacks)
if (!addRun(kBBLMNumberRunKind, runStart, runLen, *callbacks)) return noErr;
runStart = iter.Offset();
}
wordchr = isalpha(ch) || isdigit(ch);
}
makeCodeRun(iter, runStart, *callbacks);