Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
c093b78c
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
c093b78c
编写于
7月 26, 2021
作者:
J
Jean Pierre
提交者:
GitHub
7月 26, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix dragging a folder from the the explorer tree to terminal no longer copies folder path (#128419)
* Fixes #128283 * :broom: some cleanup
上级
4d4c5f80
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
30 addition
and
29 deletion
+30
-29
src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
...vs/workbench/contrib/terminal/browser/terminalInstance.ts
+13
-14
src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts
...vs/workbench/contrib/terminal/browser/terminalTabsList.ts
+17
-14
src/vs/workbench/contrib/terminal/browser/terminalView.ts
src/vs/workbench/contrib/terminal/browser/terminalView.ts
+0
-1
未找到文件。
src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
浏览文件 @
c093b78c
...
...
@@ -56,9 +56,8 @@ import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from 'vs/plat
import
{
IWorkbenchEnvironmentService
}
from
'
vs/workbench/services/environment/common/environmentService
'
;
import
{
isMacintosh
,
isWindows
,
OperatingSystem
,
OS
}
from
'
vs/base/common/platform
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
import
{
Schemas
}
from
'
vs/base/common/network
'
;
import
{
DataTransfers
}
from
'
vs/base/browser/dnd
'
;
import
{
containsDragType
,
DragAndDropObserver
,
IDragAndDropObserverCallbacks
}
from
'
vs/workbench/browser/dnd
'
;
import
{
CodeDataTransfers
,
containsDragType
,
DragAndDropObserver
,
IDragAndDropObserverCallbacks
}
from
'
vs/workbench/browser/dnd
'
;
import
{
getColorClass
}
from
'
vs/workbench/contrib/terminal/browser/terminalIcon
'
;
import
{
IWorkbenchLayoutService
,
Position
}
from
'
vs/workbench/services/layout/browser/layoutService
'
;
import
{
Orientation
}
from
'
vs/base/browser/ui/sash/sash
'
;
...
...
@@ -2024,7 +2023,7 @@ class TerminalInstanceDragAndDropController extends Disposable implements IDragA
}
onDragEnter
(
e
:
DragEvent
)
{
if
(
!
containsDragType
(
e
,
DataTransfers
.
FILES
,
DataTransfers
.
RESOURCES
,
DataTransfers
.
TERMINALS
))
{
if
(
!
containsDragType
(
e
,
DataTransfers
.
FILES
,
DataTransfers
.
RESOURCES
,
DataTransfers
.
TERMINALS
,
CodeDataTransfers
.
FILES
))
{
return
;
}
...
...
@@ -2085,17 +2084,17 @@ class TerminalInstanceDragAndDropController extends Disposable implements IDragA
// Check if files were dragged from the tree explorer
let
path
:
string
|
undefined
;
const
resources
=
e
.
dataTransfer
.
getData
(
DataTransfers
.
RESOURCES
);
if
(
resources
)
{
const
uri
=
URI
.
parse
(
JSON
.
parse
(
resources
)[
0
])
;
if
(
uri
.
scheme
===
Schemas
.
vscodeTerminal
)
{
const
side
=
this
.
_getDropSide
(
e
);
this
.
_onDropTerminal
.
fire
({
uri
,
side
}
);
return
;
}
else
{
path
=
uri
.
fsPath
;
}
}
else
if
(
e
.
dataTransfer
.
files
.
length
>
0
&&
e
.
dataTransfer
.
files
[
0
].
path
/* Electron only */
)
{
const
r
awR
esources
=
e
.
dataTransfer
.
getData
(
DataTransfers
.
RESOURCES
);
if
(
r
awR
esources
)
{
path
=
URI
.
parse
(
JSON
.
parse
(
rawResources
)[
0
]).
fsPath
;
}
const
rawCodeFiles
=
e
.
dataTransfer
.
getData
(
CodeDataTransfers
.
FILES
);
if
(
!
path
&&
rawCodeFiles
)
{
path
=
URI
.
file
(
JSON
.
parse
(
rawCodeFiles
)[
0
]).
fsPath
;
}
if
(
!
path
&&
e
.
dataTransfer
.
files
.
length
>
0
&&
e
.
dataTransfer
.
files
[
0
].
path
/* Electron only */
)
{
// Check if the file was dragged from the filesystem
path
=
URI
.
file
(
e
.
dataTransfer
.
files
[
0
].
path
).
fsPath
;
}
...
...
src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts
浏览文件 @
c093b78c
...
...
@@ -33,7 +33,6 @@ import { disposableTimeout } from 'vs/base/common/async';
import
{
ElementsDragAndDropData
,
NativeDragAndDropData
}
from
'
vs/base/browser/ui/list/listView
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
import
{
getColorClass
,
getIconId
,
getUriClasses
}
from
'
vs/workbench/contrib/terminal/browser/terminalIcon
'
;
import
{
Schemas
}
from
'
vs/base/common/network
'
;
import
{
IEditableData
}
from
'
vs/workbench/common/views
'
;
import
{
IContextViewService
}
from
'
vs/platform/contextview/browser/contextView
'
;
import
{
InputBox
,
MessageType
}
from
'
vs/base/browser/ui/inputbox/inputBox
'
;
...
...
@@ -41,10 +40,9 @@ import { once } from 'vs/base/common/functional';
import
{
attachInputBoxStyler
}
from
'
vs/platform/theme/common/styler
'
;
import
{
IKeyboardEvent
}
from
'
vs/base/browser/keyboardEvent
'
;
import
{
KeyCode
}
from
'
vs/base/common/keyCodes
'
;
import
{
containsDragType
}
from
'
vs/workbench/browser/dnd
'
;
import
{
CodeDataTransfers
,
containsDragType
}
from
'
vs/workbench/browser/dnd
'
;
import
{
terminalStrings
}
from
'
vs/workbench/contrib/terminal/common/terminalStrings
'
;
import
{
ILifecycleService
}
from
'
vs/workbench/services/lifecycle/common/lifecycle
'
;
import
{
IWorkspaceContextService
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
IProcessDetails
}
from
'
vs/platform/terminal/common/terminalProcess
'
;
import
{
TerminalContextKeys
}
from
'
vs/workbench/contrib/terminal/common/terminalContextKey
'
;
import
{
getTerminalResourcesFromDragEvent
,
parseTerminalUri
}
from
'
vs/workbench/contrib/terminal/browser/terminalUri
'
;
...
...
@@ -545,16 +543,12 @@ class TerminalTabsDragAndDrop implements IListDragAndDrop<ITerminalInstance> {
@
ITerminalService
private
readonly
_terminalService
:
ITerminalService
,
@
ITerminalGroupService
private
readonly
_terminalGroupService
:
ITerminalGroupService
,
@
ITerminalInstanceService
private
readonly
_terminalInstanceService
:
ITerminalInstanceService
,
@
IWorkspaceContextService
private
readonly
_workspaceContextService
:
IWorkspaceContextService
)
{
this
.
_offProcessTerminalService
=
_terminalService
.
getOffProcessTerminalService
();
}
getDragURI
(
instance
:
ITerminalInstance
):
string
|
null
{
return
URI
.
from
({
scheme
:
Schemas
.
vscodeTerminal
,
path
:
`/
${
this
.
_workspaceContextService
.
getWorkspace
().
id
}
/
${
instance
.
instanceId
.
toString
()}
`
}).
toString
();
return
instance
.
resource
.
toString
();
}
getDragLabel
?(
elements
:
ITerminalInstance
[],
originalEvent
:
DragEvent
):
string
|
undefined
{
...
...
@@ -579,13 +573,12 @@ class TerminalTabsDragAndDrop implements IListDragAndDrop<ITerminalInstance> {
const
terminals
:
ITerminalInstance
[]
=
dndData
.
filter
(
e
=>
'
instanceId
'
in
(
e
as
any
));
if
(
terminals
.
length
>
0
)
{
originalEvent
.
dataTransfer
.
setData
(
DataTransfers
.
TERMINALS
,
JSON
.
stringify
(
terminals
.
map
(
e
=>
e
.
resource
.
toString
())));
originalEvent
.
dataTransfer
.
setData
(
DataTransfers
.
RESOURCES
,
JSON
.
stringify
(
terminals
.
map
(
e
=>
e
.
resource
.
toString
())));
}
}
onDragOver
(
data
:
IDragAndDropData
,
targetInstance
:
ITerminalInstance
|
undefined
,
targetIndex
:
number
|
undefined
,
originalEvent
:
DragEvent
):
boolean
|
IListDragOverReaction
{
if
(
data
instanceof
NativeDragAndDropData
)
{
if
(
!
containsDragType
(
originalEvent
,
DataTransfers
.
FILES
,
DataTransfers
.
RESOURCES
,
DataTransfers
.
TERMINALS
))
{
if
(
!
containsDragType
(
originalEvent
,
DataTransfers
.
FILES
,
DataTransfers
.
RESOURCES
,
DataTransfers
.
TERMINALS
,
CodeDataTransfers
.
FILES
))
{
return
false
;
}
}
...
...
@@ -634,6 +627,9 @@ class TerminalTabsDragAndDrop implements IListDragAndDrop<ITerminalInstance> {
}
}
}
}
if
(
promises
.
length
)
{
let
processes
=
await
Promise
.
all
(
promises
);
processes
=
processes
.
filter
(
p
=>
p
!==
undefined
);
let
lastInstance
:
ITerminalInstance
|
undefined
;
...
...
@@ -687,10 +683,17 @@ class TerminalTabsDragAndDrop implements IListDragAndDrop<ITerminalInstance> {
// Check if files were dragged from the tree explorer
let
path
:
string
|
undefined
;
const
resources
=
e
.
dataTransfer
.
getData
(
DataTransfers
.
RESOURCES
);
if
(
resources
)
{
path
=
URI
.
parse
(
JSON
.
parse
(
resources
)[
0
]).
fsPath
;
}
else
if
(
e
.
dataTransfer
.
files
.
length
>
0
&&
e
.
dataTransfer
.
files
[
0
].
path
/* Electron only */
)
{
const
rawResources
=
e
.
dataTransfer
.
getData
(
DataTransfers
.
RESOURCES
);
if
(
rawResources
)
{
path
=
URI
.
parse
(
JSON
.
parse
(
rawResources
)[
0
]).
fsPath
;
}
const
rawCodeFiles
=
e
.
dataTransfer
.
getData
(
CodeDataTransfers
.
FILES
);
if
(
!
path
&&
rawCodeFiles
)
{
path
=
URI
.
file
(
JSON
.
parse
(
rawCodeFiles
)[
0
]).
fsPath
;
}
if
(
!
path
&&
e
.
dataTransfer
.
files
.
length
>
0
&&
e
.
dataTransfer
.
files
[
0
].
path
/* Electron only */
)
{
// Check if the file was dragged from the filesystem
path
=
URI
.
file
(
e
.
dataTransfer
.
files
[
0
].
path
).
fsPath
;
}
...
...
src/vs/workbench/contrib/terminal/browser/terminalView.ts
浏览文件 @
c093b78c
...
...
@@ -494,7 +494,6 @@ class SingleTerminalTabActionViewItem extends MenuEntryActionViewItem {
this
.
_elementDisposables
.
push
(
dom
.
addDisposableListener
(
this
.
element
,
dom
.
EventType
.
DRAG_START
,
e
=>
{
const
instance
=
this
.
_terminalGroupService
.
activeInstance
;
if
(
e
.
dataTransfer
&&
instance
)
{
e
.
dataTransfer
.
setData
(
DataTransfers
.
RESOURCES
,
JSON
.
stringify
([
instance
.
resource
.
toString
()]));
e
.
dataTransfer
.
setData
(
DataTransfers
.
TERMINALS
,
JSON
.
stringify
([
instance
.
resource
.
toString
()]));
}
}));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录