Merge branch 'master' into release/0.3.10

randy3k · randy3k · commit e272fe10fc1a · 2021-04-19T15:28:31.000-07:00
* master:
  always check scope for workspace$get_definition
diff --git a/R/definition.R b/R/definition.R
@@ -85,7 +85,7 @@ definition_reply <- function(id, uri, workspace, document, point, rootPath) {
         }
     }
 
-    if (!resolved) {
+    if (!resolved && check_scope(uri, document, point)) {
         result <- workspace$get_definition(token_result$token, token_result$package,
             exported_only = token_result$accessor != ":::")
     }

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ definition_reply <- function(id, uri, workspace, document, point, rootPath) {`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`
`88`		`- if (!resolved) {`
	`88`	`+ if (!resolved && check_scope(uri, document, point)) {`
`89`	`89`	`result <- workspace$get_definition(token_result$token, token_result$package,`
`90`	`90`	`exported_only = token_result$accessor != ":::")`
`91`	`91`	`}`