Merge pull request #1053 from zooba/v2.2.3

v2.2.3 fixes
microsoft · Jan 13, 2016 · 0a5389b · 0a5389b
2 parents 75e7eba + 52b1769
commit 0a5389b
Show file tree

Hide file tree

Showing 15 changed files with 88 additions and 50 deletions.
diff --git a/Python/Product/Django/Django.csproj b/Python/Product/Django/Django.csproj
@@ -117,11 +117,11 @@
     <When Condition="$(VSMajorVersion) >= 14">
       <ItemGroup>
         <Reference Include="Microsoft.VisualStudio.InteractiveWindow">
-          <HintPath>$(DevEnvDir)PrivateAssemblies\Microsoft.VisualStudio.InteractiveWindow.dll</HintPath>
+          <HintPath>..\PythonTools\Microsoft.VisualStudio.InteractiveWindow.dll</HintPath>
           <Private>false</Private>
         </Reference>
         <Reference Include="Microsoft.VisualStudio.VsInteractiveWindow">
-          <HintPath>$(DevEnvDir)PrivateAssemblies\Microsoft.VisualStudio.VsInteractiveWindow.dll</HintPath>
+          <HintPath>..\PythonTools\Microsoft.VisualStudio.VsInteractiveWindow.dll</HintPath>
           <Private>false</Private>
         </Reference>
       </ItemGroup>

diff --git a/Python/Product/Django/Intellisense/DjangoCompletionSource.cs b/Python/Product/Django/Intellisense/DjangoCompletionSource.cs
@@ -21,6 +21,7 @@
 using Microsoft.PythonTools.Intellisense;
 using Microsoft.VisualStudio.Language.Intellisense;
 using Microsoft.VisualStudio.Text;
+using Microsoft.VisualStudio.Text.Projection;
 
 #if DEV14_OR_LATER
 using Microsoft.Html.Editor.Document;
