References & Rename

go.mod

@@ -14,7 +14,7 @@ require (
 	github.com/gorilla/websocket v1.5.0
 	github.com/hashicorp/golang-lru/v2 v2.0.2
 	github.com/laytan/go-lsp-protocol v0.0.0-20230331135813-fccb4f5d33c5
-	github.com/laytan/php-parser v0.9.1-0.20230411203829-6b3673ece43a
+	github.com/laytan/php-parser v0.10.0
 	github.com/stretchr/testify v1.8.2
 	github.com/xeipuuv/gojsonschema v1.2.0
 	go.uber.org/goleak v1.2.1

go.sum

@@ -291,6 +291,12 @@ github.com/laytan/go-lsp-protocol v0.0.0-20230331135813-fccb4f5d33c5 h1:NtTaaRSn
 github.com/laytan/go-lsp-protocol v0.0.0-20230331135813-fccb4f5d33c5/go.mod h1:D1njoCxBWyG+vZ1r9Xy11U02X5XB5R8PTKRj3kcer7I=
 github.com/laytan/php-parser v0.9.1-0.20230411203829-6b3673ece43a h1:V9fMfdfEYUsauFstzQmdS5Evu9I6N030IC4epJNLGVY=
 github.com/laytan/php-parser v0.9.1-0.20230411203829-6b3673ece43a/go.mod h1:crDMdef5HZkk8JsREDMA6wgTXdip/8mJa4asmjt3ogM=
+github.com/laytan/php-parser v0.9.1-0.20230416220624-307175c40838 h1:IOkVuzF0K25reG7JcRuKF3uKlodtM4C9RzGAOhsb550=
+github.com/laytan/php-parser v0.9.1-0.20230416220624-307175c40838/go.mod h1:crDMdef5HZkk8JsREDMA6wgTXdip/8mJa4asmjt3ogM=
+github.com/laytan/php-parser v0.9.1-0.20230416231421-9a4744a28d1b h1:bwyZHQZmVUMwO59auHDh/GDSBHfN2acMEuwNg6jmsno=
+github.com/laytan/php-parser v0.9.1-0.20230416231421-9a4744a28d1b/go.mod h1:crDMdef5HZkk8JsREDMA6wgTXdip/8mJa4asmjt3ogM=
+github.com/laytan/php-parser v0.10.0 h1:Vpf4AdrK5uIvBLtEKbh41mnHYzT06e6yu/Kd2mJN2q0=
+github.com/laytan/php-parser v0.10.0/go.mod h1:crDMdef5HZkk8JsREDMA6wgTXdip/8mJa4asmjt3ogM=
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
 github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w=
 github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=

internal/context/context.go

@@ -73,7 +73,7 @@ func (c *Ctx) InComment() (*token.Token, CommentPosition) {
 		return nil, 0
 	}
 
-	content := wrkspc.Current.FContentOf(c.start.Path)
+	content := wrkspc.Current.ContentF(c.start.Path)
 	cursorPos := position.LocToPos(content, c.start.Row, c.start.Col)
 	return c.comment, CommentPosition(int(cursorPos) - c.comment.Position.StartPos)
 }
