Imported Upstream version 5.4+dfsg

1 files changed, 178 insertions, 141 deletions

diff --git a/LiteEditor/addincludefiledlg.cpp b/LiteEditor/addincludefiledlg.cpp
index 5e2f233c..77782784 100644
--- a/LiteEditor/addincludefiledlg.cpp
+++ b/LiteEditor/addincludefiledlg.cpp
@@ -1,173 +1,210 @@
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
 //
-// copyright            : (C) 2008 by Eran Ifrah                            
-// file name            : addincludefiledlg.cpp              
-//                                                                          
+// copyright            : (C) 2013 by Eran Ifrah
+// file name            : addincludefiledlg.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.                                   
-//                                                                          
+// 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 "addincludefiledlg.h"
+#include "addincludefiledlg.h"
 #include "manager.h"
+#include "frame.h"
 #include "wx/filename.h"
-#include "wx/regex.h"

-

-wxArrayString AddIncludeFileDlg::m_includePath;

+#include "wx/regex.h"
+#include <algorithm>
+#include "editor_config.h"
+#include "lexer_configuration.h"
+#include "windowattrmanager.h"
+
+wxArrayString AddIncludeFileDlg::m_includePath;
+
+struct SAscendingSort {
+    bool operator()(const wxString &s1, const wxString& s2) {
+        return s1.Len() > s2.Len();
+    }
+};
 
 AddIncludeFileDlg::AddIncludeFileDlg( wxWindow* parent, const wxString &fullpath, const wxString &text, int lineNo )
-		:
-		AddIncludeFileDlgBase( parent )
-		, m_fullpath(fullpath)
-		, m_text(text)
-		, m_line(lineNo)
+    :
+    AddIncludeFileDlgBase( parent )
+    , m_fullpath(fullpath)
+    , m_text(text)
+    , m_line(lineNo)
 {
-	UpdateLineToAdd();

-	

-	//initialise the preview window

-	//---------------------------------------------------------

-	wxFont font(10, wxFONTFAMILY_TELETYPE, wxNORMAL, wxNORMAL);
-	m_textCtrlPreview->MarkerDefine(0x7, wxSCI_MARK_ARROW);
-	m_textCtrlPreview->MarkerSetBackground(0x7, wxT("YELLOW GREEN"));
-	m_textCtrlPreview->StyleSetFont(0, font);
-	
-
-	//set the initial text
-	m_textCtrlPreview->SetReadOnly(false);
-	m_textCtrlPreview->AddText(m_text);
-	m_textCtrlPreview->EmptyUndoBuffer();
-	SetAndMarkLine();
-	Centre();
-	m_textCtrlLineToAdd->SetFocus();
+    UpdateLineToAdd();
+    
+    // Initialise the preview window
+    LexerConfPtr cppLex = EditorConfigST::Get()->GetLexer("C++");
+    cppLex->Apply( m_textCtrlPreview, true );
+    
+    //---------------------------------------------------------
+    m_textCtrlPreview->MarkerDefine(0x7, wxSTC_MARK_ARROW);
+    m_textCtrlPreview->MarkerSetBackground(0x7, wxT("YELLOW GREEN"));
+
+    // Set the initial text
+    m_textCtrlPreview->SetReadOnly(false);
+    m_textCtrlPreview->AddText(m_text);
+    m_textCtrlPreview->EmptyUndoBuffer();
+    SetAndMarkLine();
+    Centre();
+    m_textCtrlLineToAdd->SetFocus();
+    WindowAttrManager::Load(this, "AddIncludeFileDlg", NULL);
+}
+
+AddIncludeFileDlg::~AddIncludeFileDlg()
+{
+    WindowAttrManager::Save(this, "AddIncludeFileDlg", NULL);
+}
+
+void AddIncludeFileDlg::UpdateLineToAdd()
+{
+    wxString line;
+    wxFileName fn(m_fullpath);
+    m_textCtrlFullPath->ChangeValue(fn.GetFullPath());
+
+    //try to get a match in the include path for this file
+    wxString pp = fn.GetFullPath();
+    pp.Replace(wxT("\\"), wxT("/"));
+
+    wxString rest;
+    for(size_t i=0; i< m_includePath.GetCount(); i++) {
+        if(pp.StartsWith( m_includePath.Item(i) , &rest )) {
+            break;
+        }
+    }
+
+    if(rest.IsEmpty()) {
+        rest = fn.GetFullName();
+    }
+
+    wxString errMsg;
+    wxString projectName = clMainFrame::Get()->GetMainBook()->GetActiveEditor()->GetProject();
+    ProjectPtr proj = WorkspaceST::Get()->FindProjectByName(projectName, errMsg);
+    if(proj) {
+        wxArrayString incls = proj->GetIncludePaths();
+        std::sort(incls.begin(), incls.end(), SAscendingSort());
+
+        for(size_t i=0; i<incls.GetCount(); i++) {
+            wxString path = incls.Item(i);
+#ifdef __WXMSW__
+            path.MakeLower();
+#endif
+            if(m_fullpath.StartsWith(path, &rest) ) {
+                break;
+            }
+        }
+    }
+
+    rest.Replace(wxT("\\"), wxT("/"));
+    if(rest.StartsWith(wxT("/"))) {
+        rest.Remove(0, 1);
+    }
+
+    if(!ManagerST::Get()->IsFileInWorkspace(m_fullpath)) {
+        line << wxT("#include <") << rest << wxT(">");
+
+    } else {
+        line << wxT("#include \"") << rest << wxT("\"");
+
+    }
+    m_textCtrlLineToAdd->ChangeValue(line);
 }
