From dc807f527cc9c2ef386efb9577deb3de9184b0fb Mon Sep 17 00:00:00 2001 From: "royqh1979@gmail.com" Date: Sat, 25 Sep 2021 21:34:10 +0800 Subject: [PATCH] - function tips done --- NEWS.md | 1 + RedPandaIDE/RedPandaIDE_zh_CN.qm | Bin 75625 -> 78175 bytes RedPandaIDE/RedPandaIDE_zh_CN.ts | 1056 ++++++++++------- RedPandaIDE/editor.cpp | 67 +- RedPandaIDE/mainwindow.ui | 10 +- RedPandaIDE/parser/cpptokenizer.cpp | 1 - RedPandaIDE/qsynedit/Types.cpp | 3 +- RedPandaIDE/widgets/functiontooltipwidget.cpp | 30 +- RedPandaIDE/widgets/functiontooltipwidget.h | 2 +- 9 files changed, 682 insertions(+), 488 deletions(-) diff --git a/NEWS.md b/NEWS.md index 47091fad..a8173f59 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,5 @@ Version 0.2 + - enhancement: function tips - enhancement: project support - enhancement: paint color editor use system palette's disabled group color - fix: add watch not work when there's no editor openned; diff --git a/RedPandaIDE/RedPandaIDE_zh_CN.qm b/RedPandaIDE/RedPandaIDE_zh_CN.qm index 89a5daae3f34cf2f88e221c79b2da59451495b4b..ccf431de0ca65e2d973fe92778a21fc1bb92cb96 100644 GIT binary patch delta 9289 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 I%y`-V0jqgbjQ{`u delta 7209 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 BacktraceModel - + Function 函数 - + Filename 文件名 - + Line 行 @@ -45,17 +45,17 @@ BreakpointModel - + Filename 文件名 - + Line 行 - + Condition 条件 @@ -92,7 +92,7 @@ ColorEdit - + NONE 无颜色 @@ -221,28 +221,28 @@ CompilerManager - - - - + + + + No compiler set 无编译器设置 - - - - + + + + No compiler set is configured. 没有配置编译器设置。 - - - - + + + + Can't start debugging. 无法启动调试器 @@ -573,28 +573,28 @@ Are you really want to continue? 找不到调试器程序"%1" - - + + Execute to evaluate 执行以求值 - + Not found in current context 不在当前语境中 - + Compile 编译 - + Source file is more recent than executable. 源文件比程序文件新。 - + Recompile? 重新编译？ @@ -618,10 +618,10 @@ Are you really want to continue? - - - - + + + + Error 错误 @@ -636,50 +636,50 @@ Are you really want to continue? 另存为 - + 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! 要剪切的内容超过了字符数限制！ - - - + + + Ctrl+click for more info Ctrl+单击以获取更多信息 - - + + Symbol '%1' not found! 未找到符号'%1'! - + Break point condition 断点条件 - + Enter the condition of the breakpoint: 输入当前断点的生效条件: - + Readonly 只读 @@ -952,32 +952,37 @@ Are you really want to continue? 下划线 - + + Rainbow parenthesis + 彩虹括号 + + + Duplicate... 复制... - + Rename... 重命名... - + Restore to Default 删除自定义修改 - + Import Scheme... 导入配色... - + Export... 导出... - + Delete... 删除... @@ -987,55 +992,55 @@ Are you really want to continue? 背景色 - - - - - - - - + + + + + + + + Error 错误 - + Open 打开 - - + + Color Scheme Files (*.scheme) 配色方案文件 (*.scheme) - + '%1' is not a valid name for color scheme file. '%1'不是合法的配色方案文件名。 - + New scheme name 新方案名 - + '%1' is not a valid scheme name! '%1'不是合法的配色方案名! - + Save 保存 - + Confirm Delete Scheme 确认删除方案 - + Scheme '%1' will be deleted!<br />Do you really want to continue? 配色方案'%1'将会被删除！<br />您确认要继续吗？ @@ -1230,7 +1235,7 @@ Are you really want to continue? 自动覆写匹配的符号 - + Remove symbol pairs when delete chars 在删除字符时自动删除配对的符号 @@ -1258,6 +1263,44 @@ Are you really want to continue? 在文件函数变化时检查 + + EditorTooltipsWidget + + + Form + 表单 + + + + Show function tips + 显示函数参数提示 + + + + Enable mouse hover tooltips + 启用鼠标悬停提示 + + + + Show syntax issue tooltips + 显示语法错误信息 + + + + Show full header filename tooltips + 显示头文件路径信息 + + + + Show identifier definition tooltips + 显示标识符定义信息 + + + + Show expression value tooltips when debugging + 调试时显示表达式的值 + + EnvironmentAppearenceWidget @@ -1345,6 +1388,31 @@ Are you really want to continue? Minimize IDE when running programs 在运行程序时自动最小化IDE + + + Parameters to pass to your program + 运行程序的命令行参数 + + + + Redirect input to the following file: + 将程序的标准输入重定向到下面的文件 + + + + Note: Debugger doesn't support this feature. + 注意:由于gdb的bug，调试时不支持该功能 + + + + Choose input file + 选择输入文件 + + + + All files (*.*) + 所有文件 (*.*) + FileCompiler @@ -2106,40 +2174,40 @@ Are you really want to continue? 小熊猫C++ - - + + Issues 编译器 - + Compile Log 编译日志 - + File 文件 - + Tools 工具 - - + + Run 运行 - + Edit 编辑 - + Project 项目 @@ -2149,12 +2217,12 @@ Are you really want to continue? 监视 - + Structure 结构 - + Files 文件 @@ -2163,95 +2231,92 @@ Are you really want to continue? 资源 - - - + + + + Debug 调试 - + Evaluate: 求值 - + Debug Console 调试主控台 - + Call Stack 调用栈 - + Breakpoints 断点 - + Locals 本地变量 - - + + Search 查找 - + History: 历史： - + Search Again 重新查找 - + Replace with: 替换为： - + Replace 替换 - + Close 关闭 - + Execute 运行 - + + Code 代码 - + Window 窗口 - - - - toolBar - 工具栏 + 工具栏 - toolBar_2 - 工具栏2 + 工具栏2 @@ -2259,542 +2324,553 @@ 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 编译 - + 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 单步进入 - - + + Main + 主工具栏 + + + + Compiler Set + 编译器配置集 + + + + New Source File 新建源代码文件 - + 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 清除全部监视 - + 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 跳转到声明处 - + Goto Definition 跳转到定义处 - + Find references 查找符号的引用 - + Open containing folder 打开所在的文件夹 - + Ctrl+B Ctrl+B - + Open a terminal here 打开命令行窗口 - + File Properties... 文件属性... - + Close Project 关闭项目 - + Project options 项目属性 - + New Project... 新建项目... - + New File 新建项目文件 - + Add to project... 添加到项目... - + Remove from project 从项目删除 - + View Makefile 查看Makefile - + Clean 清理构建文件 - + Open Folder in Explorer 在浏览器中打开 - + Open In Terminal 在终端中打开 @@ -2809,32 +2885,32 @@ Are you really want to continue? 文件历史 - - - - - - + + + + + + Debugging 正在调试 - - - - - - + + + + + + Running 正在运行 - - - - - - + + + + + + Compiling 正在编译 @@ -2843,255 +2919,292 @@ Are you really want to continue? 行:%1 列:%2 已选择:%3 总行数:%4 总长度:%5 - + Line:%1 Col:%2 Selected:%3 Lines:%4 Length:%5 行:%1 列:%2 已选择:%3 总行数:%4 总长度:%5 - + Read Only 只读 - + Insert 插入 - + Overwrite 覆写 - + Close project 关闭项目 - + Are you sure you want to close %1? 你确定要关闭'%1'吗？ - - + + Confirm 确认 - - - + + + Source file is not compiled. 源文件尚未编译。 - - + + Compile now? 现在编译？ - - + + Source file is more recent than executable. 源文件比可执行程序新。 - + Recompile now? 重新编译？ - + 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'不存在。 + + + Recompile? 重新编译？ - + Copy all 全部复制 - + Clear 清除 - + Remove this search 清除这次搜索 - + Clear all searches 删除所有搜索 - + Breakpoint condition... 断点条件... - + Break point condition 断点条件 - + Enter the condition of the breakpoint: 输入当前断点的生效条件: - + Remove all breakpoints 清除所有断点 - + Rename File 重命名文件 - - + + Add Folder 添加文件夹 - + New folder 新文件夹 - + Folder name: 文件夹： - + Rename Folder 重命名 - + Remove Folder 删除文件夹 - + %1 files autosaved 已自动保存%1个文件 - + Save project 保存项目 - + The project '%1' has modifications. 项目'%1'有改动。 - + Do you want to save it? 需要保存吗？ - + 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 - + Red panda Dev-C++ project file (*.dev) 小熊猫Dev-C++项目文件 (*.dev) - + New project fail 新建项目失败 - + Can't assign project template 无法使用模板创建项目 - + Add to project 添加到项目 - - - - - - - - + + + + + + + + Error 错误 @@ -3101,75 +3214,75 @@ Are you really want to continue? 项目历史 - + 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个文件） @@ -3226,87 +3339,87 @@ Are you really want to continue? Project - + File Not Found 未找到文件 - + Project file '%1' can't be found! 找不到项目文件'%1'! - + untitled 无标题 - + Can't save file 无法保存文件 - + Can't save file '%1' 无法保存文件'%1'. - + File Exists 文件已存在 - + File '%1' is already in the project 文件'%1'已在项目中 - + Project Updated 项目已升级 - + Your project was succesfully updated to a newer file format! 已成功将项目升级到新的格式 - + If something has gone wrong, we kept a backup-file: '%1'... 旧项目文件备份在'%1'。 - + Settings need update 设置需要更新 - + The compiler settings format of Dev-C++ has changed. Dev-C++的编译器设置格式已发生改变。 - + Please update your settings at Project >> Project Options >> Compiler and save your project. 请在项目 >> 项目属性 >> 编译器设置中修改您的设置并保存您的项目 - + Compiler not found 未找到编译器 - + The compiler set you have selected for this project, no longer exists. 您为该项目设置的编译器不存在。 - + It will be substituted by the global compiler set. 它将会被全局编译器设置代替。 - + Developed using the Red Panda Dev-C++ IDE 使用小熊猫Dev-C++编辑器开发 @@ -3430,6 +3543,29 @@ Are you really want to continue? 自定义设置(仅对本项目生效) + + ProjectDLLHostWidget + + + Form + 表单 + + + + Host application for DLL: + DLL文件的宿主程序： + + + + Choose host application + 选择宿主程序 + + + + All files (*.*) + 所有文件 (*.*) + + ProjectDirectoriesWidget @@ -3631,6 +3767,11 @@ Are you really want to continue? Information about using a custom make file 关于自定义Makefile + + + Include the following files into the makefile: + 在Makefile中包含下列文件: + Custom makefile @@ -3645,24 +3786,24 @@ Are you really want to continue? ProjectModel - + File exists 文件已存在 - + File '%1' already exists. Delete it now? 文件'%1'已存在。是否删除？ - - + + Remove failed 删除失败 - - + + Failed to remove file '%1' 无法删除文件'%1' @@ -3956,175 +4097,175 @@ 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 options C语言选项 - + Support all ANSI standard C programs (-ansi) 支持所有ANSI标准C程序(-ansi) - + Do not recognize asm,inline or typeof as a keyword (-fno-asm) 不支持将asm、inline和typeof作为关键字(-fno-asm) - + Imitate traditional C preprocessors (-traditional-cpp) 模仿传统C预处理器行为(-traditional-cpp) - + Code Generation 代码生成 - + Optimize for the following machine (-march) 生成特定机器的专用指令(-march) - + Optimize less, while maintaining full compatibility (-tune) 完整兼容特定机器，较少优化(-tune) - + Enable use of specific instructions (-mx) 启用特定指令集(-mx) - + Optimization level (-Ox) 优化级别(-Ox) - + Compile with the following pointer size (-mx) 使用下列指针大小编译(-mx) - + Language standard (-std) 语言标准(-std) - + Profile 性能分析 - + Generate debugging information (-g3) 生成调试信息(-g3) - + Generate profiling info for analysis (-pg) 生成性能分析信息(-pg) - + Warnings 代码警告 - + Inhibit all warning messages (-w) 忽略所有警告信息(-w) - + Show most warnings (-Wall) 启用常见问题警告(-Wall) - + Show some more warnings (-Wextra) 启用更多问题警告(-Wextra) - + Check ISO C/C++/C++0x conformance (-pedantic) 检查ISO C/C++/C++0x语法一致性(-pedantic) - + Only check the code for syntax errors (-fsyntax-only) 只进行语法检查（不编译）(-fsyntax-only) - + Make all warnings into errors (-Werror) 将警告作为错误处理(-Werror) - + Abort compilation on first error (-Wfatal-errors) 遇到第一个错误后立即中止编译(-Wfatal-errors) - + Linker 链接器 - + Link an Objective C program (-lobjc) 链接Objective-C程序 (-lobjc) - + Do not use standard system libraries (-nostdlib) 不使用标准库和系统启动文件(-nostdlib) - + Do not create a console window (-mwindows) 不产生控制台窗口(-mwindows) - + Strip executable (-s) 剥除附加信息(-s) @@ -4133,43 +4274,43 @@ Are you really want to continue? 链接Ojbective C程序(-lobjc) - + Output 输出 - + Put comments in generated assembly code (-fverbose-asm) 在生成的汇编代码中加入注释(-fverbose-asm) - + Use pipes instead of temporary files during compilation (-pipe) 编译时使用管道而不是临时文件(-pipe) - + Do not assemble, compile and generate the assemble code (-S) 只生成汇编代码(-S) - - + + Confirm 确认 - + The following problems were found during validation of compiler set "%1": 在验证编译器设置"%1"时遇到了下列问题： - + 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 @@ -4488,17 +4629,17 @@ Are you really want to continue? 缺省 - + Untitled 无标题 - + constructor 构造函数 - + destructor 析构函数 @@ -4518,17 +4659,17 @@ Are you really want to continue? RegisterModel - + Register 寄存器 - + Value(Hex) 值(HEX) - + Value(Dec) 值(DEC) @@ -4861,164 +5002,176 @@ Are you really want to continue? 取消 - + Appearence 外观 - + Environment 环境 - - + + Compiler Set 编译器配置集 - - + + Compiler 编译器 - + Auto Link 自动链接 - - - - - + + + + + General 通用 - - - - - - - - - + + + + + + + + + + Editor 编辑器 - + Font 字体 - + Copy & Export 复制/导出 - + Color 配色 - + Code Completion 代码补全 - + Symbol Completion 符号补全 - + Auto Syntax Checking 自动语法检查 - + + Tooltips + 信息提示 + + + Auto save 自动保存 - + Misc 杂项 - + Program Runner 程序运行 - + Debugger 调试器 - + Code Formatter 代码排版 - - - - - - - - - + + + + + + + + + + Project 项目 - + Files 文件 - + Custom Compile options 自定义编译选项 - + Directories 文件夹 - + Precompiled Header 预编译头文件 - + Makefile Makefile - + Output 输出 - + + DLL host + DLL宿主 + + + Version info 版本信息 - + Save Changes 保存修改 - + There are changes in the settings, do you want to save them before swtich to other page? 本页中有尚未保存的设置修改，是否保存后再切换到其他页？ @@ -5069,8 +5222,8 @@ Are you really want to continue? SynEdit + - The highlighter seems to be in an infinite loop 高亮处理进入了死循环 @@ -5078,16 +5231,29 @@ Are you really want to continue? SynEditStringList - + Can't open file '%1' for read! 无法读取文件'%1'! - + Can't open file '%1' for save! 无法写入文件'%2'! + + WatchModel + + + Expression + 表达式 + + + + Value + 值 + + editorgeneralwidget diff --git a/RedPandaIDE/editor.cpp b/RedPandaIDE/editor.cpp index ef94dbdc..e038ddae 100644 --- a/RedPandaIDE/editor.cpp +++ b/RedPandaIDE/editor.cpp @@ -464,6 +464,7 @@ void Editor::focusOutEvent(QFocusEvent *event) pMainWindow->updateEditorActions(); pMainWindow->updateStatusbarForLineCol(); pMainWindow->updateForStatusbarModeInfo(); + pMainWindow->functionTip()->hide(); } void Editor::keyPressEvent(QKeyEvent *event) @@ -1784,6 +1785,7 @@ void Editor::showCompletion(bool autoComplete) }); mCompletionPopup->setParser(mParser); mCompletionPopup->setUseCppKeyword(mUseCppSyntax); + pMainWindow->functionTip()->hide(); mCompletionPopup->show(); // Scan the current function body @@ -1842,6 +1844,7 @@ void Editor::showHeaderCompletion(bool autoComplete) if (word.lastIndexOf('"')>0 || word.lastIndexOf('>')>0) return; + pMainWindow->functionTip()->hide(); mHeaderCompletionPopup->show(); mHeaderCompletionPopup->setSearchLocal(word.startsWith('"')); word.remove(0,1); @@ -2246,6 +2249,10 @@ QString Editor::getHintForFunction(const PStatement &statement, const PStatement void Editor::updateFunctionTip() { + if (pMainWindow->completionPopup()->isVisible()) { + pMainWindow->functionTip()->hide(); + return; + } BufferCoord caretPos = caretXY(); ContentsCoord curPos = fromBufferCoord(caretPos); ContentsCoord cursorPos = curPos; @@ -2257,6 +2264,7 @@ void Editor::updateFunctionTip() // Stopping characters... QChar ch = *curPos; if (ch == '\0' || ch == ';') { + pMainWindow->functionTip()->hide(); return; // Opening brace, increase count } @@ -2299,14 +2307,17 @@ void Editor::updateFunctionTip() curPos += 1; } + //qDebug()<<"first pass:"<functionTip()->hide(); return; } ContentsCoord FFunctionEnd = curPos; int paramPos = 0; + bool paramPosFounded = false; // We've stopped at the ending ), start walking backwards )*here* with nBraces = -1 for (int i=0;ifunctionTip()->hide(); return; + } if (prevCh == '/' && ch == '*' ) { curPos -= 1; break; @@ -2331,8 +2344,9 @@ void Editor::updateFunctionTip() break;; } else if (ch == ',') { if (nBraces == 0) { - if (curPos <= cursorPos) { + if (curPos <= cursorPos && !paramPosFounded) { paramPos = nCommas; + paramPosFounded = true; } nCommas++; } @@ -2341,10 +2355,13 @@ void Editor::updateFunctionTip() if (curPos.atStart()) break; } - paramPos = nCommas - paramPos; + if (paramPosFounded) + paramPos = nCommas - paramPos; + //qDebug()<<"second pass:"<functionTip()->hide(); return; } @@ -2362,22 +2379,31 @@ void Editor::updateFunctionTip() } ContentsCoord prevPos = curPos-1; - if (prevPos.atStart()) + if (prevPos.atStart()) { + pMainWindow->functionTip()->hide(); return; + } // Get the name of the function we're about to show BufferCoord FuncStartXY = prevPos.toBufferCoord(); QString token; PSynHighlighterAttribute HLAttr; if (!getHighlighterAttriAtRowCol(FuncStartXY,token,HLAttr)) { + pMainWindow->functionTip()->hide(); return; } - if (HLAttr->name()!=SYNS_AttrIdentifier) + if (HLAttr->name()!=SYNS_AttrIdentifier) { + pMainWindow->functionTip()->hide(); return; + } BufferCoord pWordBegin, pWordEnd; QString s = getWordAtPosition(this, FuncStartXY, pWordBegin,pWordEnd, WordPurpose::wpInformation); +// qDebug()<functionTip()->tipCount()<=0) { + pMainWindow->functionTip()->hide(); return; } + // Position it at the top of the next line + QPoint p = rowColumnToPixels(displayXY()); + p+=QPoint(0,textHeight()+2); + pMainWindow->functionTip()->move(mapToGlobal(p)); pMainWindow->functionTip()->setFunctioFullName(s); pMainWindow->functionTip()->guessFunction(nCommas); @@ -2410,32 +2441,6 @@ void Editor::updateFunctionTip() paramPos ); pMainWindow->functionTip()->show(); -//// // get the current token position in the text -//// // this is where the prototype name usually starts -//// FTokenPos := CurPos - Length(S); - -//// Search for the best possible overload match according to comma count -//if (shoFindBestMatchingToolTip in FOptions) then - -// // Only do so when the user didn't select his own -// if not FCustomSelIndex then -// S := FindClosestToolTip(S, nCommas); - -//// Select the current one -//if (FSelIndex < FToolTips.Count) then -// S := FToolTips.Strings[FSelIndex]; - -//// set the hint caption -//Caption := Trim(S); - -//// we use the LookupEditor to get the highlighter-attributes -//// from. check the DrawAdvanced method! -//FLookupEditor.Text := Caption; -//FLookupEditor.Highlighter := FEditor.Highlighter; - -//// get the index of the current argument (where the cursor is) -//FCurParamIndex := GetCommaIndex(P, FFunctionStart + 1, CaretPos - 1); -//RethinkCoordAndActivate; } void Editor::setInProject(bool newInProject) diff --git a/RedPandaIDE/mainwindow.ui b/RedPandaIDE/mainwindow.ui index 48ae4bcc..ae0ce024 100644 --- a/RedPandaIDE/mainwindow.ui +++ b/RedPandaIDE/mainwindow.ui @@ -926,7 +926,7 @@ - toolBar + Main @@ -947,7 +947,7 @@ - toolBar + Code TopToolBarArea @@ -962,7 +962,7 @@ - toolBar + Compile @@ -983,7 +983,7 @@ - toolBar + Debug @@ -1008,7 +1008,7 @@ - toolBar_2 + Compiler Set diff --git a/RedPandaIDE/parser/cpptokenizer.cpp b/RedPandaIDE/parser/cpptokenizer.cpp index 75957d04..ab556f3b 100644 --- a/RedPandaIDE/parser/cpptokenizer.cpp +++ b/RedPandaIDE/parser/cpptokenizer.cpp @@ -594,7 +594,6 @@ void CppTokenizer::advance() mCurrent++; break; case '\\': - if (isLineChar(*(mCurrent + 1))) skipSplitLine(); else diff --git a/RedPandaIDE/qsynedit/Types.cpp b/RedPandaIDE/qsynedit/Types.cpp index e6d91af9..19d93538 100644 --- a/RedPandaIDE/qsynedit/Types.cpp +++ b/RedPandaIDE/qsynedit/Types.cpp @@ -204,9 +204,10 @@ QChar ContentsCoord::operator*() const return QChar('\0'); } QString s = mEdit->lines()->getString(mLine-1); - if (mChar > s.length()+1 ) { + if (mChar >= s.length()+1 ) { return QChar('\n'); } + //qDebug()< +#include -FunctionTooltipWidget::FunctionTooltipWidget(QWidget *parent) : QWidget(parent) +FunctionTooltipWidget::FunctionTooltipWidget(QWidget *parent) : + QFrame(parent, Qt::ToolTip | Qt::WindowStaysOnTopHint | Qt::WindowDoesNotAcceptFocus) { - setWindowFlags(Qt::Popup); setFocusPolicy(Qt::NoFocus); mInfoLabel = new QLabel(this); mInfoLabel->setWordWrap(true); @@ -21,12 +22,17 @@ FunctionTooltipWidget::FunctionTooltipWidget(QWidget *parent) : QWidget(parent) mDownButton->setFixedSize(16, 16); mDownButton->setAutoRaise(true); - this->setLayout(new QHBoxLayout()); + layout()->setContentsMargins(0,0,0,0); + layout()->setSpacing(0); layout()->addWidget(mUpButton); layout()->addWidget(mTotalLabel); layout()->addWidget(mDownButton); layout()->addWidget(mInfoLabel); + connect(mUpButton,&QPushButton::clicked, + this,&FunctionTooltipWidget::previousTip); + connect(mDownButton,&QPushButton::clicked, + this,&FunctionTooltipWidget::nextTip); } void FunctionTooltipWidget::addTip(const QString &name, const QString& fullname, @@ -102,11 +108,23 @@ void FunctionTooltipWidget::updateTip() } text += "( "+displayList.join(", ") + ") "; } + if (mInfos.length()>1) { + mTotalLabel->setText(QString("%1/%2").arg(mInfoIndex+1).arg(mInfos.length())); + } + int width = mInfoLabel->fontMetrics().horizontalAdvance(text); + if (width > 400) { + mInfoLabel->setMinimumWidth(410); + } else { + mInfoLabel->setMinimumWidth(width); + } mInfoLabel->setText(text); } void FunctionTooltipWidget::guessFunction(int commas) { + if (mInfoIndex>=0 && mInfoIndexparams.count()>commas) + return; for (int i=0;iparams.count()>commas) { mInfoIndex = i; @@ -141,6 +159,8 @@ QStringList FunctionTooltipWidget::splitArgs(QString argStr) QString s = argStr.mid(paramStart,i-paramStart); s=s.trimmed(); if (!s.isEmpty()) { + if (s.endsWith(')')) + s.truncate(s.length()-1); result.append(s); } return result; @@ -164,6 +184,7 @@ int FunctionTooltipWidget::paramIndex() const void FunctionTooltipWidget::setParamIndex(int newParamIndex) { mParamIndex = newParamIndex; + updateTip(); } void FunctionTooltipWidget::closeEvent(QCloseEvent *) @@ -179,7 +200,8 @@ void FunctionTooltipWidget::showEvent(QShowEvent *) updateTip(); } -void FunctionTooltipWidget::hideEvent(QHideEvent *event) +void FunctionTooltipWidget::hideEvent(QHideEvent *) { mInfos.clear(); + mFunctioFullName = ""; } diff --git a/RedPandaIDE/widgets/functiontooltipwidget.h b/RedPandaIDE/widgets/functiontooltipwidget.h index 1c829352..d4d8f14f 100644 --- a/RedPandaIDE/widgets/functiontooltipwidget.h +++ b/RedPandaIDE/widgets/functiontooltipwidget.h @@ -14,7 +14,7 @@ struct FunctionInfo { using PFunctionInfo = std::shared_ptr; -class FunctionTooltipWidget : public QWidget +class FunctionTooltipWidget : public QFrame { Q_OBJECT public: