apex-dev-tools · pwrightcertinia · Apr 24, 2024 · Mar 31, 2024 · Mar 31, 2024 · Apr 1, 2024
diff --git a/build.sbt b/build.sbt
@@ -57,7 +57,7 @@ lazy val apexls = crossProject(JSPlatform, JVMPlatform)
       "org.scala-lang.modules"  %% "scala-xml"                      % "1.3.0",
       "org.scala-lang.modules"  %% "scala-parallel-collections"     % "1.0.0",
       "org.scala-js"            %% "scalajs-stubs"                  % "1.0.0",
-      "io.github.apex-dev-tools" % "apex-parser"                    % "3.6.0",
+      "io.github.apex-dev-tools" % "apex-parser"                    % "4.0.0",
       "io.github.apex-dev-tools" % "vf-parser"                      % "1.1.0",
       "io.github.apex-dev-tools" % "sobject-types"                  % "60.0.1",
       "io.github.apex-dev-tools" % "standard-types"                 % "60.0.1",

diff --git a/js/src/main/scala/com/nawforce/runtime/parsers/CodeParser.scala b/js/src/main/scala/com/nawforce/runtime/parsers/CodeParser.scala
@@ -13,12 +13,11 @@
  */
 package com.nawforce.runtime.parsers
 
-import com.nawforce.apexparser.ApexParser.TypeRefContext
-import com.nawforce.apexparser.{ApexLexer, ApexParser, CaseInsensitiveInputStream}
 import com.nawforce.pkgforce.diagnostics.IssuesAnd
 import com.nawforce.pkgforce.path.{PathLike, PathLocation}
 import com.nawforce.runtime.parsers.CodeParser.ParserRuleContext
 import com.nawforce.runtime.parsers.antlr.CommonTokenStream
+import io.github.apexdevtools.apexparser.{ApexLexer, ApexParser, CaseInsensitiveInputStream}
 
 import scala.collection.compat.immutable.ArraySeq
 import scala.reflect.ClassTag

diff --git a/js/src/main/scala/com/nawforce/runtime/parsers/Source.scala b/js/src/main/scala/com/nawforce/runtime/parsers/Source.scala
@@ -13,10 +13,10 @@
  */
 package com.nawforce.runtime.parsers
 
-import com.nawforce.apexparser.CaseInsensitiveInputStream
 import com.nawforce.pkgforce.path.{Location, PathLike, PathLocation}
 import com.nawforce.runtime.SourceBlob
 import com.nawforce.runtime.parsers.CodeParser.ParserRuleContext
