Recreate Glass integration for go-to-def and find-ref

Summary: recreate

Reviewed By: CatherineGasnier

Differential Revision: D78538987

fbshipit-source-id: e148941f7eceadc28ce1663154447487e713aa8e

Author: Amith Bhat Nekkare

Makefile

@@ -160,6 +160,7 @@ SCHEMAS= \
 	code \
 	code_anglelang \
 	code_buck \
+	code_chef \
 	code_csharp \
 	code_cxx \
 	code_dataswarm \
@@ -175,6 +176,7 @@ SCHEMAS= \
 	codemarkup \
 	codemarkup_anglelang \
 	codemarkup_buck \
+	codemarkup_chef \
 	codemarkup_csharp \
 	codemarkup_cxx \
 	codemarkup_dataswarm \

glean.cabal.in

@@ -711,8 +711,10 @@ library schema
         Glean.Schema.Anglelang
         Glean.Schema.Buck
         Glean.Schema.Builtin
+        Glean.Schema.Chef
         Glean.Schema.Code
         Glean.Schema.CodeAnglelang
+        Glean.Schema.CodeChef
         Glean.Schema.CodeCsharp
         Glean.Schema.CodeCxx
         Glean.Schema.CodeDataswarm
@@ -726,6 +728,7 @@ library schema
         Glean.Schema.Codemarkup
         Glean.Schema.CodemarkupAnglelang
         Glean.Schema.CodemarkupBuck
+        Glean.Schema.CodemarkupChef
         Glean.Schema.CodemarkupCsharp
         Glean.Schema.CodemarkupCxx
         Glean.Schema.CodemarkupDataswarm
@@ -774,6 +777,7 @@ library schema
         Glean.Schema.Builtin.Types
         Glean.Schema.CodeAnglelang.Types
         Glean.Schema.CodeBuck.Types
+        Glean.Schema.CodeChef.Types
         Glean.Schema.CodeCsharp.Types
         Glean.Schema.CodeCxx.Types
         Glean.Schema.CodeDataswarm.Types
@@ -787,6 +791,7 @@ library schema
         Glean.Schema.CodeLsif.Types
         Glean.Schema.CodemarkupAnglelang.Types
         Glean.Schema.CodemarkupBuck.Types
+        lean.Schema.CodemarkupChef.Types
         Glean.Schema.CodemarkupCsharp.Types
         Glean.Schema.CodemarkupCxx.Types
         Glean.Schema.CodemarkupDataswarm.Types
@@ -807,6 +812,7 @@ library schema
         Glean.Schema.CodeScip.Types
         Glean.Schema.CodeFbthrift.Types
         Glean.Schema.Code.Types
+        Glean.Schema.Chef.Types
         Glean.Schema.Csharp.Types
         Glean.Schema.Cxx1.Types
         Glean.Schema.Dataswarm.Types

glean/glass/Glean/Glass/SymbolId.hs

