Commit9737c25

committed

fix(scope): textobjects should use synchronous treesitter parsing.Closes#2448

1 parent8ff16ab commit9737c25Copy full SHA for 9737c25

File tree

-2

lines changed

-2

lines changed

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ M.meta = {`
`10`	`10`	`---@fieldbuf?number`
`11`	`11`	`---@fieldpos?{[1]:number,[2]:number}-- (1,0)indexed`
`12`	`12`	`---@fieldend_pos?{[1]:number,[2]:number}-- (1,0)indexed`
	`13`	`+---@fieldasync?boolean run scope detection asynchronously(defaults to true)`
`13`	`14`
`14`	`15`	`---@classsnacks.scope.TextObject:snacks.scope.Opts`
`15`	`16`	---@fieldlinewise?boolean if nil,use visual mode. Defaults to`false`when not in visual mode
`@@ -396,7 +397,12 @@ function TSScope:init(cb, opts)`
`396`	`397`	`ifnotparserthen`
`397`	`398`	`returncb()`
`398`	`399`	`end`
`399`		`-Snacks.util.parse(parser,opts.treesitter.injections,cb)`
	`400`	`+ifopts.async==falsethen`
	`401`	`+parser:parse()`
	`402`	`+cb()`
	`403`	`+else`
	`404`	`+Snacks.util.parse(parser,opts.treesitter.injections,cb)`
	`405`	`+end`
`400`	`406`	`end`
`401`	`407`
`402`	`408`	`---@paramoptssnacks.scope.Opts`
`@@ -731,6 +737,7 @@ function M.textobject(opts)`
`731`	`737`	`end`
`732`	`738`	`localinner=notopts.edge`
`733`	`739`	`opts.edge=true-- always include the edge of the scope to make inner work`
	`740`	`+opts.async=false-- run synchronously`
`734`	`741`
`735`	`742`	`M.get(function(scope)`
`736`	`743`	`ifnotscopethen`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -459,7 +459,7 @@ M.base64 = vim.base64 and vim.base64.encode`
`459`	`459`	`---@paramon_parsefun(err?:string,trees?:table<integer,TSTree>)Function invoked when parsing completes.`
`460`	`460`	`functionM.parse(parser,range,on_parse)`
`461`	`461`	`---@diagnosticdisable-next-line:invisible`
`462`		`-localhave_async= (vim.treesitter.languagetreeor {})._async_parse~=nil`
	`462`	`+localhave_async=vim.fn.has("nvim-0.11.4")==1or(vim.treesitter.languagetreeor {})._async_parse~=nil`
`463`	`463`	`ifhave_asyncthen`
`464`	`464`	`parser:parse(range,on_parse)`
`465`	`465`	`else`

Comments

(0)