fix: get json.Types and build graph

Author: Hoblovski

lang/collect/export.go

@@ -286,7 +286,7 @@ func (c *Collector) exportSymbol(repo *uniast.Repository, symbol *DocumentSymbol
 						obj.GlobalVars = make([]uniast.Dependency, 0, len(deps))
 					}
 					obj.GlobalVars = uniast.InsertDependency(obj.GlobalVars, pdep)
-				case lsp.SKStruct, lsp.SKTypeParameter, lsp.SKInterface, lsp.SKEnum:
+				case lsp.SKStruct, lsp.SKTypeParameter, lsp.SKInterface, lsp.SKEnum, lsp.SKClass:
 					if obj.Types == nil {
 						obj.Types = make([]uniast.Dependency, 0, len(deps))
 					}
@@ -300,7 +300,7 @@ func (c *Collector) exportSymbol(repo *uniast.Repository, symbol *DocumentSymbol
 		pkg.Functions[id.Name] = obj
 
 	// Type
-	case lsp.SKStruct, lsp.SKTypeParameter, lsp.SKInterface, lsp.SKEnum:
+	case lsp.SKStruct, lsp.SKTypeParameter, lsp.SKInterface, lsp.SKEnum, lsp.SKClass:
 		obj := &uniast.Type{
 			FileLine: fileLine,
 			Content:  content,
@@ -317,7 +317,7 @@ func (c *Collector) exportSymbol(repo *uniast.Repository, symbol *DocumentSymbol
 					continue
 				}
 				switch dep.Symbol.Kind {
-				case lsp.SKStruct, lsp.SKTypeParameter, lsp.SKInterface, lsp.SKEnum:
+				case lsp.SKStruct, lsp.SKTypeParameter, lsp.SKInterface, lsp.SKEnum, lsp.SKClass:
 					obj.SubStruct = append(obj.SubStruct, uniast.NewDependency(*depid, c.fileLine(dep.Location)))
 				default:
 					log.Error("dep symbol %s not collected for \n", dep.Symbol, id)
@@ -370,6 +370,9 @@ func mapKind(kind lsp.SymbolKind) uniast.TypeKind {
 	switch kind {
 	case lsp.SKStruct:
 		return "struct"
+	// XXX: C++ should use class instead of struct
+	case lsp.SKClass:
+		return "struct"
 	case lsp.SKTypeParameter:
 		return "type-parameter"
 	case lsp.SKInterface:

lang/cxx/spec.go

@@ -59,10 +59,10 @@ func (c *CxxSpec) NameSpace(path string) (string, string, error) {
 }
 
 func (c *CxxSpec) ShouldSkip(path string) bool {
-	if !strings.HasSuffix(path, ".c") {
-		return true
+	if strings.HasSuffix(path, ".c") || strings.HasSuffix(path, ".h") {
+		return false
 	}
-	return false
+	return true
 }
 
 func (c *CxxSpec) IsDocToken(tok lsp.Token) bool {