* Improved intellisense experience

Peter Rosconi · Peter Rosconi · commit 2c254039eb49 · 2014-10-08T18:06:39.000-04:00
* More consistent **ctrl+space** behavior
    * **#r** intellisense
    * **#load** intellisense
diff --git a/IfSharp.sln b/IfSharp.sln
@@ -80,6 +80,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "img", "img", "{7B100429-EB1
 		docs\files\img\intellisense-1.png = docs\files\img\intellisense-1.png
 		docs\files\img\intellisense-2.png = docs\files\img\intellisense-2.png
 		docs\files\img\intellisense-3.png = docs\files\img\intellisense-3.png
+		docs\files\img\intellisense-4.png = docs\files\img\intellisense-4.png
+		docs\files\img\intellisense-5.png = docs\files\img\intellisense-5.png
 		docs\files\img\logo.png = docs\files\img\logo.png
 		docs\files\img\math-1.png = docs\files\img\math-1.png
 		docs\files\img\toaster.png = docs\files\img\toaster.png
diff --git a/README.md b/README.md
@@ -28,6 +28,12 @@ See our [release repository](https://github.com/BayardRock/IfSharp/releases). Al
 ![Intellisense Example #3 With Chart](https://raw.github.com/BayardRock/IfSharp/master/docs/files/img/intellisense-3.png "Intellisense Example #3 With Chart")
 ***
 
+![Intellisense Example #4 #r Directive](https://raw.github.com/BayardRock/IfSharp/master/docs/files/img/intellisense-4.png "Intellisense Example #3 #r Directive")
+***
+
+![Intellisense Example #5 #load Directive](https://raw.github.com/BayardRock/IfSharp/master/docs/files/img/intellisense-5.png "Intellisense Example #load Directive")
+***
+
 ## Integrated NuGet
 ![NuGet Example](https://raw.github.com/BayardRock/IfSharp/master/docs/files/img/NuGet-1.png "NuGet example")
 
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,9 @@
+### New in 2.0.2 Beta (Released 2014/10/08)
+* Improved intellisense experience
+    * More consistent **ctrl+space** behavior
+    * **#r** intellisense
+    * **#load** intellisense
+
 ### New in 2.0.1 Beta (Released 2014/06/02)
 * Added gcAllowVeryLargeObjects to the app.config
 * The `--install` command line argument no longer supported. File system is automatically copied if no command line arguments are supplied
diff --git a/docs/files/img/intellisense-4.png b/docs/files/img/intellisense-4.png
diff --git a/docs/files/img/intellisense-5.png b/docs/files/img/intellisense-5.png
diff --git a/ipython-profile/static/custom/custom.css b/ipython-profile/static/custom/custom.css
@@ -168,6 +168,14 @@ th {
     background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACO0lEQVR4Xo2SS0hUURiAv3PunWFMMinNiijG3BQ9wIykh6skU2xji2gTSFEY1EJyYWHLqEURBaY9wGVBBC3KMsIEGUmLGi1RRs0YnPH9Gu80cx+nWVhckgG/xVkc+D5+zvmFUgoAIQShx8cPOY7VqWwLlu8RIKREaB6E1CiobhUAfz0dF0vxeOWWwr3kHLiEYxlgG0jPOqxEjJFn9bzujl7GxYqALpwKX+52knPfiY/eB+klc0cdU59eYSTMwStNvS38h8SFx6v2+HL8WIs/ENpavOuPYhtzLIR6KGvoOQUspJ0g9Kik0LchC9BRZhjpycSTtYuJwBuCo7Hb0dlEH0DagPHbrMrO86OSU+AkEPoaJgPNLA5Nsm+br26w8WCdkBpC0xFSAgh3AF04lRl5m3DsaaSeAcDGI7XklSgUFkItoZCMtTYxHom15wMA/74x1Fys8k9fwIr9AnMRx7FIHSAEUtNQShENfCUaWXpXXNtdk/KG3BMgpCDS9hzHtlFWkq0nGzDnO5DKxDQMJnuC9Idmmk/cCN4Chle8QcH5riKAu+f8xVWl/gdCgqZJzJhFpCNAR99cffW9gRZgLN0efAYoK8y+6cvNRTCFHU8y9rGdzv756yn5ITCbZg9cRZ3SjM27MWd/Ev7wlqtPhsrP3hlodMnpA8NP95+RQqTkMOG2F1xrGal4GZh+D8yQBh0XSUvVeDUYD3ZN7Lz4rRzoBUyAVQW8OodtRy2k5GPLsotVBPKrvxQB9mplgD9z7vSpojdyCgAAAABJRU5ErkJggg==)
 }
 
+.icon-glyph-1000 {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAASklEQVR42mNkgIKGhob/DAQAUA0juhgjsgH19fU4NTc2NmI1hCQDQPIgGtkQkg2AsWGGkOwF9DAh2gBsBo4aMGoAbQwgWjdCDyMAjqlwEfGZXsQAAAAASUVORK5CYII=);
+}
+
+.icon-glyph-1001 {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAoklEQVR4XsXTPQ6CQBCG4Q8ksTAbrb2BB6CioLT0Cl7Bxmt4Bc9gZwmJieEChsKCUkMFFT9hCJspiAVxGRKeevPObDZrEREkbAg5AJDfTwS2UNvbyjsfMKC/dXcFHVD+DjoWvPAvtb9YDn5waFB/kA5USYjs8YGJOok5wJauZxZ4x5O9AiOSBaguhYGqmHmDJv3CXm9GB45l9LzCjD4//29sAVazOELv0oQIAAAAAElFTkSuQmCC);
+}
+
 .cm-s-neat span.cm-comment { color: #008000; }
 .cm-s-neat span.cm-keyword { line-height: 1em; font-weight: bold; color: blue; }
 .cm-s-neat span.cm-string { color: #B21543; }
diff --git a/ipython-profile/static/custom/custom.js b/ipython-profile/static/custom/custom.js
@@ -82,9 +82,12 @@ $([IPython.events]).on('app_initialized.NotebookApp', function ()
 
                 intellisense.addDeclarationTrigger({ keyCode: 190 }); // `.`
                 intellisense.addDeclarationTrigger({ keyCode: 32, ctrlKey: true, preventDefault: true, type: 'down' }); // `ctrl+space`
+                intellisense.addDeclarationTrigger({ keyCode: 191 }); // `/`
+                intellisense.addDeclarationTrigger({ keyCode: 220 }); // `\`
+                intellisense.addDeclarationTrigger({ keyCode: 222 }); // `"`
+                intellisense.addDeclarationTrigger({ keyCode: 222, shiftKey: true }); // `"`
                 intellisense.addMethodsTrigger({ keyCode: 57, shiftKey: true }); // `(`
                 intellisense.addMethodsTrigger({ keyCode: 48, shiftKey: true });// `)`
-                intellisense.addMethodsTrigger({ keyCode: 8 }); // `backspace`
                 intellisense.onMethod(function (item, position)
                 {
 
@@ -95,11 +98,32 @@ $([IPython.events]).on('app_initialized.NotebookApp', function ()
                     var codes = cells.codes;
                     var cursor = cells.selectedCell.code_mirror.doc.getCursor();
                     var callbacks = { shell: {}, iopub: {} };
+                    var line = editor.getLine(cursor.line);
+                    var isSlash = item.keyCode === 191 || item.keyCode === 220;
+                    var isQuote = item.keyCode === 222;
+
+                    var isLoadOrRef = line.indexOf('#load') === 0
+                        || line.indexOf('#r') === 0;
+
+                    var isStartLoadOrRef = line === '#load "'
+                        || line === '#r "'
+                        || line === '#load @"'
+                        || line === '#r @"';
+
+                    if (isSlash && !isLoadOrRef)
+                    {
+                        return;
+                    }
+                    if (isQuote && !isStartLoadOrRef)
+                    {
+                        return;
+                    }
 
                     // v2
                     callbacks.shell.reply = function (msg)
                     {
                         intellisense.setDeclarations(msg.content.matches);
+                        intellisense.setStartColumnIndex(data.filter_start_index);
                     };
 
                     callbacks.iopub.output = function (msg)
@@ -111,6 +135,7 @@ $([IPython.events]).on('app_initialized.NotebookApp', function ()
                     callbacks.complete_reply = function (data)
                     {
                         intellisense.setDeclarations(data.matches);
+                        intellisense.setStartColumnIndex(data.filter_start_index);
                     };
 
                     callbacks.output = function (msgType, content, metadata)
diff --git a/ipython-profile/static/custom/webintellisense-codemirror.js b/ipython-profile/static/custom/webintellisense-codemirror.js
@@ -62,9 +62,17 @@ var CodeMirrorIntellisense = function (editor)
         {
             if (decls.isVisible())
             {
+                // backspace
                 if (evt.keyCode === 8)
                 {
                     decls.setFilter(getFilterText());
+
+                    // hide if we go too far left
+                    var cursor = editor.getCursor();
+                    if (cursor.ch <= autoCompleteStart.columnIndex)
+                    {
+                        decls.setVisible(false);
+                    }
                 }
                 else
                 {
@@ -223,7 +231,11 @@ var CodeMirrorIntellisense = function (editor)
      * @param {int} i - The index to set
      * @function setStartColumnIndex
      */
-    this.setStartColumnIndex = function (i) { autoCompleteStart.columnIndex = i; };
+    this.setStartColumnIndex = function (i)
+    {
+        autoCompleteStart.columnIndex = i;
+        decls.setFilter(getFilterText());
+    };
 
     /**
      * Gets the text after startColumnIndex but before caret offset.
diff --git a/ipython-profile/static/custom/webintellisense.js b/ipython-profile/static/custom/webintellisense.js
@@ -765,9 +765,10 @@ var DeclarationsIntellisense = function ()
         }
 
         var ret = [];
+        var lowerFilter = filterText.toLowerCase();
         declarations.forEach(function (item)
         {
-            if (filterMode(item, filterText))
+            if (filterMode(item, lowerFilter))
             {
                 ret.push(item);
             }
diff --git a/src/IfSharp.Kernel/AssemblyInfo.fs b/src/IfSharp.Kernel/AssemblyInfo.fs
@@ -4,9 +4,9 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("IfSharp.Kernel")>]
 [<assembly: AssemblyProductAttribute("IfSharp.Kernel")>]
 [<assembly: AssemblyDescriptionAttribute("A short summary of your project.")>]
-[<assembly: AssemblyVersionAttribute("2.0")>]
-[<assembly: AssemblyFileVersionAttribute("2.0")>]
+[<assembly: AssemblyVersionAttribute("2.0.2")>]
+[<assembly: AssemblyFileVersionAttribute("2.0.2")>]
 do ()
 
 module internal AssemblyVersionInformation =
-    let [<Literal>] Version = "2.0"
+    let [<Literal>] Version = "2.0.2"
diff --git a/src/IfSharp.Kernel/FsCompiler.fs b/src/IfSharp.Kernel/FsCompiler.fs
@@ -31,9 +31,10 @@ type TooltipInfo =
 
 type SimpleDeclaration =
     {
-        Documentation: string;
-        Glyph: int;
-        Name: string;
+        Documentation: string
+        Glyph: int
+        Name: string
+        Value: string
     }
 
 type TypeCheckResults = 
@@ -43,6 +44,103 @@ type TypeCheckResults =
         Preprocess : PreprocessResults
     }
 
+[<AutoOpen>]
+module FsCompilerInternals = 
+    
+    type PreprocessorMatchType = 
+        | Folder
+        | File
+
+    type PreprocessorMatch = 
+        {
+            MatchType: PreprocessorMatchType
+            Name: string
+        }
+
+    type Directive =
+        | Load
+        | Reference
+
+    type PreprocessorMatches =
+        {
+            Directive: Directive
+            Directory: string
+            Filter: string
+            Matches: PreprocessorMatch[]
+            FilterStartIndex: int
+        }
+
+    type String with 
+        member this.Substring2(startIndex, endIndex) =
+           this.Substring(startIndex, endIndex - startIndex)
+
+    let matchToDocumentation (m:PreprocessorMatch) =
+        match m.MatchType with
+        | File -> "File: " + m.Name
+        | Folder -> "Folder: " + m.Name
+
+    let directiveToFileFilter d = 
+        match d with 
+        | Reference -> "*.dll"
+        | Load -> "*.fsx"
+
+    let matchToGlyph m = 
+        match m with
+        | File -> 1000
+        | Folder -> 1001
+
+    let getPreprocessorIntellisense baseDirectory charIndex (line:string) = 
+    
+        let directive = 
+            if line.StartsWith "#load" then Some Load
+            elif line.StartsWith "#r" then Some Reference
+            else None
+
+        match directive with
+        | Some d ->
+            let nextQuote = line.IndexOf('"')
+            let firstQuote = line.LastIndexOf('"', charIndex - 1)
+    
+            // make sure we are inside quotes
+            if firstQuote <> -1 && nextQuote <> -1 && firstQuote = nextQuote then
+
+                let previousSlash = line.LastIndexOfAny([| '/'; '\\' |], charIndex - 1)
+
+                let directory, filter, startIndex = 
+                    if previousSlash <> -1 && previousSlash > firstQuote then
+                        let directory = line.Substring2(firstQuote + 1, previousSlash + 1)
+                        let filter = line.Substring2(previousSlash + 1, charIndex)
+                        if Path.IsPathRooted(directory) then
+                            directory, filter, previousSlash + 1
+                        else
+                            Path.Combine(baseDirectory, directory), filter, previousSlash + 1
+                    else 
+                        baseDirectory, line.Substring2(firstQuote + 1, charIndex), firstQuote + 1
+
+                let files = 
+                    Directory.GetFiles(directory, directiveToFileFilter d)
+                    |> Array.map Path.GetFileName
+                    |> Array.map (fun x -> { MatchType = PreprocessorMatchType.File; Name = x })
+
+                let dirs = 
+                    DirectoryInfo(directory).GetDirectories()
+                    |> Array.map (fun x -> x.Name)
+                    |> Array.map (fun x -> { MatchType = PreprocessorMatchType.Folder; Name = x })
+
+                {
+                    Matches = Array.append dirs files
+                    Directory = directory
+                    Filter = filter
+                    FilterStartIndex = startIndex
+                    Directive = d
+                } |> Some
+        
+            else
+
+                None
+
+        | None -> None
+
 /// The Compiler class contains methods and for compiling F# code and other tasks
 type FsCompiler (executingDirectory : string) =
 
@@ -155,18 +253,23 @@ type FsCompiler (executingDirectory : string) =
                 | Some(x) -> endIndex - x
                 | None -> 0
 
+            let finalIndex = 
+                if token.TokenName = "IDENT" then
+                    endIndex - 1
+                else
+                    endIndex
+
             let relevantTokens = 
-                tokens.[startIndex..endIndex]
+                tokens.[startIndex..finalIndex]
                 |> Array.filter (fun x -> x.TokenName = "IDENT")
                 |> Array.map (fun x -> line.Substring(x.LeftColumn, x.FullMatchedLength))
                 |> Array.map (fun x -> x.Trim([|'`'|]))
 
-            if token.TokenName = "IDENT" then
-                relevantTokens |> Seq.take (relevantTokens.Length - 1) |> Seq.toList
-            else
-                relevantTokens |> Seq.toList
+            let filterStartIndex = if finalIndex = -1 then tokens.[0].LeftColumn else tokens.[finalIndex].RightColumn + 1
+            let lst = relevantTokens |> Seq.toList
+            (lst, filterStartIndex)
 
-        | None -> List.empty
+        | None -> (List.empty, 0)
 
     /// Tries to figure out the names to pass to GetToolTip
     member this.ExtractTooltipName (line : string) (charIndex : int) =
@@ -231,7 +334,7 @@ type FsCompiler (executingDirectory : string) =
         let fileName = "/home/Test.fsx"
         let tcr = this.TypeCheck(source, fileName)
         let line = tcr.Preprocess.OriginalLines.[lineNumber - 1]
-        let names = this.ExtractNames(line, charIndex)
+        let names, _ = this.ExtractNames(line, charIndex)
 
         // get declarations for a location
         let methods = tcr.Check.GetMethodsAlternate(lineNumber, charIndex, line, Some(names))
@@ -242,21 +345,35 @@ type FsCompiler (executingDirectory : string) =
 
         let fileName = "/home/Test.fsx"
         let tcr = this.TypeCheck(source, fileName)
-        let lines = tcr.Preprocess.OriginalLines
         let line = tcr.Preprocess.OriginalLines.[lineNumber - 1]
-        let names = this.ExtractNames(line, charIndex)
+        let preprocess = FsCompilerInternals.getPreprocessorIntellisense "." charIndex line
 
-        // get declarations for a location
-        let decls = 
-            tcr.Check.GetDeclarationsAlternate(Some(tcr.Parse), lineNumber, charIndex, line, names, "")
-            |> Async.RunSynchronously
+        match preprocess with
+        | None ->
+
+            let getValue(str:string) =
+                if str.Contains(" ") then "``" + str + "``" else str
+
+            // get declarations for a location
+            let names, filterStartIndex = this.ExtractNames(line, charIndex)
+            let decls = 
+                tcr.Check.GetDeclarationsAlternate(Some(tcr.Parse), lineNumber, charIndex, line, names, "")
+                |> Async.RunSynchronously
 
-        let items = 
-            decls.Items
-            |> Seq.map (fun x -> { Documentation = this.FormatTip(x.DescriptionText, None); Glyph = x.Glyph; Name = x.Name })
-            |> Seq.toArray
+            let items = 
+                decls.Items
+                |> Seq.map (fun x -> { Documentation = this.FormatTip(x.DescriptionText, None); Glyph = x.Glyph; Name = x.Name; Value = getValue x.Name })
+                |> Seq.toArray
 
-        (names, items, tcr)
+            (names, items, tcr, filterStartIndex)
+
+        | Some(x) -> 
+            
+            let items = 
+                x.Matches
+                |> Array.map (fun x -> { Documentation = matchToDocumentation x; Glyph = matchToGlyph x.MatchType; Name = x.Name; Value = x.Name })
+            
+            (List.empty, items, tcr, x.FilterStartIndex)
 
     /// Gets tooltip information for the specified information
     member this.GetToolTipText (source, lineNumber : int, charIndex : int) =
diff --git a/src/IfSharp.Kernel/Kernel.fs b/src/IfSharp.Kernel/Kernel.fs
diff --git a/src/IfSharp.Kernel/ShellMessages.fs b/src/IfSharp.Kernel/ShellMessages.fs

Original file line number	Diff line number	Diff line change
`@@ -62,9 +62,17 @@ var CodeMirrorIntellisense = function (editor)`
`62`	`62`	`{`
`63`	`63`	`if (decls.isVisible())`
`64`	`64`	`{`
	`65`	`+ // backspace`
`65`	`66`	`if (evt.keyCode === 8)`
`66`	`67`	`{`
`67`	`68`	`decls.setFilter(getFilterText());`
	`69`	`+`
	`70`	`+ // hide if we go too far left`
	`71`	`+ var cursor = editor.getCursor();`
	`72`	`+ if (cursor.ch <= autoCompleteStart.columnIndex)`
	`73`	`+ {`
	`74`	`+ decls.setVisible(false);`
	`75`	`+ }`
`68`	`76`	`}`
`69`	`77`	`else`
`70`	`78`	`{`
`@@ -223,7 +231,11 @@ var CodeMirrorIntellisense = function (editor)`
`223`	`231`	`* @param {int} i - The index to set`
`224`	`232`	`* @function setStartColumnIndex`
`225`	`233`	`*/`
`226`		`- this.setStartColumnIndex = function (i) { autoCompleteStart.columnIndex = i; };`
	`234`	`+ this.setStartColumnIndex = function (i)`
	`235`	`+ {`
	`236`	`+ autoCompleteStart.columnIndex = i;`
	`237`	`+ decls.setFilter(getFilterText());`
	`238`	`+ };`
`227`	`239`
`228`	`240`	`/**`
`229`	`241`	`* Gets the text after startColumnIndex but before caret offset.`
Original file line number	Diff line number	Diff line change
`@@ -765,9 +765,10 @@ var DeclarationsIntellisense = function ()`
`765`	`765`	`}`
`766`	`766`
`767`	`767`	`var ret = [];`
	`768`	`+ var lowerFilter = filterText.toLowerCase();`
`768`	`769`	`declarations.forEach(function (item)`
`769`	`770`	`{`
`770`		`- if (filterMode(item, filterText))`
	`771`	`+ if (filterMode(item, lowerFilter))`
`771`	`772`	`{`
`772`	`773`	`ret.push(item);`
`773`	`774`	`}`