Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Indexing: clean up ctags parser wrapper #708

Merged
merged 9 commits into from
Dec 6, 2023
Merged

Indexing: clean up ctags parser wrapper #708

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e9386f0
Remove mutex
jtibshirani Nov 22, 2023
387bbae
Remove timeout from parser wrapper
jtibshirani Nov 23, 2023
b1f56f3
Clean up bin delegation
jtibshirani Nov 23, 2023
13f5839
Reintroduce document parsing timeout
jtibshirani Dec 5, 2023
2d23e26
Rename files
jtibshirani Dec 5, 2023
35bf4b7
Handle case where require_ctags is false
jtibshirani Dec 5, 2023
8828b2b
Include the parser type in go ctags logs
jtibshirani Dec 6, 2023
be68326
Make error check more robust
jtibshirani Dec 6, 2023
bd801a0
Merge remote-tracking branch 'upstream/main' into jtibs/parser
jtibshirani Dec 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions ctags/json.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ package ctags

import (
"fmt"
"sync"
"time"

goctags "github.com/sourcegraph/go-ctags"
Expand All @@ -38,7 +37,6 @@ type parseResp struct {
}

type lockedParser struct {
mu sync.Mutex
opts goctags.Options
p Parser
send chan<- parseReq
Expand All @@ -51,13 +49,9 @@ type lockedParser struct {
const parseTimeout = time.Minute

// Parse wraps go-ctags Parse. It lazily starts the process and adds a timeout
// around parse requests. Additionally it serializes access to the parsing
// process. The timeout is important since we occasionally come across
// documents which hang universal-ctags.
// around parse requests. The timeout is important since we occasionally come
// across documents which hang universal-ctags.
func (lp *lockedParser) Parse(name string, content []byte) ([]*Entry, error) {
lp.mu.Lock()
defer lp.mu.Unlock()
jtibshirani marked this conversation as resolved.
Show resolved Hide resolved

if lp.p == nil {
p, err := goctags.New(lp.opts)
if err != nil {
Expand Down Expand Up @@ -96,12 +90,9 @@ func (lp *lockedParser) Parse(name string, content []byte) ([]*Entry, error) {
}

func (lp *lockedParser) Close() {
lp.mu.Lock()
defer lp.mu.Unlock()
lp.close()
}

// close assumes lp.mu is held.
func (lp *lockedParser) close() {
if lp.p == nil {
return
Expand Down