Merge pull request #661 from rjmholt/pester-null-deref-660

Fix possible null dereference in PesterDocumentSymbolProvider

Author: rjmholt

src/PowerShellEditorServices/Symbols/PesterDocumentSymbolProvider.cs

@@ -45,11 +45,10 @@ private static bool IsNamedCommandWithArguments(Ast ast)
  {
  CommandAst commandAst = ast as CommandAst;
 
- return
- commandAst != null &&
- commandAst.InvocationOperator != TokenKind.Dot &&
- PesterSymbolReference.GetCommandType(commandAst.GetCommandName()).HasValue &&
- commandAst.CommandElements.Count >= 2;
+ return commandAst != null &&
+ commandAst.InvocationOperator != TokenKind.Dot &&
+ PesterSymbolReference.GetCommandType(commandAst.GetCommandName()).HasValue &&
+ commandAst.CommandElements.Count >= 2;
  }
 
  /// <summary>
@@ -89,7 +88,11 @@ private static bool IsPesterCommand(CommandAst commandAst)
  private static PesterSymbolReference ConvertPesterAstToSymbolReference(ScriptFile scriptFile, CommandAst pesterCommandAst)
  {
  string testLine = scriptFile.GetLine(pesterCommandAst.Extent.StartLineNumber);
- string commandName = pesterCommandAst.GetCommandName();
+ PesterCommandType? commandName = PesterSymbolReference.GetCommandType(pesterCommandAst.GetCommandName());
+ if (commandName == null)
+ {
+ return null;
+ }
 
  // Search for a name for the test
  // If the test has more than one argument for names, we set it to null
@@ -122,7 +125,7 @@ private static PesterSymbolReference ConvertPesterAstToSymbolReference(ScriptFil
 
  return new PesterSymbolReference(
  scriptFile,
- commandName,
+ commandName.Value,
  testLine,
  testName,
  pesterCommandAst.Extent
@@ -179,7 +182,7 @@ public class PesterSymbolReference : SymbolReference
 
  internal PesterSymbolReference(
  ScriptFile scriptFile,
- string commandName,
+ PesterCommandType commandType,
  string testLine,
  string testName,
  IScriptExtent scriptExtent)
@@ -190,14 +193,14 @@ internal PesterSymbolReference(
  scriptFile.FilePath,
  testLine)
  {
- this.Command = GetCommandType(commandName).Value;
+ this.Command = commandType;
  this.TestName = testName;
  }
 
  internal static PesterCommandType? GetCommandType(string commandName)
  {
  PesterCommandType pesterCommandType;
- if (!PesterKeywords.TryGetValue(commandName, out pesterCommandType))
+ if (commandName == null || !PesterKeywords.TryGetValue(commandName, out pesterCommandType))
  {
  return null;
  }