Commit518e59b

authored and

committed

fixed drag and drop issues from files into folders in solution explorer (#4095)

1 parent72f0e92 commit518e59bCopy full SHA for 518e59b

File tree

-7

lines changed

vsintegration/src/FSharp.ProjectSystem.Base/Project
- ProjectNode.CopyPaste.cs
- ProjectNode.cs

-7

lines changed

Lines changed: 0 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,11 +39,6 @@ public override int DragEnter(IOleDataObject pDataObject, uint grfKeyState, uint`
`39`	`39`	`{`
`40`	`40`	`pdwEffect=(uint)DropEffect.None;`
`41`	`41`
`42`		`-if(this.SourceDraggedOrCutOrCopied)`
`43`		`-{`
`44`		`-returnVSConstants.S_OK;`
`45`		`-}`
`46`		`-`
`47`	`42`	`this.dropDataType=QueryDropDataType(pDataObject);`
`48`	`43`	`if(this.dropDataType!=DropDataType.None)`
`49`	`44`	`{`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4922,8 +4922,12 @@ internal int AddItemWithSpecific(uint itemIdLoc, VSADDITEMOPERATION op, string i`
`4922`	`4922`
`4923`	`4923`	`if(context==AddItemContext.Paste&&FindChild(file)!=null)`
`4924`	`4924`	`{`
`4925`		`-// if we are doing 'Paste' and source file belongs to current project - generate fresh unique name`
`4926`		`-newFileName=GenerateCopyOfFileName(baseDir,fileName);`
	`4925`	`+newFileName=Path.Combine(baseDir,fileName);`
	`4926`	`+if(FindChild(newFileName)!=null)`
	`4927`	`+{`
	`4928`	`+// if we are doing 'Paste' and source file belongs to current project - generate fresh unique name`
	`4929`	`+newFileName=GenerateCopyOfFileName(baseDir,fileName);`
	`4930`	`+}`
`4927`	`4931`	`}`
`4928`	`4932`	`elseif(!IsContainedWithinProjectDirectory(file))`
`4929`	`4933`	`{`

Comments

(0)