1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
|
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
//
// copyright : (C) 2014 Eran Ifrah
// file name : codelitediff.cpp
//
// -------------------------------------------------------------------------
// A
// _____ _ _ _ _
// / __ \ | | | | (_) |
// | / \/ ___ __| | ___| | _| |_ ___
// | | / _ \ / _ |/ _ \ | | | __/ _ )
// | \__/\ (_) | (_| | __/ |___| | || __/
// \____/\___/ \__,_|\___\_____/_|\__\___|
//
// F i l e
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
#include "codelitediff.h"
#include "DiffFoldersFrame.h"
#include "DiffSideBySidePanel.h"
#include "NewFileComparison.h"
#include "clDiffFrame.h"
#include "clKeyboardManager.h"
#include "event_notifier.h"
#include "file_logger.h"
#include "macros.h"
#include <wx/ffile.h>
#include <wx/menu.h>
#include <wx/xrc/xmlres.h>
static CodeLiteDiff* thePlugin = NULL;
// Define the plugin entry point
CL_PLUGIN_API IPlugin* CreatePlugin(IManager* manager)
{
if(thePlugin == 0) {
thePlugin = new CodeLiteDiff(manager);
}
return thePlugin;
}
CL_PLUGIN_API PluginInfo* GetPluginInfo()
{
static PluginInfo info;
info.SetAuthor("Eran Ifrah");
info.SetName("Diff Plugin");
info.SetDescription(_("CodeLite Diff Plugin"));
info.SetVersion("v1.0");
return &info;
}
CL_PLUGIN_API int GetPluginInterfaceVersion() { return PLUGIN_INTERFACE_VERSION; }
CodeLiteDiff::CodeLiteDiff(IManager* manager)
: IPlugin(manager)
{
m_longName = _("CodeLite Diff Plugin");
m_shortName = "Diff Plugin";
Bind(wxEVT_MENU, &CodeLiteDiff::OnDiff, this, XRCID("diff_compare_with"));
EventNotifier::Get()->Bind(wxEVT_CONTEXT_MENU_TAB_LABEL, &CodeLiteDiff::OnTabContextMenu, this);
wxTheApp->Bind(wxEVT_MENU, &CodeLiteDiff::OnNewDiff, this, XRCID("diff_new_comparison"));
wxTheApp->Bind(wxEVT_MENU, &CodeLiteDiff::OnNewDiffFolder, this, XRCID("diff_new_folder"));
clKeyboardManager::Get()->AddAccelerator(_("Diff Tool"),
{ { "diff_new_comparison", _("New File Comparison"), "Ctrl-Shift-C" },
{ "diff_new_folder", _("New Folder Comparison"), "Ctrl-Alt-F" } });
}
CodeLiteDiff::~CodeLiteDiff() {}
void CodeLiteDiff::CreateToolBar(clToolBarGeneric* toolbar) { wxUnusedVar(toolbar); }
void CodeLiteDiff::CreatePluginMenu(wxMenu* pluginsMenu)
{
wxMenu* menu = new wxMenu;
menu->Append(XRCID("diff_new_comparison"), _("New File Comparison"), _("Start new diff"));
menu->Append(XRCID("diff_new_folder"), _("New Folder Comparison"), _("Start new folders diff"));
pluginsMenu->Append(wxID_ANY, _("Diff Tool"), menu);
}
void CodeLiteDiff::UnPlug()
{
wxTheApp->Unbind(wxEVT_COMMAND_MENU_SELECTED, &CodeLiteDiff::OnNewDiff, this, XRCID("diff_new_comparison"));
EventNotifier::Get()->Unbind(wxEVT_CONTEXT_MENU_TAB_LABEL, &CodeLiteDiff::OnTabContextMenu, this);
Unbind(wxEVT_MENU, &CodeLiteDiff::OnDiff, this, XRCID("diff_compare_with"));
}
void CodeLiteDiff::OnNewDiff(wxCommandEvent& e)
{
clDiffFrame* diff = new clDiffFrame(EventNotifier::Get()->TopFrame());
diff->Show();
}
void CodeLiteDiff::OnTabContextMenu(clContextMenuEvent& event)
{
event.Skip();
DoClear();
IEditor* activeEditor = m_mgr->GetActiveEditor();
CHECK_PTR_RET(activeEditor);
m_leftFile = activeEditor->GetFileName();
// Edit the context menu
wxMenuItem* mi = new wxMenuItem(event.GetMenu(), XRCID("diff_compare_with"), _("Compare with..."), "");
mi->SetBitmap(m_mgr->GetStdIcons()->LoadBitmap("diff"));
event.GetMenu()->AppendSeparator();
event.GetMenu()->Append(mi);
event.GetMenu()->Bind(wxEVT_MENU, &CodeLiteDiff::OnDiff, this, XRCID("diff_compare_with"));
}
void CodeLiteDiff::DoClear() { m_leftFile.Clear(); }
void CodeLiteDiff::OnDiff(wxCommandEvent& event)
{
bool tempfile(false);
NewFileComparison dlg(EventNotifier::Get()->TopFrame(), m_leftFile);
if(dlg.ShowModal() == wxID_OK) {
if(m_leftFile.GetName().StartsWith(_("Untitled"))) {
tempfile = true;
m_leftFile = SaveEditorToTmpfile(m_mgr->GetActiveEditor());
if(!m_leftFile.IsOk()) {
clDEBUG() << "CodeLiteDiff::OnDiff: call to SaveEditorToTmpfile() failed for m_leftFile" << endl;
return;
}
}
wxString secondFile = dlg.GetTextCtrlFileName()->GetValue();
if(secondFile.StartsWith(_("Untitled"))) {
tempfile = true;
IEditor* editor = m_mgr->FindEditor(secondFile);
if(!editor) {
clDEBUG() << "CodeLiteDiff::OnDiff: call to FindEditor() failed" << endl;
return;
}
wxFileName rightFn = SaveEditorToTmpfile(editor);
if(!rightFn.IsOk()) {
clDEBUG() << "CodeLiteDiff::OnDiff: call to SaveEditorToTmpfile() failed for secondFile" << endl;
return;
}
secondFile = rightFn.GetFullPath();
}
// Check that we're not trying to diff an editor against itself
// If we are and it's been edited, diff against the unaltered version
if(m_leftFile.GetFullPath() == secondFile) {
IEditor* editor = m_mgr->FindEditor(secondFile);
if(editor && editor->IsEditorModified()) {
wxFileName rightFn = SaveEditorToTmpfile(editor);
if(!rightFn.IsOk()) {
clDEBUG() << "CodeLiteDiff::OnDiff: call to SaveEditorToTmpfile() failed for secondFile" << endl;
return;
}
secondFile = rightFn.GetFullPath();
} else {
clDEBUG() << "CodeLiteDiff::OnDiff: trying to diff an editor against itself" << endl;
return;
}
}
clDiffFrame* diffView = new clDiffFrame(EventNotifier::Get()->TopFrame(), m_leftFile, secondFile, tempfile);
diffView->Show();
}
}
wxFileName CodeLiteDiff::SaveEditorToTmpfile(IEditor* editor) const
{
wxString content = editor->GetEditorText();
if(content.empty()) {
return wxFileName(); // Nothing to diff
}
wxString tpath(wxFileName::GetTempDir());
tpath << wxFileName::GetPathSeparator() << "CLdiff" << wxFileName::GetPathSeparator();
wxFileName::Mkdir(tpath, wxS_DIR_DEFAULT, wxPATH_MKDIR_FULL);
wxFileName tmpFile(wxFileName::CreateTempFileName(tpath + editor->GetFileName().GetName()));
if(!tmpFile.IsOk()) {
return wxFileName();
}
tmpFile.SetExt(editor->GetFileName().GetExt());
wxFFile fp(tmpFile.GetFullPath(), "w+b");
if(fp.IsOpened()) {
fp.Write(content);
fp.Close();
} else {
return wxFileName();
}
return tmpFile;
}
void CodeLiteDiff::OnNewDiffFolder(wxCommandEvent& e)
{
DiffFoldersFrame *dlg = new DiffFoldersFrame(EventNotifier::Get()->TopFrame());
dlg->Show();
}
|
