Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Completion glyphs ( Bump to version 0.15.0) #1

Merged
merged 4 commits into from
May 20, 2015
Merged

Completion glyphs ( Bump to version 0.15.0) #1

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e03659d
Add Glyph to Completion output
Krzysztof-Cieslak May 17, 2015
bcc9c65
Translating glyph to string and glyph character
Krzysztof-Cieslak May 19, 2015
7ce97e3
Update test results
Krzysztof-Cieslak May 19, 2015
44d3d3b
Small fixes
Krzysztof-Cieslak May 20, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 53 additions & 2 deletions FSharp.AutoComplete/Program.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,13 @@ type Location =
Column: int
}

type CompletionResponse =
{
Name: string
Glyph: string
GlyphChar: string
}

type ProjectResponse =
{
Project: string
Expand Down Expand Up @@ -267,6 +274,48 @@ module internal CommandInput =
let cmds = compilerlocation <|> outputmode <|> helptext <|> help <|> declarations <|> parse <|> project <|> completionTipOrDecl <|> quit <|> error
reader |> Parsing.getFirst cmds

module internal CompletionUtils =
let map =
[ 0x0000, ("Class", "C")
0x0003, ("Enum", "E")
0x00012, ("Struct", "S")
0x00018, ("Struct", "S") (* value type *)
0x0002, ("Delegate", "D")
0x0008, ("Interface", "I")
0x000e, ("Module", "N") (* module *)
0x000f, ("Namespace", "N")
0x000c, ("Method", "m")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we use upper-case for consistency?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mean 'M'

0x000d, ("Extension Method", "m") (* method2 ? *)
0x00011, ("Property", "P")
0x0005, ("Event", "e")
0x0007, ("Field", "F") (* fieldblue ? *)
0x0020, ("Field", "F") (* fieldyellow ? *)
0x0001, ("Field", "F") (* const *)
0x0004, ("Property", "P") (* enummember *)
0x0006, ("Exception", "X") (* exception *)
0x0009, ("Text File Icon", "t") (* TextLine *)
0x000a, ("Regular File", "R") (* Script *)
0x000b, ("Script", "s") (* Script2 *)
0x0010, ("Tip of the day", "t") (* Formula *);
0x00013, ("Class", "C") (* Template *)
0x00014, ("Class", "C") (* Typedef *)
0x00015, ("Type", "T") (* Type *)
0x00016, ("Type", "T") (* Union *)
0x00017, ("Field", "F") (* Variable *)
0x00019, ("Class", "C") (* Intrinsic *)
0x0001f, ("Other", "o") (* error *)
0x00021, ("Other", "o") (* Misc1 *)
0x0022, ("Other", "o") (* Misc2 *)
0x00023, ("Other", "o") (* Misc3 *) ] |> Map.ofSeq

/// Translates icon code that we get from F# language service into a MonoDevelop icon
let getIcon glyph =
match map.TryFind (glyph / 6), map.TryFind (glyph % 6) with
| Some(s), _ -> s // Is the second number good for anything?
| _, _ -> ("", "")



// --------------------------------------------------------------------------------------
// Main application command-line loop
// --------------------------------------------------------------------------------------
Expand Down Expand Up @@ -474,7 +523,7 @@ module internal Main =
match state.OutputMode with
| Text ->
printAgent.WriteLine "DATA: completion"
for d in decls.Items do printAgent.WriteLine(d.Name)
for d in decls.Items do printAgent.WriteLine(sprintf "%s" d.Name)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you revert this line please?

printAgent.WriteLine "<<EOF>>"
main state
| Json ->
Expand All @@ -488,7 +537,9 @@ module internal Main =
prAsJson { Kind = "helptext"; Data = helptext }

prAsJson { Kind = "completion"
Data = [ for d in decls.Items do yield d.Name ] }
Data = [ for d in decls.Items do
let (glyph, glyphChar) = CompletionUtils.getIcon d.Glyph
yield { Name = d.Name; Glyph = glyph; GlyphChar = glyphChar } ] }

