Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 53608725aa | |||
| aefa627e42 |
1
.gitignore
vendored
@@ -1,2 +1,3 @@
|
|||||||
{src/
|
{src/
|
||||||
build/
|
build/
|
||||||
|
BareCodeAUR
|
||||||
|
|||||||
@@ -1,47 +0,0 @@
|
|||||||
# Maintainer: Dany Thinnes <deine@email.de>
|
|
||||||
|
|
||||||
pkgname=barecode-git
|
|
||||||
pkgver=r5.cb66172
|
|
||||||
pkgrel=1
|
|
||||||
pkgdesc="Modularer Code-Editor, entwickelt von Projekt Hirnfrei (git)"
|
|
||||||
arch=('x86_64' 'aarch64')
|
|
||||||
url="https://git.projekt-hirnfrei.de/diabolus/BareCode"
|
|
||||||
license=('MIT')
|
|
||||||
depends=('qt6-base')
|
|
||||||
makedepends=('cmake' 'ninja' 'git')
|
|
||||||
provides=('barecode')
|
|
||||||
conflicts=('barecode')
|
|
||||||
|
|
||||||
source=("$pkgname::git+$url.git")
|
|
||||||
sha256sums=('SKIP')
|
|
||||||
|
|
||||||
pkgver()
|
|
||||||
{
|
|
||||||
cd "$pkgname"
|
|
||||||
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
|
|
||||||
}
|
|
||||||
|
|
||||||
build()
|
|
||||||
{
|
|
||||||
cmake \
|
|
||||||
-B build \
|
|
||||||
-S "$pkgname" \
|
|
||||||
-G Ninja \
|
|
||||||
-DCMAKE_BUILD_TYPE=Release \
|
|
||||||
-DCMAKE_INSTALL_PREFIX=/usr
|
|
||||||
cmake --build build
|
|
||||||
}
|
|
||||||
|
|
||||||
package()
|
|
||||||
{
|
|
||||||
DESTDIR="$pkgdir" cmake --install build
|
|
||||||
|
|
||||||
install -Dm644 "$pkgname/barecode.desktop" \
|
|
||||||
"$pkgdir/usr/share/applications/barecode.desktop"
|
|
||||||
|
|
||||||
# install -Dm644 "$pkgname/resources/barecode.png" \
|
|
||||||
# "$pkgdir/usr/share/pixmaps/barecode.png"
|
|
||||||
|
|
||||||
install -Dm644 "$pkgname/LICENSE" \
|
|
||||||
"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
|
|
||||||
}
|
|
||||||
@@ -1,47 +0,0 @@
|
|||||||
# Maintainer: Dany Thinnes <deine@email.de>
|
|
||||||
|
|
||||||
pkgname=barecode-git
|
|
||||||
pkgver=r1.0.0
|
|
||||||
pkgrel=1
|
|
||||||
pkgdesc="Modularer Code-Editor, entwickelt von Projekt Hirnfrei (git)"
|
|
||||||
arch=('x86_64' 'aarch64')
|
|
||||||
url="https://git.projekt-hirnfrei.de/diabolus/BareCode"
|
|
||||||
license=('MIT')
|
|
||||||
depends=('qt6-base')
|
|
||||||
makedepends=('cmake' 'ninja' 'git')
|
|
||||||
provides=('barecode')
|
|
||||||
conflicts=('barecode')
|
|
||||||
|
|
||||||
source=("$pkgname::git+$url.git")
|
|
||||||
sha256sums=('SKIP')
|
|
||||||
|
|
||||||
pkgver()
|
|
||||||
{
|
|
||||||
cd "$pkgname"
|
|
||||||
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
|
|
||||||
}
|
|
||||||
|
|
||||||
build()
|
|
||||||
{
|
|
||||||
cmake \
|
|
||||||
-B build \
|
|
||||||
-S "$pkgname" \
|
|
||||||
-G Ninja \
|
|
||||||
-DCMAKE_BUILD_TYPE=Release \
|
|
||||||
-DCMAKE_INSTALL_PREFIX=/usr
|
|
||||||
cmake --build build
|
|
||||||
}
|
|
||||||
|
|
||||||
package()
|
|
||||||
{
|
|
||||||
DESTDIR="$pkgdir" cmake --install build
|
|
||||||
|
|
||||||
install -Dm644 "$pkgname/barecode.desktop" \
|
|
||||||
"$pkgdir/usr/share/applications/barecode.desktop"
|
|
||||||
|
|
||||||
# install -Dm644 "$pkgname/resources/barecode.png" \
|
|
||||||
# "$pkgdir/usr/share/pixmaps/barecode.png"
|
|
||||||
|
|
||||||
install -Dm644 "$pkgname/LICENSE" \
|
|
||||||
"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
|
|
||||||
}
|
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
# Maintainer: Dany Thinnes <deine@email.de>
|
|
||||||
|
|
||||||
pkgname=barecode
|
|
||||||
pkgver=1.0.0
|
|
||||||
pkgrel=1
|
|
||||||
pkgdesc="Modularer Code-Editor, entwickelt von Projekt Hirnfrei"
|
|
||||||
arch=('x86_64' 'aarch64')
|
|
||||||
url="https://git.projekt-hirnfrei.de/diabolus/BareCode"
|
|
||||||
license=('MIT')
|
|
||||||
depends=('qt6-base')
|
|
||||||
makedepends=('cmake' 'ninja' 'git')
|
|
||||||
|
|
||||||
# Gitea erzeugt automatisch Tarballs unter:
|
|
||||||
# https://DEIN-GITEA-SERVER/DEINNAME/BareCode/archive/v1.0.0.tar.gz
|
|
||||||
#
|
|
||||||
# sha256sum nach dem Taggen ermitteln:
|
|
||||||
# curl -L https://DEIN-GITEA-SERVER/DEINNAME/BareCode/archive/v1.0.0.tar.gz | sha256sum
|
|
||||||
source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz")
|
|
||||||
sha256sums=('SKIP') # Ersetzen nach erstem Tag
|
|
||||||
|
|
||||||
build()
|
|
||||||
{
|
|
||||||
cmake \
|
|
||||||
-B build \
|
|
||||||
-S "BareCode-$pkgver" \
|
|
||||||
-G Ninja \
|
|
||||||
-DCMAKE_BUILD_TYPE=Release \
|
|
||||||
-DCMAKE_INSTALL_PREFIX=/usr
|
|
||||||
cmake --build build
|
|
||||||
}
|
|
||||||
|
|
||||||
package()
|
|
||||||
{
|
|
||||||
DESTDIR="$pkgdir" cmake --install build
|
|
||||||
|
|
||||||
install -Dm644 "BareCode-$pkgver/barecode.desktop" \
|
|
||||||
"$pkgdir/usr/share/applications/barecode.desktop"
|
|
||||||
|
|
||||||
install -Dm644 "BareCode-$pkgver/LICENSE" \
|
|
||||||
"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
|
|
||||||
}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
ref: refs/heads/main
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
[core]
|
|
||||||
repositoryformatversion = 0
|
|
||||||
filemode = true
|
|
||||||
bare = true
|
|
||||||
[remote "origin"]
|
|
||||||
url = https://git.projekt-hirnfrei.de/diabolus/BareCode.git
|
|
||||||
tagOpt = --no-tags
|
|
||||||
fetch = +refs/*:refs/*
|
|
||||||
mirror = true
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
Unnamed repository; edit this file 'description' to name the repository.
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# An example hook script to check the commit log message taken by
|
|
||||||
# applypatch from an e-mail message.
|
|
||||||
#
|
|
||||||
# The hook should exit with non-zero status after issuing an
|
|
||||||
# appropriate message if it wants to stop the commit. The hook is
|
|
||||||
# allowed to edit the commit message file.
|
|
||||||
#
|
|
||||||
# To enable this hook, rename this file to "applypatch-msg".
|
|
||||||
|
|
||||||
. git-sh-setup
|
|
||||||
commitmsg="$(git rev-parse --git-path hooks/commit-msg)"
|
|
||||||
test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"}
|
|
||||||
:
|
|
||||||
@@ -1,74 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# An example hook script to check the commit log message.
|
|
||||||
# Called by "git commit" with one argument, the name of the file
|
|
||||||
# that has the commit message. The hook should exit with non-zero
|
|
||||||
# status after issuing an appropriate message if it wants to stop the
|
|
||||||
# commit. The hook is allowed to edit the commit message file.
|
|
||||||
#
|
|
||||||
# To enable this hook, rename this file to "commit-msg".
|
|
||||||
|
|
||||||
# Uncomment the below to add a Signed-off-by line to the message.
|
|
||||||
# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
|
|
||||||
# hook is more suited to it.
|
|
||||||
#
|
|
||||||
# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
|
|
||||||
# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
|
|
||||||
|
|
||||||
# This example catches duplicate Signed-off-by lines and messages that
|
|
||||||
# would confuse 'git am'.
|
|
||||||
|
|
||||||
ret=0
|
|
||||||
|
|
||||||
test "" = "$(grep '^Signed-off-by: ' "$1" |
|
|
||||||
sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || {
|
|
||||||
echo >&2 Duplicate Signed-off-by lines.
|
|
||||||
ret=1
|
|
||||||
}
|
|
||||||
|
|
||||||
comment_re="$(
|
|
||||||
{
|
|
||||||
git config --get-regexp "^core\.comment(char|string)\$" ||
|
|
||||||
echo '#'
|
|
||||||
} | sed -n -e '
|
|
||||||
${
|
|
||||||
s/^[^ ]* //
|
|
||||||
s|[][*./\]|\\&|g
|
|
||||||
s/^auto$/[#;@!$%^&|:]/
|
|
||||||
p
|
|
||||||
}'
|
|
||||||
)"
|
|
||||||
scissors_line="^${comment_re} -\{8,\} >8 -\{8,\}\$"
|
|
||||||
comment_line="^${comment_re}.*"
|
|
||||||
blank_line='^[ ]*$'
|
|
||||||
# Disallow lines starting with "diff -" or "Index: " in the body of the
|
|
||||||
# message. Stop looking if we see a scissors line.
|
|
||||||
line="$(sed -n -e "
|
|
||||||
# Skip comments and blank lines at the start of the file.
|
|
||||||
/${scissors_line}/q
|
|
||||||
/${comment_line}/d
|
|
||||||
/${blank_line}/d
|
|
||||||
# The first paragraph will become the subject header so
|
|
||||||
# does not need to be checked.
|
|
||||||
: subject
|
|
||||||
n
|
|
||||||
/${scissors_line}/q
|
|
||||||
/${blank_line}/!b subject
|
|
||||||
# Check the body of the message for problematic
|
|
||||||
# prefixes.
|
|
||||||
: body
|
|
||||||
n
|
|
||||||
/${scissors_line}/q
|
|
||||||
/${comment_line}/b body
|
|
||||||
/^diff -/{p;q;}
|
|
||||||
/^Index: /{p;q;}
|
|
||||||
b body
|
|
||||||
" "$1")"
|
|
||||||
if test -n "$line"
|
|
||||||
then
|
|
||||||
echo >&2 "Message contains a diff that will confuse 'git am'."
|
|
||||||
echo >&2 "To fix this indent the diff."
|
|
||||||
ret=1
|
|
||||||
fi
|
|
||||||
|
|
||||||
exit $ret
|
|
||||||
@@ -1,168 +0,0 @@
|
|||||||
#!/usr/bin/perl
|
|
||||||
|
|
||||||
use strict;
|
|
||||||
use warnings;
|
|
||||||
use IPC::Open2;
|
|
||||||
|
|
||||||
# An example hook script to integrate Watchman
|
|
||||||
# (https://facebook.github.io/watchman/) with git to speed up detecting
|
|
||||||
# new and modified files.
|
|
||||||
#
|
|
||||||
# The hook is passed a version (currently 2) and last update token
|
|
||||||
# formatted as a string and outputs to stdout a new update token and
|
|
||||||
# all files that have been modified since the update token. Paths must
|
|
||||||
# be relative to the root of the working tree and separated by a single NUL.
|
|
||||||
#
|
|
||||||
# To enable this hook, rename this file to "query-watchman" and set
|
|
||||||
# 'git config core.fsmonitor .git/hooks/query-watchman'
|
|
||||||
#
|
|
||||||
my ($version, $last_update_token) = @ARGV;
|
|
||||||
|
|
||||||
# Uncomment for debugging
|
|
||||||
# print STDERR "$0 $version $last_update_token\n";
|
|
||||||
|
|
||||||
# Check the hook interface version
|
|
||||||
if ($version ne 2) {
|
|
||||||
die "Unsupported query-fsmonitor hook version '$version'.\n" .
|
|
||||||
"Falling back to scanning...\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
my $git_work_tree = get_working_dir();
|
|
||||||
|
|
||||||
my $json_pkg;
|
|
||||||
eval {
|
|
||||||
require JSON::XS;
|
|
||||||
$json_pkg = "JSON::XS";
|
|
||||||
1;
|
|
||||||
} or do {
|
|
||||||
require JSON::PP;
|
|
||||||
$json_pkg = "JSON::PP";
|
|
||||||
};
|
|
||||||
|
|
||||||
launch_watchman();
|
|
||||||
|
|
||||||
sub launch_watchman {
|
|
||||||
my $o = watchman_query();
|
|
||||||
if (is_work_tree_watched($o)) {
|
|
||||||
output_result($o->{clock}, @{$o->{files}});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
sub output_result {
|
|
||||||
my ($clockid, @files) = @_;
|
|
||||||
|
|
||||||
# Uncomment for debugging watchman output
|
|
||||||
# open (my $fh, ">", ".git/watchman-output.out");
|
|
||||||
# binmode $fh, ":utf8";
|
|
||||||
# print $fh "$clockid\n@files\n";
|
|
||||||
# close $fh;
|
|
||||||
|
|
||||||
binmode STDOUT, ":utf8";
|
|
||||||
print $clockid;
|
|
||||||
print "\0";
|
|
||||||
local $, = "\0";
|
|
||||||
print @files;
|
|
||||||
}
|
|
||||||
|
|
||||||
sub watchman_clock {
|
|
||||||
my $response = qx/watchman clock "$git_work_tree"/;
|
|
||||||
die "Failed to get clock id on '$git_work_tree'.\n" .
|
|
||||||
"Falling back to scanning...\n" if $? != 0;
|
|
||||||
|
|
||||||
return $json_pkg->new->utf8->decode($response);
|
|
||||||
}
|
|
||||||
|
|
||||||
sub watchman_query {
|
|
||||||
my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty')
|
|
||||||
or die "open2() failed: $!\n" .
|
|
||||||
"Falling back to scanning...\n";
|
|
||||||
|
|
||||||
# In the query expression below we're asking for names of files that
|
|
||||||
# changed since $last_update_token but not from the .git folder.
|
|
||||||
#
|
|
||||||
# To accomplish this, we're using the "since" generator to use the
|
|
||||||
# recency index to select candidate nodes and "fields" to limit the
|
|
||||||
# output to file names only. Then we're using the "expression" term to
|
|
||||||
# further constrain the results.
|
|
||||||
my $last_update_line = "";
|
|
||||||
if (substr($last_update_token, 0, 1) eq "c") {
|
|
||||||
$last_update_token = "\"$last_update_token\"";
|
|
||||||
$last_update_line = qq[\n"since": $last_update_token,];
|
|
||||||
}
|
|
||||||
my $query = <<" END";
|
|
||||||
["query", "$git_work_tree", {$last_update_line
|
|
||||||
"fields": ["name"],
|
|
||||||
"expression": ["not", ["dirname", ".git"]]
|
|
||||||
}]
|
|
||||||
END
|
|
||||||
|
|
||||||
# Uncomment for debugging the watchman query
|
|
||||||
# open (my $fh, ">", ".git/watchman-query.json");
|
|
||||||
# print $fh $query;
|
|
||||||
# close $fh;
|
|
||||||
|
|
||||||
print CHLD_IN $query;
|
|
||||||
close CHLD_IN;
|
|
||||||
my $response = do {local $/; <CHLD_OUT>};
|
|
||||||
|
|
||||||
# Uncomment for debugging the watch response
|
|
||||||
# open ($fh, ">", ".git/watchman-response.json");
|
|
||||||
# print $fh $response;
|
|
||||||
# close $fh;
|
|
||||||
|
|
||||||
die "Watchman: command returned no output.\n" .
|
|
||||||
"Falling back to scanning...\n" if $response eq "";
|
|
||||||
die "Watchman: command returned invalid output: $response\n" .
|
|
||||||
"Falling back to scanning...\n" unless $response =~ /^\{/;
|
|
||||||
|
|
||||||
return $json_pkg->new->utf8->decode($response);
|
|
||||||
}
|
|
||||||
|
|
||||||
sub is_work_tree_watched {
|
|
||||||
my ($output) = @_;
|
|
||||||
my $error = $output->{error};
|
|
||||||
if ($error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) {
|
|
||||||
my $response = qx/watchman watch "$git_work_tree"/;
|
|
||||||
die "Failed to make watchman watch '$git_work_tree'.\n" .
|
|
||||||
"Falling back to scanning...\n" if $? != 0;
|
|
||||||
$output = $json_pkg->new->utf8->decode($response);
|
|
||||||
$error = $output->{error};
|
|
||||||
die "Watchman: $error.\n" .
|
|
||||||
"Falling back to scanning...\n" if $error;
|
|
||||||
|
|
||||||
# Uncomment for debugging watchman output
|
|
||||||
# open (my $fh, ">", ".git/watchman-output.out");
|
|
||||||
# close $fh;
|
|
||||||
|
|
||||||
# Watchman will always return all files on the first query so
|
|
||||||
# return the fast "everything is dirty" flag to git and do the
|
|
||||||
# Watchman query just to get it over with now so we won't pay
|
|
||||||
# the cost in git to look up each individual file.
|
|
||||||
my $o = watchman_clock();
|
|
||||||
$error = $o->{error};
|
|
||||||
|
|
||||||
die "Watchman: $error.\n" .
|
|
||||||
"Falling back to scanning...\n" if $error;
|
|
||||||
|
|
||||||
output_result($o->{clock}, ("/"));
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
die "Watchman: $error.\n" .
|
|
||||||
"Falling back to scanning...\n" if $error;
|
|
||||||
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
sub get_working_dir {
|
|
||||||
my $working_dir;
|
|
||||||
if ($^O =~ 'msys' || $^O =~ 'cygwin') {
|
|
||||||
$working_dir = Win32::GetCwd();
|
|
||||||
$working_dir =~ tr/\\/\//;
|
|
||||||
} else {
|
|
||||||
require Cwd;
|
|
||||||
$working_dir = Cwd::cwd();
|
|
||||||
}
|
|
||||||
|
|
||||||
return $working_dir;
|
|
||||||
}
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# An example hook script to prepare a packed repository for use over
|
|
||||||
# dumb transports.
|
|
||||||
#
|
|
||||||
# To enable this hook, rename this file to "post-update".
|
|
||||||
|
|
||||||
exec git update-server-info
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# An example hook script to verify what is about to be committed
|
|
||||||
# by applypatch from an e-mail message.
|
|
||||||
#
|
|
||||||
# The hook should exit with non-zero status after issuing an
|
|
||||||
# appropriate message if it wants to stop the commit.
|
|
||||||
#
|
|
||||||
# To enable this hook, rename this file to "pre-applypatch".
|
|
||||||
|
|
||||||
. git-sh-setup
|
|
||||||
precommit="$(git rev-parse --git-path hooks/pre-commit)"
|
|
||||||
test -x "$precommit" && exec "$precommit" ${1+"$@"}
|
|
||||||
:
|
|
||||||
@@ -1,49 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# An example hook script to verify what is about to be committed.
|
|
||||||
# Called by "git commit" with no arguments. The hook should
|
|
||||||
# exit with non-zero status after issuing an appropriate message if
|
|
||||||
# it wants to stop the commit.
|
|
||||||
#
|
|
||||||
# To enable this hook, rename this file to "pre-commit".
|
|
||||||
|
|
||||||
if git rev-parse --verify HEAD >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
against=HEAD
|
|
||||||
else
|
|
||||||
# Initial commit: diff against an empty tree object
|
|
||||||
against=$(git hash-object -t tree /dev/null)
|
|
||||||
fi
|
|
||||||
|
|
||||||
# If you want to allow non-ASCII filenames set this variable to true.
|
|
||||||
allownonascii=$(git config --type=bool hooks.allownonascii)
|
|
||||||
|
|
||||||
# Redirect output to stderr.
|
|
||||||
exec 1>&2
|
|
||||||
|
|
||||||
# Cross platform projects tend to avoid non-ASCII filenames; prevent
|
|
||||||
# them from being added to the repository. We exploit the fact that the
|
|
||||||
# printable range starts at the space character and ends with tilde.
|
|
||||||
if [ "$allownonascii" != "true" ] &&
|
|
||||||
# Note that the use of brackets around a tr range is ok here, (it's
|
|
||||||
# even required, for portability to Solaris 10's /usr/bin/tr), since
|
|
||||||
# the square bracket bytes happen to fall in the designated range.
|
|
||||||
test $(git diff-index --cached --name-only --diff-filter=A -z $against |
|
|
||||||
LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
|
|
||||||
then
|
|
||||||
cat <<\EOF
|
|
||||||
Error: Attempt to add a non-ASCII file name.
|
|
||||||
|
|
||||||
This can cause problems if you want to work with people on other platforms.
|
|
||||||
|
|
||||||
To be portable it is advisable to rename the file.
|
|
||||||
|
|
||||||
If you know what you are doing you can disable this check using:
|
|
||||||
|
|
||||||
git config hooks.allownonascii true
|
|
||||||
EOF
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# If there are whitespace errors, print the offending file names and fail.
|
|
||||||
exec git diff-index --check --cached $against --
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# An example hook script to verify what is about to be committed.
|
|
||||||
# Called by "git merge" with no arguments. The hook should
|
|
||||||
# exit with non-zero status after issuing an appropriate message to
|
|
||||||
# stderr if it wants to stop the merge commit.
|
|
||||||
#
|
|
||||||
# To enable this hook, rename this file to "pre-merge-commit".
|
|
||||||
|
|
||||||
. git-sh-setup
|
|
||||||
test -x "$GIT_DIR/hooks/pre-commit" &&
|
|
||||||
exec "$GIT_DIR/hooks/pre-commit"
|
|
||||||
:
|
|
||||||
@@ -1,53 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
# An example hook script to verify what is about to be pushed. Called by "git
|
|
||||||
# push" after it has checked the remote status, but before anything has been
|
|
||||||
# pushed. If this script exits with a non-zero status nothing will be pushed.
|
|
||||||
#
|
|
||||||
# This hook is called with the following parameters:
|
|
||||||
#
|
|
||||||
# $1 -- Name of the remote to which the push is being done
|
|
||||||
# $2 -- URL to which the push is being done
|
|
||||||
#
|
|
||||||
# If pushing without using a named remote those arguments will be equal.
|
|
||||||
#
|
|
||||||
# Information about the commits which are being pushed is supplied as lines to
|
|
||||||
# the standard input in the form:
|
|
||||||
#
|
|
||||||
# <local ref> <local oid> <remote ref> <remote oid>
|
|
||||||
#
|
|
||||||
# This sample shows how to prevent push of commits where the log message starts
|
|
||||||
# with "WIP" (work in progress).
|
|
||||||
|
|
||||||
remote="$1"
|
|
||||||
url="$2"
|
|
||||||
|
|
||||||
zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
|
|
||||||
|
|
||||||
while read local_ref local_oid remote_ref remote_oid
|
|
||||||
do
|
|
||||||
if test "$local_oid" = "$zero"
|
|
||||||
then
|
|
||||||
# Handle delete
|
|
||||||
:
|
|
||||||
else
|
|
||||||
if test "$remote_oid" = "$zero"
|
|
||||||
then
|
|
||||||
# New branch, examine all commits
|
|
||||||
range="$local_oid"
|
|
||||||
else
|
|
||||||
# Update to existing branch, examine new commits
|
|
||||||
range="$remote_oid..$local_oid"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check for WIP commit
|
|
||||||
commit=$(git rev-list -n 1 --grep '^WIP' "$range")
|
|
||||||
if test -n "$commit"
|
|
||||||
then
|
|
||||||
echo >&2 "Found WIP commit in $local_ref, not pushing"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
exit 0
|
|
||||||
@@ -1,169 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# Copyright (c) 2006, 2008 Junio C Hamano
|
|
||||||
#
|
|
||||||
# The "pre-rebase" hook is run just before "git rebase" starts doing
|
|
||||||
# its job, and can prevent the command from running by exiting with
|
|
||||||
# non-zero status.
|
|
||||||
#
|
|
||||||
# The hook is called with the following parameters:
|
|
||||||
#
|
|
||||||
# $1 -- the upstream the series was forked from.
|
|
||||||
# $2 -- the branch being rebased (or empty when rebasing the current branch).
|
|
||||||
#
|
|
||||||
# This sample shows how to prevent topic branches that are already
|
|
||||||
# merged to 'next' branch from getting rebased, because allowing it
|
|
||||||
# would result in rebasing already published history.
|
|
||||||
|
|
||||||
publish=next
|
|
||||||
basebranch="$1"
|
|
||||||
if test "$#" = 2
|
|
||||||
then
|
|
||||||
topic="refs/heads/$2"
|
|
||||||
else
|
|
||||||
topic=`git symbolic-ref HEAD` ||
|
|
||||||
exit 0 ;# we do not interrupt rebasing detached HEAD
|
|
||||||
fi
|
|
||||||
|
|
||||||
case "$topic" in
|
|
||||||
refs/heads/??/*)
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
exit 0 ;# we do not interrupt others.
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# Now we are dealing with a topic branch being rebased
|
|
||||||
# on top of master. Is it OK to rebase it?
|
|
||||||
|
|
||||||
# Does the topic really exist?
|
|
||||||
git show-ref -q "$topic" || {
|
|
||||||
echo >&2 "No such branch $topic"
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
# Is topic fully merged to master?
|
|
||||||
not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
|
|
||||||
if test -z "$not_in_master"
|
|
||||||
then
|
|
||||||
echo >&2 "$topic is fully merged to master; better remove it."
|
|
||||||
exit 1 ;# we could allow it, but there is no point.
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Is topic ever merged to next? If so you should not be rebasing it.
|
|
||||||
only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
|
|
||||||
only_next_2=`git rev-list ^master ${publish} | sort`
|
|
||||||
if test "$only_next_1" = "$only_next_2"
|
|
||||||
then
|
|
||||||
not_in_topic=`git rev-list "^$topic" master`
|
|
||||||
if test -z "$not_in_topic"
|
|
||||||
then
|
|
||||||
echo >&2 "$topic is already up to date with master"
|
|
||||||
exit 1 ;# we could allow it, but there is no point.
|
|
||||||
else
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
|
|
||||||
/usr/bin/perl -e '
|
|
||||||
my $topic = $ARGV[0];
|
|
||||||
my $msg = "* $topic has commits already merged to public branch:\n";
|
|
||||||
my (%not_in_next) = map {
|
|
||||||
/^([0-9a-f]+) /;
|
|
||||||
($1 => 1);
|
|
||||||
} split(/\n/, $ARGV[1]);
|
|
||||||
for my $elem (map {
|
|
||||||
/^([0-9a-f]+) (.*)$/;
|
|
||||||
[$1 => $2];
|
|
||||||
} split(/\n/, $ARGV[2])) {
|
|
||||||
if (!exists $not_in_next{$elem->[0]}) {
|
|
||||||
if ($msg) {
|
|
||||||
print STDERR $msg;
|
|
||||||
undef $msg;
|
|
||||||
}
|
|
||||||
print STDERR " $elem->[1]\n";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
' "$topic" "$not_in_next" "$not_in_master"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
<<\DOC_END
|
|
||||||
|
|
||||||
This sample hook safeguards topic branches that have been
|
|
||||||
published from being rewound.
|
|
||||||
|
|
||||||
The workflow assumed here is:
|
|
||||||
|
|
||||||
* Once a topic branch forks from "master", "master" is never
|
|
||||||
merged into it again (either directly or indirectly).
|
|
||||||
|
|
||||||
* Once a topic branch is fully cooked and merged into "master",
|
|
||||||
it is deleted. If you need to build on top of it to correct
|
|
||||||
earlier mistakes, a new topic branch is created by forking at
|
|
||||||
the tip of the "master". This is not strictly necessary, but
|
|
||||||
it makes it easier to keep your history simple.
|
|
||||||
|
|
||||||
* Whenever you need to test or publish your changes to topic
|
|
||||||
branches, merge them into "next" branch.
|
|
||||||
|
|
||||||
The script, being an example, hardcodes the publish branch name
|
|
||||||
to be "next", but it is trivial to make it configurable via
|
|
||||||
$GIT_DIR/config mechanism.
|
|
||||||
|
|
||||||
With this workflow, you would want to know:
|
|
||||||
|
|
||||||
(1) ... if a topic branch has ever been merged to "next". Young
|
|
||||||
topic branches can have stupid mistakes you would rather
|
|
||||||
clean up before publishing, and things that have not been
|
|
||||||
merged into other branches can be easily rebased without
|
|
||||||
affecting other people. But once it is published, you would
|
|
||||||
not want to rewind it.
|
|
||||||
|
|
||||||
(2) ... if a topic branch has been fully merged to "master".
|
|
||||||
Then you can delete it. More importantly, you should not
|
|
||||||
build on top of it -- other people may already want to
|
|
||||||
change things related to the topic as patches against your
|
|
||||||
"master", so if you need further changes, it is better to
|
|
||||||
fork the topic (perhaps with the same name) afresh from the
|
|
||||||
tip of "master".
|
|
||||||
|
|
||||||
Let's look at this example:
|
|
||||||
|
|
||||||
o---o---o---o---o---o---o---o---o---o "next"
|
|
||||||
/ / / /
|
|
||||||
/ a---a---b A / /
|
|
||||||
/ / / /
|
|
||||||
/ / c---c---c---c B /
|
|
||||||
/ / / \ /
|
|
||||||
/ / / b---b C \ /
|
|
||||||
/ / / / \ /
|
|
||||||
---o---o---o---o---o---o---o---o---o---o---o "master"
|
|
||||||
|
|
||||||
|
|
||||||
A, B and C are topic branches.
|
|
||||||
|
|
||||||
* A has one fix since it was merged up to "next".
|
|
||||||
|
|
||||||
* B has finished. It has been fully merged up to "master" and "next",
|
|
||||||
and is ready to be deleted.
|
|
||||||
|
|
||||||
* C has not merged to "next" at all.
|
|
||||||
|
|
||||||
We would want to allow C to be rebased, refuse A, and encourage
|
|
||||||
B to be deleted.
|
|
||||||
|
|
||||||
To compute (1):
|
|
||||||
|
|
||||||
git rev-list ^master ^topic next
|
|
||||||
git rev-list ^master next
|
|
||||||
|
|
||||||
if these match, topic has not merged in next at all.
|
|
||||||
|
|
||||||
To compute (2):
|
|
||||||
|
|
||||||
git rev-list master..topic
|
|
||||||
|
|
||||||
if this is empty, it is fully merged to "master".
|
|
||||||
|
|
||||||
DOC_END
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# An example hook script to make use of push options.
|
|
||||||
# The example simply echoes all push options that start with 'echoback='
|
|
||||||
# and rejects all pushes when the "reject" push option is used.
|
|
||||||
#
|
|
||||||
# To enable this hook, rename this file to "pre-receive".
|
|
||||||
|
|
||||||
if test -n "$GIT_PUSH_OPTION_COUNT"
|
|
||||||
then
|
|
||||||
i=0
|
|
||||||
while test "$i" -lt "$GIT_PUSH_OPTION_COUNT"
|
|
||||||
do
|
|
||||||
eval "value=\$GIT_PUSH_OPTION_$i"
|
|
||||||
case "$value" in
|
|
||||||
echoback=*)
|
|
||||||
echo "echo from the pre-receive-hook: ${value#*=}" >&2
|
|
||||||
;;
|
|
||||||
reject)
|
|
||||||
exit 1
|
|
||||||
esac
|
|
||||||
i=$((i + 1))
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# An example hook script to prepare the commit log message.
|
|
||||||
# Called by "git commit" with the name of the file that has the
|
|
||||||
# commit message, followed by the description of the commit
|
|
||||||
# message's source. The hook's purpose is to edit the commit
|
|
||||||
# message file. If the hook fails with a non-zero status,
|
|
||||||
# the commit is aborted.
|
|
||||||
#
|
|
||||||
# To enable this hook, rename this file to "prepare-commit-msg".
|
|
||||||
|
|
||||||
# This hook includes three examples. The first one removes the
|
|
||||||
# "# Please enter the commit message..." help message.
|
|
||||||
#
|
|
||||||
# The second includes the output of "git diff --name-status -r"
|
|
||||||
# into the message, just before the "git status" output. It is
|
|
||||||
# commented because it doesn't cope with --amend or with squashed
|
|
||||||
# commits.
|
|
||||||
#
|
|
||||||
# The third example adds a Signed-off-by line to the message, that can
|
|
||||||
# still be edited. This is rarely a good idea.
|
|
||||||
|
|
||||||
COMMIT_MSG_FILE=$1
|
|
||||||
COMMIT_SOURCE=$2
|
|
||||||
SHA1=$3
|
|
||||||
|
|
||||||
/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE"
|
|
||||||
|
|
||||||
# case "$COMMIT_SOURCE,$SHA1" in
|
|
||||||
# ,|template,)
|
|
||||||
# /usr/bin/perl -i.bak -pe '
|
|
||||||
# print "\n" . `git diff --cached --name-status -r`
|
|
||||||
# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;;
|
|
||||||
# *) ;;
|
|
||||||
# esac
|
|
||||||
|
|
||||||
# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
|
|
||||||
# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE"
|
|
||||||
# if test -z "$COMMIT_SOURCE"
|
|
||||||
# then
|
|
||||||
# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE"
|
|
||||||
# fi
|
|
||||||
@@ -1,78 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
# An example hook script to update a checked-out tree on a git push.
|
|
||||||
#
|
|
||||||
# This hook is invoked by git-receive-pack(1) when it reacts to git
|
|
||||||
# push and updates reference(s) in its repository, and when the push
|
|
||||||
# tries to update the branch that is currently checked out and the
|
|
||||||
# receive.denyCurrentBranch configuration variable is set to
|
|
||||||
# updateInstead.
|
|
||||||
#
|
|
||||||
# By default, such a push is refused if the working tree and the index
|
|
||||||
# of the remote repository has any difference from the currently
|
|
||||||
# checked out commit; when both the working tree and the index match
|
|
||||||
# the current commit, they are updated to match the newly pushed tip
|
|
||||||
# of the branch. This hook is to be used to override the default
|
|
||||||
# behaviour; however the code below reimplements the default behaviour
|
|
||||||
# as a starting point for convenient modification.
|
|
||||||
#
|
|
||||||
# The hook receives the commit with which the tip of the current
|
|
||||||
# branch is going to be updated:
|
|
||||||
commit=$1
|
|
||||||
|
|
||||||
# It can exit with a non-zero status to refuse the push (when it does
|
|
||||||
# so, it must not modify the index or the working tree).
|
|
||||||
die () {
|
|
||||||
echo >&2 "$*"
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
# Or it can make any necessary changes to the working tree and to the
|
|
||||||
# index to bring them to the desired state when the tip of the current
|
|
||||||
# branch is updated to the new commit, and exit with a zero status.
|
|
||||||
#
|
|
||||||
# For example, the hook can simply run git read-tree -u -m HEAD "$1"
|
|
||||||
# in order to emulate git fetch that is run in the reverse direction
|
|
||||||
# with git push, as the two-tree form of git read-tree -u -m is
|
|
||||||
# essentially the same as git switch or git checkout that switches
|
|
||||||
# branches while keeping the local changes in the working tree that do
|
|
||||||
# not interfere with the difference between the branches.
|
|
||||||
|
|
||||||
# The below is a more-or-less exact translation to shell of the C code
|
|
||||||
# for the default behaviour for git's push-to-checkout hook defined in
|
|
||||||
# the push_to_deploy() function in builtin/receive-pack.c.
|
|
||||||
#
|
|
||||||
# Note that the hook will be executed from the repository directory,
|
|
||||||
# not from the working tree, so if you want to perform operations on
|
|
||||||
# the working tree, you will have to adapt your code accordingly, e.g.
|
|
||||||
# by adding "cd .." or using relative paths.
|
|
||||||
|
|
||||||
if ! git update-index -q --ignore-submodules --refresh
|
|
||||||
then
|
|
||||||
die "Up-to-date check failed"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ! git diff-files --quiet --ignore-submodules --
|
|
||||||
then
|
|
||||||
die "Working directory has unstaged changes"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# This is a rough translation of:
|
|
||||||
#
|
|
||||||
# head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX
|
|
||||||
if git cat-file -e HEAD 2>/dev/null
|
|
||||||
then
|
|
||||||
head=HEAD
|
|
||||||
else
|
|
||||||
head=$(git hash-object -t tree --stdin </dev/null)
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ! git diff-index --quiet --cached --ignore-submodules $head --
|
|
||||||
then
|
|
||||||
die "Working directory has staged changes"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ! git read-tree -u -m "$commit"
|
|
||||||
then
|
|
||||||
die "Could not update working tree to new HEAD"
|
|
||||||
fi
|
|
||||||
@@ -1,77 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
# An example hook script to validate a patch (and/or patch series) before
|
|
||||||
# sending it via email.
|
|
||||||
#
|
|
||||||
# The hook should exit with non-zero status after issuing an appropriate
|
|
||||||
# message if it wants to prevent the email(s) from being sent.
|
|
||||||
#
|
|
||||||
# To enable this hook, rename this file to "sendemail-validate".
|
|
||||||
#
|
|
||||||
# By default, it will only check that the patch(es) can be applied on top of
|
|
||||||
# the default upstream branch without conflicts in a secondary worktree. After
|
|
||||||
# validation (successful or not) of the last patch of a series, the worktree
|
|
||||||
# will be deleted.
|
|
||||||
#
|
|
||||||
# The following config variables can be set to change the default remote and
|
|
||||||
# remote ref that are used to apply the patches against:
|
|
||||||
#
|
|
||||||
# sendemail.validateRemote (default: origin)
|
|
||||||
# sendemail.validateRemoteRef (default: HEAD)
|
|
||||||
#
|
|
||||||
# Replace the TODO placeholders with appropriate checks according to your
|
|
||||||
# needs.
|
|
||||||
|
|
||||||
validate_cover_letter () {
|
|
||||||
file="$1"
|
|
||||||
# TODO: Replace with appropriate checks (e.g. spell checking).
|
|
||||||
true
|
|
||||||
}
|
|
||||||
|
|
||||||
validate_patch () {
|
|
||||||
file="$1"
|
|
||||||
# Ensure that the patch applies without conflicts.
|
|
||||||
git am -3 "$file" || return
|
|
||||||
# TODO: Replace with appropriate checks for this patch
|
|
||||||
# (e.g. checkpatch.pl).
|
|
||||||
true
|
|
||||||
}
|
|
||||||
|
|
||||||
validate_series () {
|
|
||||||
# TODO: Replace with appropriate checks for the whole series
|
|
||||||
# (e.g. quick build, coding style checks, etc.).
|
|
||||||
true
|
|
||||||
}
|
|
||||||
|
|
||||||
# main -------------------------------------------------------------------------
|
|
||||||
|
|
||||||
if test "$GIT_SENDEMAIL_FILE_COUNTER" = 1
|
|
||||||
then
|
|
||||||
remote=$(git config --default origin --get sendemail.validateRemote) &&
|
|
||||||
ref=$(git config --default HEAD --get sendemail.validateRemoteRef) &&
|
|
||||||
worktree=$(mktemp --tmpdir -d sendemail-validate.XXXXXXX) &&
|
|
||||||
git worktree add -fd --checkout "$worktree" "refs/remotes/$remote/$ref" &&
|
|
||||||
git config --replace-all sendemail.validateWorktree "$worktree"
|
|
||||||
else
|
|
||||||
worktree=$(git config --get sendemail.validateWorktree)
|
|
||||||
fi || {
|
|
||||||
echo "sendemail-validate: error: failed to prepare worktree" >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
unset GIT_DIR GIT_WORK_TREE
|
|
||||||
cd "$worktree" &&
|
|
||||||
|
|
||||||
if grep -q "^diff --git " "$1"
|
|
||||||
then
|
|
||||||
validate_patch "$1"
|
|
||||||
else
|
|
||||||
validate_cover_letter "$1"
|
|
||||||
fi &&
|
|
||||||
|
|
||||||
if test "$GIT_SENDEMAIL_FILE_COUNTER" = "$GIT_SENDEMAIL_FILE_TOTAL"
|
|
||||||
then
|
|
||||||
git config --unset-all sendemail.validateWorktree &&
|
|
||||||
trap 'git worktree remove -ff "$worktree"' EXIT &&
|
|
||||||
validate_series
|
|
||||||
fi
|
|
||||||
@@ -1,128 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# An example hook script to block unannotated tags from entering.
|
|
||||||
# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
|
|
||||||
#
|
|
||||||
# To enable this hook, rename this file to "update".
|
|
||||||
#
|
|
||||||
# Config
|
|
||||||
# ------
|
|
||||||
# hooks.allowunannotated
|
|
||||||
# This boolean sets whether unannotated tags will be allowed into the
|
|
||||||
# repository. By default they won't be.
|
|
||||||
# hooks.allowdeletetag
|
|
||||||
# This boolean sets whether deleting tags will be allowed in the
|
|
||||||
# repository. By default they won't be.
|
|
||||||
# hooks.allowmodifytag
|
|
||||||
# This boolean sets whether a tag may be modified after creation. By default
|
|
||||||
# it won't be.
|
|
||||||
# hooks.allowdeletebranch
|
|
||||||
# This boolean sets whether deleting branches will be allowed in the
|
|
||||||
# repository. By default they won't be.
|
|
||||||
# hooks.denycreatebranch
|
|
||||||
# This boolean sets whether remotely creating branches will be denied
|
|
||||||
# in the repository. By default this is allowed.
|
|
||||||
#
|
|
||||||
|
|
||||||
# --- Command line
|
|
||||||
refname="$1"
|
|
||||||
oldrev="$2"
|
|
||||||
newrev="$3"
|
|
||||||
|
|
||||||
# --- Safety check
|
|
||||||
if [ -z "$GIT_DIR" ]; then
|
|
||||||
echo "Don't run this script from the command line." >&2
|
|
||||||
echo " (if you want, you could supply GIT_DIR then run" >&2
|
|
||||||
echo " $0 <ref> <oldrev> <newrev>)" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
|
|
||||||
echo "usage: $0 <ref> <oldrev> <newrev>" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# --- Config
|
|
||||||
allowunannotated=$(git config --type=bool hooks.allowunannotated)
|
|
||||||
allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch)
|
|
||||||
denycreatebranch=$(git config --type=bool hooks.denycreatebranch)
|
|
||||||
allowdeletetag=$(git config --type=bool hooks.allowdeletetag)
|
|
||||||
allowmodifytag=$(git config --type=bool hooks.allowmodifytag)
|
|
||||||
|
|
||||||
# check for no description
|
|
||||||
projectdesc=$(sed -e '1q' "$GIT_DIR/description")
|
|
||||||
case "$projectdesc" in
|
|
||||||
"Unnamed repository"* | "")
|
|
||||||
echo "*** Project description file hasn't been set" >&2
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# --- Check types
|
|
||||||
# if $newrev is 0000...0000, it's a commit to delete a ref.
|
|
||||||
zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
|
|
||||||
if [ "$newrev" = "$zero" ]; then
|
|
||||||
newrev_type=delete
|
|
||||||
else
|
|
||||||
newrev_type=$(git cat-file -t $newrev)
|
|
||||||
fi
|
|
||||||
|
|
||||||
case "$refname","$newrev_type" in
|
|
||||||
refs/tags/*,commit)
|
|
||||||
# un-annotated tag
|
|
||||||
short_refname=${refname##refs/tags/}
|
|
||||||
if [ "$allowunannotated" != "true" ]; then
|
|
||||||
echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
|
|
||||||
echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
refs/tags/*,delete)
|
|
||||||
# delete tag
|
|
||||||
if [ "$allowdeletetag" != "true" ]; then
|
|
||||||
echo "*** Deleting a tag is not allowed in this repository" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
refs/tags/*,tag)
|
|
||||||
# annotated tag
|
|
||||||
if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
|
|
||||||
then
|
|
||||||
echo "*** Tag '$refname' already exists." >&2
|
|
||||||
echo "*** Modifying a tag is not allowed in this repository." >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
refs/heads/*,commit)
|
|
||||||
# branch
|
|
||||||
if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
|
|
||||||
echo "*** Creating a branch is not allowed in this repository" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
refs/heads/*,delete)
|
|
||||||
# delete branch
|
|
||||||
if [ "$allowdeletebranch" != "true" ]; then
|
|
||||||
echo "*** Deleting a branch is not allowed in this repository" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
refs/remotes/*,commit)
|
|
||||||
# tracking branch
|
|
||||||
;;
|
|
||||||
refs/remotes/*,delete)
|
|
||||||
# delete tracking branch
|
|
||||||
if [ "$allowdeletebranch" != "true" ]; then
|
|
||||||
echo "*** Deleting a tracking branch is not allowed in this repository" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
# Anything else (is there anything else?)
|
|
||||||
echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# --- Finished
|
|
||||||
exit 0
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
* -export-subst -export-ignore
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
# git ls-files --others --exclude-from=.git/info/exclude
|
|
||||||
# Lines that start with '#' are comments.
|
|
||||||
# For a project mostly in C, the following would be a good set of
|
|
||||||
# exclude patterns (uncomment them if you want to use them):
|
|
||||||
# *.[oa]
|
|
||||||
# *~
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
# pack-refs with: peeled fully-peeled sorted
|
|
||||||
cb6617222dbcac30aaf15bf336b150fed440cc7f refs/heads/main
|
|
||||||
ca573209e715409e5989324aaeaa4efbd4da5642 refs/tags/v1.0.0
|
|
||||||
^36e074f43d5b76d940d953956b0ed80899e71848
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
# Generated by makepkg 7.1.0
|
|
||||||
# using fakeroot version 1.37.2
|
|
||||||
pkgname = barecode-git
|
|
||||||
pkgbase = barecode-git
|
|
||||||
xdata = pkgtype=pkg
|
|
||||||
pkgver = r5.cb66172-1
|
|
||||||
pkgdesc = Modularer Code-Editor, entwickelt von Projekt Hirnfrei (git)
|
|
||||||
url = https://git.projekt-hirnfrei.de/diabolus/BareCode
|
|
||||||
builddate = 1781069213
|
|
||||||
packager = Unknown Packager
|
|
||||||
size = 1191503
|
|
||||||
arch = x86_64
|
|
||||||
license = MIT
|
|
||||||
conflict = barecode
|
|
||||||
provides = barecode
|
|
||||||
depend = qt6-base
|
|
||||||
makedepend = cmake
|
|
||||||
makedepend = ninja
|
|
||||||
makedepend = git
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
[Desktop Entry]
|
|
||||||
Version=1.0
|
|
||||||
Type=Application
|
|
||||||
Name=BareCode
|
|
||||||
GenericName=Code Editor
|
|
||||||
Comment=Modularer Code-Editor für HTML, PHP, CSS und mehr
|
|
||||||
Exec=BareCode %F
|
|
||||||
Icon=barecode
|
|
||||||
Terminal=false
|
|
||||||
Categories=Development;TextEditor;
|
|
||||||
MimeType=text/plain;text/html;text/css;text/x-php;text/x-csrc;text/x-chdr;text/x-c++src;text/x-c++hdr;
|
|
||||||
Keywords=editor;code;html;php;css;c++;
|
|
||||||
StartupWMClass=BareCode
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
[Desktop Entry]
|
|
||||||
Type=Application
|
|
||||||
Name=BareCode
|
|
||||||
GenericName=Code-Editor
|
|
||||||
Comment=Modularer Code-Editor von Projekt Hirnfrei
|
|
||||||
Exec=BareCode %F
|
|
||||||
Icon=barecode
|
|
||||||
Terminal=false
|
|
||||||
Categories=Development;TextEditor;IDE;
|
|
||||||
MimeType=text/plain;text/x-csrc;text/x-chdr;text/x-c++src;text/x-c++hdr;
|
|
||||||
Keywords=editor;code;programmierung;entwicklung;
|
|
||||||
StartupNotify=true
|
|
||||||
StartupWMClass=BareCode
|
|
||||||
|
Before Width: | Height: | Size: 25 KiB |
|
Before Width: | Height: | Size: 824 B |
|
Before Width: | Height: | Size: 90 KiB |
|
Before Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 4.7 KiB |
|
Before Width: | Height: | Size: 303 KiB |
|
Before Width: | Height: | Size: 7.6 KiB |
@@ -1,21 +0,0 @@
|
|||||||
MIT License
|
|
||||||
|
|
||||||
Copyright (c) 2025 Dany Thinnes – Projekt Hirnfrei
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
cmake_minimum_required(VERSION 3.16)
|
cmake_minimum_required(VERSION 3.16)
|
||||||
|
|
||||||
project(BareCode
|
project(BareCode
|
||||||
VERSION 1.1.0
|
VERSION 1.2.0
|
||||||
DESCRIPTION "A modular code editor built with Qt6"
|
DESCRIPTION "A modular code editor built with Qt6"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
|||||||
2
PKGBUILD
@@ -2,7 +2,7 @@
|
|||||||
# Projekt Hirnfrei - https://www.projekt-hirnfrei.de
|
# Projekt Hirnfrei - https://www.projekt-hirnfrei.de
|
||||||
|
|
||||||
pkgname=barecode
|
pkgname=barecode
|
||||||
pkgver=1.1.0
|
pkgver=1.2.0
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="Schlanker modularer Code-Editor für HTML, PHP, CSS und C++"
|
pkgdesc="Schlanker modularer Code-Editor für HTML, PHP, CSS und C++"
|
||||||
arch=('x86_64' 'aarch64')
|
arch=('x86_64' 'aarch64')
|
||||||
|
|||||||
27
README.md
@@ -1,7 +1,7 @@
|
|||||||
# BareCode
|
# BareCode
|
||||||
|
|
||||||
**Schlanker, modularer Code-Editor für Web-Entwickler**
|
**Schlanker, modularer Code-Editor für Web-Entwickler**
|
||||||
Version 1.1.0 — von **Dany Thinnes** | [Projekt Hirnfrei](https://www.projekt-hirnfrei.de) | [Discord](https://discord.projekt-hirnfrei.de)
|
Version 1.2.0 — von **Dany Thinnes** | [Projekt Hirnfrei](https://www.projekt-hirnfrei.de) | [Discord](https://discord.projekt-hirnfrei.de)
|
||||||
|
|
||||||
Entwickelt mit **C++17**, **Qt6** und **CMake**.
|
Entwickelt mit **C++17**, **Qt6** und **CMake**.
|
||||||
Kompiliert auf **Linux**, **Windows** und **Haiku**.
|
Kompiliert auf **Linux**, **Windows** und **Haiku**.
|
||||||
@@ -34,17 +34,19 @@ Siehe Abschnitt **Bauen** weiter unten.
|
|||||||
### Editor
|
### Editor
|
||||||
| Feature | Details |
|
| Feature | Details |
|
||||||
|---|---|
|
|---|---|
|
||||||
| Syntax-Highlighting | HTML, PHP, CSS, C/C++ — inkl. mehrzeiliger Kommentare |
|
| Syntax-Highlighting | HTML, PHP, CSS, C/C++ — inkl. mehrzeiliger Kommentare über Leerzeilen |
|
||||||
| Tabs | Mehrere Dateien gleichzeitig, verschiebbar und schließbar |
|
| Tabs | Mehrere Dateien gleichzeitig, verschiebbar und schließbar |
|
||||||
| Änderungsindikator | ● im Tab-Titel bei ungespeicherten Änderungen |
|
| Änderungsindikator | ● im Tab-Titel bei ungespeicherten Änderungen |
|
||||||
| Zeilennummern | Eigener Gutter, aktuelle Zeile hervorgehoben |
|
| Zeilennummern | Eigener Gutter, aktuelle Zeile hervorgehoben |
|
||||||
| Einrück-Führungslinien | Vertikale Linien wie in VS Code |
|
| Einrück-Führungslinien | Vertikale Linien wie in VS Code |
|
||||||
|
| Klammerzugehörigkeit | Zusammengehörige Klammern werden grün hervorgehoben, fehlende rot |
|
||||||
| Auto-Indent | Einrückungstiefe wird bei Enter übernommen |
|
| Auto-Indent | Einrückungstiefe wird bei Enter übernommen |
|
||||||
| Tab / Shift+Tab | Ein- und Ausrücken, auch für mehrere Zeilen gleichzeitig |
|
| Tab / Shift+Tab | Ein- und Ausrücken für einzelne Zeilen und Selektionen |
|
||||||
| Smart Backspace | Springt zur vorherigen Tab-Stop-Position |
|
| Smart Backspace | Springt zur vorherigen Tab-Stop-Position |
|
||||||
| Farbvorschau | CSS-Farbwerte (#hex, rgb, hsl) werden inline angezeigt |
|
| Farbvorschau | CSS-Farbwerte (#hex, rgb, hsl) werden inline angezeigt |
|
||||||
| Farbauswahl | Klick auf das Farbquadrat öffnet einen Farbauswahl-Dialog |
|
| Farbauswahl | Klick auf das Farbquadrat öffnet einen Farbauswahl-Dialog |
|
||||||
| Funktionssignatur | Tooltip mit Parametern beim Tippen von PHP-Funktionen |
|
| Funktionssignatur | Tooltip mit Parametern beim Tippen von PHP-Funktionen |
|
||||||
|
| Variablen-Popup | Vorschläge für $variablen beim Tippen (nur Anzeige, kein Autocomplete) |
|
||||||
|
|
||||||
### Navigation
|
### Navigation
|
||||||
| Feature | Details |
|
| Feature | Details |
|
||||||
@@ -109,14 +111,15 @@ BareCode/
|
|||||||
├── editor/ # EditorPanel, EditorTab, CodeEditor,
|
├── editor/ # EditorPanel, EditorTab, CodeEditor,
|
||||||
│ # SearchPanel, FileSearchPanel,
|
│ # SearchPanel, FileSearchPanel,
|
||||||
│ # ColorIndicator, SignatureHelper,
|
│ # ColorIndicator, SignatureHelper,
|
||||||
│ # FunctionScanner, FunctionIndex,
|
│ # VariableCompleter, FunctionScanner,
|
||||||
│ # FunctionListPanel, FunctionListDialog,
|
│ # FunctionIndex, FunctionListPanel,
|
||||||
│ # DeadCodeAnalyzer, DeadCodeDialog
|
│ # FunctionListDialog, DeadCodeAnalyzer,
|
||||||
|
│ # DeadCodeDialog
|
||||||
├── filetree/ # FileTreePanel
|
├── filetree/ # FileTreePanel
|
||||||
└── highlighter/ # SyntaxHighlighter, HighlighterFactory
|
└── highlighter/ # SyntaxHighlighter, HighlighterFactory
|
||||||
```
|
```
|
||||||
|
|
||||||
Jedes Unterverzeichnis kompiliert als eigene statische Bibliothek — Komponenten lassen sich unabhängig austauschen und erweitern.
|
Jedes Unterverzeichnis kompiliert als eigene statische Bibliothek.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -160,11 +163,6 @@ cmake -B build -G "Visual Studio 17 2022" -A x64
|
|||||||
cmake --build build --config Release
|
cmake --build build --config Release
|
||||||
```
|
```
|
||||||
|
|
||||||
**Installer erstellen** (mit [Inno Setup](https://jrsoftware.org/isinfo.php)):
|
|
||||||
```bat
|
|
||||||
windeployqt --release build\Release\BareCode.exe
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
### Haiku
|
### Haiku
|
||||||
@@ -176,8 +174,7 @@ cmake --build build -j$(nproc)
|
|||||||
./build/BareCode
|
./build/BareCode
|
||||||
```
|
```
|
||||||
|
|
||||||
> Getestet auf Haiku R1/beta5. `qt6_base_devel` enthält auf Haiku
|
> Getestet auf Haiku R1/beta5.
|
||||||
> sowohl die Header als auch die Build-Tools.
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -187,8 +184,6 @@ cmake --build build -j$(nproc)
|
|||||||
2. `m_rules` im Konstruktor befüllen (siehe `CppHighlighter` als Vorlage)
|
2. `m_rules` im Konstruktor befüllen (siehe `CppHighlighter` als Vorlage)
|
||||||
3. Dateiendung in `HighlighterFactory.cpp` registrieren
|
3. Dateiendung in `HighlighterFactory.cpp` registrieren
|
||||||
|
|
||||||
Keine weiteren Dateien müssen geändert werden.
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## Lizenz
|
## Lizenz
|
||||||
|
|||||||
2
main.cpp
@@ -7,7 +7,7 @@ int main(int argc, char *argv[])
|
|||||||
QApplication app(argc, argv);
|
QApplication app(argc, argv);
|
||||||
|
|
||||||
app.setApplicationName("BareCode");
|
app.setApplicationName("BareCode");
|
||||||
app.setApplicationVersion("1.1.0");
|
app.setApplicationVersion("1.2.0");
|
||||||
app.setOrganizationName("BareCode");
|
app.setOrganizationName("BareCode");
|
||||||
|
|
||||||
// Icon in allen verfügbaren Größen setzen
|
// Icon in allen verfügbaren Größen setzen
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ AboutDialog::AboutDialog(QWidget *parent)
|
|||||||
info->addLayout(row);
|
info->addLayout(row);
|
||||||
};
|
};
|
||||||
|
|
||||||
makeRow(tr("Version"), "1.1.0");
|
makeRow(tr("Version"), "1.2.0");
|
||||||
makeRow(tr("Entwickler"), "Dany Thinnes");
|
makeRow(tr("Entwickler"), "Dany Thinnes");
|
||||||
makeRow(tr("Projekt"), "Projekt Hirnfrei");
|
makeRow(tr("Projekt"), "Projekt Hirnfrei");
|
||||||
makeRow(tr("Framework"), QString("Qt %1").arg(qVersion()));
|
makeRow(tr("Framework"), QString("Qt %1").arg(qVersion()));
|
||||||
|
|||||||
@@ -29,6 +29,8 @@ set(EDITOR_SOURCES
|
|||||||
DeadCodeAnalyzer.h
|
DeadCodeAnalyzer.h
|
||||||
DeadCodeDialog.cpp
|
DeadCodeDialog.cpp
|
||||||
DeadCodeDialog.h
|
DeadCodeDialog.h
|
||||||
|
VariableCompleter.cpp
|
||||||
|
VariableCompleter.h
|
||||||
)
|
)
|
||||||
|
|
||||||
add_library(BareCode_Editor STATIC ${EDITOR_SOURCES})
|
add_library(BareCode_Editor STATIC ${EDITOR_SOURCES})
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
#include "ColorIndicator.h"
|
#include "ColorIndicator.h"
|
||||||
#include "SignatureHelper.h"
|
#include "SignatureHelper.h"
|
||||||
#include "FunctionIndex.h"
|
#include "FunctionIndex.h"
|
||||||
|
#include "VariableCompleter.h"
|
||||||
|
|
||||||
#include "core/Settings.h"
|
#include "core/Settings.h"
|
||||||
#include "highlighter/HighlighterFactory.h"
|
#include "highlighter/HighlighterFactory.h"
|
||||||
@@ -27,6 +28,7 @@ CodeEditor::CodeEditor(Settings *settings, QWidget *parent)
|
|||||||
m_lineNumberArea = new LineNumberArea(this);
|
m_lineNumberArea = new LineNumberArea(this);
|
||||||
m_colorIndicator = new ColorIndicator(this);
|
m_colorIndicator = new ColorIndicator(this);
|
||||||
m_signatureHelper = new SignatureHelper(this);
|
m_signatureHelper = new SignatureHelper(this);
|
||||||
|
m_varCompleter = new VariableCompleter(this);
|
||||||
setupEditor();
|
setupEditor();
|
||||||
|
|
||||||
connect(this, &CodeEditor::blockCountChanged,
|
connect(this, &CodeEditor::blockCountChanged,
|
||||||
@@ -390,7 +392,7 @@ void CodeEditor::lineNumberAreaPaintEvent(QPaintEvent *event)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
// Current line highlight
|
// Current line highlight + Klammerzugehörigkeit
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
void CodeEditor::highlightCurrentLine()
|
void CodeEditor::highlightCurrentLine()
|
||||||
{
|
{
|
||||||
@@ -398,20 +400,161 @@ void CodeEditor::highlightCurrentLine()
|
|||||||
|
|
||||||
if (!isReadOnly())
|
if (!isReadOnly())
|
||||||
{
|
{
|
||||||
QTextEdit::ExtraSelection selection;
|
// Aktuelle Zeile hervorheben
|
||||||
|
QTextEdit::ExtraSelection lineSelection;
|
||||||
|
lineSelection.format.setBackground(palette().color(QPalette::AlternateBase));
|
||||||
|
lineSelection.format.setProperty(QTextFormat::FullWidthSelection, true);
|
||||||
|
lineSelection.cursor = textCursor();
|
||||||
|
lineSelection.cursor.clearSelection();
|
||||||
|
extraSelections.append(lineSelection);
|
||||||
|
|
||||||
const QColor lineColor = palette().color(QPalette::AlternateBase);
|
// Klammerzugehörigkeit
|
||||||
selection.format.setBackground(lineColor);
|
matchBrackets(extraSelections);
|
||||||
selection.format.setProperty(QTextFormat::FullWidthSelection, true);
|
|
||||||
selection.cursor = textCursor();
|
|
||||||
selection.cursor.clearSelection();
|
|
||||||
|
|
||||||
extraSelections.append(selection);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
setExtraSelections(extraSelections);
|
setExtraSelections(extraSelections);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void CodeEditor::matchBrackets(QList<QTextEdit::ExtraSelection> &selections)
|
||||||
|
{
|
||||||
|
static const QString openBrackets = "({[";
|
||||||
|
static const QString closeBrackets = ")}]";
|
||||||
|
|
||||||
|
QTextCursor cursor = textCursor();
|
||||||
|
const QString blockText = cursor.block().text();
|
||||||
|
const int col = cursor.columnNumber();
|
||||||
|
|
||||||
|
// Zeichen unter oder links vom Cursor prüfen
|
||||||
|
QChar ch;
|
||||||
|
int charPos = -1;
|
||||||
|
|
||||||
|
// Zuerst Zeichen unter dem Cursor
|
||||||
|
if (col < blockText.length())
|
||||||
|
{
|
||||||
|
ch = blockText[col];
|
||||||
|
if (openBrackets.contains(ch) || closeBrackets.contains(ch))
|
||||||
|
{
|
||||||
|
charPos = col;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Dann Zeichen links vom Cursor
|
||||||
|
if (charPos == -1 && col > 0)
|
||||||
|
{
|
||||||
|
ch = blockText[col - 1];
|
||||||
|
if (openBrackets.contains(ch) || closeBrackets.contains(ch))
|
||||||
|
{
|
||||||
|
charPos = col - 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (charPos == -1)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Passende Klammer suchen
|
||||||
|
const bool isOpen = openBrackets.contains(ch);
|
||||||
|
const int bracketIndex = isOpen
|
||||||
|
? openBrackets.indexOf(ch)
|
||||||
|
: closeBrackets.indexOf(ch);
|
||||||
|
const QChar matchChar = isOpen
|
||||||
|
? closeBrackets[bracketIndex]
|
||||||
|
: openBrackets[bracketIndex];
|
||||||
|
|
||||||
|
// Dokumentposition der gefundenen Klammer
|
||||||
|
const int startPos = cursor.block().position() + charPos;
|
||||||
|
|
||||||
|
// Passende Klammer suchen — vorwärts oder rückwärts
|
||||||
|
int depth = 0;
|
||||||
|
int matchPos = -1;
|
||||||
|
|
||||||
|
if (isOpen)
|
||||||
|
{
|
||||||
|
// Vorwärts suchen
|
||||||
|
QTextCursor search(document());
|
||||||
|
search.setPosition(startPos);
|
||||||
|
|
||||||
|
while (!search.atEnd())
|
||||||
|
{
|
||||||
|
search.movePosition(QTextCursor::NextCharacter, QTextCursor::KeepAnchor);
|
||||||
|
const QChar c = search.selectedText()[0];
|
||||||
|
search.clearSelection();
|
||||||
|
|
||||||
|
if (c == ch) { ++depth; }
|
||||||
|
else if (c == matchChar)
|
||||||
|
{
|
||||||
|
--depth;
|
||||||
|
if (depth == 0)
|
||||||
|
{
|
||||||
|
matchPos = search.position() - 1;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Rückwärts suchen
|
||||||
|
QTextCursor search(document());
|
||||||
|
search.setPosition(startPos + 1);
|
||||||
|
|
||||||
|
while (search.position() > 0)
|
||||||
|
{
|
||||||
|
search.movePosition(QTextCursor::PreviousCharacter, QTextCursor::KeepAnchor);
|
||||||
|
const QChar c = search.selectedText()[0];
|
||||||
|
search.clearSelection();
|
||||||
|
|
||||||
|
if (c == ch) { ++depth; }
|
||||||
|
else if (c == matchChar)
|
||||||
|
{
|
||||||
|
--depth;
|
||||||
|
if (depth == 0)
|
||||||
|
{
|
||||||
|
matchPos = search.position();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Formatierung
|
||||||
|
QTextCharFormat matchFormat;
|
||||||
|
if (matchPos >= 0)
|
||||||
|
{
|
||||||
|
// Gefunden — beide Klammern grün hervorheben
|
||||||
|
matchFormat.setBackground(QColor("#1a5a1a"));
|
||||||
|
matchFormat.setForeground(QColor("#88ff88"));
|
||||||
|
matchFormat.setFontWeight(QFont::Bold);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Kein Match — rot markieren
|
||||||
|
matchFormat.setBackground(QColor("#5a1a1a"));
|
||||||
|
matchFormat.setForeground(QColor("#ff8888"));
|
||||||
|
matchFormat.setFontWeight(QFont::Bold);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Öffnende / schließende Klammer markieren
|
||||||
|
QTextEdit::ExtraSelection sel1;
|
||||||
|
sel1.cursor = QTextCursor(document());
|
||||||
|
sel1.cursor.setPosition(startPos);
|
||||||
|
sel1.cursor.movePosition(QTextCursor::NextCharacter, QTextCursor::KeepAnchor);
|
||||||
|
sel1.format = matchFormat;
|
||||||
|
selections.append(sel1);
|
||||||
|
|
||||||
|
// Passende Klammer markieren (nur wenn gefunden)
|
||||||
|
if (matchPos >= 0)
|
||||||
|
{
|
||||||
|
QTextEdit::ExtraSelection sel2;
|
||||||
|
sel2.cursor = QTextCursor(document());
|
||||||
|
sel2.cursor.setPosition(matchPos);
|
||||||
|
sel2.cursor.movePosition(QTextCursor::NextCharacter, QTextCursor::KeepAnchor);
|
||||||
|
sel2.format = matchFormat;
|
||||||
|
selections.append(sel2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
// Key handling – Tab/Shift+Tab, Smart-Backspace, Auto-Indent
|
// Key handling – Tab/Shift+Tab, Smart-Backspace, Auto-Indent
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
@@ -430,6 +573,16 @@ void CodeEditor::keyPressEvent(QKeyEvent *event)
|
|||||||
QTextBlock startBlock = document()->findBlock(cursor.selectionStart());
|
QTextBlock startBlock = document()->findBlock(cursor.selectionStart());
|
||||||
QTextBlock endBlock = document()->findBlock(cursor.selectionEnd());
|
QTextBlock endBlock = document()->findBlock(cursor.selectionEnd());
|
||||||
|
|
||||||
|
// Wenn die Selektion genau am Anfang des letzten Blocks endet,
|
||||||
|
// diesen Block nicht mit einbeziehen — der Cursor steht dort nur
|
||||||
|
// mit Position 0, der Nutzer hat die Zeile nicht markiert
|
||||||
|
if (cursor.hasSelection() &&
|
||||||
|
cursor.selectionEnd() == endBlock.position() &&
|
||||||
|
endBlock != startBlock)
|
||||||
|
{
|
||||||
|
endBlock = endBlock.previous();
|
||||||
|
}
|
||||||
|
|
||||||
cursor.beginEditBlock();
|
cursor.beginEditBlock();
|
||||||
for (QTextBlock b = startBlock; b != endBlock.next(); b = b.next())
|
for (QTextBlock b = startBlock; b != endBlock.next(); b = b.next())
|
||||||
{
|
{
|
||||||
@@ -438,22 +591,14 @@ void CodeEditor::keyPressEvent(QKeyEvent *event)
|
|||||||
|
|
||||||
if (m_settings->useSpacesForTabs())
|
if (m_settings->useSpacesForTabs())
|
||||||
{
|
{
|
||||||
// Bis zu tabSize führende Leerzeichen entfernen
|
|
||||||
for (int i = 0; i < tabSize && i < lineText.length(); ++i)
|
for (int i = 0; i < tabSize && i < lineText.length(); ++i)
|
||||||
{
|
{
|
||||||
if (lineText[i] == ' ')
|
if (lineText[i] == ' ') { ++toRemove; }
|
||||||
{
|
else { break; }
|
||||||
++toRemove;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Einen führenden Tab entfernen
|
|
||||||
if (!lineText.isEmpty() && lineText[0] == '\t')
|
if (!lineText.isEmpty() && lineText[0] == '\t')
|
||||||
{
|
{
|
||||||
toRemove = 1;
|
toRemove = 1;
|
||||||
@@ -483,10 +628,16 @@ void CodeEditor::keyPressEvent(QKeyEvent *event)
|
|||||||
|
|
||||||
if (cursor.hasSelection())
|
if (cursor.hasSelection())
|
||||||
{
|
{
|
||||||
// Mehrere Zeilen einrücken
|
|
||||||
QTextBlock startBlock = document()->findBlock(cursor.selectionStart());
|
QTextBlock startBlock = document()->findBlock(cursor.selectionStart());
|
||||||
QTextBlock endBlock = document()->findBlock(cursor.selectionEnd());
|
QTextBlock endBlock = document()->findBlock(cursor.selectionEnd());
|
||||||
|
|
||||||
|
// Gleiche Korrektur: Cursor am Zeilenanfang → Zeile nicht einrücken
|
||||||
|
if (cursor.selectionEnd() == endBlock.position() &&
|
||||||
|
endBlock != startBlock)
|
||||||
|
{
|
||||||
|
endBlock = endBlock.previous();
|
||||||
|
}
|
||||||
|
|
||||||
cursor.beginEditBlock();
|
cursor.beginEditBlock();
|
||||||
for (QTextBlock b = startBlock; b != endBlock.next(); b = b.next())
|
for (QTextBlock b = startBlock; b != endBlock.next(); b = b.next())
|
||||||
{
|
{
|
||||||
@@ -591,5 +742,8 @@ void CodeEditor::keyPressEvent(QKeyEvent *event)
|
|||||||
}
|
}
|
||||||
|
|
||||||
QPlainTextEdit::keyPressEvent(event);
|
QPlainTextEdit::keyPressEvent(event);
|
||||||
|
|
||||||
|
// Variablen-Popup nach jedem Tastendruck aktualisieren
|
||||||
|
m_varCompleter->handleKeyPress(event);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ class SyntaxHighlighter;
|
|||||||
class ColorIndicator;
|
class ColorIndicator;
|
||||||
class SignatureHelper;
|
class SignatureHelper;
|
||||||
class FunctionIndex;
|
class FunctionIndex;
|
||||||
|
class VariableCompleter;
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
// CodeEditor – Core editing widget.
|
// CodeEditor – Core editing widget.
|
||||||
@@ -55,8 +56,7 @@ signals:
|
|||||||
void fileSaved(const QString &filePath);
|
void fileSaved(const QString &filePath);
|
||||||
void navigateToRequested(const QString &filePath, int line);
|
void navigateToRequested(const QString &filePath, int line);
|
||||||
|
|
||||||
protected:
|
protected: void resizeEvent(QResizeEvent *event) override;
|
||||||
void resizeEvent(QResizeEvent *event) override;
|
|
||||||
void keyPressEvent(QKeyEvent *event) override;
|
void keyPressEvent(QKeyEvent *event) override;
|
||||||
void paintEvent(QPaintEvent *event) override;
|
void paintEvent(QPaintEvent *event) override;
|
||||||
void mousePressEvent(QMouseEvent *event) override;
|
void mousePressEvent(QMouseEvent *event) override;
|
||||||
@@ -71,6 +71,7 @@ private:
|
|||||||
void setupEditor();
|
void setupEditor();
|
||||||
void installHighlighter(const QString &filePath);
|
void installHighlighter(const QString &filePath);
|
||||||
bool writeToFile(const QString &filePath);
|
bool writeToFile(const QString &filePath);
|
||||||
|
void matchBrackets(QList<QTextEdit::ExtraSelection> &selections);
|
||||||
|
|
||||||
Settings *m_settings = nullptr;
|
Settings *m_settings = nullptr;
|
||||||
LineNumberArea *m_lineNumberArea = nullptr;
|
LineNumberArea *m_lineNumberArea = nullptr;
|
||||||
@@ -78,5 +79,6 @@ private:
|
|||||||
ColorIndicator *m_colorIndicator = nullptr;
|
ColorIndicator *m_colorIndicator = nullptr;
|
||||||
SignatureHelper *m_signatureHelper = nullptr;
|
SignatureHelper *m_signatureHelper = nullptr;
|
||||||
FunctionIndex *m_functionIndex = nullptr;
|
FunctionIndex *m_functionIndex = nullptr;
|
||||||
|
VariableCompleter *m_varCompleter = nullptr;
|
||||||
QString m_filePath;
|
QString m_filePath;
|
||||||
};
|
};
|
||||||
|
|||||||
243
src/editor/VariableCompleter.cpp
Normal file
@@ -0,0 +1,243 @@
|
|||||||
|
#include "VariableCompleter.h"
|
||||||
|
#include "CodeEditor.h"
|
||||||
|
|
||||||
|
#include <QTextCursor>
|
||||||
|
#include <QTextBlock>
|
||||||
|
#include <QKeyEvent>
|
||||||
|
#include <QListWidgetItem>
|
||||||
|
#include <QAbstractItemView>
|
||||||
|
#include <QScrollBar>
|
||||||
|
#include <QApplication>
|
||||||
|
#include <QScreen>
|
||||||
|
|
||||||
|
VariableCompleter::VariableCompleter(CodeEditor *editor)
|
||||||
|
: QObject(editor)
|
||||||
|
, m_editor(editor)
|
||||||
|
{
|
||||||
|
// Popup als eigenständiges, rahmenloses Werkzeugfenster
|
||||||
|
m_popup = new QListWidget(nullptr);
|
||||||
|
m_popup->setWindowFlags(Qt::Tool | Qt::FramelessWindowHint |
|
||||||
|
Qt::WindowStaysOnTopHint);
|
||||||
|
m_popup->setAttribute(Qt::WA_ShowWithoutActivating);
|
||||||
|
m_popup->setFocusPolicy(Qt::NoFocus);
|
||||||
|
m_popup->setMaximumHeight(200);
|
||||||
|
m_popup->setMinimumWidth(180);
|
||||||
|
m_popup->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
|
||||||
|
m_popup->setStyleSheet(
|
||||||
|
"QListWidget {"
|
||||||
|
" border: 1px solid palette(mid);"
|
||||||
|
" background: palette(toolTipBase);"
|
||||||
|
" color: palette(toolTipText);"
|
||||||
|
" font-family: Monospace;"
|
||||||
|
"}"
|
||||||
|
"QListWidget::item:selected {"
|
||||||
|
" background: palette(highlight);"
|
||||||
|
" color: palette(highlightedText);"
|
||||||
|
"}"
|
||||||
|
);
|
||||||
|
|
||||||
|
connect(m_popup, &QListWidget::itemActivated,
|
||||||
|
this, &VariableCompleter::onItemActivated);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Nach jedem Tastendruck aufrufen
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
void VariableCompleter::handleKeyPress(QKeyEvent *event)
|
||||||
|
{
|
||||||
|
// Popup-Navigation
|
||||||
|
if (m_popup->isVisible())
|
||||||
|
{
|
||||||
|
if (event->key() == Qt::Key_Escape)
|
||||||
|
{
|
||||||
|
hidePopup();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (event->key() == Qt::Key_Return || event->key() == Qt::Key_Enter)
|
||||||
|
{
|
||||||
|
if (m_popup->currentItem())
|
||||||
|
{
|
||||||
|
onItemActivated(m_popup->currentItem());
|
||||||
|
}
|
||||||
|
hidePopup();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (event->key() == Qt::Key_Down)
|
||||||
|
{
|
||||||
|
const int next = qMin(m_popup->currentRow() + 1,
|
||||||
|
m_popup->count() - 1);
|
||||||
|
m_popup->setCurrentRow(next);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (event->key() == Qt::Key_Up)
|
||||||
|
{
|
||||||
|
const int prev = qMax(m_popup->currentRow() - 1, 0);
|
||||||
|
m_popup->setCurrentRow(prev);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Nach dem normalen Tastendruck Popup aktualisieren
|
||||||
|
// (der Event wurde bereits an QPlainTextEdit weitergegeben)
|
||||||
|
updatePopup();
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Popup aktualisieren
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
void VariableCompleter::updatePopup()
|
||||||
|
{
|
||||||
|
const QString prefix = currentPrefix();
|
||||||
|
|
||||||
|
// Nur bei $ und mindestens einem weiteren Zeichen anzeigen
|
||||||
|
if (prefix.length() < 2 || !prefix.startsWith('$'))
|
||||||
|
{
|
||||||
|
hidePopup();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const QStringList allVars = collectVariables();
|
||||||
|
const QString filter = prefix.toLower();
|
||||||
|
|
||||||
|
QStringList matches;
|
||||||
|
for (const QString &var : allVars)
|
||||||
|
{
|
||||||
|
if (var.toLower().startsWith(filter) && var != prefix)
|
||||||
|
{
|
||||||
|
matches.append(var);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (matches.isEmpty())
|
||||||
|
{
|
||||||
|
hidePopup();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Popup befüllen
|
||||||
|
m_popup->clear();
|
||||||
|
for (const QString &var : matches)
|
||||||
|
{
|
||||||
|
m_popup->addItem(var);
|
||||||
|
}
|
||||||
|
m_popup->setCurrentRow(0);
|
||||||
|
|
||||||
|
// Größe anpassen
|
||||||
|
const int itemHeight = m_popup->sizeHintForRow(0) + 2;
|
||||||
|
const int height = qMin(matches.size() * itemHeight + 4, 200);
|
||||||
|
m_popup->setFixedHeight(height);
|
||||||
|
|
||||||
|
// Position unter dem Cursor
|
||||||
|
const QRect cursorRect = m_editor->cursorRect();
|
||||||
|
QPoint pos = m_editor->viewport()->mapToGlobal(
|
||||||
|
QPoint(cursorRect.left(), cursorRect.bottom() + 2)
|
||||||
|
);
|
||||||
|
|
||||||
|
// Nicht aus dem Bildschirm herausragen
|
||||||
|
const QRect screen = QApplication::primaryScreen()->availableGeometry();
|
||||||
|
if (pos.x() + m_popup->width() > screen.right())
|
||||||
|
{
|
||||||
|
pos.setX(screen.right() - m_popup->width());
|
||||||
|
}
|
||||||
|
if (pos.y() + height > screen.bottom())
|
||||||
|
{
|
||||||
|
pos.setY(cursorRect.top() - height - 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
m_popup->move(pos);
|
||||||
|
m_popup->show();
|
||||||
|
m_popup->raise();
|
||||||
|
}
|
||||||
|
|
||||||
|
void VariableCompleter::hidePopup()
|
||||||
|
{
|
||||||
|
m_popup->hide();
|
||||||
|
m_popup->clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Variablen im aktuellen Dokument sammeln
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
QStringList VariableCompleter::collectVariables() const
|
||||||
|
{
|
||||||
|
static const QRegularExpression varRegex(R"(\$[a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*)");
|
||||||
|
|
||||||
|
QSet<QString> seen;
|
||||||
|
QStringList result;
|
||||||
|
|
||||||
|
const QString text = m_editor->toPlainText();
|
||||||
|
QRegularExpressionMatchIterator it = varRegex.globalMatch(text);
|
||||||
|
|
||||||
|
while (it.hasNext())
|
||||||
|
{
|
||||||
|
const QString var = it.next().captured(0);
|
||||||
|
if (!seen.contains(var))
|
||||||
|
{
|
||||||
|
seen.insert(var);
|
||||||
|
result.append(var);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
result.sort(Qt::CaseInsensitive);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Text links vom Cursor — das angefangene $variable
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
QString VariableCompleter::currentPrefix() const
|
||||||
|
{
|
||||||
|
const QTextCursor cursor = m_editor->textCursor();
|
||||||
|
const QString line = cursor.block().text();
|
||||||
|
const int col = cursor.columnNumber();
|
||||||
|
|
||||||
|
if (col == 0)
|
||||||
|
{
|
||||||
|
return QString();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Rückwärts gehen bis zum $ oder einem Nicht-Bezeichner-Zeichen
|
||||||
|
int start = col - 1;
|
||||||
|
while (start > 0)
|
||||||
|
{
|
||||||
|
const QChar c = line[start - 1];
|
||||||
|
if (!c.isLetterOrNumber() && c != '_' && c != '$')
|
||||||
|
{
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
--start;
|
||||||
|
}
|
||||||
|
|
||||||
|
const QString token = line.mid(start, col - start);
|
||||||
|
return token.startsWith('$') ? token : QString();
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Klick oder Enter — Variable einfügen
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
void VariableCompleter::onItemActivated(QListWidgetItem *item)
|
||||||
|
{
|
||||||
|
if (!item)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const QString selected = item->text();
|
||||||
|
const QString prefix = currentPrefix();
|
||||||
|
|
||||||
|
if (prefix.isEmpty())
|
||||||
|
{
|
||||||
|
hidePopup();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Prefix durch den vollständigen Variablennamen ersetzen
|
||||||
|
QTextCursor cursor = m_editor->textCursor();
|
||||||
|
cursor.movePosition(QTextCursor::Left,
|
||||||
|
QTextCursor::KeepAnchor,
|
||||||
|
prefix.length());
|
||||||
|
cursor.insertText(selected);
|
||||||
|
|
||||||
|
m_editor->setTextCursor(cursor);
|
||||||
|
hidePopup();
|
||||||
|
}
|
||||||
38
src/editor/VariableCompleter.h
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <QObject>
|
||||||
|
#include <QListWidget>
|
||||||
|
#include <QStringList>
|
||||||
|
#include <QRegularExpression>
|
||||||
|
|
||||||
|
class CodeEditor;
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// VariableCompleter – Zeigt ein Popup mit passenden Variablennamen
|
||||||
|
// wenn der Nutzer $ tippt und weiter eingibt.
|
||||||
|
//
|
||||||
|
// Kein Autocomplete — nur Anzeige. Klick oder Enter übernimmt.
|
||||||
|
// Escape oder Weiterschreiben ohne Treffer schließt das Popup.
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
class VariableCompleter : public QObject
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
explicit VariableCompleter(CodeEditor *editor);
|
||||||
|
|
||||||
|
// Muss nach jedem Tastendruck aufgerufen werden
|
||||||
|
void handleKeyPress(QKeyEvent *event);
|
||||||
|
|
||||||
|
private slots:
|
||||||
|
void onItemActivated(QListWidgetItem *item);
|
||||||
|
|
||||||
|
private:
|
||||||
|
void updatePopup();
|
||||||
|
void hidePopup();
|
||||||
|
QStringList collectVariables() const;
|
||||||
|
QString currentPrefix() const; // "$me" etc. links vom Cursor
|
||||||
|
|
||||||
|
CodeEditor *m_editor = nullptr;
|
||||||
|
QListWidget *m_popup = nullptr;
|
||||||
|
};
|
||||||
@@ -11,6 +11,7 @@ SyntaxHighlighter::SyntaxHighlighter(QTextDocument *parent)
|
|||||||
|
|
||||||
void SyntaxHighlighter::highlightBlock(const QString &text)
|
void SyntaxHighlighter::highlightBlock(const QString &text)
|
||||||
{
|
{
|
||||||
|
// Einzel-Zeilen-Regeln anwenden
|
||||||
for (const HighlightRule &rule : m_rules)
|
for (const HighlightRule &rule : m_rules)
|
||||||
{
|
{
|
||||||
QRegularExpressionMatchIterator it = rule.pattern.globalMatch(text);
|
QRegularExpressionMatchIterator it = rule.pattern.globalMatch(text);
|
||||||
@@ -27,21 +28,65 @@ void SyntaxHighlighter::highlightBlock(const QString &text)
|
|||||||
|
|
||||||
if (!m_hasMultiLineComment)
|
if (!m_hasMultiLineComment)
|
||||||
{
|
{
|
||||||
|
setCurrentBlockState(0);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Mehrzeilige Kommentare
|
||||||
|
// Zustand 0 = normal, 1 = mitten in /* ... */
|
||||||
setCurrentBlockState(0);
|
setCurrentBlockState(0);
|
||||||
|
|
||||||
int startIndex = 0;
|
// Leere Zeile mitten im Kommentar — Zustand weitertragen
|
||||||
if (previousBlockState() != 1)
|
if (text.isEmpty())
|
||||||
{
|
{
|
||||||
|
if (previousBlockState() == 1)
|
||||||
|
{
|
||||||
|
setCurrentBlockState(1);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
int startIndex = 0;
|
||||||
|
|
||||||
|
if (previousBlockState() == 1)
|
||||||
|
{
|
||||||
|
// Vorherige Zeile war mitten im Kommentar — ab Zeilenanfang nach Ende suchen
|
||||||
|
QRegularExpressionMatch endMatch = m_commentEndExpression.match(text, 0);
|
||||||
|
|
||||||
|
if (endMatch.hasMatch())
|
||||||
|
{
|
||||||
|
// Ende des Kommentars gefunden
|
||||||
|
const int commentLength = static_cast<int>(endMatch.capturedStart())
|
||||||
|
+ static_cast<int>(endMatch.capturedLength());
|
||||||
|
setFormat(0, commentLength, m_multiLineCommentFormat);
|
||||||
|
|
||||||
|
// Nach weiteren Kommentaren in der gleichen Zeile suchen
|
||||||
|
QRegularExpressionMatch nextStart =
|
||||||
|
m_commentStartExpression.match(text, commentLength);
|
||||||
|
startIndex = nextStart.hasMatch()
|
||||||
|
? static_cast<int>(nextStart.capturedStart())
|
||||||
|
: -1;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Noch kein Ende — gesamte Zeile ist Kommentar
|
||||||
|
setFormat(0, text.length(), m_multiLineCommentFormat);
|
||||||
|
setCurrentBlockState(1);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Neuen Kommentaranfang suchen
|
||||||
QRegularExpressionMatch m = m_commentStartExpression.match(text);
|
QRegularExpressionMatch m = m_commentStartExpression.match(text);
|
||||||
startIndex = m.hasMatch() ? static_cast<int>(m.capturedStart()) : -1;
|
startIndex = m.hasMatch() ? static_cast<int>(m.capturedStart()) : -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
while (startIndex >= 0)
|
while (startIndex >= 0)
|
||||||
{
|
{
|
||||||
QRegularExpressionMatch endMatch = m_commentEndExpression.match(text, startIndex);
|
QRegularExpressionMatch endMatch =
|
||||||
|
m_commentEndExpression.match(text, startIndex);
|
||||||
|
|
||||||
int commentLength = 0;
|
int commentLength = 0;
|
||||||
|
|
||||||
if (endMatch.hasMatch())
|
if (endMatch.hasMatch())
|
||||||
@@ -52,6 +97,7 @@ void SyntaxHighlighter::highlightBlock(const QString &text)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
// Kommentar geht über Zeilenende
|
||||||
setCurrentBlockState(1);
|
setCurrentBlockState(1);
|
||||||
commentLength = text.length() - startIndex;
|
commentLength = text.length() - startIndex;
|
||||||
}
|
}
|
||||||
@@ -63,6 +109,7 @@ void SyntaxHighlighter::highlightBlock(const QString &text)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Nach weiteren Kommentaren in dieser Zeile suchen
|
||||||
QRegularExpressionMatch nextStart =
|
QRegularExpressionMatch nextStart =
|
||||||
m_commentStartExpression.match(text, startIndex + commentLength);
|
m_commentStartExpression.match(text, startIndex + commentLength);
|
||||||
startIndex = nextStart.hasMatch()
|
startIndex = nextStart.hasMatch()
|
||||||
@@ -374,14 +421,22 @@ void PhpHighlighter::highlightPhpRange(const QString &text, int start, int lengt
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// /* */ Block-Kommentare innerhalb des PHP-Bereichs mehrzeilig behandeln.
|
|
||||||
// Block-Zustand 3 = wir sind mitten in einem /* ... */ PHP-Kommentar.
|
|
||||||
static const QRegularExpression blockOpen(R"(/\*)");
|
static const QRegularExpression blockOpen(R"(/\*)");
|
||||||
static const QRegularExpression blockClose(R"(\*/)");
|
static const QRegularExpression blockClose(R"(\*/)");
|
||||||
|
|
||||||
int searchFrom = 0;
|
int searchFrom = 0;
|
||||||
|
|
||||||
// Waren wir bereits in einem Block-Kommentar?
|
// Leere Zeile mitten im PHP-Blockkommentar — Zustand weitertragen
|
||||||
|
if (phpText.trimmed().isEmpty())
|
||||||
|
{
|
||||||
|
if (previousBlockState() == 3)
|
||||||
|
{
|
||||||
|
setFormat(start, length, m_phpCommentFormat);
|
||||||
|
setCurrentBlockState(3);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (previousBlockState() == 3)
|
if (previousBlockState() == 3)
|
||||||
{
|
{
|
||||||
QRegularExpressionMatch closeMatch = blockClose.match(phpText, 0);
|
QRegularExpressionMatch closeMatch = blockClose.match(phpText, 0);
|
||||||
@@ -391,18 +446,15 @@ void PhpHighlighter::highlightPhpRange(const QString &text, int start, int lengt
|
|||||||
+ static_cast<int>(closeMatch.capturedLength());
|
+ static_cast<int>(closeMatch.capturedLength());
|
||||||
setFormat(start, end, m_phpCommentFormat);
|
setFormat(start, end, m_phpCommentFormat);
|
||||||
searchFrom = end;
|
searchFrom = end;
|
||||||
// Block-Kommentar geschlossen — Zustand wird weiter unten gesetzt
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Gesamter Bereich ist noch Kommentar
|
|
||||||
setFormat(start, length, m_phpCommentFormat);
|
setFormat(start, length, m_phpCommentFormat);
|
||||||
setCurrentBlockState(3);
|
setCurrentBlockState(3);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Neue /* ... */ Kommentare innerhalb dieses PHP-Bereichs suchen
|
|
||||||
while (searchFrom < phpText.length())
|
while (searchFrom < phpText.length())
|
||||||
{
|
{
|
||||||
QRegularExpressionMatch openMatch = blockOpen.match(phpText, searchFrom);
|
QRegularExpressionMatch openMatch = blockOpen.match(phpText, searchFrom);
|
||||||
@@ -423,7 +475,6 @@ void PhpHighlighter::highlightPhpRange(const QString &text, int start, int lengt
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Kein schließendes */ gefunden — geht über Zeilenende
|
|
||||||
setFormat(start + openPos, length - openPos, m_phpCommentFormat);
|
setFormat(start + openPos, length - openPos, m_phpCommentFormat);
|
||||||
setCurrentBlockState(3);
|
setCurrentBlockState(3);
|
||||||
return;
|
return;
|
||||||
@@ -434,13 +485,39 @@ void PhpHighlighter::highlightPhpRange(const QString &text, int start, int lengt
|
|||||||
void PhpHighlighter::highlightBlock(const QString &text)
|
void PhpHighlighter::highlightBlock(const QString &text)
|
||||||
{
|
{
|
||||||
// Zuerst HTML-Basis-Regeln auf den gesamten Text anwenden
|
// Zuerst HTML-Basis-Regeln auf den gesamten Text anwenden
|
||||||
|
// (setzt auch den State für HTML <!-- --> Kommentare)
|
||||||
SyntaxHighlighter::highlightBlock(text);
|
SyntaxHighlighter::highlightBlock(text);
|
||||||
|
|
||||||
// Block-Zustände:
|
// Block-Zustände:
|
||||||
// 0 = HTML-Modus
|
// 0 = HTML-Modus
|
||||||
|
// 1 = HTML <!-- --> Kommentar (von Basisklasse verwaltet)
|
||||||
// 2 = innerhalb PHP-Block (kein /* */ Kommentar)
|
// 2 = innerhalb PHP-Block (kein /* */ Kommentar)
|
||||||
// 3 = innerhalb PHP /* */ Block-Kommentar
|
// 3 = innerhalb PHP /* */ Block-Kommentar
|
||||||
setCurrentBlockState(0);
|
|
||||||
|
// State 1 (HTML-Kommentar) wurde von der Basisklasse gesetzt — nicht überschreiben
|
||||||
|
if (currentBlockState() == 1)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Wenn der vorherige Block ein HTML-Kommentar war und dieser noch nicht
|
||||||
|
// abgeschlossen wurde, hat die Basisklasse das bereits korrekt behandelt.
|
||||||
|
// Wir setzen nur dann auf 0 zurück wenn wir sicher nicht in HTML-Kommentar sind.
|
||||||
|
if (previousBlockState() != 1)
|
||||||
|
{
|
||||||
|
setCurrentBlockState(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Leere Zeile — Zustand weitertragen
|
||||||
|
if (text.isEmpty())
|
||||||
|
{
|
||||||
|
const int prev = previousBlockState();
|
||||||
|
if (prev == 2 || prev == 3)
|
||||||
|
{
|
||||||
|
setCurrentBlockState(prev);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
static const QRegularExpression phpOpen(R"(<\?(?:php|=)?\s?)",
|
static const QRegularExpression phpOpen(R"(<\?(?:php|=)?\s?)",
|
||||||
QRegularExpression::CaseInsensitiveOption);
|
QRegularExpression::CaseInsensitiveOption);
|
||||||
@@ -466,8 +543,6 @@ void PhpHighlighter::highlightBlock(const QString &text)
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
highlightPhpRange(text, 0, text.length());
|
highlightPhpRange(text, 0, text.length());
|
||||||
// highlightPhpRange setzt den Zustand auf 3 falls nötig,
|
|
||||||
// sonst behalten wir 2 (offener PHP-Block ohne Kommentar)
|
|
||||||
if (currentBlockState() != 3)
|
if (currentBlockState() != 3)
|
||||||
{
|
{
|
||||||
setCurrentBlockState(2);
|
setCurrentBlockState(2);
|
||||||
|
|||||||