| | 1 | --- libgui/src/m-editor/file-editor-tab.cc.orig 2013-12-05 21:23:49.000000000 -0500 |
| | 2 | +++ libgui/src/m-editor/file-editor-tab.cc 2013-12-05 21:24:41.000000000 -0500 |
| | 3 | @@ -258,118 +258,7 @@ |
| | 4 | void |
| | 5 | file_editor_tab::update_lexer () |
| | 6 | { |
| | 7 | - if (_lexer_apis) |
| | 8 | - _lexer_apis->cancelPreparation (); // stop preparing if apis exists |
| | 9 | - |
| | 10 | - QsciLexer *lexer = _edit_area->lexer (); |
| | 11 | - delete lexer; |
| | 12 | - lexer = 0; |
| | 13 | - |
| | 14 | - if (_file_name.endsWith (".m") |
| | 15 | - || _file_name.endsWith ("octaverc")) |
| | 16 | - { |
| | 17 | -#if defined (HAVE_LEXER_OCTAVE) |
| | 18 | - lexer = new QsciLexerOctave (); |
| | 19 | -#elif defined (HAVE_LEXER_MATLAB) |
| | 20 | - lexer = new QsciLexerMatlab (); |
| | 21 | -#endif |
| | 22 | - } |
| | 23 | - |
| | 24 | - if (! lexer) |
| | 25 | - { |
| | 26 | - if (_file_name.endsWith (".c") |
| | 27 | - || _file_name.endsWith (".cc") |
| | 28 | - || _file_name.endsWith (".cpp") |
| | 29 | - || _file_name.endsWith (".cxx") |
| | 30 | - || _file_name.endsWith (".c++") |
| | 31 | - || _file_name.endsWith (".h") |
| | 32 | - || _file_name.endsWith (".hh") |
| | 33 | - || _file_name.endsWith (".hpp") |
| | 34 | - || _file_name.endsWith (".h++")) |
| | 35 | - { |
| | 36 | - lexer = new QsciLexerCPP (); |
| | 37 | - } |
| | 38 | - else if (_file_name.endsWith (".pl")) |
| | 39 | - { |
| | 40 | - lexer = new QsciLexerPerl (); |
| | 41 | - } |
| | 42 | - else if (_file_name.endsWith (".bat")) |
| | 43 | - { |
| | 44 | - lexer = new QsciLexerBatch (); |
| | 45 | - } |
| | 46 | - else if (_file_name.endsWith (".diff")) |
| | 47 | - { |
| | 48 | - lexer = new QsciLexerDiff (); |
| | 49 | - } |
| | 50 | - else if (! valid_file_name ()) |
| | 51 | - { |
| | 52 | - // new, no yet named file: let us assume it is octave |
| | 53 | -#if defined (HAVE_LEXER_OCTAVE) |
| | 54 | - lexer = new QsciLexerOctave (); |
| | 55 | -#elif defined (HAVE_LEXER_MATLAB) |
| | 56 | - lexer = new QsciLexerMatlab (); |
| | 57 | -#else |
| | 58 | - lexer = new QsciLexerBash (); |
| | 59 | -#endif |
| | 60 | - } |
| | 61 | - else |
| | 62 | - { |
| | 63 | - // other or no extension |
| | 64 | - lexer = new QsciLexerBash (); |
| | 65 | - } |
| | 66 | - } |
| | 67 | - |
| | 68 | - _lexer_apis = new QsciAPIs(lexer); |
| | 69 | - if (_lexer_apis) |
| | 70 | - { |
| | 71 | - // get path to prepared api info |
| | 72 | - QDesktopServices desktopServices; |
| | 73 | - QString prep_apis_path |
| | 74 | - = desktopServices.storageLocation (QDesktopServices::HomeLocation) |
| | 75 | - + "/.config/octave/" + QString(OCTAVE_VERSION) + "/qsci/"; |
| | 76 | - _prep_apis_file = prep_apis_path + lexer->lexer () + ".pap"; |
| | 77 | - |
| | 78 | - if (!_lexer_apis->loadPrepared (_prep_apis_file)) |
| | 79 | - { |
| | 80 | - // no prepared info loaded, prepare and save if possible |
| | 81 | - |
| | 82 | - // create raw apis info |
| | 83 | - QString keyword; |
| | 84 | - QStringList keyword_list; |
| | 85 | - int i,j; |
| | 86 | - for (i=1; i<=3; i++) // test the first 5 keyword sets |
| | 87 | - { |
| | 88 | - keyword = QString(lexer->keywords (i)); // get list |
| | 89 | - keyword_list = keyword.split (QRegExp ("\\s+")); // split |
| | 90 | - for (j = 0; j < keyword_list.size (); j++) // add to API |
| | 91 | - _lexer_apis->add (keyword_list.at (j)); |
| | 92 | - } |
| | 93 | - |
| | 94 | - // dsiconnect slot for saving prepared info if already connected |
| | 95 | - disconnect (_lexer_apis, SIGNAL (apiPreparationFinished ()), 0, 0); |
| | 96 | - // check whether path for prepared info exists or can be created |
| | 97 | - if (QDir("/").mkpath (prep_apis_path)) |
| | 98 | - { |
| | 99 | - // path exists, apis info can be saved there |
| | 100 | - connect (_lexer_apis, SIGNAL (apiPreparationFinished ()), |
| | 101 | - this, SLOT (save_apis_info ())); |
| | 102 | - } |
| | 103 | - _lexer_apis->prepare (); // prepare apis info |
| | 104 | - } |
| | 105 | - } |
| | 106 | - |
| | 107 | - QSettings *settings = resource_manager::get_settings (); |
| | 108 | - if (settings) |
| | 109 | - lexer->readSettings (*settings); |
| | 110 | - |
| | 111 | - _edit_area->setLexer (lexer); |
| | 112 | - |
| | 113 | - // fix line number width with respect to the font size of the lexer |
| | 114 | - if (settings->value ("editor/showLineNumbers", true).toBool ()) |
| | 115 | - auto_margin_width (); |
| | 116 | - else |
| | 117 | - _edit_area->setMarginWidth (2,0); |
| | 118 | - |
| | 119 | + _edit_area->setLexer (); |
| | 120 | } |
| | 121 | |
| | 122 | void |