let helptext =
Seq.fold (fun m (d: FSharpDeclarationListItem) -> Map.add d.Name d.DescriptionText m) Map.empty decls.Items
Expand Down
4 changes: 2 additions & 2 deletions FSharp.AutoComplete/test/integration/ErrorTestsJson/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
{"Kind":"INFO","Data":"Synchronous parsing started"}
{"Kind":"errors","Data":[{"StartLine":7,"StartLineAlternate":8,"EndLine":7,"EndLineAlternate":8,"StartColumn":12,"EndColumn":19,"Severity":"Error","Message":"The value or constructor 'unnamed' is not defined","Subcategory":"typecheck","FileName":"<absolute path removed>/test/integration/ErrorTestsJson/Script.fsx"}]}
{"Kind":"helptext","Data":{"func":"val func : x:int -> int"}}
{"Kind":"completion","Data":["func"]}
{"Kind":"completion","Data":[{"Name":"func","Glyph":"Method","GlyphChar":"m"}]}
{"Kind":"helptext","Data":{"func":"val func : x:int -> int"}}
{"Kind":"completion","Data":["func"]}
{"Kind":"completion","Data":[{"Name":"func","Glyph":"Method","GlyphChar":"m"}]}
10 changes: 5 additions & 5 deletions FSharp.AutoComplete/test/integration/Test1Json/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
{"Kind":"INFO","Data":"Synchronous parsing started"}
{"Kind":"errors","Data":[]}
{"Kind":"helptext","Data":{"funky":"val funky : x:int -> int"}}
{"Kind":"completion","Data":["funky"]}
{"Kind":"completion","Data":[{"Name":"funky","Glyph":"Method","GlyphChar":"m"}]}
{"Kind":"helptext","Data":{"Equals":"System.Object.Equals(obj: obj) : bool"}}
{"Kind":"completion","Data":["Equals","GetHashCode","GetType","Terrific","ToString"]}
{"Kind":"completion","Data":[{"Name":"Equals","Glyph":"Method","GlyphChar":"m"},{"Name":"GetHashCode","Glyph":"Method","GlyphChar":"m"},{"Name":"GetType","Glyph":"Method","GlyphChar":"m"},{"Name":"Terrific","Glyph":"Method","GlyphChar":"m"},{"Name":"ToString","Glyph":"Method","GlyphChar":"m"}]}
{"Kind":"helptext","Data":{"Bar":"union case FileTwo.Foo.Bar: FileTwo.Foo"}}
{"Kind":"completion","Data":["Bar","Foo","NewObjectType","Qux","add","addition"]}
{"Kind":"completion","Data":[{"Name":"Bar","Glyph":"Property","GlyphChar":"P"},{"Name":"Foo","Glyph":"Type","GlyphChar":"T"},{"Name":"NewObjectType","Glyph":"Class","GlyphChar":"C"},{"Name":"Qux","Glyph":"Property","GlyphChar":"P"},{"Name":"add","Glyph":"Method","GlyphChar":"m"},{"Name":"addition","Glyph":"Method","GlyphChar":"m"}]}
{"Kind":"helptext","Data":{"func":"val func : x:int -> int"}}
{"Kind":"completion","Data":["func"]}
{"Kind":"completion","Data":[{"Name":"func","Glyph":"Method","GlyphChar":"m"}]}
{"Kind":"helptext","Data":{"Bar":"union case FileTwo.Foo.Bar: FileTwo.Foo"}}
{"Kind":"completion","Data":["Bar","Foo","NewObjectType","Qux","add","addition"]}
{"Kind":"completion","Data":[{"Name":"Bar","Glyph":"Property","GlyphChar":"P"},{"Name":"Foo","Glyph":"Type","GlyphChar":"T"},{"Name":"NewObjectType","Glyph":"Class","GlyphChar":"C"},{"Name":"Qux","Glyph":"Property","GlyphChar":"P"},{"Name":"add","Glyph":"Method","GlyphChar":"m"},{"Name":"addition","Glyph":"Method","GlyphChar":"m"}]}
{"Kind":"tooltip","Data":"val add : x:int -> y:int -> int\n\nFull name: FileTwo.add"}
{"Kind":"tooltip","Data":"val func : x:int -> int\n\nFull name: Program.X.func"}
{"Kind":"tooltip","Data":"val testval : FileTwo.NewObjectType\n\nFull name: Program.testval"}
Expand Down