-

-void AddIncludeFileDlg::UpdateLineToAdd()

-{

-	wxString line;

-	wxFileName fn(m_fullpath);

-	m_textCtrlFullPath->SetValue(fn.GetFullPath());

-

-	//try to get a match in the include path for this file

-	wxString pp = fn.GetFullPath();

-	pp.Replace(wxT("\\"), wxT("/"));

-	

-	wxString rest;

-	for(size_t i=0; i< m_includePath.GetCount(); i++){

-		if(pp.StartsWith( m_includePath.Item(i) , &rest )){

-			break;

-		}

-	}

-	

-	if(rest.IsEmpty()){

-		rest = fn.GetFullName();

-	}

-	
-	if (!ManagerST::Get()->IsFileInWorkspace(m_fullpath)) {
-		line << wxT("#include <") << rest << wxT(">");
-	} else {
-		line << wxT("#include \"") << rest << wxT("\"");
-	}
-	

-	m_textCtrlLineToAdd->SetValue(line);

-

-}

 
 void AddIncludeFileDlg::SetAndMarkLine()
 {
-	wxString line = m_textCtrlLineToAdd->GetValue();
-	m_textCtrlPreview->SetReadOnly(false);
-	if (m_textCtrlPreview->CanUndo()) {
-		m_textCtrlPreview->Undo();
-	}
-
-	m_textCtrlPreview->BeginUndoAction();
-	if (m_line == wxNOT_FOUND) {
-		m_line = 0;
-	}
-	m_textCtrlPreview->MarkerDeleteAll(0x7);
-	long pos = m_textCtrlPreview->PositionFromLine(m_line);
-	m_textCtrlPreview->InsertText(pos, line + wxT("\n"));
-	m_textCtrlPreview->MarkerAdd(m_line, 0x7);
-	m_textCtrlPreview->SetCurrentPos(pos);
-	m_textCtrlPreview->SetSelectionStart(pos);
-	m_textCtrlPreview->SetSelectionEnd(pos);
-	m_textCtrlPreview->EnsureCaretVisible();
-	m_textCtrlPreview->EndUndoAction();
-	m_textCtrlPreview->SetReadOnly(true);
+    wxString line = m_textCtrlLineToAdd->GetValue();
+    m_textCtrlPreview->SetReadOnly(false);
+    if (m_textCtrlPreview->CanUndo()) {
+        m_textCtrlPreview->Undo();
+    }
+
+    m_textCtrlPreview->BeginUndoAction();
+    if (m_line == wxNOT_FOUND) {
+        m_line = 0;
+    }
+    m_textCtrlPreview->MarkerDeleteAll(0x7);
+    long pos = m_textCtrlPreview->PositionFromLine(m_line);
+    m_textCtrlPreview->InsertText(pos, line + wxT("\n"));
+    m_textCtrlPreview->MarkerAdd(m_line, 0x7);
+    m_textCtrlPreview->SetCurrentPos(pos);
+    m_textCtrlPreview->SetSelectionStart(pos);
+    m_textCtrlPreview->SetSelectionEnd(pos);
+    m_textCtrlPreview->EnsureCaretVisible();
+    m_textCtrlPreview->EndUndoAction();
+    m_textCtrlPreview->SetReadOnly(true);
 }
 
 void AddIncludeFileDlg::OnTextUpdated(wxCommandEvent &e)
 {
-	wxUnusedVar(e);
-	SetAndMarkLine();
+    wxUnusedVar(e);
+    SetAndMarkLine();
 }
 
 void AddIncludeFileDlg::OnButtonDown(wxCommandEvent &event)
 {
-	wxUnusedVar(event);
-	if (m_line+2 >= m_textCtrlPreview->GetLineCount()) {
-		return;
-	}
-	m_line++;
-	SetAndMarkLine();
+    wxUnusedVar(event);
+    if (m_line+2 >= m_textCtrlPreview->GetLineCount()) {
+        return;
+    }
+    m_line++;
+    SetAndMarkLine();
 }
 
 void AddIncludeFileDlg::OnButtonUp(wxCommandEvent &event)
 {
-	wxUnusedVar(event);
-	if (m_line-1 < 0) {
-		return;
-	}
-	m_line--;
-	SetAndMarkLine();
+    wxUnusedVar(event);
+    if (m_line-1 < 0) {
+        return;
+    }
+    m_line--;
+    SetAndMarkLine();
 }
 
 void AddIncludeFileDlg::OnButtonOK(wxCommandEvent &e)
 {
-	wxUnusedVar(e);
-	//get the include file to add
-	wxString fullpath = m_textCtrlFullPath->GetValue();
-	static wxRegEx reIncludeFile(wxT("include *[\\\"\\<]{1}([a-zA-Z0-9_/\\.]*)"));
-	wxString relativePath;
-
-	if (reIncludeFile.Matches(m_textCtrlLineToAdd->GetValue())) {
-		relativePath = reIncludeFile.GetMatch(m_textCtrlLineToAdd->GetValue(), 1);
-	}
-
-	fullpath.Replace(wxT("\\"), wxT("/"));
-	relativePath.Replace(wxT("\\"), wxT("/"));
-	wxFileName fn(fullpath);

-	
-	wxString inclPath;
-	if (fullpath.EndsWith(relativePath, &inclPath) && 

-		fullpath != relativePath &&	//dont save the '.' path this is done by default

-		fn.GetFullName() != relativePath)  //if the relative path is only file name, nothing to cache

-	{
-		m_includePath.Add(inclPath);
-	}
-	EndModal(wxID_OK);
-}

