Multiple version fixes

Author: adamdriscoll

src/PowerShellEditorServices/Language/CompletionResults.cs

@@ -275,8 +275,10 @@ private static CompletionType ConvertCompletionResultType(
                 case CompletionResultType.Type:
                     return CompletionType.Type;
 
+#if !PowerShellv3
                 case CompletionResultType.Keyword:
                     return CompletionType.Keyword;
+#endif
 
                 case CompletionResultType.ProviderContainer:
                 case CompletionResultType.ProviderItem:

src/PowerShellEditorServices/Language/FindSymbolVisitor.cs

@@ -10,7 +10,11 @@ namespace Microsoft.PowerShell.EditorServices
     /// <summary>
     /// The visitor used to find the the symbol at a specfic location in the AST
     /// </summary>
+#if PowerShellv5
     internal class FindSymbolVisitor : AstVisitor2
+#else
+    internal class FindSymbolVisitor : AstVisitor
+#endif
     {
         private int lineNumber;
         private int columnNumber;

src/PowerShellEditorServices/Language/FindSymbolsVisitor.cs

@@ -11,7 +11,11 @@ namespace Microsoft.PowerShell.EditorServices
     /// <summary>
     /// The visitor used to find all the symbols (function and class defs) in the AST.
     /// </summary>
+#if PowerShellv5
     internal class FindSymbolsVisitor : AstVisitor2
+#else
+    internal class FindSymbolsVisitor : AstVisitor
+#endif
     {
         public List<SymbolReference> SymbolReferences { get; private set; }
 
@@ -69,9 +73,11 @@ public override AstVisitAction VisitVariableExpression(VariableExpressionAst var
             return AstVisitAction.Continue;
         }
 
+#if PowerShell5
         public override AstVisitAction VisitConfigurationDefinition(ConfigurationDefinitionAst configurationDefinitionAst)
         {
-            IScriptExtent nameExtent = new ScriptExtent() {
+            IScriptExtent nameExtent = new ScriptExtent()
+            {
                 Text = configurationDefinitionAst.InstanceName.Extent.Text,
                 StartLineNumber = configurationDefinitionAst.Extent.StartLineNumber,
                 EndLineNumber = configurationDefinitionAst.Extent.EndLineNumber,
@@ -86,6 +92,8 @@ public override AstVisitAction VisitConfigurationDefinition(ConfigurationDefinit
 
             return AstVisitAction.Continue;
         }
+#endif
+
 
         private bool IsAssignedAtScriptScope(VariableExpressionAst variableExpressionAst)
         {

src/PowerShellEditorServices/PowerShellEditorServices.csproj

@@ -13,13 +13,16 @@
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <DefineConstants Condition=" '$(PowerShellVersion)' == 'v3'">PowerShellv3</DefineConstants>
+    <DefineConstants Condition=" '$(PowerShellVersion)' == 'v4'">PowerShellv4</DefineConstants>
+    <DefineConstants Condition=" '$(PowerShellVersion)' == ''">PowerShellv5</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;$(DefineConstants)</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Debug\Microsoft.PowerShell.EditorServices.XML</DocumentationFile>
@@ -28,7 +31,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;$(DefineConstants)</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <WarningsAsErrors>1591,1573,1572</WarningsAsErrors>

src/PowerShellEditorServices/Session/PowerShellContext.cs

@@ -15,6 +15,7 @@
 
 namespace Microsoft.PowerShell.EditorServices
 {
+    using System.Collections;
     using System.Management.Automation;
     using System.Management.Automation.Host;
     using System.Management.Automation.Runspaces;
@@ -68,6 +69,14 @@ public PowerShellContextState SessionState
             private set;
         }
 
+        /// <summary>
+        /// PowerShell Version of the current runspace.
+        /// </summary>
+        public Version PowerShellVersion
+        {
+            get; private set;
+        }
+
         #endregion
 
         #region Constructors
@@ -109,7 +118,7 @@ private void Initialize(Runspace initialRunspace)
 
             this.initialRunspace = initialRunspace;
             this.currentRunspace = initialRunspace;
-            this.currentRunspace.Debugger.SetDebugMode(DebugModes.LocalScript | DebugModes.RemoteScript);
+
             this.currentRunspace.Debugger.BreakpointUpdated += OnBreakpointUpdated;
             this.currentRunspace.Debugger.DebuggerStop += OnDebuggerStop;
 
@@ -120,6 +129,21 @@ private void Initialize(Runspace initialRunspace)
             // TODO: Should this be configurable?
             this.SetExecutionPolicy(ExecutionPolicy.RemoteSigned);
 
+            var psVersionTable = this.currentRunspace.SessionStateProxy.GetVariable("PSVersionTable") as Hashtable;
+            if (psVersionTable != null)
+            {
+                Version version;
+                Version.TryParse(psVersionTable["PSVersion"] as string, out version);
+                PowerShellVersion = version;
+            }
+
+#if !PowerShellv3
+            if (PowerShellVersion > new Version(3,0))
+            {
+                this.currentRunspace.Debugger.SetDebugMode(DebugModes.LocalScript | DebugModes.RemoteScript);
+            }
+#endif
+
             this.SessionState = PowerShellContextState.Ready;
         }
 
@@ -370,7 +394,12 @@ internal void BreakExecution()
         {
             Logger.Write(LogLevel.Verbose, "Debugger break requested...");
 
-            this.currentRunspace.Debugger.SetDebuggerStepMode(true);
+#if PowerShellv5
+            if (PowerShellVersion >= new Version(5, 0))
+            {
+                this.currentRunspace.Debugger.SetDebuggerStepMode(true);
+            }
+#endif
         }
 
         internal void ResumeDebugger(DebuggerResumeAction resumeAction)
@@ -568,7 +597,7 @@ private static string GetStringForPSCommand(PSCommand psCommand)
 
             return stringBuilder.ToString();
         }
-
+        
         private void SetExecutionPolicy(ExecutionPolicy desiredExecutionPolicy)
         {
             var currentPolicy = ExecutionPolicy.Undefined;

test/PowerShellEditorServices.Test/Language/LanguageServiceTests.cs

@@ -319,15 +319,15 @@ public void CompilesWithPowerShellVersion(string version)
 
             try
             {
-                Compile(projectVersion);
+                Compile(projectVersion, version);
             }
             finally
             {
                 File.Delete(projectVersion);
             }
         }
 
-        private void Compile(string project)
+        private void Compile(string project, string version)
         {
             string msbuild;
             using (var key = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\MSBuild\ToolsVersions\14.0"))
@@ -340,7 +340,7 @@ private void Compile(string project)
 
             var p = new Process();
             p.StartInfo.FileName = msbuild;
-            p.StartInfo.Arguments = string.Format(@" {0} /p:Configuration=Debug /t:Build /fileLogger /flp1:logfile=errors.txt;errorsonly  /p:SolutionDir={1} /p:SolutionName=PowerShellEditorServices", project, fi.Directory.Parent.Parent.FullName);
+            p.StartInfo.Arguments = string.Format(@" {0} /p:Configuration=Debug /t:Build /fileLogger /flp1:logfile=errors.txt;errorsonly  /p:SolutionDir={1} /p:SolutionName=PowerShellEditorServices /p:DefineConstants=PowerShellv{2}", project, fi.Directory.Parent.Parent.FullName, version);
             p.StartInfo.UseShellExecute = false;
             p.StartInfo.CreateNoWindow = true;
             p.Start();