Merge branch 'completionRefactor' into disableNewCompletionFeatures

src/EditorFeatures/Core/EditorFeatures.csproj

@@ -274,7 +274,7 @@
     <Compile Include="Implementation\Intellisense\Completion\OptionSetExtensions.cs" />
     <Compile Include="Implementation\Intellisense\Completion\Presentation\ClassificationTags.cs" />
     <Compile Include="Implementation\Intellisense\Completion\Presentation\ImageMonikers.cs" />
-    <Compile Include="Implementation\Intellisense\Completion\Presentation\IVsCompletionSet.cs" />
+    <Compile Include="Implementation\Intellisense\Completion\Presentation\IVisualStudioCompletionSet.cs" />
     <Compile Include="Implementation\Intellisense\Completion\Presentation\Roslyn14CompletionSet.cs" />
     <Compile Include="Implementation\Intellisense\Completion\Presentation\VisualStudio14CompletionSet.cs" />
     <Compile Include="Implementation\Intellisense\Completion\SimplePresentationItem.cs" />

src/EditorFeatures/Core/Implementation/IntelliSense/Completion/Presentation/IVsCompletionSet.cs → src/EditorFeatures/Core/Implementation/IntelliSense/Completion/Presentation/IVisualStudioCompletionSet.cs

@@ -13,7 +13,7 @@ namespace Microsoft.CodeAnalysis.Editor.Implementation.IntelliSense.Completion.P
     /// us to encapulate logic in our own inheritance hierarchy without having to fit into the
     /// editor's inheritance hierarchy.
     /// </summary>
