Merge remote-tracking branch 'origin/main' into rebranch

Author: swift-ci

lib/IDE/SyntaxModel.cpp

@@ -555,23 +555,20 @@ std::pair<bool, Expr *> ModelASTWalker::walkToExprPre(Expr *E) {
     if (isa<DefaultArgumentExpr>(Elem))
       return;
 
-    CharSourceRange NR;
     auto NL = Arg.getLabelLoc();
     auto Name = Arg.getLabel();
-    if (NL.isValid() && !Name.empty())
-      NR = CharSourceRange(NL, Name.getLength());
 
     SyntaxStructureNode SN;
     SN.Kind = SyntaxStructureKind::Argument;
-    SN.NameRange = NR;
     SN.BodyRange = charSourceRangeFromSourceRange(SM, Elem->getSourceRange());
-    if (NR.isValid()) {
-      SN.Range = charSourceRangeFromSourceRange(SM, SourceRange(NR.getStart(),
-                                                          Elem->getEndLoc()));
-      passTokenNodesUntil(NR.getStart(), ExcludeNodeAtLocation);
-    }
-    else
+    if (NL.isValid() && !Name.empty()) {
+      SN.NameRange = CharSourceRange(NL, Name.getLength());
+      SN.Range = charSourceRangeFromSourceRange(
+          SM, SourceRange(NL, Elem->getEndLoc()));
+      passTokenNodesUntil(NL, ExcludeNodeAtLocation);
+    } else {
       SN.Range = SN.BodyRange;
+    }
 
     pushStructureNode(SN, Elem);
   };
@@ -605,6 +602,17 @@ std::pair<bool, Expr *> ModelASTWalker::walkToExprPre(Expr *E) {
           SM, CE->getArgs()->getSourceRange());
     pushStructureNode(SN, CE);
 
+  } else if (auto *SE = dyn_cast<SubscriptExpr>(E)) {
+    SyntaxStructureNode SN;
+    SN.Kind = SyntaxStructureKind::CallExpression;
+    SN.Range = charSourceRangeFromSourceRange(SM, E->getSourceRange());
+    SN.NameRange =
+        charSourceRangeFromSourceRange(SM, SE->getBase()->getSourceRange());
+    if (SE->getArgs()->getSourceRange().isValid())
+      SN.BodyRange = innerCharSourceRangeFromSourceRange(
+          SM, SE->getArgs()->getSourceRange());
+    pushStructureNode(SN, SE);
+
   } else if (auto *ObjectE = dyn_cast<ObjectLiteralExpr>(E)) {
     SyntaxStructureNode SN;
     SN.Kind = SyntaxStructureKind::ObjectLiteralExpression;

test/SourceKit/DocumentStructure/access_parse.swift.response

@@ -543,8 +543,6 @@
           key.kind: source.lang.swift.decl.enumcase,
           key.offset: 911,
           key.length: 9,
-          key.nameoffset: 0,
-          key.namelength: 0,
           key.substructure: [
             {
               key.kind: source.lang.swift.decl.enumelement,
@@ -561,8 +559,6 @@
           key.kind: source.lang.swift.decl.enumcase,
           key.offset: 923,
           key.length: 9,
-          key.nameoffset: 0,
-          key.namelength: 0,
           key.substructure: [
             {
               key.kind: source.lang.swift.decl.enumelement,

test/SourceKit/DocumentStructure/mark_edit.swift.response

@@ -6,9 +6,7 @@
     {
       key.kind: source.lang.swift.syntaxtype.comment.mark,
       key.offset: 5,
-      key.length: 11,
-      key.nameoffset: 0,
-      key.namelength: 0
+      key.length: 11
     }
   ]
 }
@@ -18,9 +16,7 @@
     {
       key.kind: source.lang.swift.syntaxtype.comment.mark,
       key.offset: 6,
-      key.length: 11,
-      key.nameoffset: 0,
-      key.namelength: 0
+      key.length: 11
     }
   ]
 }