FI to Node.js branch

Author: dinov

Build/AssemblyInfoCommon.cs

@@ -6,16 +6,13 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// The following assembly information is common to all * Tools for Visual Studio assemblies.
+// The following assembly information is common to all Python Tools for Visual
+// Studio assemblies.
 // If you get compiler errors CS0579, "Duplicate '<attributename>' attribute", check your 
 // Properties\AssemblyInfo.cs file and remove any lines duplicating the ones below.
 // (See also AssemblyVersion.cs in this same directory.)
 [assembly: AssemblyCompany("Microsoft")]
-#if NODEJS_TOOLS
-[assembly: AssemblyProduct("Node.js Tools for Visual Studio")]
-#else
 [assembly: AssemblyProduct("Python Tools for Visual Studio")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2013")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2012")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-#endif

Build/Common.Build.CSharp.settings

@@ -10,7 +10,7 @@
 
   <PropertyGroup>
     <Language>C#</Language>        <!-- Duplicated from the C# targets file -->
-    <Platform Condition="'$(Platform)'==''">AnyCPU</Platform>
+    <Platform Condition="'$(Platform)'==''">x86</Platform>
 
     <CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
     <!-- This eliminates the warning CA0060, EnvDTE Version=7.0 not found, for VS 10 installations. -->

Build/Common.Build.Wix.settings

@@ -11,13 +11,13 @@
 
   <PropertyGroup>
     <Language>WiX</Language>
-    <WixToolsVersion Condition="'$(WixToolsVersion)'==''">3.5</WixToolsVersion>
+    <WixToolsVersion Condition="'$(WixToolsVersion)'==''">3.7</WixToolsVersion>
     <WixToolPath Condition="'$(WixToolPath)'==''">$(BuildRoot)\Tools\Wix\$(WixToolsVersion)</WixToolPath>
     <WixExtDir Condition="'$(WixExtDir)'==''">$(BuildRoot)\Tools\Wix\$(WixToolsVersion)</WixExtDir>
-    <WixTargetsPath>$(WixToolPath)\Targets\Wix.targets</WixTargetsPath>
-    <WixTasksPath>$(WixToolPath)\Targets\WixTasks.dll</WixTasksPath>
-    <LuxTargetsPath>$(WixToolPath)\Targets\Lux.targets</LuxTargetsPath>
-    <LuxTasksPath>$(WixToolPath)\Targets\LuxTasks.dll</LuxTasksPath>
+    <WixTargetsPath>$(WixToolPath)\Wix.targets</WixTargetsPath>
+    <WixTasksPath>$(WixToolPath)\WixTasks.dll</WixTasksPath>
+    <LuxTargetsPath>$(WixToolPath)\Lux.targets</LuxTargetsPath>
+    <LuxTasksPath>$(WixToolPath)\LuxTasks.dll</LuxTasksPath>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
   </PropertyGroup>
 

Build/Common.Build.settings

@@ -11,7 +11,6 @@
 
   <PropertyGroup>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
     <WixVersion Condition="$(WixVersion)==''">0.7.4100.000</WixVersion>
     <!--Default Platform value is specified in the C#/C++ specific files imported below -->
 
@@ -60,6 +59,11 @@
     <DevEnvDir Condition="'$(VSTarget)'=='10.0'">$(VS100COMNTOOLS)..\IDE\</DevEnvDir>
     <DevEnvDir Condition="'$(VSTarget)'=='11.0'">$(VS110COMNTOOLS)..\IDE\</DevEnvDir>
     <DevEnvDir Condition="'$(VSTarget)'=='12.0'">$(VS120COMNTOOLS)..\IDE\</DevEnvDir>
