Commit457a9d3

JoshVarty

authored and

KevinRansom

committed

Fix vs std11 commands (#2645)

* Only return VSConstants.S_OK for commands we handle.* Remove do keyword

1 parent140440a commit457a9d3Copy full SHA for 457a9d3

File tree

1 file changed

-8

lines changed

vsintegration/src/FSharp.Editor/Commands
- FsiCommandService.fs

1 file changed

-8

lines changed

`‎vsintegration/src/FSharp.Editor/Commands/FsiCommandService.fs‎`

Lines changed: 7 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,15 +36,14 @@ type internal FsiCommandFilter(serviceProvider: System.IServiceProvider) =`
`36`	`36`
`37`	`37`	`interface IOleCommandTargetwith`
`38`	`38`	`memberx.Exec(pguidCmdGroup,nCmdId,nCmdexecopt,pvaIn,pvaOut)=`
`39`		`-if pguidCmdGroup= VSConstants.VsStd11then`
`40`		`-if nCmdId= uint32 VSConstants.VSStd11CmdID.ExecuteSelectionInInteractivethen`
`41`		`- Hooks.OnMLSend projectSystemPackage.Value FsiEditorSendAction.ExecuteSelectionnullnull`
`42`		`-elif nCmdId= uint32 VSConstants.VSStd11CmdID.ExecuteLineInInteractivethen`
`43`		`- Hooks.OnMLSend projectSystemPackage.Value FsiEditorSendAction.ExecuteLinenullnull`
	`39`	`+if pguidCmdGroup= VSConstants.VsStd11&& nCmdId= uint32 VSConstants.VSStd11CmdID.ExecuteSelectionInInteractivethen`
	`40`	`+ Hooks.OnMLSend projectSystemPackage.Value FsiEditorSendAction.ExecuteSelectionnullnull`
`44`	`41`	`VSConstants.S_OK`
`45`		`-elif pguidCmdGroup= Guids.guidInteractivethen`
`46`		`-if nCmdId= uint32 Guids.cmdIDDebugSelectionthen`
`47`		`- Hooks.OnMLSend projectSystemPackage.Value FsiEditorSendAction.DebugSelectionnullnull`
	`42`	`+elif pguidCmdGroup= VSConstants.VsStd11&& nCmdId= uint32 VSConstants.VSStd11CmdID.ExecuteLineInInteractivethen`
	`43`	`+ Hooks.OnMLSend projectSystemPackage.Value FsiEditorSendAction.ExecuteLinenullnull`
	`44`	`+ VSConstants.S_OK`
	`45`	`+elif pguidCmdGroup= Guids.guidInteractive&& nCmdId= uint32 Guids.cmdIDDebugSelectionthen`
	`46`	`+ Hooks.OnMLSend projectSystemPackage.Value FsiEditorSendAction.DebugSelectionnullnull`
`48`	`47`	`VSConstants.S_OK`
`49`	`48`	`elifnot(isNull nextTarget)then`
`50`	`49`	`nextTarget.Exec(&pguidCmdGroup, nCmdId, nCmdexecopt, pvaIn, pvaOut)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit457a9d3

File tree

1 file changed

1 file changed

`‎vsintegration/src/FSharp.Editor/Commands/FsiCommandService.fs‎`

0 commit comments