enlightenment/edi
enlightenment
/
edi
7
1
Fork 3
Code Issues Pull Requests Projects Releases Wiki Activity

syntax: Add line highlighting for clang errors 

This never worked on the old elm_entry code!
Highlight where clang knows a problem exists.
Not yet inserting a caret, but there's more to be done...
This commit is contained in:
Andy Williams 2015-02-21 18:54:52 +00:00
parent 7212dc24bb
commit c18fccb646
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/bin/editor/edi_editor.c
View File

@ -273,6 +273,26 @@ _edi_range_color_set(Edi_Editor *editor, Edi_Range range, Elm_Code_Token_Type ty
ecore_thread_main_loop_end();
}
static void
_edi_line_status_set(Edi_Editor *editor, unsigned int number, Elm_Code_Status_Type status)
{
Elm_Code *code;
Elm_Code_Line *line;
eo_do(editor->entry,
code = elm_code_widget_code_get());
line = elm_code_file_line_get(code->file, number);
ecore_thread_main_loop_begin();
elm_code_line_status_set(line, status);
eo_do(editor->entry,
elm_code_widget_line_refresh(line));
ecore_thread_main_loop_end();
}
static void
_clang_load_highlighting(const char *path, Edi_Editor *editor)
{
@ -433,13 +453,12 @@ _clang_load_errors(const char *path EINA_UNUSED, Edi_Editor *editor)
for(i = 0, n = clang_getNumDiagnostics(editor->tx_unit); i != n; ++i)
{
CXDiagnostic diag = clang_getDiagnostic(editor->tx_unit, i);
Edi_Range range;
unsigned int line;
clang_getSpellingLocation(clang_getDiagnosticLocation(diag), NULL, &range.start.line, &range.start.col, NULL);
range.end = range.start;
// the parameter after line would be a caret position but we're just highlighting for now
clang_getSpellingLocation(clang_getDiagnosticLocation(diag), NULL, &line, NULL, NULL);
/* FIXME: Also handle ranges and fix suggestions. */
Elm_Code_Status_Type status = ELM_CODE_STATUS_TYPE_DEFAULT;
switch (clang_getDiagnosticSeverity(diag))
@ -461,7 +480,7 @@ _clang_load_errors(const char *path EINA_UNUSED, Edi_Editor *editor)
break;
}
// _edi_range_color_set(editor, range, color);
_edi_line_status_set(editor, line, status);
# if CLANG_DEBUG
CXString str = clang_formatDiagnostic(diag, clang_defaultDiagnosticDisplayOptions());