Skip to content

Fix LT-21867: HC rule doesn't work #369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jtmaxwell3 merged 3 commits into from
Jun 17, 2025
Merged

Fix LT-21867: HC rule doesn't work #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a1b71c9
Fix LT-21867: HC rule doesn't work
jtmaxwell3 Jun 12, 2025
88cf2ad
Fix unit test
jtmaxwell3 Jun 16, 2025
a1c62b6
Merge branch 'release/9.3' into LT-21867
jtmaxwell3 Jun 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Build/mkall.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@
<ParatextNugetVersion>9.4.0.1-beta</ParatextNugetVersion>
<LcmNugetVersion>11.0.0-beta0121</LcmNugetVersion>
<IcuNugetVersion>70.1.123</IcuNugetVersion>
<HermitCrabNugetVersion>3.6.1</HermitCrabNugetVersion>
<HermitCrabNugetVersion>3.6.6</HermitCrabNugetVersion>
<IPCFrameworkVersion>1.1.1-beta0001</IPCFrameworkVersion>
<!-- bt393 is the master branch build of ExCss for Windows development. Update when appropriate. -->
<ExCssBuildType Condition="'$(OS)'=='Windows_NT'">bt393</ExCssBuildType>
Expand Down
4 changes: 2 additions & 2 deletions Build/nuget-common/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
<package id="SIL.libpalaso.l10ns" version="6.0.0" targetFramework="net461" />
<package id="SIL.Lift" version="15.0.0-beta0117" targetFramework="net462" />
<package id="SIL.Media" version="15.0.0-beta0117" targetFramework="net462" />
<package id="SIL.Machine" version="3.6.1" targetFramework="netstandard2.0" />
<package id="SIL.Machine.Morphology.HermitCrab" version="3.6.1" targetFramework="netstandard2.0" />
<package id="SIL.Machine" version="3.6.6" targetFramework="netstandard2.0" />
<package id="SIL.Machine.Morphology.HermitCrab" version="3.6.6" targetFramework="netstandard2.0" />
<package id="SIL.ParatextShared" version="7.4.0.1" targetFramework="net40" /> <!-- REVIEW (Hasso) 2023.05: do we still integrate with PT 7? -->
<package id="SIL.Scripture" version="15.0.0-beta0117" targetFramework="net461" />
<package id="SIL.TestUtilities" version="15.0.0-beta0117" targetFramework="net461" />
Expand Down
15 changes: 14 additions & 1 deletion Src/LexText/Interlinear/ComplexConcPatternModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,20 @@ public IEnumerable<IParaFragment> Search(IStText text)
IParaFragment lastFragment = null;
var data = new ComplexConcParagraphData(m_featSys, para);
Match<ComplexConcParagraphData, ShapeNode> match = m_matcher.Match(data);
while (match.Success)
if (match.Success && match.Range.Start == null)
{
// We aren't interested in matching the empty string.
IEnumerable<Match<ComplexConcParagraphData, ShapeNode>> allMatches = m_matcher.AllMatches(data);
foreach (var m in allMatches)
{
if (m.Success && m.Range.Start != null)
{
match = m;
break;
}
}
}
while (match.Success && match.Range.Start != null)
{
if (match.Range.Start == match.Range.End
&& ((FeatureSymbol)match.Range.Start.Annotation.FeatureStruct
Expand Down
Loading