In D125763#3518621, @thakis wrote:

Thanks!

Do you have commit access?

LGTM

• Organize build script with functions

@tstellar sparse checkout is implemented

• Sparse checkout only the directories needed

@nikic @tstellar The patch is no longer needed because of the changes to the minimal config suggested by @tstellar . I hope we can get it in now.

• Patch not needed with minimal config and LLVM_ROOT

• Remove no longer needed export

• Minimal config as suggested by @tstellar

@tstellar I'm trying your minimal config now on my build machine. I thought you wanted more details which is why I've taken the settings from Copr builds.

I found another problem with both regular expressions (pre mine and mine): They cannot find

Some thing that doesn't work at the moment is ordering an include like this:

@krasimir could you please test this patch on your side? I've reopened it and tested it with the following file that contains both // and /* ... */ trailing comments on include lines followed by foo<T> and alike. The includes use <...> and "..." notation to locate files.

Address trailing comments on include lines by ignoring slashes in
characters that lead up to the match groups.

In D121370#3471183, @krasimir wrote:

It appears that this regressed include sorting in the following case, where the contents of test.h show the expected include order and the clang-format behavior before this patch:

% cat test.h
#include <cstdint>

#include "util/bar.h"
#include "util/foo/foo.h"  // foo<T>
% bin/clang-format --version; bin/clang-format -style=google test.h
clang-format version 15.0.0 (https://github.com/llvm/llvm-project.git d46fa023caa2db5a9f1e21dd038bcb626261d958)
#include "util/foo/foo.h"  // foo<T>
#include <cstdint>

#include "util/bar.h"

@kwk could you please take a look

• Rebased on main and removing fuzz

• Remove comment on builder

• Added mail notifier for standalone-build-x86_64 builder

• typo: @include bar; -> @import bar;

In D121370#3456223, @owenpan wrote:

Should we handle #import and @import for Object-C only so as to simply the regex for C++?

• Make functions lowercase

• Make function static

• Use proposed reverse loop

• Added llvm:: namespace

• Put shared code for finding include names HeaderIncludes

@HazardyKnusperkeks I've addressed your comments and did an early return together with llvm_unreachable() which is used in the clang/lib/Format in other places as well. I hope this is to your liking. There's no longer an assert. Do you want that as well?

• Address review comment

@MyDeveloperDay can you please have another look now that the patch has additional tests and most comments that still apply have been addressed?

• Remove duplicate assert

• Remove left-over comment

@HazardyKnusperkeks thank you for the approval. Can you have one last view please? I've introduced a function to get the match instead of repeating the for loop two times.

• introduce getIncludeNameFromMatches
• Fix format

@HazardyKnusperkeks @owenpan can you please have a quick look again. All I did was rebasing my changes and in the meantime I was interrupted... This patch has been sitting for some time and I'd like to land it as soon one of you approves it.

Fixup my work after interruption by screaming children wanting dinner ;)

Fixup

Rebased

In D121972#3393048, @Ericson2314 wrote:

git archive --help says:

<path>
    Without an optional path parameter, all files and subdirectories of the
    current working directory are included in the archive. If one or more paths
    are specified, only these are included.

so perhaps we should consider just doing something like that? if a two directory tarbomb is no good, we can add another layer of nesting?

I've tested this patch and it works for me:

• Fix tests

In D121370#3387175, @HazardyKnusperkeks wrote:

In D121370#3383574, @HazardyKnusperkeks wrote:

Some test with a main header and blocks would be nice.

This one please. :)

• Fix: int -> bool

• Address review comments on grouping and main headers

In D121972#3391268, @tstellar wrote:

Would it be easier just to package the cmake directory in a separate tarball?

Addressed review comments.

• Use std::numeric_limits<int>::max() instead of INT_MAX

• Fix formatting

Changed the strategy of how includes are sorted by increasing the priority if an include is of the "new" type: @import Foundation;. This will sort these includes after everything else just as requested in https://github.com/llvm/llvm-project/issues/38995.

A test if failing. Need to address this first.

Thank you for your comments! I've addressed many of them and now address the rest.

• Make @ or # not optional again
• Remove [\t\n\ \\]*
• Properly concat string

In D120884#3356746, @HazardyKnusperkeks wrote:

Please use the clang-format tag.