Merge pull request #1312 from vasily-kirichenko/peek-definition-docs

Peek definition docs
fsprojects-archive · Jan 4, 2016 · 7b7a839 · 7b7a839
2 parents 528c60e + 026938b
commit 7b7a839
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 2 deletions.
diff --git a/FSharpVSPowerTools.v14.sln b/FSharpVSPowerTools.v14.sln
@@ -35,6 +35,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "content", "content", "{8E6D
 		docs\content\navbar.fsx = docs\content\navbar.fsx
 		docs\content\navigateto.fsx = docs\content\navigateto.fsx
 		docs\content\outlining.fsx = docs\content\outlining.fsx
+		docs\content\peekdefinition.fsx = docs\content\peekdefinition.fsx
 		docs\content\recordstubgeneration.fsx = docs\content\recordstubgeneration.fsx
 		docs\content\rename.fsx = docs\content\rename.fsx
 		docs\content\resolveunopenednamespaces.fsx = docs\content\resolveunopenednamespaces.fsx

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,7 +1,8 @@
-#### 2.3.0 - Unreleased
+#### 2.3.0 - January 4 2016
 * Implement Peek definition [#1286](https://github.com/fsprojects/VisualFSharpPowerTools/pull/1286)
 * Add outlining menu items and keybindings [#1283](https://github.com/fsprojects/VisualFSharpPowerTools/pull/1283)
 * Implement highlight definitions [#1272](https://github.com/fsprojects/VisualFSharpPowerTools/pull/1272)
+* Fix Printf arguments highlighting bugs
 
 #### 2.2.0 - November 29 2015
 * Implement outlining support ([#1147](https://github.com/fsprojects/VisualFSharpPowerTools/issues/1147))

diff --git a/docs/content/index.fsx b/docs/content/index.fsx
@@ -44,6 +44,7 @@ Here are currently supported features:
  * [Quick info panel](quickinfopanel.html)
  * [Lint](lint.html)
  * [Outlining](outlining.html)
+ * [Peek Definition](peekdefinition.html)
   
 Default Keymap
 --------------

diff --git a/docs/content/peekdefinition.fsx b/docs/content/peekdefinition.fsx
@@ -0,0 +1,19 @@
+(*** hide ***)
+// This block of code is omitted in the generated HTML documentation. Use 
+// it to define helpers that you do not want to show in the documentation.
+#I "../../bin"
+
+(**
+Peek Definition (Alt + F12) command (Visual Studio 2015+ only)
+----------------
+
+This feature can also be activated through Peek Definition context menu. 
+It opens a symbol definition in a special view, embedded into current one. 
+Although this feature works in Visual Studio 2013 for C#/VB files, a public API
+was introduced only in Visual Studio 2015, so we cannot support it in previous 
+versions.
+
+Here is a screencast in VS2015:
+
+![PeekDefinition](img/peek_definition.gif)
+*)
diff --git a/docs/files/img/peek_definition.gif b/docs/files/img/peek_definition.gif
diff --git a/docs/tools/templates/template.cshtml b/docs/tools/templates/template.cshtml
@@ -71,6 +71,7 @@
 				<li><a href="@Root/quickinfopanel.html">Quick info panel</a></li>
 				<li><a href="@Root/lint.html">Lint</a></li>
 				<li><a href="@Root/outlining.html">Outlining</a></li>
+				<li><a href="@Root/peekdefinition.html">Peek Definition</a></li>
 
                 <li class="nav-header">API Documentation</li>
                 <li><a href="@Root/reference/index.html">API Reference</a></li>

diff --git a/src/FSharpVSPowerTools.Logic.VS2013/AssemblyInfo.fs b/src/FSharpVSPowerTools.Logic.VS2013/AssemblyInfo.fs
@@ -0,0 +1,14 @@
+namespace System
+open System.Reflection
+open System.Runtime.CompilerServices
+
+[<assembly: InternalsVisibleToAttribute("FSharpVSPowerTools.Tests")>]
+[<assembly: AssemblyTitleAttribute("FSharpVSPowerTools.Logic.VS2013")>]
+[<assembly: AssemblyProductAttribute("FSharpVSPowerTools")>]
+[<assembly: AssemblyDescriptionAttribute("A collection of additional commands for F# in Visual Studio")>]
+[<assembly: AssemblyVersionAttribute("2.3.0")>]
+[<assembly: AssemblyFileVersionAttribute("2.3.0")>]
+do ()
+
+module internal AssemblyVersionInformation =
+    let [<Literal>] Version = "2.3.0"
diff --git a/src/FSharpVSPowerTools/source.extension.vsixmanifest b/src/FSharpVSPowerTools/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="FSharpVSPowerTools.68b42cfe-c752-4094-8dba-ed48aa81cac8" Version="2.2.1" Language="en-US" Publisher="fsharp.org" />
+    <Identity Id="FSharpVSPowerTools.68b42cfe-c752-4094-8dba-ed48aa81cac8" Version="2.3.0" Language="en-US" Publisher="fsharp.org" />
     <DisplayName>Visual F# Power Tools</DisplayName>
     <Description xml:space="preserve">A collection of additional commands for F# in Visual Studio</Description>
     <MoreInfo>https://github.com/fsprojects/VisualFSharpPowerTools</MoreInfo>