Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-19 14:49:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

editors dnd - more 💄

Browse Source
This commit is contained in:
Benjamin Pasero
2021-05-27 12:37:18 +02:00
parent 9095b835bb
commit 55d91bbed8
1 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/browser/dnd.ts
+36 -34
View File
@@ -48,13 +48,13 @@ export const CodeDataTransfers = {
FILES: 'CodeFiles'
};
interface IDraggedResourceEditorInput extends IBaseTextResourceEditorInput {
export interface IDraggedResourceEditorInput extends IBaseTextResourceEditorInput {
resource?: URI;
isExternal?: boolean;
}
export function extractEditorsDropData(e: DragEvent, externalOnly?: boolean): Array<IDraggedResourceEditorInput> {
const editors: Array<IDraggedResourceEditorInput> = [];
const editors: IDraggedResourceEditorInput[] = [];
if (e.dataTransfer && e.dataTransfer.types.length > 0) {
// Check for window-to-window DND
@@ -76,7 +76,7 @@ export function extractEditorsDropData(e: DragEvent, externalOnly?: boolean): Ar
const rawResourcesData = e.dataTransfer.getData(DataTransfers.RESOURCES);
if (rawResourcesData) {
const resourcesRaw: string[] = JSON.parse(rawResourcesData);
editors.push(...resourcesRaw.map(resourceRaw => ({ resource: URI.parse(resourceRaw), isExternal: false })));
editors.push(...resourcesRaw.map(resourceRaw => ({ resource: URI.parse(resourceRaw) })));
}
} catch (error) {
// Invalid transfer
@@ -242,7 +242,7 @@ export function fillEditorsDragData(accessor: ServicesAccessor, resourcesOrEdito
}
// Extract resources from URIs or Editors
const resources: IResourceStat[] = coalesce(resourcesOrEditors.map(resourceOrEditor => {
const resources = coalesce(resourcesOrEditors.map(resourceOrEditor => {
if (URI.isUri(resourceOrEditor)) {
return { resource: resourceOrEditor };
}
@@ -305,42 +305,44 @@ export function fillEditorsDragData(accessor: ServicesAccessor, resourcesOrEdito
// provide everything from the `asResourceEditorInput` method.
{
const resource = editor.resource;
const textFileModel = resource ? textFileService.files.get(resource) : undefined;
if (textFileModel) {
if (resource) {
const textFileModel = textFileService.files.get(resource);
if (textFileModel) {
// mode
if (typeof editor.mode !== 'string') {
editor.mode = textFileModel.getMode();
// mode
if (typeof editor.mode !== 'string') {
editor.mode = textFileModel.getMode();
}
// encoding
if (typeof editor.encoding !== 'string') {
editor.encoding = textFileModel.getEncoding();
}
// contents (only if dirty)
if (typeof editor.contents !== 'string' && textFileModel.isDirty()) {
editor.contents = textFileModel.textEditorModel.getValue();
}
}
// encoding
if (typeof editor.encoding !== 'string') {
editor.encoding = textFileModel.getEncoding();
}
// contents (only if dirty)
if (typeof editor.contents !== 'string' && textFileModel.isDirty()) {
editor.contents = textFileModel.textEditorModel.getValue();
}
}
// viewState
if (!editor.options?.viewState) {
editor.options = {
...editor.options,
viewState: (() => {
for (const textEditorControl of editorService.visibleTextEditorControls) {
if (isCodeEditor(textEditorControl)) {
const model = textEditorControl.getModel();
if (isEqual(model?.uri, resource)) {
return withNullAsUndefined(textEditorControl.saveViewState());
// viewState
if (!editor.options?.viewState) {
editor.options = {
...editor.options,
viewState: (() => {
for (const textEditorControl of editorService.visibleTextEditorControls) {
if (isCodeEditor(textEditorControl)) {
const model = textEditorControl.getModel();
if (isEqual(model?.uri, resource)) {
return withNullAsUndefined(textEditorControl.saveViewState());
}
}
}
}
return undefined;
})()
};
return undefined;
})()
};
}
}
}