Indentation cleanup, added smart_brackets and smart_insertions, and more

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required (VERSION 2.8.8)
 
 project(juci)
-set(JUCI_VERSION "1.2.1.2")
+set(JUCI_VERSION "1.2.1.5")
 
 set(CPACK_PACKAGE_NAME "jucipp")
 set(CPACK_PACKAGE_CONTACT "Ole Christian Eidheim <eidheim@gmail.com>")

src/config.cc

@@ -141,14 +141,15 @@ bool Config::remove_deprecated_nodes(const boost::property_tree::ptree &default_
   if(parent_path.size()>0)
     parent_path+=".";
   bool unchanged=true;
-  for(auto &node: config_cfg) {
-    auto path=parent_path+node.first;
+  for(auto it=config_cfg.begin();it!=config_cfg.end();) {
+    auto path=parent_path+it->first;
     try {
       default_cfg.get<std::string>(path);
-      unchanged&=remove_deprecated_nodes(default_cfg, node.second, path);
+      unchanged&=remove_deprecated_nodes(default_cfg, it->second, path);
+      ++it;
     }
     catch(const std::exception &e) {
-      config_cfg.erase(node.first);
+      it=config_cfg.erase(it);
       unchanged=false;
     }
   }
@@ -193,6 +194,11 @@ void Config::get_source() {
 
   source.cleanup_whitespace_characters=source_json.get<bool>("cleanup_whitespace_characters");
   source.show_whitespace_characters=source_json.get<std::string>("show_whitespace_characters");
+
+  source.smart_brackets=source_json.get<bool>("smart_brackets");
+  source.smart_inserts=source_json.get<bool>("smart_inserts");
+  if(source.smart_inserts)
+    source.smart_brackets=true;
 
   source.show_map = source_json.get<bool>("show_map");
   source.map_font_size = source_json.get<std::string>("map_font_size");

src/config.h

@@ -60,6 +60,9 @@ class Config {
     bool cleanup_whitespace_characters;
     std::string show_whitespace_characters;
 
+    bool smart_brackets;
+    bool smart_inserts;
+
     bool show_map;
     std::string map_font_size;
     bool show_git_diff;

src/entrybox.cc

@@ -32,7 +32,7 @@ EntryBox::Entry::Entry(const std::string& content, std::function<void(const std:
     }
   });
   signal_key_press_event().connect([this](GdkEventKey* key){
-    if(key->keyval==GDK_KEY_Up) {
+    if(key->keyval==GDK_KEY_Up || key->keyval==GDK_KEY_KP_Up) {
       auto &history=entry_histories[get_placeholder_text()];
       if(history.size()>0) {
         selected_history++;
@@ -42,7 +42,7 @@ EntryBox::Entry::Entry(const std::string& content, std::function<void(const std:
         set_position(-1);
       }
     }
-    if(key->keyval==GDK_KEY_Down) {
+    if(key->keyval==GDK_KEY_Down || key->keyval==GDK_KEY_KP_Down) {
       auto &history=entry_histories[get_placeholder_text()];
       if(history.size()>0) {
         if(selected_history!=0)

src/files.h

@@ -41,6 +41,10 @@ R"RAW(
         "cleanup_whitespace_characters": false,
         "show_whitespace_characters_comment": "Determines what kind of whitespaces should be drawn. Use comma-separated list of: space, tab, newline, nbsp, leading, text, trailing or all",
         "show_whitespace_characters": "",
+        "smart_brackets_comment": "If smart_inserts is enabled, this option is automatically enabled. When inserting an already closed bracket, the cursor might instead be moved, avoiding the need of arrow keys after autocomplete",
+        "smart_brackets": true,
+        "smart_inserts_comment": "When for instance inserting (, () gets inserted. Applies to: (), [], \", '. Also enables pressing ; inside an expression before a final ) to insert ; at the end of line, and deletions of empty insertions",
+        "smart_inserts": false,
         "show_map": true,
         "map_font_size": "1",
         "show_git_diff": true,

src/project.cc

@@ -17,6 +17,7 @@ std::unordered_map<std::string, std::string> Project::debug_run_arguments;
 std::atomic<bool> Project::compiling(false);
 std::atomic<bool> Project::debugging(false);
 std::pair<boost::filesystem::path, std::pair<int, int> > Project::debug_stop;
+std::string Project::debug_status;
 std::unique_ptr<Project::Base> Project::current;
 #ifdef JUCI_ENABLE_DEBUG
 std::unordered_map<std::string, Project::Clang::DebugOptions> Project::Clang::debug_options;
@@ -67,20 +68,27 @@ void Project::on_save(size_t index) {
   }
 }
 
-void Project::debug_update_status(const std::string &debug_status) {
+void Project::debug_update_status(const std::string &new_debug_status) {
+  debug_status=new_debug_status;
   if(debug_status.empty())
     debug_status_label().set_text("");
   else
     debug_status_label().set_text("debug: "+debug_status);
+  debug_activate_menu_items();
+}
+
+void Project::debug_activate_menu_items() {
   auto &menu=Menu::get();
+  auto view=Notebook::get().get_current_view();
   menu.actions["debug_stop"]->set_enabled(!debug_status.empty());
   menu.actions["debug_kill"]->set_enabled(!debug_status.empty());
   menu.actions["debug_step_over"]->set_enabled(!debug_status.empty());
   menu.actions["debug_step_into"]->set_enabled(!debug_status.empty());
   menu.actions["debug_step_out"]->set_enabled(!debug_status.empty());
-  menu.actions["debug_backtrace"]->set_enabled(!debug_status.empty());
-  menu.actions["debug_show_variables"]->set_enabled(!debug_status.empty());
+  menu.actions["debug_backtrace"]->set_enabled(!debug_status.empty() && view);
+  menu.actions["debug_show_variables"]->set_enabled(!debug_status.empty() && view);
   menu.actions["debug_run_command"]->set_enabled(!debug_status.empty());
+  menu.actions["debug_toggle_breakpoint"]->set_enabled(view && static_cast<bool>(view->toggle_breakpoint));
   menu.actions["debug_goto_stop"]->set_enabled(!debug_status.empty());
 }
 
@@ -471,8 +479,10 @@ void Project::Clang::debug_backtrace() {
     auto iter=view->get_iter_for_dialog();
     view->selection_dialog=std::make_unique<SelectionDialog>(*view, view->get_buffer()->create_mark(iter), true, true);
     auto rows=std::make_shared<std::unordered_map<std::string, Debug::LLDB::Frame> >();
-    if(backtrace.size()==0)
+    if(backtrace.size()==0) {
+      Info::get().print("No backtrace found");
       return;
+    }
 
     bool cursor_set=false;
     for(auto &frame: backtrace) {
@@ -521,8 +531,10 @@ void Project::Clang::debug_show_variables() {
     auto iter=view->get_iter_for_dialog();
     view->selection_dialog=std::make_unique<SelectionDialog>(*view, view->get_buffer()->create_mark(iter), true, true);
     auto rows=std::make_shared<std::unordered_map<std::string, Debug::LLDB::Variable> >();
-    if(variables.size()==0)
+    if(variables.size()==0) {
+      Info::get().print("No variables found");
       return;
+    }
 
     for(auto &variable: variables) {
       std::string row="#"+std::to_string(variable.thread_index_id)+":#"+std::to_string(variable.frame_index)+":"+variable.file_path.filename().string()+":"+std::to_string(variable.line_nr)+" - <b>"+Glib::Markup::escape_text(variable.name)+"</b>";
@@ -629,33 +641,14 @@ void Project::Markdown::compile_and_run() {
   }
 
   std::stringstream stdin_stream, stdout_stream;
-  auto exit_status=Terminal::get().process(stdin_stream, stdout_stream, "markdown "+filesystem::escape_argument(Notebook::get().get_current_view()->file_path.string()));
+  auto exit_status=Terminal::get().process(stdin_stream, stdout_stream, "command -v grip");
   if(exit_status==0) {
-    boost::system::error_code ec;
-    auto temp_path=boost::filesystem::temp_directory_path(ec);
-    if(!ec) {
-      temp_path/=boost::filesystem::unique_path();
-      temp_path+=".html";
-      if(!boost::filesystem::exists(temp_path)) {
-        last_temp_path=temp_path;
-        std::ofstream file_stream(temp_path.string(), std::fstream::binary);
-        file_stream << stdout_stream.rdbuf();
-        file_stream.close();
-
-        auto uri=temp_path.string();
-#ifdef __APPLE__
-        Terminal::get().process("open "+filesystem::escape_argument(uri));
-#else
-#ifdef __linux
-        uri="file://"+uri;
-#endif
-        GError* error=nullptr;
-        gtk_show_uri(nullptr, uri.c_str(), GDK_CURRENT_TIME, &error);
-        g_clear_error(&error);
-#endif
-      }
-    }
+    auto command="grip -b "+filesystem::escape_argument(Notebook::get().get_current_view()->file_path.string());
+    Terminal::get().print("Running: "+command+" in a quiet background process\n");
+    Terminal::get().async_process(command, "", nullptr, true);
   }
+  else
+    Terminal::get().print("Warning: install grip to preview Markdown files\n");
 }
 
 void Project::Python::compile_and_run() {

src/project.h

@@ -21,8 +21,10 @@ namespace Project {
   extern std::atomic<bool> compiling;
   extern std::atomic<bool> debugging;
   extern std::pair<boost::filesystem::path, std::pair<int, int> > debug_stop;
+  extern std::string debug_status;
+  void debug_update_status(const std::string &new_debug_status);
+  void debug_activate_menu_items();
   void debug_update_stop();
-  void debug_update_status(const std::string &debug_status);
 
   class Base {
   protected:

src/selectiondialog.cc

@@ -229,7 +229,7 @@ SelectionDialog::SelectionDialog(Gtk::TextView& text_view, Glib::RefPtr<Gtk::Tex
 }
 
 bool SelectionDialog::on_key_press(GdkEventKey* key) {
-  if(key->keyval==GDK_KEY_Down && list_view_text.get_model()->children().size()>0) {
+  if((key->keyval==GDK_KEY_Down || key->keyval==GDK_KEY_KP_Down) && list_view_text.get_model()->children().size()>0) {
     auto it=list_view_text.get_selection()->get_selected();
     if(it) {
       it++;
@@ -238,7 +238,7 @@ bool SelectionDialog::on_key_press(GdkEventKey* key) {
     }
     return true;
   }
-  else if(key->keyval==GDK_KEY_Up && list_view_text.get_model()->children().size()>0) {
+  else if((key->keyval==GDK_KEY_Up || key->keyval==GDK_KEY_KP_Up) && list_view_text.get_model()->children().size()>0) {
     auto it=list_view_text.get_selection()->get_selected();
     if(it) {
       it--;
@@ -257,7 +257,7 @@ bool SelectionDialog::on_key_press(GdkEventKey* key) {
     hide();
     return true;
   }
-  else if(key->keyval==GDK_KEY_Left || key->keyval==GDK_KEY_Right) {
+  else if(key->keyval==GDK_KEY_Left || key->keyval==GDK_KEY_KP_Left || key->keyval==GDK_KEY_Right || key->keyval==GDK_KEY_KP_Right) {
     hide();
     return false;
   }
@@ -347,7 +347,7 @@ void CompletionDialog::select(bool hide_window) {
 }
 
 bool CompletionDialog::on_key_release(GdkEventKey* key) {
-  if(key->keyval==GDK_KEY_Down || key->keyval==GDK_KEY_Up)
+  if(key->keyval==GDK_KEY_Down || key->keyval==GDK_KEY_KP_Down || key->keyval==GDK_KEY_Up || key->keyval==GDK_KEY_KP_Up)
     return false;
 
   if(show_offset>text_view.get_buffer()->get_insert()->get_iter().get_offset()) {
@@ -381,7 +381,7 @@ bool CompletionDialog::on_key_press(GdkEventKey* key) {
   }
   if(key->keyval==GDK_KEY_Shift_L || key->keyval==GDK_KEY_Shift_R || key->keyval==GDK_KEY_Alt_L || key->keyval==GDK_KEY_Alt_R || key->keyval==GDK_KEY_Control_L || key->keyval==GDK_KEY_Control_R || key->keyval==GDK_KEY_Meta_L || key->keyval==GDK_KEY_Meta_R)
     return false;
-  if(key->keyval==GDK_KEY_Down && list_view_text.get_model()->children().size()>0) {
+  if((key->keyval==GDK_KEY_Down || key->keyval==GDK_KEY_KP_Down) && list_view_text.get_model()->children().size()>0) {
     auto it=list_view_text.get_selection()->get_selected();
     if(it) {
       it++;
@@ -395,7 +395,7 @@ bool CompletionDialog::on_key_press(GdkEventKey* key) {
     select(false);
     return true;
   }
-  if(key->keyval==GDK_KEY_Up && list_view_text.get_model()->children().size()>0) {
+  if((key->keyval==GDK_KEY_Up || key->keyval==GDK_KEY_KP_Up) && list_view_text.get_model()->children().size()>0) {
     auto it=list_view_text.get_selection()->get_selected();
     if(it) {
       it--;