MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

proper data context fallback for non-project-related editors (probably fixes DBE-2299)

Browse Source
This commit is contained in:
Dmitry Batrak
2016-01-29 20:11:41 +03:00
parent 68cd5b1668
commit bdd50ff1d2
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/openapi/editor/actionSystem/CaretSpecificDataContext.java
+9 -6
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -37,11 +37,14 @@ public class CaretSpecificDataContext extends DataContextWrapper {
@Override
public Object getData(@NonNls String dataId) {
Project project = (Project)super.getData(CommonDataKeys.PROJECT.getName());
if (project == null) {
return null;
if (project != null) {
FileEditorManager fm = FileEditorManager.getInstance(project);
if (fm != null) {
Object data = fm.getData(dataId, myCaret.getEditor(), myCaret);
if (data != null) return data;
}
}
FileEditorManager fm = FileEditorManager.getInstance(project);
Object data = fm == null ? null : fm.getData(dataId, myCaret.getEditor(), myCaret);
return data == null ? super.getData(dataId) : data;
if (CommonDataKeys.CARET.is(dataId)) return myCaret;
return super.getData(dataId);
}
}