-

-void AddIncludeFileDlg::OnClearCachedPaths(wxCommandEvent &e)

-{

-	wxUnusedVar(e);

-	m_includePath.Clear();

-	UpdateLineToAdd();

-	SetAndMarkLine();

-}

-

+    wxUnusedVar(e);
+    //get the include file to add
+    wxString fullpath = m_textCtrlFullPath->GetValue();
+    static wxRegEx reIncludeFile(wxT("include *[\\\"\\<]{1}([a-zA-Z0-9_/\\.]*)"));
+    wxString relativePath;
+
+    if (reIncludeFile.Matches(m_textCtrlLineToAdd->GetValue())) {
+        relativePath = reIncludeFile.GetMatch(m_textCtrlLineToAdd->GetValue(), 1);
+    }
 
+    fullpath.Replace(wxT("\\"), wxT("/"));
+    relativePath.Replace(wxT("\\"), wxT("/"));
+    wxFileName fn(fullpath);
+
+    wxString inclPath;
+    if (fullpath.EndsWith(relativePath, &inclPath) &&
+        fullpath != relativePath &&	//dont save the '.' path this is done by default
+        fn.GetFullName() != relativePath) { //if the relative path is only file name, nothing to cache
+        m_includePath.Add(inclPath);
+    }
+    EndModal(wxID_OK);
+}
+
+void AddIncludeFileDlg::OnClearCachedPaths(wxCommandEvent &e)
+{
+    wxUnusedVar(e);
+    m_includePath.Clear();
+    UpdateLineToAdd();
+    SetAndMarkLine();
+}