Merge pull request #17649 from AnthonyLatsis/code-compl-precedencegroups

[Parse][CodeCompletion] Completions for precedencegroup decls

Author: rintaro

include/swift/AST/AttrKind.h

@@ -40,6 +40,9 @@ enum class Associativity : uint8_t {
   Right
 };
 
+/// Returns the in-source spelling of the given associativity.
+StringRef getAssociativitySpelling(Associativity value);
+
 /// The kind of unary operator, if any.
 enum class UnaryOperatorKind : uint8_t {
   None,

include/swift/AST/Module.h

@@ -431,6 +431,12 @@ class ModuleDecl : public DeclContext, public TypeDecl {
   /// The order of the results is not guaranteed to be meaningful.
   void getLocalTypeDecls(SmallVectorImpl<TypeDecl*> &Results) const;
 
+  /// Finds all precedence group decls of this module.
+  ///
+  /// This does a simple local lookup, not recursively looking through imports.
+  /// The order of the results is not guaranteed to be meaningful.
+  void getPrecedenceGroups(SmallVectorImpl<PrecedenceGroupDecl*> &Results) const;
+
   /// Finds all top-level decls that should be displayed to a client of this
   /// module.
   ///
@@ -690,6 +696,13 @@ class FileUnit : public DeclContext {
   virtual void getTopLevelDecls(SmallVectorImpl<Decl*> &results) const {}
 
 
+  /// Finds all precedence group decls in this file.
+  ///
+  /// This does a simple local lookup, not recursively looking through imports.
+  /// The order of the results is not guaranteed to be meaningful.
+  virtual void
+  getPrecedenceGroups(SmallVectorImpl<PrecedenceGroupDecl*> &Results) const {}
+
   /// Finds all local type decls in this file.
   ///
   /// This does a simple local lookup, not recursively looking through imports.
@@ -985,6 +998,9 @@ class SourceFile final : public FileUnit {
 
   virtual void getTopLevelDecls(SmallVectorImpl<Decl*> &results) const override;
 
+  virtual void
+  getPrecedenceGroups(SmallVectorImpl<PrecedenceGroupDecl*> &results) const override;
+
   virtual void
   getLocalTypeDecls(SmallVectorImpl<TypeDecl*> &results) const override;
 

include/swift/IDE/CodeCompletion.h

@@ -508,6 +508,7 @@ enum class CompletionKind {
   PlatformConditon,
   AfterIfStmtElse,
   GenericParams,
+  PrecedenceGroup,
 };
 
 /// \brief A single code completion result.
@@ -891,7 +892,8 @@ void lookupCodeCompletionResultsFromModule(CodeCompletionResultSink &targetSink,
 /// restricting by \p onlyTypes.
 void copyCodeCompletionResults(CodeCompletionResultSink &targetSink,
                                CodeCompletionResultSink &sourceSink,
-                               bool onlyTypes);
+                               bool onlyTypes,
+                               bool onlyPrecedenceGroups);
 
 } // end namespace ide
 } // end namespace swift

include/swift/IDE/CodeCompletionCache.h

@@ -95,6 +95,7 @@ struct RequestedCachedModule {
   CodeCompletionCache::Key Key;
   const ModuleDecl *TheModule;
   bool OnlyTypes;
+  bool OnlyPrecedenceGroups;
 };
 
 } // end namespace ide

include/swift/Parse/CodeCompletionCallbacks.h

@@ -183,6 +183,10 @@ class CodeCompletionCallbacks {
   /// @available.
   virtual void completeDeclAttrParam(DeclAttrKind DK, int Index) = 0;
 
+  /// Complete within a precedence group decl or after a colon in an
+  /// operator decl.
+  virtual void completeInPrecedenceGroup(SyntaxKind SK) = 0;
+
   /// Complete the platform names inside #available statements.
   virtual void completePoundAvailablePlatform() = 0;
 

include/swift/Parse/SyntaxParsingContext.h

@@ -331,8 +331,8 @@ class alignas(1 << SyntaxAlignInBits) SyntaxParsingContext {
   /// are supported. See the implementation.
   void createNodeInPlace(SyntaxKind Kind);
 
-  /// Squshing nodes from the back of the pending syntax list to a given syntax
-  /// collection kind. If there're no nodes can fit into the collection kind,
+  /// Squashing nodes from the back of the pending syntax list to a given syntax
+  /// collection kind. If there're no nodes that can fit into the collection kind,
   /// this function does nothing. Otherwise, it creates a collection node in place
   /// to contain all sequential suitable nodes from back.
   void collectNodesInPlace(SyntaxKind ColletionKind);

include/swift/Serialization/ModuleFile.h

@@ -738,6 +738,9 @@ class ModuleFile
   /// Adds all top-level decls to the given vector.
   void getTopLevelDecls(SmallVectorImpl<Decl*> &Results);
 
+  /// Adds all precedence groups to the given vector.
+  void getPrecedenceGroups(SmallVectorImpl<PrecedenceGroupDecl*> &Results);
+
   /// Adds all local type decls to the given vector.
   void getLocalTypeDecls(SmallVectorImpl<TypeDecl*> &Results);
 

include/swift/Serialization/SerializedModuleLoader.h

@@ -175,6 +175,9 @@ class SerializedASTFile final : public LoadedFile {
 
   virtual void getTopLevelDecls(SmallVectorImpl<Decl*> &results) const override;
 
+  virtual void
+  getPrecedenceGroups(SmallVectorImpl<PrecedenceGroupDecl*> &Results) const override;
+
   virtual void
   getLocalTypeDecls(SmallVectorImpl<TypeDecl*> &results) const override;
 

lib/AST/Decl.cpp

@@ -6062,6 +6062,15 @@ SourceRange DestructorDecl::getSourceRange() const {
   return { getDestructorLoc(), getBody()->getEndLoc() };
 }
 
+StringRef swift::getAssociativitySpelling(Associativity value) {
+  switch (value) {
+  case Associativity::None: return "none";
+  case Associativity::Left: return "left";
+  case Associativity::Right: return "right";
+  }
+  llvm_unreachable("Unhandled Associativity in switch.");
+}
+
 PrecedenceGroupDecl *
 PrecedenceGroupDecl::create(DeclContext *dc,
                             SourceLoc precedenceGroupLoc,

lib/AST/Module.cpp

@@ -547,6 +547,20 @@ void SourceFile::getTopLevelDecls(SmallVectorImpl<Decl*> &Results) const {
   Results.append(Decls.begin(), Decls.end());
 }
 
+void ModuleDecl::getPrecedenceGroups(
+       SmallVectorImpl<PrecedenceGroupDecl*> &Results) const {
+  FORWARD(getPrecedenceGroups, (Results));
+}
+
+void SourceFile::getPrecedenceGroups(
+       SmallVectorImpl<PrecedenceGroupDecl*> &Results) const {
+  for (auto pair : PrecedenceGroups) {
+    if (pair.second.getPointer() && pair.second.getInt()) {
+      Results.push_back(pair.second.getPointer());
+    }
+  }
+}
+
 void SourceFile::getLocalTypeDecls(SmallVectorImpl<TypeDecl*> &Results) const {
   Results.append(LocalTypeDecls.begin(), LocalTypeDecls.end());
 }