+
+    <VSSDKDir Condition="'$(VSTarget)'=='10.0'">$(VSSDK100Install)</VSSDKDir>
+    <VSSDKDir Condition="'$(VSTarget)'=='11.0'">$(VSSDK110Install)</VSSDKDir>
+    <VSSDKDir Condition="'$(VSTarget)'=='12.0'">$(VSSDK120Install)</VSSDKDir>
+
   </PropertyGroup>
 
   <Import Project="$(TargetsPath)\Common.Build.CSharp.settings" Condition="'$(MSBuildProjectExtension)' == '.csproj' or '$(MSBuildProjectExtension)' == '.tmp_proj'" />

Common/Product/ReplWindow/Repl/InlineReplAdornment.cs

@@ -12,11 +12,8 @@
  *
  * ***************************************************************************/
 
-using System;
-using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.Windows;
-using System.Windows.Threading;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Text.Tagging;
@@ -42,72 +39,23 @@ public ITagger<T> CreateTagger<T>(ITextView textView, ITextBuffer buffer) where
                 );
         }
 
-        class InlineReplAdornmentManager : ITagger<IntraTextAdornmentTag> {
-            private readonly ITextView _textView;
-            private readonly List<Tuple<int, ZoomableInlineAdornment>> _tags;
-            private readonly Dispatcher _dispatcher;
-
-            internal InlineReplAdornmentManager(ITextView textView) {
-                _textView = textView;
-                _tags = new List<Tuple<int, ZoomableInlineAdornment>>();
-                _dispatcher = Dispatcher.CurrentDispatcher;
-            }
-
-            public IEnumerable<ITagSpan<IntraTextAdornmentTag>> GetTags(NormalizedSnapshotSpanCollection spans) {
-                var result = new List<TagSpan<IntraTextAdornmentTag>>();
-                foreach (var t in _tags) {
-                    var span = new SnapshotSpan(_textView.TextSnapshot, t.Item1, 0);
-                    t.Item2.UpdateSize();
-                    var tag = new IntraTextAdornmentTag(t.Item2, null);
-                    result.Add(new TagSpan<IntraTextAdornmentTag>(span, tag));
-                }
-                return result;
-            }
-
-            public void AddAdornment(ZoomableInlineAdornment uiElement) {
-                if (Dispatcher.CurrentDispatcher != _dispatcher) {
-                    _dispatcher.BeginInvoke(new Action(() => AddAdornment(uiElement)));
-                    return;
-                }
-                var caretPos = _textView.Caret.Position.BufferPosition;
-                var caretLine = caretPos.GetContainingLine();
-                _tags.Add(new Tuple<int, ZoomableInlineAdornment>(caretPos.Position, uiElement));
-                var handler = TagsChanged;
-                if (handler != null) {
-                    var span = new SnapshotSpan(_textView.TextSnapshot, caretLine.Start, caretLine.Length);
-                    var args = new SnapshotSpanEventArgs(span);
-                    handler(this, args);
-                }
-            }
-
-            public IList<Tuple<int, ZoomableInlineAdornment>> Adornments {
-                get { return _tags; }
-            }
-
-            public void RemoveAll() {
-                _tags.Clear();
-            }
-
-            public event EventHandler<SnapshotSpanEventArgs> TagsChanged;
-
-        }
-
-        private static InlineReplAdornmentManager GetManager(ITextView view) {
+        internal static InlineReplAdornmentManager GetManager(ITextView view) {
             InlineReplAdornmentManager result;
             if (!view.Properties.TryGetProperty<InlineReplAdornmentManager>(typeof(InlineReplAdornmentManager), out result)) {
                 return null;
             }
             return result;
         }
 
-        public static void AddInlineAdornment(ITextView view, UIElement uiElement, RoutedEventHandler onLoaded) {
+        public static void AddInlineAdornment(ITextView view, UIElement uiElement, RoutedEventHandler onLoaded, SnapshotPoint targetLoc) {
             var manager = GetManager(view);
             if (manager != null) {
                 var adornment = new ZoomableInlineAdornment(uiElement, view);
-                // Original Python code unhooked this event after load was complete
-                // I don't think this should be needed... we'll see.
+                // Event is unhooked in ReplWindow.  If we don't we'll receive the event multiple
+                // times leading to very jerky / hang like behavior where we've setup a new event
+                // loop in the repl window.
                 adornment.Loaded += onLoaded;
-                manager.AddAdornment(adornment);
+                manager.AddAdornment(adornment, targetLoc);
             }
         }
 

Common/Product/ReplWindow/Repl/InlineReplAdornmentManager.cs

@@ -0,0 +1,91 @@
+/* ****************************************************************************
+ *
+ * Copyright (c) Microsoft Corporation. 
+ *
+ * This source code is subject to terms and conditions of the Apache License, Version 2.0. A 
+ * copy of the license can be found in the License.html file at the root of this distribution. If 
+ * you cannot locate the Apache License, Version 2.0, please send an email to 
+ * [email protected]. By using this source code in any fashion, you are agreeing to be bound 
+ * by the terms of the Apache License, Version 2.0.
+ *
+ * You must not remove this notice, or any other, from this software.
+ *
+ * ***************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Windows.Threading;
+using Microsoft.VisualStudio.Text;
+using Microsoft.VisualStudio.Text.Editor;
+using Microsoft.VisualStudio.Text.Tagging;
+
+#if NTVS_FEATURE_INTERACTIVEWINDOW
+namespace Microsoft.NodejsTools.Repl {
+#else
+namespace Microsoft.VisualStudio.Repl {
+#endif
+    class InlineReplAdornmentManager : ITagger<IntraTextAdornmentTag> {
+        private readonly ITextView _textView;
+        private readonly List<Tuple<SnapshotPoint, ZoomableInlineAdornment>> _tags;
+        private readonly Dispatcher _dispatcher;
+
+        internal InlineReplAdornmentManager(ITextView textView) {
+            _textView = textView;
+            _tags = new List<Tuple<SnapshotPoint, ZoomableInlineAdornment>>();
+            _dispatcher = Dispatcher.CurrentDispatcher;
+        }
+
+        public IEnumerable<ITagSpan<IntraTextAdornmentTag>> GetTags(NormalizedSnapshotSpanCollection spans) {
+            var result = new List<TagSpan<IntraTextAdornmentTag>>();
+            for (int i = 0; i < _tags.Count; i++) {
+                if (_tags[i].Item1.Snapshot != _textView.TextSnapshot) {
+                    // update to the latest snapshot
+                    _tags[i] = new Tuple<SnapshotPoint, ZoomableInlineAdornment>(
+                        _tags[i].Item1.TranslateTo(_textView.TextSnapshot, PointTrackingMode.Negative),
+                        _tags[i].Item2
+                    );
+                }
+                
+                var span = new SnapshotSpan(_textView.TextSnapshot, _tags[i].Item1, 0);
+                bool intersects = false;
+                foreach (var applicableSpan in spans) {
+                    if (applicableSpan.TranslateTo(_textView.TextSnapshot, SpanTrackingMode.EdgeInclusive).IntersectsWith(span)) {
+                        intersects = true;
+                        break;
+                    }
+                }
+                if (!intersects) {
+                    continue;
+                }
+                var tag = new IntraTextAdornmentTag(_tags[i].Item2, null);
+                result.Add(new TagSpan<IntraTextAdornmentTag>(span, tag));
+            }
+            return result;
+        }
+
+        public void AddAdornment(ZoomableInlineAdornment uiElement, SnapshotPoint targetLoc) {
+            if (Dispatcher.CurrentDispatcher != _dispatcher) {
+                _dispatcher.BeginInvoke(new Action(() => AddAdornment(uiElement, targetLoc)));
+                return;
+            }
+            var targetLine = targetLoc.GetContainingLine();
+            _tags.Add(new Tuple<SnapshotPoint, ZoomableInlineAdornment>(targetLoc, uiElement));
+            var handler = TagsChanged;
+            if (handler != null) {
+                var span = new SnapshotSpan(_textView.TextSnapshot, targetLine.Start, targetLine.LengthIncludingLineBreak);
+                var args = new SnapshotSpanEventArgs(span);
+                handler(this, args);
+            }
+        }
+
+        public IList<Tuple<SnapshotPoint, ZoomableInlineAdornment>> Adornments {
+            get { return _tags; }
+        }
+
+        public void RemoveAll() {
+            _tags.Clear();
+        }
+
+        public event EventHandler<SnapshotSpanEventArgs> TagsChanged;
+    }
+}

Common/Product/ReplWindow/Repl/ReplWindow.cs

@@ -161,6 +161,7 @@ class ReplWindow : ToolWindowPane, IOleCommandTarget, IReplWindow, IVsFindTarget
         //
         private readonly OutputBuffer _buffer;
         private readonly List<ColoredSpan> _outputColors = new List<ColoredSpan>();
+        private bool _addedLineBreakOnLastOutput;
 
         private string _commandPrefix = "%";
         private string _prompt = "» ";        // prompt for primary input
@@ -638,7 +639,7 @@ private void ClearScreen(bool insertInputPrompt) {
                 edit.Delete(0, _outputBuffer.CurrentSnapshot.Length);
                 edit.Apply();
             }
-
+            _addedLineBreakOnLastOutput = false;
             using (var edit = _stdInputBuffer.CreateEdit(EditOptions.None, null, SuppressPromptInjectionTag)) {
                 edit.Delete(0, _stdInputBuffer.CurrentSnapshot.Length);
                 edit.Apply();
@@ -1016,7 +1017,9 @@ private void Home(bool extendSelection) {
                     PositionAffinity.Successor, 
                     _projectionBuffer
                 );
-                Debug.Assert(projectionPoint != null);
+                if (projectionPoint == null) {
+                    throw new InvalidOperationException("Could not map langLine to buffer");
+                }
 
                 //
                 // If the caret is already at the first non-whitespace character or
@@ -1073,7 +1076,9 @@ private void End(bool extendSelection) {
                     PositionAffinity.Successor,
                     _projectionBuffer
                 );
-                Debug.Assert(projectionPoint != null);
+                if (projectionPoint == null) {
+                    throw new InvalidOperationException("Could not map langLine to buffer");
+                }
 
                 var moveTo = projectionPoint.Value;
 
@@ -2150,11 +2155,23 @@ internal void AppendOutput(ConsoleColor color, string text, bool lastOutput) {
             // append the text to output buffer and make sure it ends with a line break:
             int newOutputLength = text.Length;
             using (var edit = _outputBuffer.CreateEdit()) {
+                if (_addedLineBreakOnLastOutput) {
+                    // appending additional output, remove the line break we previously injected
+                    var lineBreak = GetLineBreak();
+                    var deleteSpan = new Span(_outputBuffer.CurrentSnapshot.Length - lineBreak.Length, lineBreak.Length);
+                    Debug.Assert(_outputBuffer.CurrentSnapshot.GetText(deleteSpan) == lineBreak);
+                    edit.Delete(deleteSpan);
+                    oldBufferLength -= lineBreak.Length;
+                }
+
                 edit.Insert(oldBufferLength, text);
                 if (lastOutput && !_readingStdIn && !EndsWithLineBreak(text)) {
                     var lineBreak = GetLineBreak();
                     edit.Insert(oldBufferLength, lineBreak);
                     newOutputLength += lineBreak.Length;
+                    _addedLineBreakOnLastOutput = true;
+                } else {
+                    _addedLineBreakOnLastOutput = false;
                 }
 
                 edit.Apply();
@@ -2231,7 +2248,35 @@ private bool TryShowObject(object obj) {
             UIElement element = obj as UIElement;
             if (element != null) {
                 _buffer.Flush();
-                InlineReplAdornmentProvider.AddInlineAdornment(TextView, element, OnAdornmentLoaded);
+
+                // figure out where we're inserting the image
+                SnapshotPoint targetPoint = new SnapshotPoint(
+                    TextView.TextBuffer.CurrentSnapshot,
+                    TextView.TextBuffer.CurrentSnapshot.Length
+                );
+
+                for (int i = _projectionSpans.Count - 1; i >= 0; i--) {
+                    if (_projectionSpans[i].Kind == ReplSpanKind.Output ||
+                        (_projectionSpans[i].Kind == ReplSpanKind.Language && _isRunning)) {
+                        // we've had some output during the execution and we hit that buffer.
+                        // OR we hit a language input buffer, and we're running, and no output
+                        // has been produced yet.
+
+                        // In either case, this is where the image goes.
+                        break;
+                    }
+
+                    // adjust where we're going to insert based upon the length of the span
+                    targetPoint -= _projectionSpans[i].Length;
+
+                    if (_projectionSpans[i].Kind == ReplSpanKind.Prompt) {
+                        // we just walked past the primary input prompt, we want to put the
+                        // image right before it.
+                        break;
+                    }
+                }
+
+                InlineReplAdornmentProvider.AddInlineAdornment(TextView, element, OnAdornmentLoaded, targetPoint);
                 OnInlineAdornmentAdded();
                 WriteLine(String.Empty);
                 WriteLine(String.Empty);
@@ -2242,6 +2287,7 @@ private bool TryShowObject(object obj) {
         }
 
         private void OnAdornmentLoaded(object source, EventArgs e) {
+            ((ZoomableInlineAdornment)source).Loaded -= OnAdornmentLoaded;
             // Make sure the caret line is rendered
             DoEvents();
             Caret.EnsureVisible();

Common/Product/ReplWindow/Repl/ReplWindowProvider.cs

@@ -60,7 +60,7 @@ public IReplWindow CreateReplWindow(IContentType contentType, string/*!*/ title,
             foreach (var provider in _evaluators) {
                 var evaluator = provider.GetEvaluator(replId);
                 if (evaluator != null) {
-                    string[] roles = provider.GetType().GetCustomAttributes(typeof(ReplRoleAttribute), true).Select(r => ((ReplRoleAttribute)r).Name).ToArray();
+                    string[] roles = evaluator.GetType().GetCustomAttributes(typeof(ReplRoleAttribute), true).Select(r => ((ReplRoleAttribute)r).Name).ToArray();
                     window = CreateReplWindowInternal(evaluator, contentType, roles, curId, title, languageServiceGuid, replId);
                     if ((null == window) || (null == window.Frame)) {
                         throw new NotSupportedException(Resources.CanNotCreateWindow);
@@ -93,7 +93,7 @@ private static IReplEvaluator GetReplEvaluator(IComponentModel model, string rep
                 var evaluator = provider.GetEvaluator(replId);
 
                 if (evaluator != null) {
-                    roles = provider.GetType().GetCustomAttributes(typeof(ReplRoleAttribute), true).Select(r => ((ReplRoleAttribute)r).Name).ToArray();
+                    roles = evaluator.GetType().GetCustomAttributes(typeof(ReplRoleAttribute), true).Select(r => ((ReplRoleAttribute)r).Name).ToArray();
                     return evaluator;
                 }
             }
@@ -216,9 +216,13 @@ private ReplWindow CreateReplWindowInternal(IReplEvaluator evaluator, IContentTy
             // we don't pass __VSCREATETOOLWIN.CTW_fMultiInstance because multi instance panes are
             // destroyed when closed.  We are really multi instance but we don't want to be closed.  This
             // seems to work fine.
+            var creationFlags = __VSCREATETOOLWIN.CTW_fInitNew;
+            if (!roles.Contains("DontPersist")) {
+                creationFlags |= __VSCREATETOOLWIN.CTW_fForceCreate;
+            }
             ErrorHandler.ThrowOnFailure(
                 service.CreateToolWindow(
-                    (uint)(__VSCREATETOOLWIN.CTW_fInitNew | __VSCREATETOOLWIN.CTW_fForceCreate),
+                    (uint)(creationFlags),
                     (uint)id,
                     replWindow.GetIVsWindowPane(),
                     ref clsId,