From b7503c2340e4f3bbbf51cdb15c71206f0ef05d83 Mon Sep 17 00:00:00 2001
From: Ninglin Du <du00cs@outlook.com>
Date: Tue, 24 Sep 2024 10:51:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20'=E4=B9=9D=E6=9C=8818?=
 =?UTF-8?q?=E5=88=B0=E4=B9=9D=E6=9C=8822'=20=E8=83=BD=E7=BB=84=E5=90=88?=
 =?UTF-8?q?=E6=88=90=20repeat=20=E7=9A=84=E9=97=AE=E9=A2=98=20(#241)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/scala/com/xiaomi/duckling/dimension/time/Rules.scala   | 1 -
 .../scala/com/xiaomi/duckling/dimension/time/repeat/Rules.scala | 2 +-
 .../core/src/main/scala/com/xiaomi/duckling/engine/Engine.scala | 2 +-
 duckling-fork-chinese/project/Dependencies.scala                | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/duckling-fork-chinese/core/src/main/scala/com/xiaomi/duckling/dimension/time/Rules.scala b/duckling-fork-chinese/core/src/main/scala/com/xiaomi/duckling/dimension/time/Rules.scala
index 44c9fac7..a1644e79 100644
--- a/duckling-fork-chinese/core/src/main/scala/com/xiaomi/duckling/dimension/time/Rules.scala
+++ b/duckling-fork-chinese/core/src/main/scala/com/xiaomi/duckling/dimension/time/Rules.scala
@@ -171,7 +171,6 @@ trait Rules extends DimRules {
   )
 
   private def intersectToken(options: Options, td1: TimeData, td2: TimeData): Option[Token] = {
-    println(td1, td2)
     // 破除(y-m)-d和y-(m-d)均构造出来的问题
     if (td1.hint == YearMonth && td2.hint == DayOnly) None
     // 固定顺序，避免(y-m)-(d H-M-S) 以及(y)-(m-d H-M-S)出现
diff --git a/duckling-fork-chinese/core/src/main/scala/com/xiaomi/duckling/dimension/time/repeat/Rules.scala b/duckling-fork-chinese/core/src/main/scala/com/xiaomi/duckling/dimension/time/repeat/Rules.scala
index df0b5957..0f52a5a3 100644
--- a/duckling-fork-chinese/core/src/main/scala/com/xiaomi/duckling/dimension/time/repeat/Rules.scala
+++ b/duckling-fork-chinese/core/src/main/scala/com/xiaomi/duckling/dimension/time/repeat/Rules.scala
@@ -162,7 +162,7 @@ trait Rules extends DimRules with LazyLogging {
   // 周一到周五早上八点
   val ruleIntervalTime = Rule(
     name = "<interval> <time/interval>",
-    pattern = List(isInterval.predicate, isDimension(Time).predicate),
+    pattern = List(isInterval.predicate, and(isDimension(Time), isNotLatent).predicate),
     prod = tokens { case Token(Time, outer: TimeData) :: Token(Time, inner: TimeData):: _
       if outer.timeGrain > inner.timeGrain && (inner.timePred.maxGrain.isEmpty || outer.timeGrain > inner.timePred.maxGrain.get) =>
       val oInterval = outer.timePred.asInstanceOf[TimeIntervalsPredicate]
diff --git a/duckling-fork-chinese/core/src/main/scala/com/xiaomi/duckling/engine/Engine.scala b/duckling-fork-chinese/core/src/main/scala/com/xiaomi/duckling/engine/Engine.scala
index 5c388386..152d88be 100644
--- a/duckling-fork-chinese/core/src/main/scala/com/xiaomi/duckling/engine/Engine.scala
+++ b/duckling-fork-chinese/core/src/main/scala/com/xiaomi/duckling/engine/Engine.scala
@@ -180,7 +180,7 @@ object Engine extends LazyLogging {
       val p :: ps = rule.pattern
       val newRule = rule.copy(pattern = ps)
       if (verboseMatch) {
-        logger.info(s"apply rule of: ${rule.name}")
+        logger.info(s"match first - apply rule of: ${rule.name}")
       }
       val valid = lookupItem(sentence, p, stash, position)
       valid.map(mkMatch(route, newRule))
diff --git a/duckling-fork-chinese/project/Dependencies.scala b/duckling-fork-chinese/project/Dependencies.scala
index b599c376..e4ada343 100644
--- a/duckling-fork-chinese/project/Dependencies.scala
+++ b/duckling-fork-chinese/project/Dependencies.scala
@@ -72,7 +72,7 @@ object Dependencies {
   lazy val jlineJansi = "org.jline" % "jline-terminal-jansi" % "3.21.0"
   lazy val config = "com.typesafe" % "config" % "1.3.4"
   lazy val guava = "com.google.guava" % "guava" % "30.1.1-jre"
-  lazy val lombok = "org.projectlombok" % "lombok" % "1.18.24" % Provided
+  lazy val lombok = "org.projectlombok" % "lombok" % "1.18.30" % Provided
   lazy val httpclient = "org.apache.httpcomponents" % "httpclient" % "4.5.13"
   lazy val java8 = "org.scala-lang.modules" %% "scala-java8-compat" % "1.0.2"
   lazy val lunar = "com.github.heqiao2010" % "lunar" % "1.5"