+import io.github.apexdevtools.apexparser.CaseInsensitiveInputStream
 
 trait Locatable {
   var locationPath: PathLike
@@ -41,7 +41,8 @@ case class Source(
   lazy val hash: Int = code.hash
 
   def extractSource(context: ParserRuleContext): Source = {
-    val subdata = code.subdata(context.start.startIndex, context.stop.stopIndex + 1)
+    val stop    = CodeParser.toScala(context.stop).getOrElse(context.start)
+    val subdata = code.subdata(context.start.startIndex, stop.stopIndex + 1)
     new Source(
       path,
       subdata,
@@ -66,14 +67,15 @@ case class Source(
   /** Find a location for a rule, adapts based on source offsets to give absolute position in file
     */
   def getLocation(context: ParserRuleContext): PathLocation = {
+    val stop = CodeParser.toScala(context.stop).getOrElse(context.start)
     PathLocation(
       path,
       adjustLocation(
         Location(
           context.start.line,
           context.start.charPositionInLine,
-          context.stop.line,
-          context.stop.charPositionInLine + context.stop.text.length
+          stop.line,
+          stop.charPositionInLine + stop.text.length
         )
       )
     )
@@ -96,22 +98,6 @@ case class Source(
 
     Location(startLine, startPosition, endLine, endPosition)
   }
-
-  def stampLocation(locatable: Locatable, context: ParserRuleContext): Unit = {
-    locatable.locationPath = path
-    locatable.startLine = context.start.line + lineOffset
-    locatable.startOffset =
-      if (context.start.line == 1)
-        context.start.charPositionInLine + columnOffset
-      else
-        context.start.charPositionInLine
-    locatable.endLine = context.stop.line + lineOffset
-    locatable.endOffset =
-      if (context.stop.line == 1)
-        context.stop.charPositionInLine + context.stop.text.length + columnOffset
-      else
-        context.stop.charPositionInLine + context.stop.text.length
-  }
 }
 
 object Source {

diff --git a/js/src/main/scala/com/nawforce/runtime/parsers/SourceData.scala b/js/src/main/scala/com/nawforce/runtime/parsers/SourceData.scala
@@ -14,10 +14,10 @@
 
 package com.nawforce.runtime.parsers
 
-import com.nawforce.apexparser.CaseInsensitiveInputStream
 import com.nawforce.pkgforce.parsers.UTF8Decode
 import com.nawforce.runtime.SourceBlob
 import com.nawforce.runtime.parsers.antlr.CharStreams
+import io.github.apexdevtools.apexparser.CaseInsensitiveInputStream
 
 import java.nio.charset.StandardCharsets
 import scala.util.hashing.MurmurHash3

diff --git a/js/src/main/scala/com/nawforce/runtime/parsers/TreeVisitor.scala b/js/src/main/scala/com/nawforce/runtime/parsers/TreeVisitor.scala
@@ -14,8 +14,8 @@
 
 package com.nawforce.runtime.parsers
 
-import com.nawforce.apexparser.ApexParser._
 import com.nawforce.runtime.parsers.antlr.{AbstractParseTreeVisitor, ApexParserVisitor, RuleNode}
+import io.github.apexdevtools.apexparser.ApexParser._
 
 import scala.collection.compat.immutable.ArraySeq
 import scala.reflect.ClassTag

diff --git a/js/src/main/scala/com/nawforce/runtime/parsers/antlr/ApexParserVisitor.scala b/js/src/main/scala/com/nawforce/runtime/parsers/antlr/ApexParserVisitor.scala
@@ -13,7 +13,7 @@
  */
 package com.nawforce.runtime.parsers.antlr
 
-import com.nawforce.apexparser.ApexParser._
+import io.github.apexdevtools.apexparser.ApexParser._
 
 import scala.scalajs.js
 

diff --git a/js/src/main/scala/com/nawforce/runtime/parsers/antlr/ParserRuleContext.scala b/js/src/main/scala/com/nawforce/runtime/parsers/antlr/ParserRuleContext.scala
@@ -19,8 +19,8 @@ import scala.scalajs.js.annotation.JSImport
 @js.native
 @JSImport("antlr4ts", "ParserRuleContext")
 class ParserRuleContext extends RuleContext {
-  val start: Token = js.native
-  val stop: Token  = js.native
+  val start: Token            = js.native
+  val stop: js.UndefOr[Token] = js.native
 
   def parent: ParserRuleContext   = js.native
   val childCount: Int             = js.native

diff --git a/js/src/main/scala/com/nawforce/runtime/parsers/antlr/Token.scala b/js/src/main/scala/com/nawforce/runtime/parsers/antlr/Token.scala
@@ -13,7 +13,7 @@
  */
 package com.nawforce.runtime.parsers.antlr
 
-import com.nawforce.apexparser.CaseInsensitiveInputStream
+import io.github.apexdevtools.apexparser.CaseInsensitiveInputStream
 
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport

diff --git a/...a/com/nawforce/apexparser/ApexLexer.scala → ...b/apexdevtools/apexparser/ApexLexer.scala b/...a/com/nawforce/apexparser/ApexLexer.scala → ...b/apexdevtools/apexparser/ApexLexer.scala
@@ -11,7 +11,7 @@
  3. The name of the author may not be used to endorse or promote products
     derived from this software without specific prior written permission.
  */
-package com.nawforce.apexparser
+package io.github.apexdevtools.apexparser
 
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport

diff --git a/.../com/nawforce/apexparser/ApexParser.scala → .../apexdevtools/apexparser/ApexParser.scala b/.../com/nawforce/apexparser/ApexParser.scala → .../apexdevtools/apexparser/ApexParser.scala
@@ -11,9 +11,9 @@
  3. The name of the author may not be used to endorse or promote products
     derived from this software without specific prior written permission.
  */
-package com.nawforce.apexparser
+package io.github.apexdevtools.apexparser
 
-import com.nawforce.apexparser.ApexParser._
+import io.github.apexdevtools.apexparser.ApexParser._
 import com.nawforce.runtime.parsers.antlr.{CommonTokenStream, ParserRuleContext, TerminalNode}
 
 import scala.scalajs.js
@@ -43,7 +43,7 @@ object ApexParser {
   class TriggerUnitContext extends ParserRuleContext {
     def id(): js.Array[IdContext]                   = js.native
     def triggerCase(): js.Array[TriggerCaseContext] = js.native
-    def block(): BlockContext                       = js.native
+    def triggerBlock(): TriggerBlockContext         = js.native
   }
 
   @js.native
@@ -57,6 +57,30 @@ object ApexParser {
     def UNDELETE(): js.UndefOr[TerminalNode] = js.native
   }
 
+  @js.native
+  @JSImport("@apexdevtools/apex-parser", "TriggerBlockContext")
+  class TriggerBlockContext extends ParserRuleContext {
+    def triggerBlockMember(): js.Array[TriggerBlockMemberContext] = js.native
+  }
+
+  @js.native
+  @JSImport("@apexdevtools/apex-parser", "TriggerBlockMemberContext")
+  class TriggerBlockMemberContext extends ParserRuleContext {
+    def triggerMemberDeclaration(): js.UndefOr[TriggerMemberDeclarationContext] = js.native
+    def modifier(): js.Array[ModifierContext]                                   = js.native
+    def statement(): js.Array[StatementContext]                                 = js.native
+  }
+
+  @js.native
+  @JSImport("@apexdevtools/apex-parser", "TriggerMemberDeclarationContext")
+  class TriggerMemberDeclarationContext extends ParserRuleContext {
+    def methodDeclaration(): js.UndefOr[MethodDeclarationContext]       = js.native
+    def fieldDeclaration(): js.UndefOr[FieldDeclarationContext]         = js.native
+    def interfaceDeclaration(): js.UndefOr[InterfaceDeclarationContext] = js.native
+    def classDeclaration(): js.UndefOr[ClassDeclarationContext]         = js.native
+    def propertyDeclaration(): js.UndefOr[PropertyDeclarationContext]   = js.native
+  }
+
   @js.native
   @JSImport("@apexdevtools/apex-parser", "CompilationUnitContext")
   class CompilationUnitContext extends ParserRuleContext {

diff --git a/...exparser/CaseInsensitiveInputStream.scala → ...exparser/CaseInsensitiveInputStream.scala b/...exparser/CaseInsensitiveInputStream.scala → ...exparser/CaseInsensitiveInputStream.scala
@@ -11,7 +11,7 @@
  3. The name of the author may not be used to endorse or promote products
     derived from this software without specific prior written permission.
  */
-package com.nawforce.apexparser
+package io.github.apexdevtools.apexparser
 
 import com.nawforce.runtime.parsers.antlr.CharStream
 

diff --git a/jvm/src/main/scala/com/nawforce/apexlink/cst/BodyDeclarations.scala b/jvm/src/main/scala/com/nawforce/apexlink/cst/BodyDeclarations.scala
@@ -26,13 +26,13 @@ import com.nawforce.apexlink.types.apex.{
   ThisType
 }
 import com.nawforce.apexlink.types.core._
-import com.nawforce.apexparser.ApexParser._
 import com.nawforce.pkgforce.diagnostics.{ERROR_CATEGORY, Issue}
 import com.nawforce.pkgforce.modifiers._
 import com.nawforce.pkgforce.names.{Name, TypeName}
 import com.nawforce.pkgforce.parsers._
 import com.nawforce.pkgforce.path.Location
 import com.nawforce.runtime.parsers.CodeParser
+import io.github.apexdevtools.apexparser.ApexParser._
 
 import scala.collection.immutable.ArraySeq
 import scala.collection.mutable

diff --git a/jvm/src/main/scala/com/nawforce/apexlink/cst/CST.scala b/jvm/src/main/scala/com/nawforce/apexlink/cst/CST.scala
@@ -15,10 +15,10 @@ package com.nawforce.apexlink.cst
 
 import com.nawforce.apexlink.diagnostics.IssueOps
 import com.nawforce.apexlink.names.XNames.NameUtils
-import com.nawforce.apexparser.ApexParser._
 import com.nawforce.pkgforce.names.{Name, Names, TypeName}
 import com.nawforce.pkgforce.path.Positionable
 import com.nawforce.runtime.parsers.{CodeParser, Source}
+import io.github.apexdevtools.apexparser.ApexParser._
 
 import scala.util.DynamicVariable
 

diff --git a/jvm/src/main/scala/com/nawforce/apexlink/cst/Creator.scala b/jvm/src/main/scala/com/nawforce/apexlink/cst/Creator.scala
@@ -18,10 +18,10 @@ import com.nawforce.apexlink.cst.AssignableSupport.{couldBeEqual, isAssignableDe
 import com.nawforce.apexlink.names.TypeNames
 import com.nawforce.apexlink.names.TypeNames._
 import com.nawforce.apexlink.types.core.TypeDeclaration
-import com.nawforce.apexparser.ApexParser._
 import com.nawforce.pkgforce.modifiers.ABSTRACT_MODIFIER
 import com.nawforce.pkgforce.names._
 import com.nawforce.runtime.parsers.CodeParser
+import io.github.apexdevtools.apexparser.ApexParser._
 
 import scala.collection.immutable.ArraySeq
 

diff --git a/jvm/src/main/scala/com/nawforce/apexlink/cst/Expressions.scala b/jvm/src/main/scala/com/nawforce/apexlink/cst/Expressions.scala
@@ -25,11 +25,11 @@ import com.nawforce.apexlink.types.core.{FieldDeclaration, MethodDeclaration, Ty
 import com.nawforce.apexlink.types.other.{AnyDeclaration, RecordSetDeclaration}
 import com.nawforce.apexlink.types.platform.{PlatformTypeDeclaration, PlatformTypes}
 import com.nawforce.apexlink.types.synthetic.CustomConstructorDeclaration
-import com.nawforce.apexparser.ApexParser._
 import com.nawforce.pkgforce.diagnostics.{ERROR_CATEGORY, Issue, WARNING_CATEGORY}
 import com.nawforce.pkgforce.names.{EncodedName, Name, Names, TypeName}
 import com.nawforce.pkgforce.path.{Locatable, Location, PathLocation}
 import com.nawforce.runtime.parsers.CodeParser
+import io.github.apexdevtools.apexparser.ApexParser._
 
 import scala.collection.immutable.ArraySeq
 

diff --git a/jvm/src/main/scala/com/nawforce/apexlink/cst/Literals.scala b/jvm/src/main/scala/com/nawforce/apexlink/cst/Literals.scala
@@ -16,9 +16,9 @@ package com.nawforce.apexlink.cst
 
 import com.nawforce.apexlink.types.core.TypeDeclaration
 import com.nawforce.apexlink.types.platform.PlatformTypes
-import com.nawforce.apexparser.ApexParser.LiteralContext
 import com.nawforce.pkgforce.names.Name
 import com.nawforce.runtime.parsers.CodeParser
+import io.github.apexdevtools.apexparser.ApexParser.LiteralContext
 
 sealed abstract class Literal() {
   def getType: TypeDeclaration

diff --git a/jvm/src/main/scala/com/nawforce/apexlink/cst/Primaries.scala b/jvm/src/main/scala/com/nawforce/apexlink/cst/Primaries.scala
@@ -18,11 +18,11 @@ import com.nawforce.apexlink.names.TypeNames
 import com.nawforce.apexlink.types.apex.{ApexClassDeclaration, ApexFieldLike}
 import com.nawforce.apexlink.types.core.{FieldDeclaration, TypeDeclaration}
 import com.nawforce.apexlink.types.platform.PlatformTypes
-import com.nawforce.apexparser.ApexParser._
-import com.nawforce.apexparser.ApexParserBaseVisitor
-import com.nawforce.pkgforce.names.{DotName, EncodedName, Name, Names, TypeName}
+import com.nawforce.pkgforce.names._
 import com.nawforce.pkgforce.path.Location
 import com.nawforce.runtime.parsers.CodeParser
+import io.github.apexdevtools.apexparser.ApexParser._
+import io.github.apexdevtools.apexparser.ApexParserBaseVisitor
 
 import scala.collection.compat.immutable.ArraySeq
 

diff --git a/jvm/src/main/scala/com/nawforce/apexlink/cst/Properties.scala b/jvm/src/main/scala/com/nawforce/apexlink/cst/Properties.scala
@@ -16,18 +16,15 @@ package com.nawforce.apexlink.cst
 
 import com.nawforce.apexlink.types.apex.{ApexFieldLike, ThisType}
 import com.nawforce.apexlink.types.core.{TypeDeclaration, TypeId}
-import com.nawforce.apexparser.ApexParser.{PropertyBlockContext, PropertyDeclarationContext}
-import com.nawforce.pkgforce.modifiers.{
-  ApexModifiers,
-  FINAL_MODIFIER,
-  Modifier,
-  ModifierResults,
-  PRIVATE_MODIFIER
-}
+import com.nawforce.pkgforce.modifiers._
 import com.nawforce.pkgforce.names.{Name, TypeName}
 import com.nawforce.pkgforce.parsers.{ApexNode, Nature, PROPERTY_NATURE}
 import com.nawforce.pkgforce.path.Location
 import com.nawforce.runtime.parsers.CodeParser
+import io.github.apexdevtools.apexparser.ApexParser.{
+  PropertyBlockContext,
+  PropertyDeclarationContext
+}
 
 import scala.collection.immutable.ArraySeq