@@ -150,7 +150,7 @@ func (c *Ctx) setScopes() {
 }
 
 func (c *Ctx) init() error {
-	content, root, err := wrkspc.Current.AllOf(c.start.Path)
+	content, root, err := wrkspc.Current.All(c.start.Path)
 	if err != nil {
 		return fmt.Errorf(
 			"Unable to parse context of %s: %w",

internal/diagnostics/phpcs.go

@@ -49,7 +49,7 @@ func (p *PhpcsAnalyzer) AnalyzeSave(
 	ctx context.Context,
 	path string,
 ) ([]protocol.Diagnostic, error) {
-	return p.Analyze(ctx, path, []byte(wrkspc.Current.FContentOf(path)))
+	return p.Analyze(ctx, path, []byte(wrkspc.Current.ContentF(path)))
 }
 
 func (p *PhpcsAnalyzer) Name() string {

internal/expr/starters.go

@@ -58,7 +58,7 @@ func (p *variableResolver) Up(
 			Position: scopes.Block.GetPosition(),
 			Parts:    nameParts(nodeident.Get(scopes.Class)),
 		}); ok {
-			return &Resolved{Path: node.Path, Node: node.ToIRNode(wrk.FIROf(node.Path))},
+			return &Resolved{Path: node.Path, Node: node.ToIRNode(wrk.AstF(node.Path))},
 				node.FQN,
 				phprivacy.PrivacyPrivate,
 				true
@@ -69,7 +69,7 @@ func (p *variableResolver) Up(
 
 	case "parent":
 		node := parentOf(scopes)
-		return &Resolved{Path: node.Path, Node: node.ToIRNode(wrk.FIROf(node.Path))},
+		return &Resolved{Path: node.Path, Node: node.ToIRNode(wrk.AstF(node.Path))},
 			node.FQN,
 			phprivacy.PrivacyProtected,
 			true
@@ -79,14 +79,14 @@ func (p *variableResolver) Up(
 			return nil, nil, 0, false
 		}
 
-		t := traversers.NewVariable(toResolve.Identifier)
+		t := traversers.NewVariable(toResolve.Identifier, false)
 		tv := traverser.NewTraverser(t)
 		scopes.Block.Accept(tv)
-		if t.Result == nil {
+		if len(t.Results) == 0 {
 			return nil, nil, 0, false
 		}
 
-		ta := traversers.NewAssignment(t.Result)
+		ta := traversers.NewAssignment(t.Results[0])
 		tav := traverser.NewTraverser(ta)
 		scopes.Block.Accept(tav)
 		if ta.Assignment == nil || ta.Scope == nil {
@@ -200,7 +200,7 @@ func (p *nameResolver) Up(
 		return nil, nil, 0, false
 	}
 
-	return &Resolved{Path: res.Path, Node: res.ToIRNode(wrkspc.Current.FIROf(res.Path))},
+	return &Resolved{Path: res.Path, Node: res.ToIRNode(wrkspc.Current.AstF(res.Path))},
 		qualified,
 		privacy,
 		true
@@ -266,7 +266,7 @@ func (p *functionResolver) Up(
 		return nil, nil, 0, false
 	}
 
-	t := traversers.NewFunctionCall(toResolve.Identifier)
+	t := traversers.NewFunctionCall(toResolve.Identifier, false)
 	tv := traverser.NewTraverser(t)
 	scopes.Block.Accept(tv)
 	if t.Result == nil {
@@ -313,7 +313,7 @@ func (p *functionResolver) Up(
 		Position: toResolve.Position,
 		Parts:    nameParts(toResolve.Identifier),
 	}); ok {
-		n := def.ToIRNode(wrkspc.Current.FIROf(def.Path))
+		n := def.ToIRNode(wrkspc.Current.AstF(def.Path))
 		return &Resolved{
 			Node: n,
 			Path: def.Path,
@@ -328,7 +328,7 @@ func (p *functionResolver) Up(
 		return nil, nil, 0, false
 	}
 
-	n := def.ToIRNode(wrkspc.Current.FIROf(def.Path))
+	n := def.ToIRNode(wrkspc.Current.AstF(def.Path))
 	return &Resolved{
 		Node: n,
 		Path: def.Path,
@@ -378,7 +378,7 @@ func (newresolver *newResolver) Up(
 
 		return &Resolved{
 				Path: def.Path,
-				Node: def.ToIRNode(wrkspc.Current.FIROf(def.Path)),
+				Node: def.ToIRNode(wrkspc.Current.AstF(def.Path)),
 			},
 			qualified,
 			phprivacy.PrivacyPublic,

internal/fqner/fqner.go

@@ -10,19 +10,13 @@ import (
 	"github.com/laytan/phpls/pkg/fqn"
 	"github.com/laytan/phpls/pkg/functional"
 	"github.com/laytan/phpls/pkg/nodeident"
-	"github.com/laytan/phpls/pkg/nodescopes"
 	"github.com/laytan/phpls/pkg/position"
 )
 
 func FullyQualifyName(root *ast.Root, name ast.Vertex) *fqn.FQN {
-	if !nodescopes.IsName(name.GetType()) {
-		panic(
-			"FullyQualifyName can only be called with *ast.Name, *ast.NameFullyQualified or *ast.NameRelative",
-		)
-	}
-
-	if strings.HasPrefix(nodeident.Get(name), `\`) {
-		return fqn.New(nodeident.Get(name))
+	ident := nodeident.Get(name)
+	if strings.HasPrefix(ident, `\`) {
+		return fqn.New(ident)
 	}
 
 	t := fqn.NewTraverser()
@@ -39,7 +33,7 @@ func FindFullyQualifiedName(root *ast.Root, name ast.Vertex) (*index.INode, bool
 
 // Returns whether the file at given pos needs a use statement for the given fqn.
 func NeedsUseStmtFor(pos *position.Position, name *fqn.FQN) bool {
-	content, root := wrkspc.Current.FAllOf(pos.Path)
+	content, root := wrkspc.Current.AllF(pos.Path)
 	parts := strings.Split(name.String(), `\`)
 	className := parts[len(parts)-1]
 

internal/index/index.go

@@ -52,8 +52,8 @@ type Index interface {
 }
 
 type index struct {
-	normalParser parsing.Parser
-	stubParser   parsing.Parser
+	normalParser *parsing.Parser
+	stubParser   *parsing.Parser
 
 	symbolTrie       *symboltrie.Trie[*INode]
 	symbolTraversers *sync.Pool
@@ -81,12 +81,6 @@ func New(phpv *phpversion.PHPVersion) Index {
 }
 
 func (i *index) Index(path string, content string) error {
-	defer func() {
-		if r := recover(); r != nil {
-			log.Printf("Could not parse %s into an AST: %v", path, r)
-		}
-	}()
-
 	root, err := i.parser(path).Parse([]byte(content))
 	if err != nil {
 		return fmt.Errorf(errParseFmt, path, err)
@@ -205,7 +199,7 @@ func (i *index) Delete(path string) error {
 
 var stubsDir = filepath.Join(pathutils.Root(), "third_party", "phpstorm-stubs")
 
-func (i *index) parser(path string) parsing.Parser {
+func (i *index) parser(path string) *parsing.Parser {
 	if strings.HasPrefix(path, config.Current.StubsPath) || strings.HasPrefix(path, stubsDir) {
 		return i.stubParser
 	}

internal/project/completion.go

@@ -84,7 +84,12 @@ func GetCompletionQuery(pos *position.Position) CompletionContext {
 	// what.Is(v.Nodes)
 
 	ctx := CompletionContext{}
-	lexer := wrkspc.Current.FLexerOf(pos.Path)
+	lexer, err := wrkspc.Current.Lexer(pos.Path)
+	if err != nil {
+		log.Printf("[ERROR]: creating lexer for completion context: %v", err)
+		return ctx
+	}
+
 	for tok := lexer.Lex(); tok != nil && tok.ID != 0; tok = lexer.Lex() {
 		if tok.Position.EndLine > int(pos.Row) {
 			break
@@ -308,7 +313,7 @@ func Complete(pos *position.Position, comp CompletionContext) (list protocol.Com
 			})
 		}
 	case NameRelative:
-		root := wrkspc.Current.FIROf(pos.Path)
+		root := wrkspc.Current.AstF(pos.Path)
 		v := traversers.NewNamespace(int(pos.Row))
 		tv := traverser.NewTraverser(v)
 		root.Accept(tv)
@@ -370,7 +375,7 @@ func Complete(pos *position.Position, comp CompletionContext) (list protocol.Com
 				return nil
 			}
 
-			if !wrkspc.Current.IsPhpFile(path) {
+			if !wrkspc.Current.IsPhp(path) {
 				return nil
 			}
 
@@ -409,14 +414,15 @@ func AddExprCompletions(
 	}
 
 	scopes := definition.ContextToScopes(ctx)
-	res, lastClass, left := expr.Resolve(subj, scopes)
+	_, lastClass, left := expr.Resolve(subj, scopes)
 	if left != 0 {
 		log.Println("[WARN]: could not resolve reconstructed expression to provide completion")
 		return
 	}
-
-	log.Printf("[DEBUG]: res: %#v", res)
-	log.Printf("[DEBUG]: lastClass: %#v", lastClass)
+	if lastClass == nil {
+		log.Printf("[INFO]: resolved expression has no resulting class to create completions from")
+		return
+	}
 
 	cls, err := symbol.NewClassLikeFromFQN(wrkspc.NewRooter(ctx.Path(), ctx.Root()), lastClass)
 	if err != nil {
@@ -609,11 +615,11 @@ func PredictNamespace(pos *position.Position) string {
 				continue
 			}
 
-			if !wrkspc.Current.IsPhpFile(fn) {
+			if !wrkspc.Current.IsPhp(fn) {
 				continue
 			}
 
-			root, err := wrkspc.Current.IROf(fn)
+			root, err := wrkspc.Current.Ast(fn)
 			if err != nil {
 				log.Println(err)
 				continue
@@ -651,6 +657,7 @@ func AddFromIndex(
 		// Add completion data for automatic use statements.
 		if nodescopes.IsClassLike(node.Kind) {
 			item.Data = CompletionData(pos, node)
+			item.Detail = node.FQN.String()
 			// Adding an additional text edit, so the client shows it in the UI.
 			// The actual text edit is added in the Resolve method.
 			item.AdditionalTextEdits = []protocol.TextEdit{{}}
@@ -667,6 +674,10 @@ func AddScopeVars(
 ) {
 	// TODO: if scope is arrow function, use the scope above that one (vars are inherited in arrow funcs).
 	scope := ctx.Scope()
+	if scope == nil {
+		return
+	}
+
 	scopet := scope.GetType()
 	if scopet != ast.TypeStmtFunction && scopet != ast.TypeStmtClassMethod &&
 		scopet != ast.TypeExprClosure && scopet != ast.TypeExprArrowFunction {
@@ -700,7 +711,7 @@ func AddScopeVars(
 
 // Gets the current word ([a-zA-Z0-9]*) that the position is at.
 func (p *Project) getCompletionQuery(pos *position.Position) string {
-	content := wrkspc.Current.FContentOf(pos.Path)
+	content := wrkspc.Current.ContentF(pos.Path)
 	scanner := bufio.NewScanner(strings.NewReader(content))
 	for i := 0; scanner.Scan(); i++ {
 		// The target line:

internal/project/definition.go

@@ -10,8 +10,6 @@ import (
 	"github.com/laytan/phpls/internal/context"
 	"github.com/laytan/phpls/internal/project/definition"
 	"github.com/laytan/phpls/internal/project/definition/providers"
-	"github.com/laytan/phpls/internal/wrkspc"
-	"github.com/laytan/phpls/pkg/functional"
 	"github.com/laytan/phpls/pkg/position"
 )
 
@@ -40,7 +38,7 @@ type DefinitionProvider interface {
 	Define(ctx *context.Ctx) ([]*definition.Definition, error)
 }
 
-func (p *Project) Definition(pos *position.Position) ([]*position.Position, error) {
+func (p *Project) Definition(pos *position.Position) ([]*definition.Definition, error) {
 	ctx, err := context.New(pos)
 	if err != nil {
 		return nil, fmt.Errorf("Could not create definition context: %w", err)
@@ -59,16 +57,11 @@ func (p *Project) Definition(pos *position.Position) ([]*position.Position, erro
 					return nil, ErrNoDefinitionFound
 				}
 
-				return functional.MapFilter(defs, defPosition), nil
+				return defs, nil
 			}
 		}
 	}
 
 	log.Println("no definition provider registered for the given position")
 	return nil, ErrNoDefinitionFound
 }
-
-func defPosition(def *definition.Definition) *position.Position {
-	content := wrkspc.Current.FContentOf(def.Path)
-	return position.FromIRPosition(def.Path, content, def.Position.StartPos)
-}

internal/project/definition/providers/function.go

@@ -4,6 +4,7 @@ import (
 	"github.com/laytan/php-parser/pkg/ast"
 	"github.com/laytan/phpls/internal/context"
 	"github.com/laytan/phpls/internal/project/definition"
+	"github.com/laytan/phpls/pkg/nodeident"
 )
 
 // FunctionProvider resolves the definition of a function call.
@@ -16,9 +17,18 @@ func NewFunction() *FunctionProvider {
 }
 
 func (p *FunctionProvider) CanDefine(ctx *context.Ctx, kind ast.Type) bool {
-	return kind == ast.TypeExprFunctionCall
+	return kind == ast.TypeExprFunctionCall || kind == ast.TypeStmtFunction
 }
 
 func (p *FunctionProvider) Define(ctx *context.Ctx) ([]*definition.Definition, error) {
+	// If stmt function, it is the current function, so just return that one.
+	if ctx.Current().GetType() == ast.TypeStmtFunction {
+		return []*definition.Definition{{
+			Path:       ctx.Path(),
+			Position:   ctx.Current().GetPosition(),
+			Identifier: nodeident.Get(ctx.Current()),
+		}}, nil
+	}
+
 	return DefineExpr(ctx)
 }

internal/project/definition/providers/name.go

@@ -17,6 +17,10 @@ func NewName() *NameProvider {
 }
 
 func (p *NameProvider) CanDefine(ctx *context.Ctx, kind ast.Type) bool {
+	if kind == ast.TypeStmtClass || kind == ast.TypeStmtInterface || kind == ast.TypeStmtTrait {
+		return true
+	}
+
 	if !nodescopes.IsName(kind) {
 		return false
 	}