@@ -37,13 +38,17 @@ public DjangoCompletionSource(IGlyphService glyphService, DjangoAnalyzer analyze
         }
 
         public override void AugmentCompletionSession(ICompletionSession session, IList<CompletionSet> completionSets) {
-            var doc = HtmlEditorDocument.FromTextBuffer(_buffer);
+            var doc = TemplateClassifier.HtmlEditorDocumentFromTextBuffer(_buffer);
             if (doc == null) {
                 return;
             }
-            doc.HtmlEditorTree.EnsureTreeReady();
+            var tree = doc.HtmlEditorTree;
+            if (tree == null) {
+                return;
+            }
+            tree.EnsureTreeReady();
 
-            var primarySnapshot = doc.PrimaryView.TextSnapshot;
+            var primarySnapshot = tree.TextSnapshot;
             var nullableTriggerPoint = session.GetTriggerPoint(primarySnapshot);
             if (!nullableTriggerPoint.HasValue) {
                 return;

diff --git a/Python/Product/Django/TemplateParsing/TemplateClassifier.cs b/Python/Product/Django/TemplateParsing/TemplateClassifier.cs
@@ -39,10 +39,28 @@ public TemplateClassifier(TemplateClassifierProviderBase provider, ITextBuffer t
 
         public override event EventHandler<ClassificationChangedEventArgs> ClassificationChanged;
 
+        internal static HtmlEditorDocument HtmlEditorDocumentFromTextBuffer(ITextBuffer buffer) {
+            var doc = HtmlEditorDocument.FromTextBuffer(buffer);
+#if DEV14_OR_LATER
+            if (doc == null) {
+                var projBuffer = buffer as IProjectionBuffer;
+                if (projBuffer != null) {
+                    foreach (var b in projBuffer.SourceBuffers) {
+                        if (b.ContentType.IsOfType(TemplateHtmlContentType.ContentTypeName) &&
+                            (doc = HtmlEditorDocument.TryFromTextBuffer(b)) != null) {
+                            return doc;
+                        }
+                    }
+                }
+            }
+#endif
+            return doc;
+        }
+
         public override IList<ClassificationSpan> GetClassificationSpans(SnapshotSpan span) {
             var spans = new List<ClassificationSpan>();
 
-            var htmlDoc = HtmlEditorDocument.TryFromTextBuffer(span.Snapshot.TextBuffer);
+            var htmlDoc = HtmlEditorDocumentFromTextBuffer(span.Snapshot.TextBuffer);
             if (htmlDoc == null) {
                 return spans;
             }
@@ -64,35 +82,49 @@ public override IList<ClassificationSpan> GetClassificationSpans(SnapshotSpan sp
                 return spans;
             }
 
-            var projSnapshot = _htmlDoc.PrimaryView.TextSnapshot as IProjectionSnapshot;
-            if (projSnapshot == null) {
-                return spans;
-            }
-
-            var primarySpans = projSnapshot.MapFromSourceSnapshot(span);
-            foreach (var primarySpan in primarySpans) {
-                var index = _htmlDoc.HtmlEditorTree.ArtifactCollection.GetItemContaining(primarySpan.Start);
-                if (index < 0) {
-                    continue;
-                }
-
-                var artifact = _htmlDoc.HtmlEditorTree.ArtifactCollection[index] as TemplateArtifact;
-                if (artifact == null) {
-                    continue;
+            // The provided span may be in a projection snapshot, so we need to
+            // map back to the source snapshot to find the correct
+            // classification. If projSnapshot is null, we are already in the
+            // correct snapshot.
+            var projSnapshot = span.Snapshot as IProjectionSnapshot;
+            var sourceSnapshot = span.Snapshot;
+
+            var sourceStartIndex = span.Start.Position;
+            if (projSnapshot != null) {
+                var pt = projSnapshot.MapToSourceSnapshot(sourceStartIndex);
+                sourceStartIndex = pt.Position;
+                sourceSnapshot = pt.Snapshot;
+                if (HtmlEditorDocument.TryFromTextBuffer(sourceSnapshot.TextBuffer) != _htmlDoc) {
+                    return spans;
                 }
+            }
 
-                var artifactStart = projSnapshot.MapToSourceSnapshot(artifact.InnerRange.Start);
-                if (artifactStart.Snapshot != span.Snapshot) {
-                    continue;
-                }
+            var index = _htmlDoc.HtmlEditorTree.ArtifactCollection.GetItemContaining(sourceStartIndex);
+            if (index < 0) {
+                return spans;
+            }
 
-                var artifactText = _htmlDoc.HtmlEditorTree.ParseTree.Text.GetText(artifact.InnerRange);
-                artifact.Parse(artifactText);
+            var artifact = _htmlDoc.HtmlEditorTree.ArtifactCollection[index] as TemplateArtifact;
+            if (artifact == null) {
+                return spans;
+            }
 
-                var classifications = artifact.GetClassifications();
-                foreach (var classification in classifications) {
-                    var classificationSpan = ToClassificationSpan(classification, span.Snapshot, artifactStart.Position);
-                    spans.Add(classificationSpan);
+            int artifactStart = artifact.InnerRange.Start;
+            var artifactText = _htmlDoc.HtmlEditorTree.ParseTree.Text.GetText(artifact.InnerRange);
+            artifact.Parse(artifactText);
+
+            var classifications = artifact.GetClassifications();
+            foreach (var classification in classifications) {
+                var cls = GetClassification(classification.Classification);
+                int clsStart = artifactStart + classification.Span.Start;
+                int clsLen = Math.Min(sourceSnapshot.Length - clsStart, classification.Span.Length);
+                var clsSpan = new SnapshotSpan(sourceSnapshot, clsStart, clsLen);
+                if (projSnapshot != null) {
+                    foreach (var sp in projSnapshot.MapFromSourceSnapshot(clsSpan)) {
+                        spans.Add(new ClassificationSpan(new SnapshotSpan(span.Snapshot, sp), cls));
+                    }
+                } else {
+                    spans.Add(new ClassificationSpan(clsSpan, cls));
                 }
             }
 

diff --git a/Python/Product/Django/TemplateParsing/TemplateClassifierBase.cs b/Python/Product/Django/TemplateParsing/TemplateClassifierBase.cs
@@ -89,7 +89,7 @@ protected ClassificationSpan ToClassificationSpan(BlockClassification curSpan, I
             );
         }
 
-        private IClassificationType GetClassification(Classification classification) {
+        protected IClassificationType GetClassification(Classification classification) {
             switch (classification) {
                 case Classification.None:           return _classifierProvider._classType;                    
                 case Classification.Keyword:        return _classifierProvider._keywordType;

diff --git a/Python/Product/EnvironmentsListHost/EnvironmentsListHost.csproj b/Python/Product/EnvironmentsListHost/EnvironmentsListHost.csproj
@@ -75,11 +75,11 @@
     <When Condition="$(VSMajorVersion) >= 14">
       <ItemGroup>
         <Reference Include="Microsoft.VisualStudio.InteractiveWindow">
-          <HintPath>$(DevEnvDir)PrivateAssemblies\Microsoft.VisualStudio.InteractiveWindow.dll</HintPath>
+          <HintPath>..\PythonTools\Microsoft.VisualStudio.InteractiveWindow.dll</HintPath>
           <Private>false</Private>
         </Reference>
         <Reference Include="Microsoft.VisualStudio.VsInteractiveWindow">
-          <HintPath>$(DevEnvDir)PrivateAssemblies\Microsoft.VisualStudio.VsInteractiveWindow.dll</HintPath>
+          <HintPath>..\PythonTools\Microsoft.VisualStudio.VsInteractiveWindow.dll</HintPath>
           <Private>false</Private>
         </Reference>
       </ItemGroup>

diff --git a/Python/Product/PythonTools/Microsoft.VisualStudio.InteractiveWindow.dll b/Python/Product/PythonTools/Microsoft.VisualStudio.InteractiveWindow.dll
diff --git a/Python/Product/PythonTools/Microsoft.VisualStudio.VsInteractiveWindow.dll b/Python/Product/PythonTools/Microsoft.VisualStudio.VsInteractiveWindow.dll
diff --git a/Python/Product/PythonTools/PythonTools.csproj b/Python/Product/PythonTools/PythonTools.csproj
@@ -126,6 +126,7 @@
           <SpecificVersion>True</SpecificVersion>
           <HintPath Condition="Exists('$(DevEnvDir)PrivateAssemblies\Microsoft.VisualStudio.Web.WindowsAzure.Contracts.dll')">$(DevEnvDir)PrivateAssemblies\Microsoft.VisualStudio.Web.WindowsAzure.Contracts.dll</HintPath>
           <HintPath Condition="Exists('$(DevEnvDir)Extensions\Microsoft\Web Tools\WindowsAzure\Microsoft.VisualStudio.Web.WindowsAzure.Contracts.dll')">$(DevEnvDir)Extensions\Microsoft\Web Tools\WindowsAzure\Microsoft.VisualStudio.Web.WindowsAzure.Contracts.dll</HintPath>
+          <HintPath Condition="Exists('$(DevEnvDir)Extensions\Microsoft\Web Tools Azure\Microsoft.VisualStudio.Web.WindowsAzure.Contracts.dll')">$(DevEnvDir)Extensions\Microsoft\Web Tools Azure\Microsoft.VisualStudio.Web.WindowsAzure.Contracts.dll</HintPath>
           <Private>false</Private>
         </Reference>
       </ItemGroup>
@@ -243,11 +244,11 @@
     <When Condition="$(VSMajorVersion) &gt;= 14">
       <ItemGroup>
         <Reference Include="Microsoft.VisualStudio.InteractiveWindow">
-          <HintPath>$(DevEnvDir)PrivateAssemblies\Microsoft.VisualStudio.InteractiveWindow.dll</HintPath>
+          <HintPath>Microsoft.VisualStudio.InteractiveWindow.dll</HintPath>
           <Private>false</Private>
         </Reference>
         <Reference Include="Microsoft.VisualStudio.VsInteractiveWindow">
-          <HintPath>$(DevEnvDir)PrivateAssemblies\Microsoft.VisualStudio.VsInteractiveWindow.dll</HintPath>
+          <HintPath>Microsoft.VisualStudio.VsInteractiveWindow.dll</HintPath>
           <Private>false</Private>
         </Reference>
         <Reference Include="Microsoft.VisualStudio.ImageCatalog, Version=$(VSTarget).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />

diff --git a/Python/Tests/AzurePublishingUITests/AzurePublishingUITests.csproj b/Python/Tests/AzurePublishingUITests/AzurePublishingUITests.csproj
@@ -107,11 +107,11 @@
     <When Condition="$(VSMajorVersion) >= 14">
       <ItemGroup>
         <Reference Include="Microsoft.VisualStudio.InteractiveWindow">
-          <HintPath>$(DevEnvDir)PrivateAssemblies\Microsoft.VisualStudio.InteractiveWindow.dll</HintPath>
+          <HintPath>$(BuildRoot)Python\Product\PythonTools\Microsoft.VisualStudio.InteractiveWindow.dll</HintPath>
           <Private>false</Private>
         </Reference>
         <Reference Include="Microsoft.VisualStudio.VsInteractiveWindow">
-          <HintPath>$(DevEnvDir)PrivateAssemblies\Microsoft.VisualStudio.VsInteractiveWindow.dll</HintPath>
+          <HintPath>$(BuildRoot)Python\Product\PythonTools\Microsoft.VisualStudio.VsInteractiveWindow.dll</HintPath>
           <Private>false</Private>
         </Reference>
       </ItemGroup>

diff --git a/Python/Tests/Core.UI/PythonToolsUITests.csproj b/Python/Tests/Core.UI/PythonToolsUITests.csproj
@@ -107,11 +107,11 @@
     <When Condition="$(VSMajorVersion) >= 14">
       <ItemGroup>
         <Reference Include="Microsoft.VisualStudio.InteractiveWindow">
-          <HintPath>$(DevEnvDir)PrivateAssemblies\Microsoft.VisualStudio.InteractiveWindow.dll</HintPath>
+          <HintPath>$(BuildRoot)Python\Product\PythonTools\Microsoft.VisualStudio.InteractiveWindow.dll</HintPath>
           <Private>false</Private>
         </Reference>
         <Reference Include="Microsoft.VisualStudio.VsInteractiveWindow">
-          <HintPath>$(DevEnvDir)PrivateAssemblies\Microsoft.VisualStudio.VsInteractiveWindow.dll</HintPath>
+          <HintPath>$(BuildRoot)Python\Product\PythonTools\Microsoft.VisualStudio.VsInteractiveWindow.dll</HintPath>
           <Private>false</Private>
         </Reference>
       </ItemGroup>

diff --git a/Python/Tests/Core/PythonToolsTests.csproj b/Python/Tests/Core/PythonToolsTests.csproj
@@ -106,12 +106,12 @@
     <When Condition="$(VSMajorVersion) &gt;= 14">
       <ItemGroup>
         <Reference Include="Microsoft.VisualStudio.InteractiveWindow">
-          <HintPath>$(DevEnvDir)PrivateAssemblies\Microsoft.VisualStudio.InteractiveWindow.dll</HintPath>
+          <HintPath>$(BuildRoot)Python\Product\PythonTools\Microsoft.VisualStudio.InteractiveWindow.dll</HintPath>
           <!-- Need a copy of the correct DLL for non-UI tests -->
           <Private>true</Private>
         </Reference>
         <Reference Include="Microsoft.VisualStudio.VsInteractiveWindow">
-          <HintPath>$(DevEnvDir)PrivateAssemblies\Microsoft.VisualStudio.VsInteractiveWindow.dll</HintPath>
+          <HintPath>$(BuildRoot)Python\Product\PythonTools\Microsoft.VisualStudio.VsInteractiveWindow.dll</HintPath>
           <!-- Need a copy of the correct DLL for non-UI tests -->
           <Private>true</Private>
         </Reference>

diff --git a/Python/Tests/IronPython/IronPythonTests.csproj b/Python/Tests/IronPython/IronPythonTests.csproj
@@ -103,11 +103,11 @@
     <When Condition="$(VSMajorVersion) >= 14">
       <ItemGroup>
         <Reference Include="Microsoft.VisualStudio.InteractiveWindow">
-          <HintPath>$(DevEnvDir)PrivateAssemblies\Microsoft.VisualStudio.InteractiveWindow.dll</HintPath>
+          <HintPath>$(BuildRoot)Python\Product\PythonTools\Microsoft.VisualStudio.InteractiveWindow.dll</HintPath>
           <Private>false</Private>
         </Reference>
         <Reference Include="Microsoft.VisualStudio.VsInteractiveWindow">
-          <HintPath>$(DevEnvDir)PrivateAssemblies\Microsoft.VisualStudio.VsInteractiveWindow.dll</HintPath>
+          <HintPath>$(BuildRoot)Python\Product\PythonTools\Microsoft.VisualStudio.VsInteractiveWindow.dll</HintPath>
           <Private>false</Private>
         </Reference>
       </ItemGroup>

diff --git a/Python/Tests/PythonToolsMockTests/PythonToolsMockTests.csproj b/Python/Tests/PythonToolsMockTests/PythonToolsMockTests.csproj
@@ -115,11 +115,11 @@
     <When Condition="$(VSMajorVersion) &gt;= 14">
       <ItemGroup>
         <Reference Include="Microsoft.VisualStudio.InteractiveWindow">
-          <HintPath>$(DevEnvDir)PrivateAssemblies\Microsoft.VisualStudio.InteractiveWindow.dll</HintPath>
+          <HintPath>$(BuildRoot)Python\Product\PythonTools\Microsoft.VisualStudio.InteractiveWindow.dll</HintPath>
           <Private>false</Private>
         </Reference>
         <Reference Include="Microsoft.VisualStudio.VsInteractiveWindow">
-          <HintPath>$(DevEnvDir)PrivateAssemblies\Microsoft.VisualStudio.VsInteractiveWindow.dll</HintPath>
+          <HintPath>$(BuildRoot)Python\Product\PythonTools\Microsoft.VisualStudio.VsInteractiveWindow.dll</HintPath>
           <Private>false</Private>
         </Reference>
       </ItemGroup>

diff --git a/Python/Tests/ReplWindowUITests/ReplWindowUITests.csproj b/Python/Tests/ReplWindowUITests/ReplWindowUITests.csproj
@@ -94,11 +94,11 @@
     <When Condition="$(VSMajorVersion) &gt;= 14">
       <ItemGroup>
         <Reference Include="Microsoft.VisualStudio.InteractiveWindow">
-          <HintPath>$(DevEnvDir)PrivateAssemblies\Microsoft.VisualStudio.InteractiveWindow.dll</HintPath>
+          <HintPath>$(BuildRoot)Python\Product\PythonTools\Microsoft.VisualStudio.InteractiveWindow.dll</HintPath>
           <Private>false</Private>
         </Reference>
         <Reference Include="Microsoft.VisualStudio.VsInteractiveWindow">
-          <HintPath>$(DevEnvDir)PrivateAssemblies\Microsoft.VisualStudio.VsInteractiveWindow.dll</HintPath>
+          <HintPath>$(BuildRoot)Python\Product\PythonTools\Microsoft.VisualStudio.VsInteractiveWindow.dll</HintPath>
           <Private>false</Private>
         </Reference>
       </ItemGroup>

diff --git a/Python/Tests/Utilities.Python/TestUtilities.Python.csproj b/Python/Tests/Utilities.Python/TestUtilities.Python.csproj
@@ -97,11 +97,11 @@
     <When Condition="$(VSMajorVersion) &gt;= 14">
       <ItemGroup>
         <Reference Include="Microsoft.VisualStudio.InteractiveWindow">
-          <HintPath>$(DevEnvDir)PrivateAssemblies\Microsoft.VisualStudio.InteractiveWindow.dll</HintPath>
+          <HintPath>$(BuildRoot)Python\Product\PythonTools\Microsoft.VisualStudio.InteractiveWindow.dll</HintPath>
           <Private>false</Private>
         </Reference>
         <Reference Include="Microsoft.VisualStudio.VsInteractiveWindow">
-          <HintPath>$(DevEnvDir)PrivateAssemblies\Microsoft.VisualStudio.VsInteractiveWindow.dll</HintPath>
+          <HintPath>$(BuildRoot)Python\Product\PythonTools\Microsoft.VisualStudio.VsInteractiveWindow.dll</HintPath>
           <Private>false</Private>
         </Reference>
       </ItemGroup>