Merge pull request github#13232 from github/redsun82/swift-hidden-ast

Swift: fix hidden AST getters

Author: redsun82

misc/codegen/templates/ql_class.mustache

@@ -84,7 +84,8 @@ module Generated {
     {{/has_description}}
      */
     final {{type}} {{getter}}({{#is_indexed}}int index{{/is_indexed}}) {
-      result = this.get{{#is_unordered}}An{{/is_unordered}}Immediate{{singular}}({{#is_indexed}}index{{/is_indexed}}).resolve()
+      exists({{type}} immediate | immediate = this.get{{#is_unordered}}An{{/is_unordered}}Immediate{{singular}}({{#is_indexed}}index{{/is_indexed}}) and
+        if exists(this.getResolveStep()) then result = immediate else result = immediate.resolve())
     }
 
     {{/type_is_class}}

misc/codegen/templates/ql_parent.mustache

@@ -80,7 +80,7 @@ result = unique(Element x | e = Impl::getImmediateChild(x, _, _) | x)
 * Gets the immediate child indexed at `index`. Indexes are not guaranteed to be contiguous, but are guaranteed to be distinct. `accessor` is bound the member predicate call resulting in the given child.
 */
 Element getImmediateChildAndAccessor(Element e, int index, string accessor) {
-exists(string partialAccessor | result = Impl::getImmediateChild(e, index, partialAccessor) and accessor = "getImmediate" + partialAccessor)
+exists(string partialAccessor | result = Impl::getImmediateChild(e, index, partialAccessor) and accessor = "get" + partialAccessor)
 }
 
 /**