Fix #291: Dot-source reference detection should ignore ScriptBlocks

daviwil · daviwil · commit 09abdc8dedb8 · 2016-12-09T11:00:36.000-08:00
diff --git a/src/PowerShellEditorServices/Language/FindDotSourcedVisitor.cs b/src/PowerShellEditorServices/Language/FindDotSourcedVisitor.cs
@@ -32,7 +32,8 @@ public FindDotSourcedVisitor()
         /// or a decision to continue if it wasn't found</returns>
         public override AstVisitAction VisitCommand(CommandAst commandAst)
         {
-            if (commandAst.InvocationOperator.Equals(TokenKind.Dot))
+            if (commandAst.InvocationOperator.Equals(TokenKind.Dot) &&
+                commandAst.CommandElements[0] is StringConstantExpressionAst)
             {
                 // Strip any quote characters off of the string
                 string fileName = commandAst.CommandElements[0].Extent.Text.Trim('\'', '"');

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,8 @@ public FindDotSourcedVisitor()`
`32`	`32`	`/// or a decision to continue if it wasn't found</returns>`
`33`	`33`	`public override AstVisitAction VisitCommand(CommandAst commandAst)`
`34`	`34`	`{`
`35`		`- if (commandAst.InvocationOperator.Equals(TokenKind.Dot))`
	`35`	`+ if (commandAst.InvocationOperator.Equals(TokenKind.Dot) &&`
	`36`	`+ commandAst.CommandElements[0] is StringConstantExpressionAst)`
`36`	`37`	`{`
`37`	`38`	`// Strip any quote characters off of the string`
`38`	`39`	`string fileName = commandAst.CommandElements[0].Extent.Text.Trim('\'', '"');`