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"

... in particular also accept + in message filename detection,
such as e.g. in /usr/include/c++

Otherwise, in a message such as the following, only the part following c++
is extracted as a filename:
/usr/include/c++/8/bits/basic_string.h:420:7:

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"

See also 2ce0f42e

The referenced bug report requests to restore order by "Session Name",
but presumably expects so in ascending alphabetical order (as was),
rather than descending (which makes more sense for "Last opened").

BUG: 420504

(cherry picked from commit 4884f909)

While typing, update very 1000ms (slow), but after stopping typing,
update quickly after 150ms (fast).

Commit 4b0260eb changed the default order, probably by accident as it
was not mentioned in the commit message. This commit reverts that change.

Fixes BUG 422201

This is useful especially for long variable name/values

CCMAIL: kare.sars@iki.fi

Unify the regular expression into one and add support for more formats

Sometimes the build system prints out relative paths that are not
relative to the current work directory. Adding a search path makes it
possible for the plugin to find and open the correct file.

(cherry picked from commit 6610de53)

Add an enum for selecting copy type
Make copy all the default for ctrl-c

Using the standard copy shortcut in the results tree you can copy the
visible search results to the clipboard.

Plain path() returns /C:/Users/... in stead of C:/Users/...
That made QProcess fail to start the LSP server.

If the file name is not parsed correctly don't try to open the broken
file-location. Display the parsed file so that the user might get a
hint of why the parsing failed.

MSVC sometimes prints all lowercase filenames in compile output, so to
not end up with duplicate files in Kate we have to fix the case of the
url before opening it.

Thread safety was only provided by disabling the UI and that breaks
if we use the commands.

Add terminateSearch functions that stop the search without sending
signals and prevent already queued signals from adding matches in the
matches tree.

BUG: 419719

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"