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.

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

Don't match braces at the end of the caret #1619

Merged
merged 1 commit into from
Oct 15, 2016
Merged

Don't match braces at the end of the caret #1619

merged 1 commit into from
Oct 15, 2016

Conversation

OmarTawfik
Copy link
Contributor

Fixes #1597
@Microsoft/fsharp-compiler

Due to how ProduceTagsAsync() behaves, position position passed to the service is the character that should be matched (not the caret position). So we should not match carets after the braces. The tagger will check in both directions for braces.

Copy link
Member

@KevinRansom KevinRansom left a comment

Choose a reason for hiding this comment

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

Looks good

@KevinRansom KevinRansom merged commit 749ba2d into dotnet:master Oct 15, 2016
dsyme pushed a commit to dsyme/fsharp that referenced this pull request Oct 17, 2016
dsyme added a commit to dsyme/fsharp that referenced this pull request Oct 17, 2016
commit 2a991b6
Author: Don Syme <dsyme@users.noreply.github.com>
Date:   Mon Oct 17 20:40:15 2016 +0100

    Fix microbuild (dotnet#1629)

commit 169d366
Author: Kevin Ransom (msft) <codecutter.fsharp@hotmail.com>
Date:   Sun Oct 16 15:04:50 2016 -0700

    Add missed file. (dotnet#1625)

    * Ensure that portable libraries have correct hintpath for preview 5

    * Replaced missed file

commit d64ff35
Author: Don Syme <dsyme@users.noreply.github.com>
Date:   Sun Oct 16 22:37:08 2016 +0100

    cleanup build and test scripts (dotnet#1615)

    * cleanup build and test scripts

commit 39480c4
Author: Kevin Ransom (msft) <codecutter.fsharp@hotmail.com>
Date:   Sun Oct 16 10:19:03 2016 -0700

    Ensure that portable libraries have correct hintpath for preview 5 (dotnet#1624)

commit 2fe5a3b
Author: Kevin Ransom (msft) <codecutter@hotmail.com>
Date:   Sat Oct 15 14:03:48 2016 -0700

    Add support for generating sourcelink record in portable pdbs.  Fixes dotnet#1585

commit e0318a8
Author: Kevin Ransom (msft) <codecutter.fsharp@hotmail.com>
Date:   Sat Oct 15 13:32:44 2016 -0700

    FSharp ms build task to support new xommand line options (dotnet#1616)

commit 749ba2d
Author: Omar Tawfik <OmarTawfik@users.noreply.github.com>
Date:   Sat Oct 15 13:27:14 2016 -0700

    Don't match braces at the end of the caret (dotnet#1619)

commit 00bab99
Author: Kevin Ransom (msft) <codecutter.fsharp@hotmail.com>
Date:   Sat Oct 15 13:25:15 2016 -0700

    (Nugetize F# templates.  Ensure value tuple installed on create template. (dotnet#1620)

commit 2a9b5ef
Author: Omar Tawfik <OmarTawfik@users.noreply.github.com>
Date:   Fri Oct 14 22:45:35 2016 -0700

    Add fsx files to workspaces (dotnet#1612)

    * Add fsx files to workspaces

    * Stop passing project output paths to CPS

    * Read script file contents from memory (on workspace initialization)

commit 8b434e0
Author: Kevin Ransom (msft) <codecutter.fsharp@hotmail.com>
Date:   Fri Oct 14 10:32:59 2016 -0700

    Don't try to deploy vsix during OSS build.  Specify prereq in vsixmanifest (dotnet#1613)

commit 79430d2
Author: Don Syme <dsyme@users.noreply.github.com>
Date:   Fri Oct 14 15:58:08 2016 +0100

    simplify use of if-defs (dotnet#1614)

commit b708921
Author: Don Syme <dsyme@users.noreply.github.com>
Date:   Fri Oct 14 10:25:28 2016 +0100

    Always use FSharp.Core not fsharp.core (dotnet#1610)
@OmarTawfik OmarTawfik deleted the fix-1597-brace-matching-at-end branch October 18, 2016 18:05
KevinRansom added a commit that referenced this pull request Oct 22, 2016
* Always use FSharp.Core not fsharp.core (#1610)

* simplify use of if-defs (#1614)

* Don't try to deploy vsix during OSS build.  Specify prereq in vsixmanifest (#1613)

* Add fsx files to workspaces (#1612)

* Add fsx files to workspaces

* Stop passing project output paths to CPS

* Read script file contents from memory (on workspace initialization)

* (Nugetize F# templates.  Ensure value tuple installed on create template. (#1620)

* Don't match braces at the end of the caret (#1619)

* FSharp ms build task to support new xommand line options (#1616)

* Add support for generating sourcelink record in portable pdbs.  Fixes #1585

* Ensure that portable libraries have correct hintpath for preview 5

* Ensure that portable libraries have correct hintpath for preview 5 (#1624)

* cleanup build and test scripts (#1615)

* cleanup build and test scripts

* Replaced missed file

* Fix merge issue

* fix merge error

* Fix ngen build error
KevinRansom added a commit that referenced this pull request Oct 25, 2016
* Always use FSharp.Core not fsharp.core (#1610)

* simplify use of if-defs (#1614)

* Don't try to deploy vsix during OSS build.  Specify prereq in vsixmanifest (#1613)

* Add fsx files to workspaces (#1612)

* Add fsx files to workspaces

* Stop passing project output paths to CPS

* Read script file contents from memory (on workspace initialization)

* (Nugetize F# templates.  Ensure value tuple installed on create template. (#1620)

* Don't match braces at the end of the caret (#1619)

* FSharp ms build task to support new xommand line options (#1616)

* Add support for generating sourcelink record in portable pdbs.  Fixes #1585

* Ensure that portable libraries have correct hintpath for preview 5

* Ensure that portable libraries have correct hintpath for preview 5 (#1624)

* cleanup build and test scripts (#1615)

* cleanup build and test scripts

* Replaced missed file

* Fix merge issue

* fix merge error

* update build tools

* reset build_coreclr

* Fix coreclr proto build

* Typo
KevinRansom added a commit that referenced this pull request Oct 26, 2016
* Always use FSharp.Core not fsharp.core (#1610)

* simplify use of if-defs (#1614)

* Don't try to deploy vsix during OSS build.  Specify prereq in vsixmanifest (#1613)

* Add fsx files to workspaces (#1612)

* Add fsx files to workspaces

* Stop passing project output paths to CPS

* Read script file contents from memory (on workspace initialization)

* (Nugetize F# templates.  Ensure value tuple installed on create template. (#1620)

* Don't match braces at the end of the caret (#1619)

* FSharp ms build task to support new xommand line options (#1616)

* Add support for generating sourcelink record in portable pdbs.  Fixes #1585

* Ensure that portable libraries have correct hintpath for preview 5

* Ensure that portable libraries have correct hintpath for preview 5 (#1624)

* cleanup build and test scripts (#1615)

* cleanup build and test scripts

* Replaced missed file

* Fix merge issue

* fix merge error

* Update to nunit 3.5
KevinRansom added a commit that referenced this pull request Oct 27, 2016
* Always use FSharp.Core not fsharp.core (#1610)

* simplify use of if-defs (#1614)

* Don't try to deploy vsix during OSS build.  Specify prereq in vsixmanifest (#1613)

* Add fsx files to workspaces (#1612)

* Add fsx files to workspaces

* Stop passing project output paths to CPS

* Read script file contents from memory (on workspace initialization)

* (Nugetize F# templates.  Ensure value tuple installed on create template. (#1620)

* Don't match braces at the end of the caret (#1619)

* FSharp ms build task to support new xommand line options (#1616)

* Add support for generating sourcelink record in portable pdbs.  Fixes #1585

* Ensure that portable libraries have correct hintpath for preview 5

* Ensure that portable libraries have correct hintpath for preview 5 (#1624)

* cleanup build and test scripts (#1615)

* cleanup build and test scripts

* Replaced missed file

* Fix merge issue

* fix merge error

* Update to nunit 3.5

* revert unit runner to 3.0.0

* move back to local packages.

* revert to nuget
KevinRansom added a commit that referenced this pull request Oct 27, 2016
* Always use FSharp.Core not fsharp.core (#1610)

* simplify use of if-defs (#1614)

* Don't try to deploy vsix during OSS build.  Specify prereq in vsixmanifest (#1613)

* Add fsx files to workspaces (#1612)

* Add fsx files to workspaces

* Stop passing project output paths to CPS

* Read script file contents from memory (on workspace initialization)

* (Nugetize F# templates.  Ensure value tuple installed on create template. (#1620)

* Don't match braces at the end of the caret (#1619)

* FSharp ms build task to support new xommand line options (#1616)

* Add support for generating sourcelink record in portable pdbs.  Fixes #1585

* Ensure that portable libraries have correct hintpath for preview 5

* Ensure that portable libraries have correct hintpath for preview 5 (#1624)

* cleanup build and test scripts (#1615)

* cleanup build and test scripts

* Replaced missed file

* Fix merge issue

* fix merge error

* Update to nunit 3.5

* revert unit runner to 3.0.0

* Reduce number of times check path for illegal chars occurs in cropextension
nosami pushed a commit to xamarin/visualfsharp that referenced this pull request Jan 26, 2022
commit 2a991b6
Author: Don Syme <dsyme@users.noreply.github.com>
Date:   Mon Oct 17 20:40:15 2016 +0100

    Fix microbuild (dotnet#1629)

commit 169d366
Author: Kevin Ransom (msft) <codecutter.fsharp@hotmail.com>
Date:   Sun Oct 16 15:04:50 2016 -0700

    Add missed file. (dotnet#1625)

    * Ensure that portable libraries have correct hintpath for preview 5

    * Replaced missed file

commit d64ff35
Author: Don Syme <dsyme@users.noreply.github.com>
Date:   Sun Oct 16 22:37:08 2016 +0100

    cleanup build and test scripts (dotnet#1615)

    * cleanup build and test scripts

commit 39480c4
Author: Kevin Ransom (msft) <codecutter.fsharp@hotmail.com>
Date:   Sun Oct 16 10:19:03 2016 -0700

    Ensure that portable libraries have correct hintpath for preview 5 (dotnet#1624)

commit 2fe5a3b
Author: Kevin Ransom (msft) <codecutter@hotmail.com>
Date:   Sat Oct 15 14:03:48 2016 -0700

    Add support for generating sourcelink record in portable pdbs.  Fixes dotnet#1585

commit e0318a8
Author: Kevin Ransom (msft) <codecutter.fsharp@hotmail.com>
Date:   Sat Oct 15 13:32:44 2016 -0700

    FSharp ms build task to support new xommand line options (dotnet#1616)

commit 749ba2d
Author: Omar Tawfik <OmarTawfik@users.noreply.github.com>
Date:   Sat Oct 15 13:27:14 2016 -0700

    Don't match braces at the end of the caret (dotnet#1619)

commit 00bab99
Author: Kevin Ransom (msft) <codecutter.fsharp@hotmail.com>
Date:   Sat Oct 15 13:25:15 2016 -0700

    (Nugetize F# templates.  Ensure value tuple installed on create template. (dotnet#1620)

commit 2a9b5ef
Author: Omar Tawfik <OmarTawfik@users.noreply.github.com>
Date:   Fri Oct 14 22:45:35 2016 -0700

    Add fsx files to workspaces (dotnet#1612)

    * Add fsx files to workspaces

    * Stop passing project output paths to CPS

    * Read script file contents from memory (on workspace initialization)

commit 8b434e0
Author: Kevin Ransom (msft) <codecutter.fsharp@hotmail.com>
Date:   Fri Oct 14 10:32:59 2016 -0700

    Don't try to deploy vsix during OSS build.  Specify prereq in vsixmanifest (dotnet#1613)

commit 79430d2
Author: Don Syme <dsyme@users.noreply.github.com>
Date:   Fri Oct 14 15:58:08 2016 +0100

    simplify use of if-defs (dotnet#1614)

commit b708921
Author: Don Syme <dsyme@users.noreply.github.com>
Date:   Fri Oct 14 10:25:28 2016 +0100

    Always use FSharp.Core not fsharp.core (dotnet#1610)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants