Skip to content

Merge master to dev15.8 #5071

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

Merged
KevinRansom merged 12 commits into from
Jun 2, 2018
Merged

Merge master to dev15.8 #5071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a8d516a
fix namespace auto open if parsed input is empty (#5040)
vasily-kirichenko Jun 1, 2018
3d47f4e
Added preliminary work for brace completion
TIHan Dec 1, 2017
685d2d8
Added Parenthesis for brace completion
TIHan Dec 2, 2017
93c1a5f
Automatic completion for parenthesis works
TIHan Dec 2, 2017
24f2cc5
Cleaning up opens
TIHan Dec 2, 2017
20d3ba0
Added Curly, Square brackets, Double quotes and [||]
gibranrosa Mar 16, 2018
e71bcc8
Fixes for typing "|" at the beginning and end, implemented [<>] and (…
gibranrosa Mar 23, 2018
02af98e
Code cleanup for brace completion
TIHan Apr 3, 2018
e42cef3
Using maybe to make TryCreateSession a bit cleaner
TIHan Apr 11, 2018
5d22bec
Fix Asterisk completion, not checking open parenthesis
gibranrosa May 4, 2018
ec13ce3
Added ProvideBraceCompletionAttribute
TIHan May 31, 2018
b54527d
Merge branch 'dev15.8' into merges/master-to-dev15.8
KevinRansom Jun 2, 2018
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
3 changes: 2 additions & 1 deletion build/targets/PackageVersions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,10 @@
<MicrosoftVisualStudioShellInterop100PackageVersion>10.0.30319</MicrosoftVisualStudioShellInterop100PackageVersion>
<MicrosoftVisualStudioShellInterop110PackageVersion>11.0.61030</MicrosoftVisualStudioShellInterop110PackageVersion>
<MicrosoftVisualStudioShellInterop120PackageVersion>12.0.30110</MicrosoftVisualStudioShellInterop120PackageVersion>
<MicrosoftVisualStudioTextManagerInteropPackageVersion>7.10.6070</MicrosoftVisualStudioTextManagerInteropPackageVersion>
<MicrosoftVisualStudioTextManagerInteropPackageVersion>7.10.6071</MicrosoftVisualStudioTextManagerInteropPackageVersion>
<MicrosoftVisualStudioTextManagerInterop80PackageVersion>8.0.50727</MicrosoftVisualStudioTextManagerInterop80PackageVersion>
<MicrosoftVisualStudioTextManagerInterop100PackageVersion>10.0.30319</MicrosoftVisualStudioTextManagerInterop100PackageVersion>
<MicrosoftVisualStudioTextManagerInterop120PackageVersion>12.0.30112</MicrosoftVisualStudioTextManagerInterop120PackageVersion>
<MicrosoftVisualStudioTextUIPackageVersion>15.6.27740</MicrosoftVisualStudioTextUIPackageVersion>
<MicrosoftVisualStudioTextUIWpfPackageVersion>15.6.27740</MicrosoftVisualStudioTextUIWpfPackageVersion>
<MicrosoftVisualStudioWCFReferenceInteropPackageVersion>9.0.30729</MicrosoftVisualStudioWCFReferenceInteropPackageVersion>
Expand Down
9 changes: 6 additions & 3 deletions src/fsharp/service/ServiceAssemblyContent.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -999,8 +999,11 @@ module ParsedInput =

mkPos line ctx.Pos.Column

let tryFindNearestPointToInsertOpenDeclaration (currentLine: int) (ast: ParsedInput) (entity: Idents) (insertionPoint: OpenStatementInsertionPoint) =
let findNearestPointToInsertOpenDeclaration (currentLine: int) (ast: ParsedInput) (entity: Idents) (insertionPoint: OpenStatementInsertionPoint) =
match tryFindNearestPointAndModules currentLine ast insertionPoint with
| Some (scope, _, point), modules ->
Some (findBestPositionToInsertOpenDeclaration modules scope point entity)
| _ -> None
findBestPositionToInsertOpenDeclaration modules scope point entity
| _ ->
// we failed to find insertion point because ast is empty for some reason, return top left point in this case
{ ScopeKind = ScopeKind.TopModule
Pos = mkPos 1 0 }
2 changes: 1 addition & 1 deletion src/fsharp/service/ServiceAssemblyContent.fsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ module public ParsedInput =
(( (* requiresQualifiedAccessParent: *) Idents option * (* autoOpenParent: *) Idents option * (* entityNamespace *) Idents option * (* entity: *) Idents) -> (Entity * InsertContext)[])

/// Returns `InsertContext` based on current position and symbol idents.
val tryFindNearestPointToInsertOpenDeclaration : currentLine: int -> ast: Ast.ParsedInput -> entity: Idents -> insertionPoint: OpenStatementInsertionPoint -> InsertContext option
val findNearestPointToInsertOpenDeclaration : currentLine: int -> ast: Ast.ParsedInput -> entity: Idents -> insertionPoint: OpenStatementInsertionPoint -> InsertContext

/// Returns lond identifier at position.
val getLongIdentAt : ast: Ast.ParsedInput -> pos: Range.pos -> Ast.LongIdent option
Expand Down
Loading