From f9fb966c38d249119668bea5c7d5252d5577ea63 Mon Sep 17 00:00:00 2001 From: Roy Qu Date: Thu, 1 Dec 2022 22:10:44 +0800 Subject: [PATCH] - enhancement: Add "Generate Assembly" in "Run" Menu - enhancement: Improve highlighter for asm --- NEWS.md | 2 + RedPandaIDE/common.h | 7 + RedPandaIDE/compiler/compilermanager.cpp | 8 +- RedPandaIDE/compiler/compilermanager.h | 6 +- RedPandaIDE/compiler/filecompiler.cpp | 22 +- RedPandaIDE/compiler/filecompiler.h | 8 +- RedPandaIDE/editor.cpp | 8 +- RedPandaIDE/mainwindow.cpp | 51 +- RedPandaIDE/mainwindow.h | 5 +- RedPandaIDE/mainwindow.ui | 6 + RedPandaIDE/settings.cpp | 14 +- RedPandaIDE/settings.h | 3 +- RedPandaIDE/translations/RedPandaIDE_pt_BR.ts | 4 + RedPandaIDE/translations/RedPandaIDE_zh_CN.ts | 1277 +++++++++-------- RedPandaIDE/translations/RedPandaIDE_zh_TW.ts | 4 + libs/qsynedit/qsynedit/highlighter/asm.cpp | 32 +- libs/qsynedit/qsynedit/highlighter/asm.h | 4 +- libs/qsynedit/qsynedit/highlighter/base.cpp | 5 + libs/qsynedit/qsynedit/highlighter/base.h | 1 + libs/qsynedit/qsynedit/highlighter/cpp.cpp | 5 + libs/qsynedit/qsynedit/highlighter/cpp.h | 4 + libs/qsynedit/qsynedit/highlighter/glsl.cpp | 5 + libs/qsynedit/qsynedit/highlighter/glsl.h | 4 + 23 files changed, 821 insertions(+), 664 deletions(-) diff --git a/NEWS.md b/NEWS.md index e55edbac..f07fbb4a 100644 --- a/NEWS.md +++ b/NEWS.md @@ -15,6 +15,8 @@ Red Panda C++ Version 2.5 - fix: Can't correctly show completion suggest for type with template parameters - enhancement: Show compltion suggest for std::pair::first and std::pair second - enhancement: Disable "run" and "debug" actions when current project is static or dynamic library + - enhancement: Add "Generate Assembly" in "Run" Menu + - enhancement: Improve highlighter for asm Red Panda C++ Version 2.4 diff --git a/RedPandaIDE/common.h b/RedPandaIDE/common.h index 3de2dab5..d0437cca 100644 --- a/RedPandaIDE/common.h +++ b/RedPandaIDE/common.h @@ -19,6 +19,13 @@ #include #include #include + +enum class CppCompileType { + Normal, + PreprocessOnly, + GenerateAssemblyOnly +}; + enum class CompileIssueType { Other, Warning, diff --git a/RedPandaIDE/compiler/compilermanager.cpp b/RedPandaIDE/compiler/compilermanager.cpp index e204b887..766884ad 100644 --- a/RedPandaIDE/compiler/compilermanager.cpp +++ b/RedPandaIDE/compiler/compilermanager.cpp @@ -71,7 +71,7 @@ bool CompilerManager::running() return (mRunner!=nullptr && !mRunner->pausing()); } -void CompilerManager::compile(const QString& filename, const QByteArray& encoding, bool rebuild, bool silent, bool onlyCheckSyntax) +void CompilerManager::compile(const QString& filename, const QByteArray& encoding, bool rebuild, CppCompileType compileType) { if (!pSettings->compilerSets().defaultSet()) { QMessageBox::critical(pMainWindow, @@ -87,7 +87,7 @@ void CompilerManager::compile(const QString& filename, const QByteArray& encodin mCompileErrorCount = 0; mCompileIssueCount = 0; //deleted when thread finished - mCompiler = new FileCompiler(filename,encoding,silent,onlyCheckSyntax); + mCompiler = new FileCompiler(filename,encoding,compileType,false,false); mCompiler->setRebuild(rebuild); connect(mCompiler, &Compiler::finished, mCompiler, &QObject::deleteLater); connect(mCompiler, &Compiler::compileFinished, this, &CompilerManager::onCompileFinished); @@ -102,7 +102,7 @@ void CompilerManager::compile(const QString& filename, const QByteArray& encodin } } -void CompilerManager::compileProject(std::shared_ptr project, bool rebuild, bool silent,bool onlyCheckSyntax) +void CompilerManager::compileProject(std::shared_ptr project, bool rebuild) { if (!pSettings->compilerSets().defaultSet()) { QMessageBox::critical(pMainWindow, @@ -118,7 +118,7 @@ void CompilerManager::compileProject(std::shared_ptr project, bool rebu mCompileErrorCount = 0; mCompileIssueCount = 0; //deleted when thread finished - mCompiler = new ProjectCompiler(project,silent,onlyCheckSyntax); + mCompiler = new ProjectCompiler(project,false,false); mCompiler->setRebuild(rebuild); connect(mCompiler, &Compiler::finished, mCompiler, &QObject::deleteLater); connect(mCompiler, &Compiler::compileFinished, this, &CompilerManager::onCompileFinished); diff --git a/RedPandaIDE/compiler/compilermanager.h b/RedPandaIDE/compiler/compilermanager.h index 7bd251c7..96adca60 100644 --- a/RedPandaIDE/compiler/compilermanager.h +++ b/RedPandaIDE/compiler/compilermanager.h @@ -23,8 +23,8 @@ #include "../common.h" class Runner; -class Compiler; class Project; +class Compiler; struct OJProblemCase; using POJProblemCase = std::shared_ptr; class CompilerManager : public QObject @@ -37,8 +37,8 @@ public: bool backgroundSyntaxChecking(); bool running(); - void compile(const QString& filename, const QByteArray& encoding, bool rebuild, bool silent=false,bool onlyCheckSyntax=false); - void compileProject(std::shared_ptr project, bool rebuild, bool silent=false,bool onlyCheckSyntax=false); + void compile(const QString& filename, const QByteArray& encoding, bool rebuild, CppCompileType compileType); + void compileProject(std::shared_ptr project, bool rebuild); void cleanProject(std::shared_ptr project); void buildProjectMakefile(std::shared_ptr project); void checkSyntax(const QString&filename, const QByteArray& encoding, const QString& content, std::shared_ptr project); diff --git a/RedPandaIDE/compiler/filecompiler.cpp b/RedPandaIDE/compiler/filecompiler.cpp index 043b385f..1d2f645b 100644 --- a/RedPandaIDE/compiler/filecompiler.cpp +++ b/RedPandaIDE/compiler/filecompiler.cpp @@ -24,15 +24,33 @@ #include -FileCompiler::FileCompiler(const QString &filename, const QByteArray &encoding,bool silent,bool onlyCheckSyntax): +FileCompiler::FileCompiler(const QString &filename, const QByteArray &encoding, + CppCompileType compileType,bool silent,bool onlyCheckSyntax): Compiler(filename, silent,onlyCheckSyntax), - mEncoding(encoding) + mEncoding(encoding), + mCompileType(compileType) { } bool FileCompiler::prepareForCompile() { + Settings::CompilerSet::CompilationStage oldStage = compilerSet()->compilationStage(); + auto action = finally([this,oldStage]{ + compilerSet()->setCompilationStage(oldStage); + }); + Settings::CompilerSet::CompilationStage stage = oldStage; + switch(mCompileType) { + case CppCompileType::PreprocessOnly: + stage = Settings::CompilerSet::CompilationStage::PreprocessingOnly; + break; + case CppCompileType::GenerateAssemblyOnly: + stage = Settings::CompilerSet::CompilationStage::CompilationProperOnly; + break; + default: + stage = oldStage; + } + compilerSet()->setCompilationStage(stage); log(tr("Compiling single file...")); log("------------------"); log(tr("- Filename: %1").arg(mFilename)); diff --git a/RedPandaIDE/compiler/filecompiler.h b/RedPandaIDE/compiler/filecompiler.h index bb78caf7..4d9cf522 100644 --- a/RedPandaIDE/compiler/filecompiler.h +++ b/RedPandaIDE/compiler/filecompiler.h @@ -23,15 +23,17 @@ class FileCompiler : public Compiler { Q_OBJECT public: - FileCompiler(const QString& filename, const QByteArray& encoding,bool silent,bool onlyCheckSyntax); + FileCompiler(const QString& filename, const QByteArray& encoding, + CppCompileType compileType, + bool silent,bool onlyCheckSyntax); + - // Compiler interface protected: bool prepareForCompile() override; private: QByteArray mEncoding; - + CppCompileType mCompileType; // Compiler interface protected: bool prepareForRebuild() override; diff --git a/RedPandaIDE/editor.cpp b/RedPandaIDE/editor.cpp index 2a3a34aa..0b397027 100644 --- a/RedPandaIDE/editor.cpp +++ b/RedPandaIDE/editor.cpp @@ -4729,7 +4729,9 @@ void Editor::applySettings() options.setFlag(QSynedit::eoScrollByOneLess,pSettings->editor().scrollByOneLess()); options.setFlag(QSynedit::eoHalfPageScroll,pSettings->editor().halfPageScroll()); options.setFlag(QSynedit::eoHalfPageScroll,pSettings->editor().halfPageScroll()); - options.setFlag(QSynedit::eoShowRainbowColor, pSettings->editor().rainbowParenthesis()); + options.setFlag(QSynedit::eoShowRainbowColor, + pSettings->editor().rainbowParenthesis() + && highlighter() && highlighter()->supportBraceLevel()); setOptions(options); setTabWidth(pSettings->editor().tabWidth()); @@ -4818,7 +4820,9 @@ static QSynedit::PHighlighterAttribute createRainbowAttribute(const QString& att void Editor::applyColorScheme(const QString& schemeName) { QSynedit::EditorOptions options = getOptions(); - options.setFlag(QSynedit::EditorOption::eoShowRainbowColor, pSettings->editor().rainbowParenthesis()); + options.setFlag(QSynedit::EditorOption::eoShowRainbowColor, + pSettings->editor().rainbowParenthesis() + && highlighter() && highlighter()->supportBraceLevel()); setOptions(options); highlighterManager.applyColorScheme(highlighter(),schemeName); if (pSettings->editor().rainbowParenthesis()) { diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp index 49ee384b..9baf693b 100644 --- a/RedPandaIDE/mainwindow.cpp +++ b/RedPandaIDE/mainwindow.cpp @@ -674,6 +674,7 @@ void MainWindow::updateCompileActions() ui->actionCompile_Run->setEnabled(false); ui->actionRun->setEnabled(false); ui->actionRebuild->setEnabled(false); + ui->actionGenerate_Assembly->setEnabled(false); ui->actionDebug->setEnabled(false); ui->btnRunAllProblemCases->setEnabled(false); } else { @@ -681,6 +682,7 @@ void MainWindow::updateCompileActions() ui->actionCompile_Run->setEnabled(canRun); ui->actionRun->setEnabled(canRun); ui->actionRebuild->setEnabled(true); + ui->actionGenerate_Assembly->setEnabled(!forProject); ui->actionDebug->setEnabled(canRun); ui->btnRunAllProblemCases->setEnabled(canRun); } @@ -1801,7 +1803,7 @@ void MainWindow::checkSyntaxInBack(Editor *e) } } -bool MainWindow::compile(bool rebuild) +bool MainWindow::compile(bool rebuild, CppCompileType compileType) { mCompilerManager->stopPausing(); CompileTarget target =getCompileTarget(); @@ -1837,16 +1839,33 @@ bool MainWindow::compile(bool rebuild) if (mCompileSuccessionTask) { Settings::PCompilerSet compilerSet =pSettings->compilerSets().defaultSet(); if (compilerSet) { - mCompileSuccessionTask->execName = compilerSet->getOutputFilename(editor->filename()); - mCompileSuccessionTask->isExecutable = compilerSet->isOutputExecutable(); + Settings::CompilerSet::CompilationStage stage; + switch(compileType) { + case CppCompileType::GenerateAssemblyOnly: + stage = Settings::CompilerSet::CompilationStage::CompilationProperOnly; + break; + case CppCompileType::PreprocessOnly: + stage = Settings::CompilerSet::CompilationStage::PreprocessingOnly; + break; + default: + stage = compilerSet->compilationStage(); + break; + } + mCompileSuccessionTask->execName = compilerSet->getOutputFilename(editor->filename(),stage); + mCompileSuccessionTask->isExecutable = compilerSet->isOutputExecutable(stage); } else { mCompileSuccessionTask->execName = changeFileExt(editor->filename(),DEFAULT_EXECUTABLE_SUFFIX); mCompileSuccessionTask->isExecutable = true; } + if (!mCompileSuccessionTask->isExecutable) { + Editor *editor = mEditorList->getOpenedEditorByFilename(mCompileSuccessionTask->execName); + if (editor) + mEditorList->closeEditor(editor,false,true); + } } stretchMessagesPanel(true); ui->tabMessages->setCurrentWidget(ui->tabToolsOutput); - mCompilerManager->compile(editor->filename(),editor->fileEncoding(),rebuild); + mCompilerManager->compile(editor->filename(),editor->fileEncoding(),rebuild,compileType); updateCompileActions(); updateAppTitle(); return true; @@ -1963,7 +1982,7 @@ void MainWindow::runExecutable(RunType runType) bool isExecutable; if (compilerSet) { exeName = compilerSet->getOutputFilename(editor->filename()); - isExecutable = compilerSet->compilationStage()==Settings::CompilerSet::CompilationStage::GenerateExecutable; + isExecutable = compilerSet->isOutputExecutable(); } else { exeName = changeFileExt(editor->filename(), DEFAULT_EXECUTABLE_SUFFIX); isExecutable = true; @@ -2140,7 +2159,7 @@ void MainWindow::debug() bool isExecutable; if (compilerSet) { filePath = compilerSet->getOutputFilename(e->filename()); - isExecutable = compilerSet->compilationStage()==Settings::CompilerSet::CompilationStage::GenerateExecutable; + isExecutable = compilerSet->isOutputExecutable(); } else { filePath = changeFileExt(e->filename(), DEFAULT_EXECUTABLE_SUFFIX); isExecutable = true; @@ -7322,6 +7341,20 @@ void MainWindow::doCompileRun(RunType runType) compile(); } +void MainWindow::doGenerateAssembly() +{ + CompileTarget target =getCompileTarget(); + QStringList binDirs; + QString execName; + if (target == CompileTarget::File) { + binDirs = getDefaultCompilerSetBinDirs(); + } + mCompileSuccessionTask = std::make_shared(); + mCompileSuccessionTask->binDirs=binDirs; + mCompileSuccessionTask->type = CompileSuccessionTaskType::RunNormal; + compile(false,CppCompileType::GenerateAssemblyOnly); +} + void MainWindow::updateProblemCaseOutput(POJProblemCase problemCase) { if (problemCase->testState == ProblemCaseTestState::Failed) { @@ -8855,3 +8888,9 @@ SearchDialog *MainWindow::searchDialog() const return mSearchDialog; } + +void MainWindow::on_actionGenerate_Assembly_triggered() +{ + doGenerateAssembly(); +} + diff --git a/RedPandaIDE/mainwindow.h b/RedPandaIDE/mainwindow.h index 3beb648a..10384df1 100644 --- a/RedPandaIDE/mainwindow.h +++ b/RedPandaIDE/mainwindow.h @@ -129,7 +129,7 @@ public: void updateDebuggerSettings(); void updateActionIcons(); void checkSyntaxInBack(Editor* e); - bool compile(bool rebuild=false); + bool compile(bool rebuild=false, CppCompileType compileType=CppCompileType::Normal); void runExecutable( const QString& exeName, const QString& filename, @@ -281,6 +281,7 @@ private: void showSearchReplacePanel(bool show); void clearIssues(); void doCompileRun(RunType runType); + void doGenerateAssembly(); void updateProblemCaseOutput(POJProblemCase problemCase); void applyCurrentProblemCaseChanges(); void showHideInfosTab(QWidget *widget, bool show); @@ -745,6 +746,8 @@ private slots: void on_actionSwitchHeaderSource_triggered(); + void on_actionGenerate_Assembly_triggered(); + private: Ui::MainWindow *ui; EditorList *mEditorList; diff --git a/RedPandaIDE/mainwindow.ui b/RedPandaIDE/mainwindow.ui index 9172f67b..3675f8fb 100644 --- a/RedPandaIDE/mainwindow.ui +++ b/RedPandaIDE/mainwindow.ui @@ -156,6 +156,7 @@ + @@ -3263,6 +3264,11 @@ Switch Header/Source + + + Generate Assembly + + diff --git a/RedPandaIDE/settings.cpp b/RedPandaIDE/settings.cpp index 39adeba0..4bf9e446 100644 --- a/RedPandaIDE/settings.cpp +++ b/RedPandaIDE/settings.cpp @@ -2464,7 +2464,12 @@ void Settings::CompilerSet::setCompilationStage(CompilationStage newCompilationS QString Settings::CompilerSet::getOutputFilename(const QString &sourceFilename) { - switch(compilationStage()) { + return getOutputFilename(sourceFilename, compilationStage()); +} + +QString Settings::CompilerSet::getOutputFilename(const QString &sourceFilename, CompilationStage stage) +{ + switch(stage) { case Settings::CompilerSet::CompilationStage::PreprocessingOnly: return changeFileExt(sourceFilename, preprocessingSuffix()); case Settings::CompilerSet::CompilationStage::CompilationProperOnly: @@ -2479,7 +2484,12 @@ QString Settings::CompilerSet::getOutputFilename(const QString &sourceFilename) bool Settings::CompilerSet::isOutputExecutable() { - return mCompilationStage == CompilationStage::GenerateExecutable; + return isOutputExecutable(mCompilationStage); +} + +bool Settings::CompilerSet::isOutputExecutable(CompilationStage stage) +{ + return stage == CompilationStage::GenerateExecutable; } const QString &Settings::CompilerSet::assemblingSuffix() const diff --git a/RedPandaIDE/settings.h b/RedPandaIDE/settings.h index f6dec263..e461aa1f 100644 --- a/RedPandaIDE/settings.h +++ b/RedPandaIDE/settings.h @@ -1331,8 +1331,9 @@ public: void setCompilationStage(CompilationStage newCompilationStage); QString getOutputFilename(const QString& sourceFilename); + QString getOutputFilename(const QString& sourceFilename,Settings::CompilerSet::CompilationStage stage); bool isOutputExecutable(); - + bool isOutputExecutable(Settings::CompilerSet::CompilationStage stage); private: void setDirectories(const QString& binDir, CompilerType mCompilerType); //load hard defines diff --git a/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts b/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts index 0c55dcde..a5cc75aa 100644 --- a/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts +++ b/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts @@ -4728,6 +4728,10 @@ Switch Header/Source + + Generate Assembly + + NewClassDialog diff --git a/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts b/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts index 1f749e1f..9e5db9c5 100644 --- a/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts +++ b/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts @@ -1325,10 +1325,10 @@ Are you really want to continue? - - - - + + + + Error 错误 @@ -1347,34 +1347,34 @@ Are you really want to continue? 文件%1已经被打开！ - + The text to be copied exceeds count limit! 要复制的内容超过了行数限制！ - + The text to be copied exceeds character limit! 要复制的内容超过了字符数限制！ - + The text to be cut exceeds count limit! 要剪切的内容超过了行数限制！ - + The text to be cut exceeds character limit! 要剪切的内容超过了字符数限制！ - + Print Document 打印文档 - - - + + + Ctrl+click for more info Ctrl+单击以获取更多信息 @@ -1383,27 +1383,27 @@ Are you really want to continue? 未找到符号'%1'! - + astyle not found 找不到astyle程序 - + Can't find astyle in "%1". 找不到astyle程序"%1". - + Break point condition 断点条件 - + Enter the condition of the breakpoint: 输入当前断点的生效条件: - + Readonly 只读 @@ -2580,50 +2580,50 @@ Are you really want to continue? FileCompiler - + Compiling single file... 编译单个文件... - + - Filename: %1 - 文件名: %1 - + - Compiler Set Name: %1 - 编译器配置: %1 - - + + Can't delete the old executable file "%1". 无法删除旧的可执行文件"%1". - + Can't find the compiler for file %1 Can't the compiler for file %1 找不到适合文件%1的编译器 - + The Compiler '%1' doesn't exists! 编译器程序"%1"不存在！ - + Processing %1 source file: 正在处理%1源程序文件: - + %1 Compiler: %2 %1编译器: %2 - + Command: %1 %2 命令: %1 %2 @@ -3918,18 +3918,18 @@ Are you really want to continue? MainWindow - + Red Panda C++ 小熊猫C++ - - - - - - - + + + + + + + Issues 编译器 @@ -3948,38 +3948,38 @@ Are you really want to continue? 工具 - - + + Run 运行 - + Edit 编辑 - - - + + + Project 项目 - - + + Watch 监视 - - + + Structure 结构 - - + + Files 文件 @@ -3988,69 +3988,69 @@ Are you really want to continue? 资源 - - - - - + + + + + Debug 调试 - + Evaluate: 求值 - - + + Debug Console 调试主控台 - + Call Stack 调用栈 - + Breakpoints 断点 - + Locals 局部变量 - - - + + + Search 查找 - + History: 历史： - + Search Again 重新查找 - + Replace with: 替换为： - + Replace 替换 - + Close 关闭 @@ -4060,13 +4060,13 @@ Are you really want to continue? 运行 - - + + Code 代码 - + Window 窗口 @@ -4084,418 +4084,418 @@ Are you really want to continue? 新建 - + Ctrl+N Ctrl+N - + Open... 打开... - + Ctrl+O Ctrl+O - + Save 保存 - + Ctrl+S Ctrl+S - + Save As... 另存为... - + Save As 另存为 - + Save All 全部保存 - + Ctrl+Shift+S Ctrl+Shift+S - + Options 选项 - - - - - + + + + + Compile 编译 - - + + Tools Output 工具输出 - - + + Choose Input File 选择输入文件 - + ... ... - + Tool Panels 工具面板 - + Git Git - + Selection 选择 - + F9 F9 - + F10 F10 - + Undo 恢复 - + Ctrl+Z Ctrl+Z - + Redo 重做 - + Ctrl+Y Ctrl+Y - + Cut 剪切 - + Ctrl+X Ctrl+X - - - - + + + + Copy 复制 - + Ctrl+C Ctrl+C - - + + Paste 粘贴 - + Ctrl+V Ctrl+V - - - + + + Select All 选择全部 - + Ctrl+A Ctrl+A - + Indent 缩进 - + UnIndent 取消缩进 - + Toggle Comment 切换注释 - + Ctrl+/ Ctrl+/ - + Collapse All 全部收起 - + Uncollapse All 全部展开 - + Encode in ANSI 使用ANSI编码 - + Encode in UTF-8 使用UTF-8编码 - + Auto Detect 自动检测 - + Convert to ANSI 转换为ANSI编码 - + Convert to UTF-8 转换为UTF-8编码 - - + + Compile & Run 编译运行 - + F11 F11 - - + + Rebuild All 全部重编译 - + F12 F12 - + Stop Execution 停止执行 - + F6 F6 - + F5 F5 - + Step Over 单步跳过 - + F7 F7 - + Step Into 单步进入 - - - + + + Problem Set 试题集 - - - + + + New Problem Set 新建试题集 - - + + Add Problem 添加试题 - - + + Remove Problem 删除试题 - - - + + + Save Problem Set 保存试题集 - - - + + + Load Problem Set 载入试题集 - + Memory 内存 - + Address Expression: Address: 地址表达式： - + Cancel 取消 - - + + TODO TODO - - + + Bookmark 书签 - - - + + + Problem 试题 - - + + Add Probem Case 添加试题案例 - - + + Remove Problem Case Remove Problem Set 删除试题集 - - + + Open Anwser Source File 打开答案源代码文件 - - - + + + Run All Cases Run Current Case 运行所有案例 - + Problem Cases Validation Options 测试案例验证选项 - + %v/%m %v/%m - + Output 输出 - + Input 输入 - + Expected 期望输出 - + Help 帮助 - + Refactor 重构 - + View 视图 @@ -4504,637 +4504,642 @@ Are you really want to continue? 工具窗口 - + Main 主工具栏 - + Compiler Set 编译器配置集 - + Explorer 管理器 - + Messages 消息 - + Ignore Spaces 忽略空格 - + New Source File 新建源代码文件 - + Tab Tab - + Shift+Tab Shift+Tab - + F8 F8 - + Step Out 单步跳出 - + Ctrl+F8 Ctrl+F8 - + Run To Cursor 执行到光标处 - + Ctrl+F5 Ctrl+F5 - + Continue 继续执行 - + F4 F4 - + Add Watch... 添加监视 - + View CPU Window... 打开CPU信息窗口... - + Exit 退出 - + Find... 查找... - + Ctrl+F Ctrl+F - + Find in Files... 在文件中查找... - + Ctrl+Shift+F Ctrl+Shift+F - + Replace... 替换 - + Ctrl+R Ctrl+R - + Find Next 查找下一个 - + F3 F3 - + Find Previous 查找前一个 - + Shift+F3 Shift+F3 - + Remove Watch 删除监视值 - + Remove All Watches Remove All 删除全部监视值 - + Modify Watch... 修改监视值 - + Reformat Code 对代码重新排版 - + Ctrl+Shift+A Ctrl+Shift+A - + Go back 前一次编辑位置 - + Ctrl+Alt+Left Ctrl+Alt+Left - + Forward 后一次编辑位置 - + Ctrl+Alt+Right Ctrl+Alt+Right - + Ctrl+W Ctrl+W - + Close All 全部关闭 - + Ctrl+Shift+W Ctrl+Shift+W - + Maximize Editor 最大化编辑器 - + Ctrl+F11 Ctrl+F11 - + Next 下一窗口 - + Ctrl+Tab Ctrl+Tab - + Previous 前一窗口 - + Ctrl+Shift+Tab Ctrl+Shift+Tab - + Toggle breakpoint 切换断点 - + Ctrl+F4 Ctrl+F4 - - + + Clear all breakpoints 删除所有断点 - + Breakpoint property... 设置断点条件... - + Goto Declaration 跳转到声明处 - + Ctrl+Shift+G Ctrl+Shift+G - + Goto Definition 跳转到定义处 - + Ctrl+G Ctrl+G - + Find references 查找符号的引用 - + Open containing folder 打开所在的文件夹 - + Ctrl+B Ctrl+B - + Open a terminal here 打开命令行窗口 - + File Properties... 文件属性... - + Close Project 关闭项目 - + Project options 项目属性 - + New Project... 新建项目... - - + + New Project File 新建项目文件 - + F1 F1 - + Move Selection Up 向上移动选中的行 - + Ctrl+Shift+Up Ctrl+Shift+Up - + Move Selection Down 向下移动选中的行 - + Ctrl+Shift+Down Ctrl+Shift+Down - + Convert to UTF-8 BOM 转换为UTF-8 BOM编码 - + Encode in UTF-8 BOM 使用UTF-8 BOM编码 - + Compiler Options... 编译器选项... - + Toggle Explorer Panel 切换管理器面板 - + Ctrl+F9 Ctrl+F9 - + Toggle Messages Panel 切换消息面板 - + Ctrl+F10 Ctrl+F10 - + Raylib Manual Raylib教程 - + Select Word 选中当前单词 - + Go to Line... 跳转到行... - + New Template... 新建模板... - + New Template from Project 从项目创建模板 - + Goto block start 跳转到代码段开始 - + Ctrl+Alt+Up Ctrl+Alt+Up - + Goto block end 跳转到代码段结束 - + Ctrl+Alt+Down Ctrl+Alt+Down - + Switch header/source 切换头文件/源文件 - + Switch Header/Source 切换头文件/源文件 + + + Generate Assembly + 生成汇编 + Save As Template... 保存为模板... - - + + New File 新建文件 - + Add to project... 添加到项目... - + Remove from project 从项目删除 - + View Makefile 查看Makefile - + Clean 清理构建文件 - + Open Folder in Explorer 在浏览器中打开 - + Open In Terminal 在终端中打开 - + About 关于 - - + + Rename Symbol 重命名符号 - + Shift+F6 Shift+F6 - + Print... 打印... - + Ctrl+P Ctrl+P - - + + Export As RTF 导出为RTF - - + + Export As HTML 导出为HTML - + Move To Other View 移动到其他视图 - + Ctrl+M Ctrl+M - - + + C++ Reference C++参考手册 - + C Reference C参考手册 - + Show Tool Panels 显示全部工具面板 - + Create Git Repository Create Repository 创建Git仓库 - + Commit 提交(Commit) - + Revert 撤销(Revert) - + Reset 回滚(Reset) - + Add Files 添加文件 - + Restore 还原(Restore) - + Website 官方网站 - + Branch/Switch 分支切换（Switch） - + Merge 合并（Merge） - - + + Show Log Log 显示日志(Log) - + Remotes... 远程仓库... - + Fetch 取回(Fetch) - + Pull 拉取(Pull) - + Push 推送(Push) - + Hide Non Support Files 隐藏不支持的文件 - + Toggle Block Comment 切换块注释 - + Alt+Shift+A Alt+Shift+A - + Match Bracket 匹配当前括号 - + Ctrl+] Ctrl+] @@ -5143,50 +5148,50 @@ Are you really want to continue? 工具窗口栏 - + Status Bar 状态栏 - + Ctrl+Backspace Ctrl+Backspace - + Interrupt 中断 - - + + Delete To Word Begin 删除到单词开头 - + Ctrl+Shift+B Ctrl+Shift+B - + Delete to Word End 删除到单词结尾 - + Ctrl+Shift+E Ctrl+Shift+E - + New Class... Add Class... 新建类... - - + + New Header... New Header 新建头文件... @@ -5196,47 +5201,47 @@ Are you really want to continue? 插入行 - + Delete Line 删除当前行 - + Ctrl+D Ctrl+D - + Duplicate Line 复制当前行 - + Ctrl+E Ctrl+E - + Delete Word 删除当前单词 - + Ctrl+Shift+D Ctrl+Shift+D - + Delete to EOL 删除到行尾 - + Ctrl+Del Ctrl+Del - + Delete to BOL 删除到行首 @@ -5245,27 +5250,27 @@ Are you really want to continue? C/C++参考 - + EGE Manual EGE图形库手册 - + Add Bookmark 添加书签 - + Remove Bookmark 删除书签 - + Modify Bookmark Description 修改书签说明 - + Locate in Files View 在文件视图中定位 @@ -5274,12 +5279,12 @@ Are you really want to continue? 打开文件夹 - + Running Parameters... 运行参数... - + File Encoding 文件编码 @@ -5289,32 +5294,32 @@ Are you really want to continue? 文件历史 - - - - - - + + + + + + Debugging 正在调试 - - - - - - + + + + + + Running 正在运行 - - - - - - + + + + + + Compiling 正在编译 @@ -5323,23 +5328,23 @@ Are you really want to continue? 行:%1 列:%2 已选择:%3 总行数:%4 总长度:%5 - + Line:%1 Col:%2 Selected:%3 Lines:%4 Length:%5 Line: %1 Col: %2 Selected: %3 Lines: %4 Length: %5 行: %1 列: %2 已选择 :%3 总行数: %4 总长度: %5 - + Read Only 只读 - + Insert 插入 - + Overwrite 覆写 @@ -5352,133 +5357,133 @@ Are you really want to continue? 你确定要关闭'%1'吗？ - - + + Confirm 确认 - - - + + + Source file is not compiled. 源文件尚未编译。 - - + + Compile now? 现在编译？ - - + + Source file is more recent than executable. 源文件比可执行程序新。 - + Recompile now? 重新编译？ - - - - + + + + Wrong Compiler Settings 错误的编译器设置 - - - - + + + + Compiler is set not to generate executable. 编译器被设置为不生成可执行文件。 - - + + We need the executabe to run problem case. 我们需要可执行文件来运行试题案例。 - + No compiler set 无编译器设置 - + No compiler set is configured. 没有配置编译器设置。 - + Can't start debugging. 无法启动调试器 - - + + Enable debugging 启用调试参数 - - + + You have not enabled debugging info (-g3) and/or stripped it from the executable (-s) in Compiler Options.<BR /><BR />Do you want to correct this now? 当前编译设置中未启用调试选项(-g3)，或启用了信息剥除选项(-s)<br /><br/>是否纠正这一问题？ - + Project not built 项目尚未构建 - + Project hasn't been built. Build it now? 项目尚未构建。是否构建？ - + Host applcation missing 宿主程序不存在 - + DLL project needs a host application to run. 动态链接库（DLL）需要一个宿主程序来运行。 - + But it's missing. 但它不存在。 - + Host application not exists 宿主程序不存在 - + Host application file '%1' doesn't exist. 宿主程序'%1'不存在。 - - + + Please correct this before start debugging 请在调试前改正设置。 - + Recompile? 重新编译？ - - + + Save last open info error 保存上次打开信息失败 @@ -5487,70 +5492,70 @@ Are you really want to continue? 无法删除旧上次打开信息文件'%1' - + Can't save last open info file '%1' 无法保存上次打开信息文件'%1' - - + + Load last open info error 载入上次打开信息失败 - - + + Can't load last open info file '%1' 无法载入上次打开信息文件'%1' - + Open Source File 打开源代码文件 - - + + Batch Set Cases 批量设置案例 - + Show detail debug logs 显示详细调试器日志 - + Copy all 全部复制 - + Go to Line 跳转到行 - + Line 行 - + Template Exists 模板已存在 - + Template %1 already exists. Do you want to overwrite? 模板%1已存在。是否覆盖？ - - - - - - + + + + + + Clear 清除 @@ -5566,7 +5571,7 @@ Are you really want to continue? - + Problem Set %1 试题集%1 @@ -5587,68 +5592,68 @@ Are you really want to continue? 或者选择使用其他的网络端口。 - - + + Rebuild Project 重新构建项目 - - + + Project has been modified, do you want to rebuild it? 项目已经被修改过，是否需要重新构建？ - + Auto Save Error 自动保存出错 - + Auto save "%1" to "%2" failed:%3 自动保存"%1"到"%2"失败：%3 - + Properties... 试题属性... - + Set Problem Set Name 设置试题集名称 - + Problem Set Name: 试题集名称： - + Remove 删除 - + Remove All Bookmarks 删除全部书签 - + Modify Description 修改描述 - - - + + + Bookmark Description 书签描述 - - - + + + Description: 描述： @@ -5657,194 +5662,194 @@ Are you really want to continue? 在调试主控台中显示调试器输出 - + Remove this search 清除这次搜索 - + Clear all searches 删除所有搜索 - + Breakpoint condition... 断点条件... - + Break point condition 断点条件 - + Enter the condition of the breakpoint: 输入当前断点的生效条件: - + Remove All Breakpoints Remove all breakpoints 删除所有断点 - + Remove Breakpoint 删除当前断点 - + Rename File 重命名文件 - - + + Add Folder 添加文件夹 - - + + New folder 新文件夹 - + Folder name: 文件夹： - + Rename Folder 重命名 - + Can't open last open information file '%1' for write! 无法写入配置文件'%1'。 - + Run Current Case 运行当前案例 - + Remove Folder 删除文件夹 - + Switch to normal view 切换为普通视图 - + Switch to custom view 切换为自定义视图 - + Sort By Type 按类型排序 - + Sort alphabetically 按名称排序 - + Show inherited members 显示继承的成员 - + Goto declaration 跳转到声明处 - + Goto definition 跳转到定义处 - + In current file 仅当前文件 - + In current project 整个项目 - - + + New Folder 新建文件夹 - + Rename 重命名 - - - - + + + + Delete 删除 - + Open in Editor 在编辑器中打开 - + Open in External Program 使用外部程序打开 - + Open in Terminal 在终端中打开 - + Open in Windows Explorer 在Windows浏览器中打开 - + Character sets 字符集 - + Convert to %1 转换为%1编码 - + %1 files autosaved 已自动保存%1个文件 - + Set answer to... 设置答案源代码... - + select other file... 选择其他文件... - + Select Answer Source File 选择答案源代码文件 @@ -5854,7 +5859,7 @@ Are you really want to continue? C/C++源代码文件 (*.c *.cpp *.cc *.cxx) - + New Folder %1 新建文件夹%1 @@ -5867,68 +5872,68 @@ Are you really want to continue? 无标题%1 - + Do you really want to delete %1? 你真的要删除%1吗？ - + Do you really want to delete %1 files? 你真的要删除%1个文件吗？ - + Save project 保存项目 - + The project '%1' has modifications. 项目'%1'有改动。 - - + + Do you want to save it? 需要保存吗？ - + File Changed 文件已发生变化 - + New Project File? 新建项目文件? - + Do you want to add the new file to the project? 您是否要将新建的文件加入项目? - - - - + + + + Save Error 保存失败 - + Change Project Compiler Set 改变项目编译器配置集 - + Change the project's compiler set will lose all custom compiler set options. 改变项目的编译器配置集会导致所有的自定义编译器选项被重置。 - - + + Do you really want to do that? 你真的想要那么做吗？ @@ -5937,12 +5942,12 @@ Are you really want to continue? 批量设置案例 - + Choose input files 选择输入数据文件 - + Input data files (*.in) 输入数据文件 (*.in) @@ -5951,104 +5956,104 @@ Are you really want to continue? 无标题%1 - + Modify Watch 修改监视表达式 - + Watch Expression 监视表达式 - + Do you really want to clear all breakpoints in this file? 您真的要清除该文件的所有断点吗？ - + New project 新建项目 - + Close %1 and start new project? 关闭'%1'以打开新项目? - + Folder not exist 文件夹不存在 - + Folder '%1' doesn't exist. Create it now? 文件夹'%1'不存在。是否创建？ - + Can't create folder 无法创建文件夹 - + Failed to create folder '%1'. 创建文件夹'%1'失败。 - + Save new project as - + Folder %1 is not empty. 文件夹%1不是空的。 - + Do you really want to delete it? 你真的要删除它吗？ - + Change working folder 改变工作文件夹 - + File '%1' is not in the current working folder. File '%1' is not in the current working folder 文件'%1'不在当前工作文件夹中。 - + Do you want to change working folder to '%1'? 是否将工作文件夹改设为'%1'? - + Can't Commit 无法提交 - + Git needs user info to commit. Git需要用信息进行提交。 - + Choose Input Data File 选择输入数据文件 - - + + All files (*.*) 所有文件 (*.*) - + Choose Expected Output Data File Choose Expected Input Data File 选择期望输出文件 @@ -6058,61 +6063,61 @@ Are you really want to continue? 第%1行 - - - + + + Choose Working Folder 选择工作文件夹 - - + + Header Exists 头文件已存在 - - + + Header file "%1" already exists! 头文件"%1"已存在！ - + Source Exists 源文件已存在！ - + Source file "%1" already exists! 源文件"%1"已存在！ - + Can't commit! 无法提交！ - + The following files are in conflicting: 下列文件处于冲突状态，请解决后重新添加和提交： - + Commit Message 提交信息 - + Commit Message: 提交信息： - + Commit Failed 提交失败 - + Commit message shouldn't be empty! 提交信息不能为空！ @@ -6121,22 +6126,22 @@ Are you really want to continue? 小熊猫Dev-C++项目文件 (*.dev) - + New project fail 新建项目失败 - + Can't assign project template 无法使用模板创建项目 - + Remove file 删除文件 - + Remove the file from disk? 同时从硬盘上删除文件？ @@ -6145,110 +6150,110 @@ Are you really want to continue? 无标题 - + New Project File Name 新的项目文件名 - + File Name: 文件名： - + File Already Exists! 文件已存在！ - + File '%1' already exists! 文件'%1'已经存在！ - + Add to project 添加到项目 - + C/C++ Source Files (*.c *.cpp *.cc *.cxx) C/C++源代码文件 (*.c *.cpp *.cc *.cxx) - + This operation will remove all cases for the current problem. 本操作会删除此试题的所有案例。 - + Red Panda C++ project file (*.dev) 小熊猫C++项目文件(*.dev) - + Rename Error 重命名出错 - + Symbol '%1' is defined in system header. 符号'%1'在系统头文件中定义，无法修改。 - + New Name 新名称 - - + + Replace Error 替换出错 - + Can't open file '%1' for replace! 无法打开文件'%1'进行替换！ - + Contents has changed since last search! 内容和上次查找时不一致。 - + Rich Text Format Files (*.rtf) RTF格式文件 (*.rtf) - + HTML Files (*.html) HTML文件 (*.html) - + The current problem set is not empty. 当前的试题集不是空的。 - + Problem %1 试题%1 - - + + Problem Set Files (*.pbs) 试题集文件 (*.pbs) - + Load Error 载入失败 - - + + Problem Case %1 试题案例%1 @@ -6259,16 +6264,16 @@ Are you really want to continue? - - - - - - - - - - + + + + + + + + + + Error 错误 @@ -6278,96 +6283,96 @@ Are you really want to continue? 项目历史 - + Load Theme Error 载入主题失败 - - + + Clear History 清除历史 - - + + Version Control 版本控制 - + File '%1' was changed. 磁盘文件'%1'已被修改。 - + Reload its content from disk? 是否重新读取它的内容？ - + File '%1' was removed. 磁盘文件'%1'已被删除。 - + Keep it open? 是否保持它在小熊猫C++中打开的编辑窗口？ - + Open 打开 - + Compile Failed 编译失败 - + Run Failed 运行失败 - - + - + + Confirm Convertion 确认转换 - - + - + + The editing file will be saved using %1 encoding. <br />This operation can't be reverted. <br />Are you sure to continue? 当前编辑器中的文件将会使用%1编码保存。<br />这项操作无法被撤回。<br />你确定要继续吗？ - + New Watch Expression 新监视表达式 - + Enter Watch Expression (it is recommended to use 'this->' for class members): 输入监视表达式 - + Parsing file %1 of %2: "%3" （%1/%2）正在解析文件"%3" - - + + Done parsing %1 files in %2 seconds 完成%1个文件的解析,用时%2秒 - + (%1 files per second) (每秒%1个文件） @@ -7628,60 +7633,60 @@ Are you really want to continue? 无法载入自动链接设置 - - - - + + + + The following %1 directories don't exist: 下列%1文件夹不存在： - - + + binary 二进制 - + No %1 directories have been specified. 未指定%1文件夹 - + C include C包含 - - + + C++ include C++包含 - - - - + + + + Cannot find the %1 "%2" 无法找到%1程序"%2" - + C Compiler C编译器 - + C++ Compiler C++编译器 - + Maker 构建程序(Make) - + Debugger 调试器 @@ -7747,7 +7752,7 @@ Are you really want to continue? 生成调试信息(-g3) - + Would you like Red Panda C++ to search for compilers in PATH? 您同意小熊猫C++在PATH路径中寻找gcc编译器吗？ @@ -7860,23 +7865,23 @@ Are you really want to continue? 只生成汇编代码(-S) - - + + Confirm 确认 - + The following problems were found during validation of compiler set "%1": 在验证编译器设置"%1"时遇到了下列问题： - + Leaving those directories will lead to problems during compilation. 在配置中保留这些文件夹可能会导致编译出错。 - + Would you like Red Panda C++ to remove them for you and add the default paths to the valid paths? 是否让小熊猫C++删除这些配置，并尝试重新建立配置？ @@ -7885,13 +7890,13 @@ Are you really want to continue? 如果仍然保留这些设置，可能会导致编译错误。<br /><br />请选择“是”，除非您清楚的知道选择“否”的后果， - - + + Compiler set not configuared. 未配置编译器设置。 - + Would you like Red Panda C++ to search for compilers in the following locations: <BR />'%1'<BR />'%2'? 您需要小熊猫C++在下列位置搜索编译器吗：<br />%1<br />%2 @@ -8239,12 +8244,12 @@ Are you really want to continue? 无标题 - + constructor 构造函数 - + destructor 析构函数 @@ -8949,14 +8954,14 @@ Are you really want to continue? 性能 - + Compiler Set 编译器配置集 - + Compiler @@ -8968,7 +8973,7 @@ Are you really want to continue? 自动链接 - + @@ -9045,15 +9050,15 @@ Are you really want to continue? 杂项 - - + + Program Runner 程序运行 - + Problem Set 试题集 @@ -9336,12 +9341,12 @@ Are you really want to continue? TodoModel - + Filename 文件名 - + Line 行 @@ -9350,7 +9355,7 @@ Are you really want to continue? 列 - + Content 内容 diff --git a/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts b/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts index 6351d3d5..06f915cb 100644 --- a/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts +++ b/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts @@ -4569,6 +4569,10 @@ Switch Header/Source + + Generate Assembly + + NewClassDialog diff --git a/libs/qsynedit/qsynedit/highlighter/asm.cpp b/libs/qsynedit/qsynedit/highlighter/asm.cpp index 3ce97476..3f9a67c3 100644 --- a/libs/qsynedit/qsynedit/highlighter/asm.cpp +++ b/libs/qsynedit/qsynedit/highlighter/asm.cpp @@ -16,10 +16,34 @@ */ #include "asm.h" #include "../Constants.h" +#include namespace QSynedit { const QSet ASMHighlighter::Keywords { + "movb","movw","movl","movq", + "leab","leaw","leal","leaq", + "incb","incw","incl","incq", + "decb","decw","decl","decq", + "addb","addw","addl","addq", + "subb","subw","subl","subq", + "imulb","imulw","imull","imulq", + "divb","divw","divl","divq", + "xorb","xorw","xorl","xorq", + "orb","orw","orl","orq", + "andb","andw","andl","andq", + "salb","salw","sall","salq", + "shlb","shlw","shll","shlq", + "sarb","sarw","sarl","sarq", + "shrb","shrw","shrl","shrq", + "cmpb","cmpw","cmpl","cmpq", + "testb","testw","testl","testq", + "pushq","popq", + "cmove", "cmovz", "cmovne", "cmovnz", + "cmovs", "cmovns", "cmovg", "cmovge", + "cmovl", "cmovle", "cmova", "cmovae", + "cmovb", "cmovbe", "cmovnbe","cmovnb", + "cmovnae","cmovna", "aaa","aad","aam","adc","add","and","arpl","bound","bsf","bsr","bswap","bt","btc","btr","bts", "call","cbw","cdq","clc","cld","cli","clts","cmc","cmp","cmps","cmpsb","cmpsd","cmpsw", "cmpxchg","cwd","cwde","daa","das","dec","div","emms","enter","f2xm1","fabs","fadd","faddp","fbld", @@ -98,7 +122,7 @@ void ASMHighlighter::IdentProc() } QString s = mLineString.mid(start,mRun-start); if (Keywords.contains(s)) { - mTokenID = TokenId::Key; + mTokenID = TokenId::rainbow; } else { mTokenID = TokenId::Identifier; } @@ -130,7 +154,8 @@ void ASMHighlighter::NumberProc() while (true) { QChar ch = mLine[mRun]; if (!((ch>='0' && ch<='9') || (ch=='.') || (ch >= 'a' && ch<='f') - || (ch=='h') || (ch >= 'A' && ch<='F') || (ch == 'H'))) + || (ch=='h') || (ch >= 'A' && ch<='F') || (ch == 'H') + || (ch == 'x'))) break; mRun++; } @@ -181,6 +206,7 @@ void ASMHighlighter::StringProc() mTokenID = TokenId::String; if ((mRun+2 < mLineString.size()) && (mLine[mRun + 1] == '\"') && (mLine[mRun + 2] == '\"')) mRun += 2; + mRun+=1; while (true) { if (mLine[mRun] == 0 || mLine[mRun] == '\r' || mLine[mRun] == '\n') break; @@ -231,7 +257,7 @@ PHighlighterAttribute ASMHighlighter::getTokenAttribute() const return mCommentAttribute; case TokenId::Identifier: return mIdentifierAttribute; - case TokenId::Key: + case TokenId::rainbow: return mKeywordAttribute; case TokenId::Number: return mNumberAttribute; diff --git a/libs/qsynedit/qsynedit/highlighter/asm.h b/libs/qsynedit/qsynedit/highlighter/asm.h index fc087ddb..74c79a29 100644 --- a/libs/qsynedit/qsynedit/highlighter/asm.h +++ b/libs/qsynedit/qsynedit/highlighter/asm.h @@ -26,7 +26,7 @@ class ASMHighlighter : public Highlighter enum class TokenId { Comment, Identifier, - Key, + rainbow, // add mov etc Null, Number, Space, @@ -91,6 +91,8 @@ public: // SynHighlighter interface public: QSet keywords() const override; + const PHighlighterAttribute &directiveAttribute() const; + const PHighlighterAttribute &labelAttribute() const; }; } diff --git a/libs/qsynedit/qsynedit/highlighter/base.cpp b/libs/qsynedit/qsynedit/highlighter/base.cpp index 8f809eac..46af387d 100644 --- a/libs/qsynedit/qsynedit/highlighter/base.cpp +++ b/libs/qsynedit/qsynedit/highlighter/base.cpp @@ -103,6 +103,11 @@ QString Highlighter::foldString() return " ... }"; } +bool Highlighter::supportBraceLevel() +{ + return false; +} + bool Highlighter::isSpaceChar(const QChar &ch) { return ch == ' ' || ch == '\t' || ch == '\r' || ch == '\n'; diff --git a/libs/qsynedit/qsynedit/highlighter/base.h b/libs/qsynedit/qsynedit/highlighter/base.h index ad28fa2f..7dba8d11 100644 --- a/libs/qsynedit/qsynedit/highlighter/base.h +++ b/libs/qsynedit/qsynedit/highlighter/base.h @@ -154,6 +154,7 @@ public: virtual QString foldString(); + virtual bool supportBraceLevel(); virtual bool isSpaceChar(const QChar& ch); virtual bool isWordBreakChar(const QChar& ch); bool enabled() const; diff --git a/libs/qsynedit/qsynedit/highlighter/cpp.cpp b/libs/qsynedit/qsynedit/highlighter/cpp.cpp index d10623b5..724db776 100644 --- a/libs/qsynedit/qsynedit/highlighter/cpp.cpp +++ b/libs/qsynedit/qsynedit/highlighter/cpp.cpp @@ -1399,6 +1399,11 @@ void CppHighlighter::setCustomTypeKeywords(const QSet &newCustomTypeKey mCustomTypeKeywords = newCustomTypeKeywords; } +bool CppHighlighter::supportBraceLevel() +{ + return true; +} + bool CppHighlighter::getTokenFinished() const { if (mTokenId == TokenId::Comment diff --git a/libs/qsynedit/qsynedit/highlighter/cpp.h b/libs/qsynedit/qsynedit/highlighter/cpp.h index 19ba426d..af7c8184 100644 --- a/libs/qsynedit/qsynedit/highlighter/cpp.h +++ b/libs/qsynedit/qsynedit/highlighter/cpp.h @@ -202,6 +202,10 @@ public: QString foldString() override; const QSet &customTypeKeywords() const; void setCustomTypeKeywords(const QSet &newCustomTypeKeywords); + + // Highlighter interface +public: + bool supportBraceLevel() override; }; } diff --git a/libs/qsynedit/qsynedit/highlighter/glsl.cpp b/libs/qsynedit/qsynedit/highlighter/glsl.cpp index 5cf6ad9e..4d49dc95 100644 --- a/libs/qsynedit/qsynedit/highlighter/glsl.cpp +++ b/libs/qsynedit/qsynedit/highlighter/glsl.cpp @@ -1471,4 +1471,9 @@ QSet GLSLHighlighter::keywords() const { return Keywords; } + +bool GLSLHighlighter::supportBraceLevel() +{ + return true; +} } diff --git a/libs/qsynedit/qsynedit/highlighter/glsl.h b/libs/qsynedit/qsynedit/highlighter/glsl.h index 0668de48..5ab36a09 100644 --- a/libs/qsynedit/qsynedit/highlighter/glsl.h +++ b/libs/qsynedit/qsynedit/highlighter/glsl.h @@ -192,6 +192,10 @@ public: // SynHighlighter interface public: QSet keywords() const override; + + // Highlighter interface +public: + bool supportBraceLevel() override; }; }