Merge pull request #22055 from rintaro/ide-contextinfo-suppliment

[SourceKit][IDE] Update for feedback

Author: rintaro

include/swift/AST/Decl.h

@@ -2416,7 +2416,7 @@ class ValueDecl : public Decl {
   bool isUsableFromInline() const;
 
   /// Returns \c true if this declaration is *not* intended to be used directly
-  /// by application developers despite of the visibility.
+  /// by application developers despite the visibility.
   bool shouldHideFromEditor() const;
 
   bool hasAccess() const {

lib/AST/Decl.cpp

@@ -2550,8 +2550,6 @@ bool ValueDecl::isUsableFromInline() const {
   return false;
 }
 
-/// Returns \c true if this declaration is *not* intended to be used directly
-/// by application developers despite of the visibility.
 bool ValueDecl::shouldHideFromEditor() const {
   // Hide private stdlib declarations.
   if (isPrivateStdlibDecl(/*treatNonBuiltinProtocolsAsPublic*/ false) ||

lib/IDE/TypeContextInfo.cpp

@@ -39,16 +39,16 @@ class ContextInfoCallbacks : public CodeCompletionCallbacks {
 
   // Ignore callbacks for suffix completions
   // {
-  void completeDotExpr(Expr *E, SourceLoc DotLoc) override{};
-  void completePostfixExpr(Expr *E, bool hasSpace) override{};
-  void completeExprSuper(SuperRefExpr *SRE) override{};
-  void completeExprSuperDot(SuperRefExpr *SRE) override{};
+  void completeDotExpr(Expr *E, SourceLoc DotLoc) override {};
+  void completePostfixExpr(Expr *E, bool hasSpace) override {};
+  void completeExprSuper(SuperRefExpr *SRE) override {};
+  void completeExprSuperDot(SuperRefExpr *SRE) override {};
   // }
 
   // Ignore non-expression callbacks.
   // {
-  void completeInPrecedenceGroup(SyntaxKind SK) override{};
-  void completePoundAvailablePlatform() override{};
+  void completeInPrecedenceGroup(SyntaxKind SK) override {};
+  void completePoundAvailablePlatform() override {};
   void completeExprKeyPath(KeyPathExpr *KPE, SourceLoc DotLoc) override {}
   void completeTypeSimpleBeginning() override {}
   void completeTypeIdentifierWithDot(IdentTypeRepr *ITR) override {}
@@ -65,15 +65,15 @@ class ContextInfoCallbacks : public CodeCompletionCallbacks {
   void completePlatformCondition() override {}
   void completeGenericParams(TypeLoc TL) override {}
   void completeAfterIfStmt(bool hasElse) override {}
-  void completeAccessorBeginning() override{};
+  void completeAccessorBeginning() override {};
   // }
 
-  void completeStmtOrExpr() override{};
+  void completeStmtOrExpr() override {};
   void completePostfixExprBeginning(CodeCompletionExpr *E) override;
   void completeForEachSequenceBeginning(CodeCompletionExpr *E) override;
   void completeCaseStmtBeginning() override;
 
-  void completeAssignmentRHS(AssignExpr *E) override{};
+  void completeAssignmentRHS(AssignExpr *E) override {};
   void completeCallArg(CodeCompletionExpr *E) override;
   void completeReturnStmt(CodeCompletionExpr *E) override;
   void completeYieldStmt(CodeCompletionExpr *E,

test/SourceKit/CompileNotifications/type-context-info.swift

@@ -0,0 +1,12 @@
+// RUN: %sourcekitd-test -req=track-compiles == -req=typecontextinfo %s -offset=0 -- %s | %FileCheck %s -check-prefix=COMPILE_1
+// COMPILE_1: {
+// COMPILE_1:  key.notification: source.notification.compile-will-start,
+// COMPILE_1:  key.filepath: "SOURCE_DIR{{.*}}type-context-info.swift",
+// COMPILE_1:  key.compileid: [[CID1:".*"]]
+// COMPILE_1: }
+// COMPILE_1: {
+// COMPILE_1:   key.notification: source.notification.compile-did-finish,
+// COMPILE_1:   key.compileid: [[CID1]]
+// COMPILE_1: }
+// COMPILE_1-NOT: compile-will-start
+// COMPILE_1-NOT: compile-did-finish

tools/SourceKit/lib/SwiftLang/SwiftTypeContextInfo.cpp

@@ -12,6 +12,7 @@
 
 #include "SwiftASTManager.h"
 #include "SwiftLangSupport.h"
+#include "SwiftEditorDiagConsumer.h"
 #include "swift/Frontend/Frontend.h"
 #include "swift/Frontend/PrintingDiagnosticConsumer.h"
 #include "swift/IDE/TypeContextInfo.h"
@@ -54,13 +55,30 @@ static bool swiftTypeContextInfoImpl(SwiftLangSupport &Lang,
   auto bufferIdentifier =
       Lang.resolvePathSymlinks(UnresolvedInputFile->getBufferIdentifier());
 
+  auto origOffset = Offset;
   auto newBuffer = makeCodeCompletionMemoryBuffer(UnresolvedInputFile, Offset,
                                                   bufferIdentifier);
 
   CompilerInstance CI;
   PrintingDiagnosticConsumer PrintDiags;
   CI.addDiagnosticConsumer(&PrintDiags);
 
+  EditorDiagConsumer TraceDiags;
+  trace::TracedOperation TracedOp(trace::OperationKind::CodeCompletion);
+  if (TracedOp.enabled()) {
+    CI.addDiagnosticConsumer(&TraceDiags);
+    trace::SwiftInvocation SwiftArgs;
+    trace::initTraceInfo(SwiftArgs, bufferIdentifier, Args);
+    TracedOp.setDiagnosticProvider(
+        [&TraceDiags](SmallVectorImpl<DiagnosticEntryInfo> &diags) {
+          TraceDiags.getAllDiagnostics(diags);
+        });
+    TracedOp.start(
+        SwiftArgs,
+        {std::make_pair("OriginalOffset", std::to_string(origOffset)),
+         std::make_pair("Offset", std::to_string(Offset))});
+  }
+
   CompilerInvocation Invocation;
   bool Failed = Lang.getASTManager()->initCompilerInvocation(
       Invocation, Args, CI.getDiags(), bufferIdentifier, Error);