NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commitb8ea6f6

committed

Touch-ups after rebase

1 parent26ff245 commitb8ea6f6Copy full SHA for b8ea6f6

File tree

3 files changed

-25

lines changed

vsintegration/src/vs/FsPkgs
- FSharp.LanguageService/FSharp.LanguageService.Base
  - ViewFilter.cs
- FSharp.VS.FSI
  - fsiPackageHooks.fs
  - fsiSessionToolWindow.fs

3 files changed

-25

lines changed

`‎vsintegration/src/vs/FsPkgs/FSharp.LanguageService/FSharp.LanguageService.Base/ViewFilter.cs‎`

Lines changed: 0 additions & 20 deletions

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,6 @@ public class ViewFilter : IVsTextViewFilter, IVsTextViewEvents, IOleCommandTarge`
`67`	`67`	`privateVsCommandsgotoCmd;`
`68`	`68`	`privatereadonlyGuidguidInteractive=newGuid("8B9BF77B-AF94-4588-8847-2EB2BFFD29EB");`
`69`	`69`	`privatereadonlyuintcmdIDDebugSelection=0x01;`
`70`		`-privatereadonlyuintcmdIDDebugLine=0x02;`
`71`	`70`
`72`	`71`	`/// <include file='doc\ViewFilter.uex' path='docs/doc[@for="ViewFilter.SnippetBound"]/*' />`
`73`	`72`	`protectedboolSnippetBound{`
`@@ -95,13 +94,6 @@ private Microsoft.VisualStudio.Shell.Package GetProjectSystemPackage()`
`95`	`94`	`returnthis.projectSystemPackage;`
`96`	`95`	`}`
`97`	`96`
`98`		`-privateboolEditorSelectionIsEmpty()`
`99`		`-{`
`100`		`-stringselection;`
`101`		`-this.textView.GetSelectedText(outselection);`
`102`		`-returnselection=="";`
`103`		`-}`
`104`		`-`
`105`	`97`	`/// <include file='doc\ViewFilter.uex' path='docs/doc[@for="ViewFilter.ViewFilter"]/*' />`
`106`	`98`	`internalViewFilter(CodeWindowManagermgr,IVsTextViewview){`
`107`	`99`	`this.pvaChar=IntPtr.Zero;`
`@@ -451,18 +443,6 @@ protected virtual int QueryCommandStatus(ref Guid guidCmdGroup, uint nCmdId)`
`451`	`443`	`{`
`452`	`444`	`vardbgState=Interactive.Hooks.GetDebuggerState(GetProjectSystemPackage());`
`453`	`445`
`454`		`-if(dbgState==Interactive.FsiDebuggerState.AttachedNotToFSI)`
`455`		`-return(int)OLECMDF.OLECMDF_INVISIBLE;`
`456`		`-elseif(EditorSelectionIsEmpty())`
`457`		`-return(int)OLECMDF.OLECMDF_SUPPORTED;`
`458`		`-else`
`459`		`-return(int)OLECMDF.OLECMDF_SUPPORTED\|(int)OLECMDF.OLECMDF_ENABLED;`
`460`		`-}`
`461`		`-`
`462`		`-elseif(nCmdId==cmdIDDebugLine)`
`463`		`-{`
`464`		`-vardbgState=Interactive.Hooks.GetDebuggerState(GetProjectSystemPackage());`
`465`		`-`
`466`	`446`	`if(dbgState==Interactive.FsiDebuggerState.AttachedNotToFSI)`
`467`	`447`	`return(int)OLECMDF.OLECMDF_INVISIBLE;`
`468`	`448`	`else`

`‎vsintegration/src/vs/FsPkgs/FSharp.VS.FSI/fsiPackageHooks.fs‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -74,8 +74,8 @@ module internal Hooks =`
`74`	`74`
`75`	`75`	`letOnMLSend(this:Package)(debug:bool)(sender:obj)(e:EventArgs)=`
`76`	`76`	`withFSIToolWindow this(fun window->`
`77`		`-if debugthen window.MLSend(sender, e)`
`78`		`-else window.MLDebugSelection(sender, e)`
	`77`	`+if debugthen window.MLDebug(sender, e)`
	`78`	`+else window.MLSend(sender, e)`
`79`	`79`	`)`
`80`	`80`
`81`	`81`	`letAddReferencesToFSI(this:Package)references=`

`‎vsintegration/src/vs/FsPkgs/FSharp.VS.FSI/fsiSessionToolWindow.fs‎`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -543,7 +543,7 @@ type internal FsiToolWindow() as this =`
`543`	`543`	`letonMLSend(sender:obj)(e:EventArgs)=`
`544`	`544`	`sendSelectionToFSIfalse`
`545`	`545`
`546`		`-letonMLDebugSelection(sender:obj)(e:EventArgs)=`
	`546`	`+letonMLDebug(sender:obj)(e:EventArgs)=`
`547`	`547`	`attachDebugger()`
`548`	`548`	`sendSelectionToFSItrue`
`549`	`549`
`@@ -584,7 +584,7 @@ type internal FsiToolWindow() as this =`
`584`	`584`	`do this.Caption<- VFSIstrings.SR.fsharpInteractive()`
`585`	`585`
`586`	`586`	`memberthis.MLSend(obj,e)= onMLSend obj e`
`587`		`-memberthis.MLDebugSelection(obj,e)=onMLDebugSelection obj e`
	`587`	`+memberthis.MLDebug(obj,e)=onMLDebug obj e`
`588`	`588`
`589`	`589`	`memberthis.GetDebuggerState()=`
`590`	`590`	`let(state,_)= getDebuggerState()`
`@@ -662,7 +662,7 @@ type internal FsiToolWindow() as this =`
`662`	`662`	`addCommand Guids.guidFsiConsoleCmdSet Guids.cmdIDDetachDebugger onDetachDebugger None`
`663`	`663`
`664`	`664`	`addCommand Guids.guidInteractiveShell Guids.cmdIDSendSelection onMLSend None`
`665`		`- addCommand Guids.guidInteractive Guids.cmdIDDebugSelectiononMLDebugSelection None`
	`665`	`+ addCommand Guids.guidInteractive Guids.cmdIDDebugSelectiononMLDebug None`
`666`	`666`
`667`	`667`	`addCommand guidVSStd2KCmdID(int32 VSConstants.VSStd2KCmdID.UP) onHistory(Some supportWhenInInputArea)`
`668`	`668`	`addCommand guidVSStd2KCmdID(int32 VSConstants.VSStd2KCmdID.DOWN) onHistory(Some supportWhenInInputArea)`

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!

Commitb8ea6f6

File tree

3 files changed

3 files changed

`‎vsintegration/src/vs/FsPkgs/FSharp.LanguageService/FSharp.LanguageService.Base/ViewFilter.cs‎`

`‎vsintegration/src/vs/FsPkgs/FSharp.VS.FSI/fsiPackageHooks.fs‎`

`‎vsintegration/src/vs/FsPkgs/FSharp.VS.FSI/fsiSessionToolWindow.fs‎`

0 commit comments