Either clone or pull, don't do both (microsoft#35230)

Co-authored-by: Nathan Shively-Sanders <[email protected]>

Author: 2 people

src/services/outliningElementsCollector.ts

@@ -4,6 +4,7 @@ namespace ts.OutliningElementsCollector {
         const res: OutliningSpan[] = [];
         addNodeOutliningSpans(sourceFile, cancellationToken, res);
         addRegionOutliningSpans(sourceFile, res);
+        addTopLevelUnattachedCommentSpans(sourceFile, res);
         return res.sort((span1, span2) => span1.textSpan.start - span2.textSpan.start);
     }
 
@@ -75,6 +76,23 @@ namespace ts.OutliningElementsCollector {
         }
     }
 
+    function addTopLevelUnattachedCommentSpans(sourceFile: SourceFile, out: Push<OutliningSpan>): void {
+        // Comments which are attached to statements would be included in addNodeOutliningSpans
+        if (sourceFile.statements.length > 0) return;
+
+        // This will instead set up spans for the missing ones
+        forEach(getLeadingCommentRangesOfNode(sourceFile, sourceFile), (range) => {
+            // To not mess with // #region support
+            const isMultiline = sourceFile.text.substring(range.pos, 2) === "/*"
+            if (!isMultiline) return;
+
+            const span = createTextSpanFromBounds(range.pos, range.end);
+            const comment = sourceFile.text.substring(range.pos, range.end)
+            const outline = createOutliningSpan(span, OutliningSpanKind.Comment, span, /*autoCollapse*/ false, comment)
+            out.push(outline);
+        });
+    }
+
     function addRegionOutliningSpans(sourceFile: SourceFile, out: Push<OutliningSpan>): void {
         const regions: OutliningSpan[] = [];
         const lineStarts = sourceFile.getLineStarts();

src/testRunner/externalCompileRunner.ts

@@ -58,9 +58,11 @@ namespace Harness {
                         if (!fs.existsSync(submoduleDir)) {
                             exec("git", ["clone", config.cloneUrl, directoryName], { cwd });
                         }
-                        exec("git", ["reset", "HEAD", "--hard"], { cwd: submoduleDir });
-                        exec("git", ["clean", "-f"], { cwd: submoduleDir });
-                        exec("git", ["pull", "-f"], { cwd: submoduleDir });
+                        else {
+                            exec("git", ["reset", "HEAD", "--hard"], { cwd: submoduleDir });
+                            exec("git", ["clean", "-f"], { cwd: submoduleDir });
+                            exec("git", ["pull", "-f"], { cwd: submoduleDir });
+                        }
 
                         types = config.types;
 
@@ -337,4 +339,4 @@ ${stderr.replace(/\r\n/g, "\n")}`;
         }
         return result;
     }
-}
+}

tests/cases/fourslash/outliningSpansForTopLevelCommentsWithNoStatements.ts

@@ -0,0 +1,9 @@
+/// <reference path="fourslash.ts"/>
+
+// #22732
+
+////[|/*
+///// * Some text
+////  */|]
+
+verify.outliningHintSpansInCurrentFile(test.ranges());