@@ -180,6 +180,7 @@ shortCodeTable :: [(Language,Text)]
 shortCodeTable =
   [ (Language_Angle , "angle")
   , (Language_Buck , "buck")
+  , (Language_Chef, "chef")
   , (Language_CSharp, "cs")
   , (Language_Cpp, "cpp")
   , (Language_Dataswarm, "dataswarm")
@@ -222,6 +223,7 @@ entityLanguage :: Code.Entity -> Language
 entityLanguage e = case e of
   Code.Entity_angle{} -> Language_Angle
   Code.Entity_buck{} -> Language_Buck
+  Code.Entity_chef{} -> Language_Chef
   Code.Entity_csharp{} -> Language_CSharp
   Code.Entity_cxx{} -> Language_Cpp
   Code.Entity_erlang{} -> Language_Erlang
@@ -256,6 +258,7 @@ languageToCodeLang :: Language -> Maybe Code.Language
 languageToCodeLang l = case l of
   Language_Angle -> Just Code.Language_Angle
   Language_Buck -> Just Code.Language_Buck
+  Language_Chef -> Just Code.Language_Chef
   Language_CSharp -> Just Code.Language_CSharp
   Language_Cpp -> Just Code.Language_Cpp
   Language_Dataswarm -> Just Code.Language_Dataswarm

glean/glass/if/glass.thrift

@@ -562,6 +562,7 @@ enum Language {
   Yaml = 19,
   Swift = 20,
   Angle = 21,
+  Chef = 22,
 }
 
 // Kinds of definitions. E.g. for jump-to-declaration or jump-to-definition

glean/schema/source/code.angle

@@ -4,6 +4,7 @@ schema code.24 {
 import src
 import code.anglelang
 import code.buck
+import code.chef
 import code.csharp
 import code.cxx
 import code.dataswarm
@@ -40,6 +41,7 @@ type Entity =
     graphql : code.graphql.Entity |
     dataswarm: code.dataswarm.Entity |
     angle: code.anglelang.Entity |
+    chef: code.chef.Entity |
   }
 
 type SymbolId =
@@ -56,7 +58,7 @@ type Language =
   enum {
     Cpp | PreProcessor | Java | Haskell | Python | Hack | JavaScript | Rust |
     Thrift | Buck | Erlang | FSharp | Go | Kotlin | OCaml | Scala | Swift |
-    TypeScript | CSharp | GraphQL | Dataswarm | Yaml | Angle |
+    TypeScript | CSharp | GraphQL | Dataswarm | Yaml | Angle | Chef |
   }
 
 # entity tag to language id
@@ -82,7 +84,8 @@ predicate EntityLanguage:
     ( { dataswarm = _ } = Entity; Dataswarm = Language ) |
     ( { angle = _ } = Entity; Angle = Language ) |
     ( { lsif = LSIF }  = Entity; EntityLanguageLSIF { LSIF, Language } ) |
-    ( { scip = SCIP }  = Entity; EntityLanguageSCIP { SCIP, Language } );
+    ( { scip = SCIP }  = Entity; EntityLanguageSCIP { SCIP, Language } ) |
+    ( { chef = _ } = Entity; Chef = Language );
 
 # (private) helper for the LSIF subset
 predicate EntityLanguageLSIF:

glean/schema/source/code.chef.angle

@@ -0,0 +1,11 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+
+# For Glass integration
+schema code.chef.1 {
+    import chef
+
+    type Entity =
+    {
+        symbol : chef.Symbol
+    }
+}

glean/schema/source/codemarkup.angle

@@ -4,6 +4,7 @@ schema codemarkup.30 {
 import src
 import code.24
 import codemarkup.buck
+import codemarkup.chef
 import codemarkup.csharp
 import codemarkup.cxx
 import codemarkup.dataswarm
@@ -90,7 +91,7 @@ predicate EntityInfo:
     (codemarkup.lsif.EntityInfo { E, Info }; { lsif = E } = Entity) |
     (codemarkup.scip.EntityInfo { E, Info }; { scip = E } = Entity);
 
-# Source code digests produced by unspecified hash function
+# Source code digests produced by unspecified hash function
 predicate FileEntityDigest:
   { file: src.File
   , entity: code.Entity,
@@ -166,7 +167,9 @@ predicate ResolveLocation:
     (codemarkup.graphql.GraphQLResolveLocation { Location, E };
      { graphql = E } = Entity) |
     (codemarkup.anglelang.AngleResolveLocation { Location, E };
-     { angle = E } = Entity);
+     { angle = E } = Entity) |
+    (codemarkup.chef.ChefResolveLocation { Location, E };
+     { chef = E } = Entity);
 
 predicate EntityLocation:
   {
@@ -329,8 +332,10 @@ predicate FileEntityXRefLocations:
      { graphql = E } = Entity) |
     (codemarkup.dataswarm.DataswarmFileEntityXRefLocations { File, XRef, E };
      { dataswarm = E } = Entity) |
-     (codemarkup.anglelang.AngleFileEntityXRefLocations { File, XRef, E };
-     { angle = E } = Entity);
+    (codemarkup.anglelang.AngleFileEntityXRefLocations { File, XRef, E };
+     { angle = E } = Entity) |
+    (codemarkup.chef.ChefFileEntityXRefLocations { File, XRef, E };
+     { chef = E } = Entity);
 
 # Xrefs without the target location. This can be useful in cases
 # where we don't have a target location, but we don't need it. This
@@ -420,6 +425,8 @@ predicate EntityReferences:
      { flow = E } = Entity) |
     (codemarkup.python.PythonEntityUses { E, File, Span };
      { python = E } = Entity) |
+    (codemarkup.chef.ChefEntityUses { E, File, Span };
+    { chef = E } = Entity) |
     (codemarkup.cxx.CxxEntityUses { E, File, Span };
      { cxx = E } = Entity) |
     (codemarkup.haskell.HaskellEntityUses { E, File, Span };
@@ -948,7 +955,7 @@ predicate IndexedFile: src.File
 # You should not use this, instead use codemarkup.IndexedFile
 predicate EntityDataAvailable:  src.File
     File where
-      src.File _ = File; # bind File as demanded by the schema consistency check
+      src.File _ = File; # bind File as demanded by the schema consistency check
       # double negation is used to check for existence
       # (even if the Angle compiler could notice and optimize)
       !(!(codemarkup.FileEntityLocations { file = File } |

glean/schema/source/codemarkup.chef.angle

@@ -0,0 +1,40 @@
+schema codemarkup.chef.1 {
+import src
+import chef
+import code
+import code.chef
+import codemarkup.types
+
+
+# Entity -> usage
+predicate ChefEntityUses:
+  {
+    target: code.chef.Entity,
+    file: src.File,
+    range: src.ByteSpan,
+  }
+  {{ symbol = Symbol }, File, Span } where
+  chef.ReferencedAt { Symbol, { File, Span } }
+
+predicate ChefResolveLocation:
+  {
+    location: codemarkup.types.Location,
+    entity: code.chef.Entity,
+  }
+  { { EntityName, File, {span = Span}, nothing }, { symbol = Symbol } } where
+  chef.DefinedAt { Symbol,{File, Span} };
+  Symbol.identifier = chef.Name EntityName
+
+predicate ChefFileEntityXRefLocations:
+  {
+    file: src.File, # file where the reference is located
+    xref: codemarkup.types.XRefLocation, # XRefs from source to target declaration or definition
+    entity: code.chef.Entity, # actual entity that is being referenced
+  } { File, {Location, {span = Span}}, { symbol = Symbol } } where
+  chef.ReferencedAt { Symbol, { File, Span } };
+  Symbol.identifier = chef.Name EntityName;
+  chef.DefinedAt { Symbol, {TargetFile,TargetSpan} };
+  Location = codemarkup.types.Location { EntityName, TargetFile, { span = TargetSpan }, nothing }
+
+
+}

glean/schema/source/github/schema.angle

@@ -6,6 +6,7 @@ schema all.1 :
   code,
   code.anglelang,
   code.buck,
+  code.chef,
   code.csharp,
   code.cxx,
   code.erlang,
@@ -20,6 +21,7 @@ schema all.1 :
   codemarkup,
   codemarkup.anglelang,
   codemarkup.buck,
+  codemarkup.chef,
   codemarkup.csharp,
   codemarkup.cxx,
   codemarkup.erlang,