GitLab

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Original patch by @antonanikin.

Differential Revision: https://phabricator.kde.org/D14391

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Discover unit-tests using bracket arguments and/or listed in
files other than CTestTestFile.cmake:

When using gtest_discover_tests(), add_test() directives are present
in various .cmake files. To date, Kdevelop searches for unit-tests
does not follow include() directives present in the main
CTestTestfile.cmake, leading to no unit-tests being shown.
Additionally, the bracket arguments of CMake is not enabled for
parsing tests arguments.

This patch enables them, and follows include() directives.

Reviewers: apol, kfunk, mwolff
Reviewed By: mwolff
Subscribers: mwolff, kdevelop-devel
Tags: #kdevelop
BUG: 405225
Differential Revision: https://phabricator.kde.org/D19673

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Test Plan: Fix some unused variable warnings

Reviewers: kdevelop-devel, apol

Reviewed By: apol

Subscribers: apol, kdevelop-devel

Tags: #kdevelop

Differential Revision: https://phabricator.kde.org/D19861

Only fail if we actually did not find Clang, instead of failiing
while looking thru a list of clang versions.

Fix annoying assert on Windows. When a new document is created documentcontroller will create path with an empty string. That will cause two asserts pr. new file on windows when compiled in debug mode.

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

This enables us to simplify the code and remove the hack to ignore
the file size limit for the kdev-php builtins internal file.

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Summary:
-if we have a match for a key, no other key can match
-match the start of a new line as QByteArray instead of QString, most lines will
 not match and all keys are plain ASCII, this saves a lot of needless
 conversions and memory allocations
-modify the original line instead of doing a copy, the original one will not
 be used again anyway.

Test Plan: Open and build a CMake-based project.

Reviewers: mwolff

Reviewed By: mwolff

Subscribers: mwolff, apol, kdevelop-devel

Tags: #kdevelop

Differential Revision: https://phabricator.kde.org/D18857

Summary: We just show a static themed icon name

Reviewers: #kdevelop, kfunk

Reviewed By: #kdevelop, kfunk

Subscribers: kdevelop-devel

Tags: #kdevelop

Differential Revision: https://phabricator.kde.org/D19159

Adds a "Reparse the Entire Project" action to the project controller
context menu. This makes it possible to trigger a full (re)parse
of individual projects without reloading them, or when the option to
"schedule all project files for parsing" is turned off.

Differential Revision: https://phabricator.kde.org/D11934

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

This mouthful of a class is essentially just a QWidget with a
QVBoxLayout which you can add widgets to. The fun comes from
implementing the QuickOpenEmbeddedWidgetInterface too, by
delegating to the child widgets that got added.

Overall, this allows us to navigate via Alt+Arrow keyboard actions
between combined widgets, as you'd get when you have both, an error
and a declaration at a given cursor declaration.

The AbstractNavigationWidget already supported this, and it was
picked up by KTextEditor. But our own quickopen embedded widget
interface didn't allow going 'back' via Alt + Backspace yet. This
patch fixes this.

We always return instances of this type anyways, so enforce it in
the API and simplify the usage code accordingly.

The navigation widget relies on a crude HTML "parser" which
counts "lines". Yes. Only '<br/>' is considered a newline, even
though due to line wrapping we can have obviously more lines. Well,
without rewriting all of that, also count '</p>' as introducing a
new line. This allows us to jump to the 'Show documentation' link
then.

To make this work reliably, we also fixup the generated HTML to be
valid and not nest '<p>' tags. Furthermore, we prevent the ugly
line indication marker '<->' being shown when we try to down past
the last paragraph.

Fixes assertion when trying to navigate in project file
quick open navigation widget:

#9  0x00007fc05e472c28 in qt_assert(char const*, char const*, int) () from /usr/lib/libQt5Core.so.5
#10 0x00007fc061696c26 in KDevelop::TopDUContext::importedParentContexts (this=0x561284615030) at /home/milian/projects/kf5/src/extragear/kdevelop/kdevelop/kdevplatform/language/duchain/topducontext.cpp:1015
#11 0x00007fc0617883cc in KDevelop::pickContextWithData (duchains=..., maxDepth=2, type=@0x561287177ac0: KDevelop::StandardParsingEnvironment, forcePick=true) at /home/milian/projects/kf5/src/extragear/kdevelop/kdevelop/kdevplatform/language/duchain/navigation/abstractincludenavigationcontext.cpp:60
#12 0x00007fc061788815 in KDevelop::AbstractIncludeNavigationContext::html (this=0x561287177aa0, shorten=false) at /home/milian/projects/kf5/src/extragear/kdevelop/kdevelop/kdevplatform/language/duchain/navigation/abstractincludenavigationcontext.cpp:90
#13 0x00007fc0617752fb in KDevelop::AbstractNavigationContext::down (this=0x561287177aa0) at /home/milian/projects/kf5/src/extragear/kdevelop/kdevelop/kdevplatform/language/duchain/navigation/abstractnavigationcontext.cpp:282

This was *only* being used by the project file quickopen feature,
and you only saw it when clicking into the quickopen list, or when
pressing alt. I doubt anyone ever did that. And it was madness
anyways: we decreased the font size in a hacky non-html compliant
way which actually made it quite hard to read for me. So the only
thing we lose is the project name... which is an acceptable
tradeoff. This feature messed up the whole API considerably, removing
it makes me very happy.

We can bring back the project name in the future by introducing a
generic wrapper-widget that supports the
QuickOpenEmbeddedWidgetInterface.

These functions never return any non-null string, so just remove them.

We also lost this, thanks to Nicolas for pointing this out!

Fixes test_duchain-clang's testSameFunctionDefinition. My git foo
isn't good enough to figure out where this got lost?

This is a workaround for bug 404184, where KDirWatch only emits
a 'deleted' signal during a 'git stash' workflow, which never
gets paired by a 'created' signal, even though the file actually
exists before and after the 'git stash' operation.

By delaying the handling of the KDirWatch signals, we won't fall
into the trap of removing a file even though it actually exists.
Since it doesn't really matter how fast we react on such events,
it's in my opinion fine to delay it for a full second. Having a
correct state is much more important than having any state fast.

Without this patch, KDevelop frequently forgets about files from large
projects I work on after a `git stash`. This then fubars the C++
support completely, since it cannot find any include paths and
defines anymore.

Reuse the createFile helper, simplify a few places of code and remove
the unused exec function.

This is usually less code and has the chance to run faster when
the result comes in before our hardcoded previous timeout.