Skip to content

Commit e17c10f

Browse files
committed
Fix FindLocator implementation again
1 parent 85ac364 commit e17c10f

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

internal/pnp/pnpapi.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -173,16 +173,16 @@ func (p *PnpApi) FindLocator(parentPath string) (*Locator, error) {
173173

174174
// Go down the trie, looking for the latest defined packageInfo that matches the path
175175
for index, segment := range pathSegments {
176-
if currentTrie.packageData != nil && index > bestLength {
177-
bestLength = index
178-
bestLocator = &Locator{Name: currentTrie.packageData.ident, Reference: currentTrie.packageData.reference}
179-
}
176+
currentTrie = currentTrie.childrenPathSegments[segment]
180177

181-
if currentTrie.childrenPathSegments[segment] == nil {
178+
if currentTrie == nil || currentTrie.childrenPathSegments == nil {
182179
break
183180
}
184181

185-
currentTrie = currentTrie.childrenPathSegments[segment]
182+
if currentTrie.packageData != nil && index > bestLength {
183+
bestLength = index
184+
bestLocator = &Locator{Name: currentTrie.packageData.ident, Reference: currentTrie.packageData.reference}
185+
}
186186
}
187187

188188
if bestLocator == nil {

0 commit comments

Comments
 (0)