-    internal interface IVsCompletionSet : ICompletionSet
+    internal interface IVisualStudioCompletionSet : ICompletionSet
     {
         string DisplayName { get; set; }
         string Moniker { get; set; }

src/EditorFeatures/Core/Implementation/IntelliSense/Completion/Presentation/Roslyn14CompletionSet.cs

@@ -26,7 +26,7 @@ namespace Microsoft.CodeAnalysis.Editor.Implementation.IntelliSense.Completion.P
     /// </summary>
     internal class Roslyn14CompletionSet : ForegroundThreadAffinitizedObject
     {
-        protected readonly IVsCompletionSet VsCompletionSet;
+        protected readonly IVisualStudioCompletionSet VsCompletionSet;
 
         private readonly ITextView _textView;
 
@@ -37,7 +37,7 @@ internal class Roslyn14CompletionSet : ForegroundThreadAffinitizedObject
         protected IReadOnlyDictionary<CompletionItem, string> CompletionItemToFilterText;
 
         public Roslyn14CompletionSet(
-            IVsCompletionSet vsCompletionSet,
+            IVisualStudioCompletionSet vsCompletionSet,
             CompletionPresenterSession completionPresenterSession,
             ITextView textView,
             ITextBuffer subjectBuffer)

src/EditorFeatures/Core/Implementation/IntelliSense/Completion/Presentation/VisualStudio14CompletionSet.cs

@@ -12,7 +12,7 @@ namespace Microsoft.CodeAnalysis.Editor.Implementation.IntelliSense.Completion.P
     /// See comment on VisualStudio15CompletionSet for an explanation of how these types 
     /// fit together and where code should go in them.
     /// </summary>
-    internal class VisualStudio14CompletionSet : CompletionSet, IVsCompletionSet
+    internal class VisualStudio14CompletionSet : CompletionSet, IVisualStudioCompletionSet
     {
         private readonly Roslyn14CompletionSet _roslynCompletionSet;
 
@@ -65,31 +65,31 @@ PresentationItem ICompletionSet.GetPresentationItem(VSCompletion completion)
 
         #region IVsCompletionSet - Forward to base type.
 
-        string IVsCompletionSet.DisplayName
+        string IVisualStudioCompletionSet.DisplayName
         {
             get { return base.DisplayName; }
             set { base.DisplayName = value; }
         }
 
-        string IVsCompletionSet.Moniker
+        string IVisualStudioCompletionSet.Moniker
         {
             get { return base.Moniker; }
             set { base.Moniker = value; }
         }
 
-        ITrackingSpan IVsCompletionSet.ApplicableTo
+        ITrackingSpan IVisualStudioCompletionSet.ApplicableTo
         {
             get { return base.ApplicableTo; }
             set { base.ApplicableTo = value; }
         }
 
-        BulkObservableCollection<VSCompletion> IVsCompletionSet.WritableCompletionBuilders =>
+        BulkObservableCollection<VSCompletion> IVisualStudioCompletionSet.WritableCompletionBuilders =>
             base.WritableCompletionBuilders;
 
-        BulkObservableCollection<VSCompletion> IVsCompletionSet.WritableCompletions =>
+        BulkObservableCollection<VSCompletion> IVisualStudioCompletionSet.WritableCompletions =>
             base.WritableCompletions;
 
-        CompletionSelectionStatus IVsCompletionSet.SelectionStatus
+        CompletionSelectionStatus IVisualStudioCompletionSet.SelectionStatus
         {
             get { return base.SelectionStatus; }
             set { base.SelectionStatus = value; }

src/EditorFeatures/Next/EditorFeatures.Next.csproj

@@ -15,7 +15,6 @@
     <AssemblyName>Microsoft.CodeAnalysis.EditorFeatures.Next</AssemblyName>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <CopyNuGetImplementations>false</CopyNuGetImplementations>
-    <DefineConstants>DEV15</DefineConstants>
   </PropertyGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\..\Compilers\Core\Portable\CodeAnalysis.csproj">

src/EditorFeatures/Next/IntelliSense/Completion/Presentation/Roslyn15CompletionSet.cs

@@ -25,7 +25,7 @@ internal class Roslyn15CompletionSet : Roslyn14CompletionSet
         public IReadOnlyList<IntellisenseFilter2> Filters;
 
         public Roslyn15CompletionSet(
-            IVsCompletionSet vsCompletionSet,
+            IVisualStudioCompletionSet vsCompletionSet,
             CompletionPresenterSession completionPresenterSession,
             ITextView textView,
             ITextBuffer subjectBuffer)

src/EditorFeatures/Next/IntelliSense/Completion/Presentation/VisualStudio15CompletionSet.cs

@@ -29,9 +29,9 @@ namespace Microsoft.CodeAnalysis.Editor.Implementation.IntelliSense.Completion.P
     /// Important! Do not put any actual logic into this type.  Instead, forward any work to
     /// <see cref="VisualStudio15CompletionSet._roslynCompletionSet"/>.  If that code then
     /// needs information from this <see cref="CompletionSet2"/> then expose that data through
-    /// the <see cref="IVsCompletionSet"/> interface.
+    /// the <see cref="IVisualStudioCompletionSet"/> interface.
     /// </summary>
-    internal class VisualStudio15CompletionSet : CompletionSet2, IVsCompletionSet
+    internal class VisualStudio15CompletionSet : CompletionSet2, IVisualStudioCompletionSet
     {
         private readonly Roslyn15CompletionSet _roslynCompletionSet;
 
@@ -95,31 +95,31 @@ PresentationItem ICompletionSet.GetPresentationItem(VSCompletion completion)
         // not settable except through the subclass.  Here we essentially make those properties
         // available so that Roslyn15CompletionSet and Roslyn14CompletionSet can read/write them.
 
-        string IVsCompletionSet.DisplayName
+        string IVisualStudioCompletionSet.DisplayName
         {
             get { return base.DisplayName; }
             set { base.DisplayName = value; }
         }
 
-        string IVsCompletionSet.Moniker
+        string IVisualStudioCompletionSet.Moniker
         {
             get { return base.Moniker; }
             set { base.Moniker = value; }
         }
 
-        ITrackingSpan IVsCompletionSet.ApplicableTo
+        ITrackingSpan IVisualStudioCompletionSet.ApplicableTo
         {
             get { return base.ApplicableTo; }
             set { base.ApplicableTo = value; }
         }
 
-        BulkObservableCollection<VSCompletion> IVsCompletionSet.WritableCompletionBuilders =>
+        BulkObservableCollection<VSCompletion> IVisualStudioCompletionSet.WritableCompletionBuilders =>
             base.WritableCompletionBuilders;
 
-        BulkObservableCollection<VSCompletion> IVsCompletionSet.WritableCompletions =>
+        BulkObservableCollection<VSCompletion> IVisualStudioCompletionSet.WritableCompletions =>
             base.WritableCompletions;
 
-        CompletionSelectionStatus IVsCompletionSet.SelectionStatus
+        CompletionSelectionStatus IVisualStudioCompletionSet.SelectionStatus
         {
             get { return base.SelectionStatus; }
             set { base.SelectionStatus = value; }