Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,21 @@ BreakConstructorInitializers: BeforeComma
BreakInheritanceList: BeforeComma
ColumnLimit: 150
IndentCaseLabels: false
SortIncludes: false
SortIncludes: CaseInsensitive
IncludeBlocks: Regroup
IncludeCategories:
- Regex: '^["](commands|generated/).*'
Priority: 1
- Regex: '^["](lute)/.*'
Priority: 2
- Regex: '^["](Luau)/.*'
Priority: 3
- Regex: '^["](lua).*'
Priority: 4
- Regex: '^["](openssl/|sodium/|uv|curl/|zlib).*'
Priority: 5
- Regex: '^<[^/]*>'
Priority: 6
IndentWidth: 4
TabWidth: 4
ObjCBlockIndentWidth: 4
Expand Down
1 change: 1 addition & 0 deletions lute/cli/include/lute/staticrequires.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ class StaticRequireTracer
}

void printRequireGraph() const;

private:
Luau::DenseHashSet<std::string> visited{""};
std::vector<std::string> discovered;
Expand Down
2 changes: 1 addition & 1 deletion lute/cli/include/lute/tc.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#include "Luau/FileResolver.h"
#include "Luau/Frontend.h"
#include "Luau/FileUtils.h"
#include "Luau/Frontend.h"

int typecheck(const std::vector<std::string>& sourceFiles);
20 changes: 10 additions & 10 deletions lute/cli/src/climain.cpp
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
#include "lute/climain.h"

#include "Luau/Common.h"
#include "Luau/CodeGen.h"
#include "Luau/Compiler.h"
#include "Luau/DenseHash.h"
#include "Luau/FileUtils.h"
#include "Luau/Require.h"

#include "lua.h"
#include "lualib.h"

#include "lute/bundlevfs.h"
#include "lute/clicommands.h"
#include "lute/clivfs.h"
Expand All @@ -33,6 +23,16 @@
#include "lute/version.h"
#include "lute/vm.h"

#include "Luau/CodeGen.h"
#include "Luau/Common.h"
#include "Luau/Compiler.h"
#include "Luau/DenseHash.h"
#include "Luau/FileUtils.h"
#include "Luau/Require.h"

#include "lua.h"
#include "lualib.h"

#include "uv.h"

#ifdef _WIN32
Expand Down
5 changes: 3 additions & 2 deletions lute/cli/src/staticrequires.cpp
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#include "lute/modulepath.h"
#include "lute/staticrequires.h"

#include "lute/modulepath.h"

#include "Luau/Ast.h"
#include "Luau/Parser.h"
#include "Luau/FileUtils.h"
#include "Luau/Parser.h"
#include "Luau/VecDeque.h"

#include <cstdio>
Expand Down
3 changes: 2 additions & 1 deletion lute/crypto/src/crypto.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#include "lute/crypto.h"
#include "lua.h"

#include "lua.h"
#include "lualib.h"

#include "openssl/digest.h"
#include "sodium/crypto_pwhash.h"

Expand Down
14 changes: 8 additions & 6 deletions lute/fs/src/fs.cpp
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
#include "lute/fs.h"

#include "lua.h"
#include "lualib.h"
#include "uv.h"

#include "lute/runtime.h"
#include "lute/time.h"
#include "lute/userdatas.h"

#include "lua.h"
#include "lualib.h"

#include "uv.h"

#include <cstdio>
#include <cstring>
#ifdef _WIN32
Expand All @@ -20,9 +21,10 @@
#include <map>
#include <memory>
#include <optional>
#include <sys/stat.h>
#include <string>
#include <stdlib.h>
#include <string>

#include <sys/stat.h>


#if !defined(S_ISREG) && defined(S_IFMT) && defined(S_IFREG)
Expand Down
9 changes: 6 additions & 3 deletions lute/io/src/io.cpp
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
#include "lute/io.h"
#include "Luau/Variant.h"

#include "lute/runtime.h"

#include "uv.h"
#include <memory>
#include "Luau/Variant.h"

#include "lua.h"
#include "lualib.h"

#include "uv.h"

#include <memory>


namespace io
{
Expand Down
2 changes: 1 addition & 1 deletion lute/luau/src/configresolver.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "lute/configresolver.h"

#include "Luau/LuauConfig.h"
#include "Luau/FileUtils.h"
#include "Luau/LuauConfig.h"
#include "Luau/StringUtils.h"

namespace Luau
Expand Down
13 changes: 6 additions & 7 deletions lute/luau/src/luau.cpp
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
#include "lute/luau.h"

#include "lute/userdatas.h"

#include "Luau/Ast.h"
#include "Luau/Compiler.h"
#include "Luau/Location.h"
#include "Luau/ParseResult.h"
#include "Luau/Parser.h"
#include "Luau/NotNull.h"
#include "Luau/ParseOptions.h"
#include "Luau/Parser.h"
#include "Luau/ParseResult.h"
#include "Luau/ToString.h"
#include "Luau/Compiler.h"
#include "Luau/NotNull.h"

#include "lute/userdatas.h"


#include "lua.h"
#include "lualib.h"
Expand Down
4 changes: 2 additions & 2 deletions lute/luau/src/moduleresolver.cpp
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#include "lute/moduleresolver.h"

#include "lute/resolverequire.h"

#include "Luau/Ast.h"
#include "Luau/FileUtils.h"

#include "lute/resolverequire.h"

namespace Luau
{

Expand Down
6 changes: 3 additions & 3 deletions lute/luau/src/resolverequire.cpp
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#include "lute/resolverequire.h"

#include "Luau/Common.h"
#include "Luau/RequireNavigator.h"

#include "lute/filevfs.h"
#include "lute/modulepath.h"

#include "Luau/Common.h"
#include "Luau/RequireNavigator.h"

#include "lua.h"
#include "lualib.h"

Expand Down
8 changes: 5 additions & 3 deletions lute/net/src/net.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@

#include "lute/runtime.h"

#include "curl/curl.h"
#include "App.h"
#include "Loop.h"
#include "Luau/DenseHash.h"
#include "Luau/Variant.h"

#include "lua.h"
#include "lualib.h"

#include "curl/curl.h"
#include "uv.h"

#include <memory>
Expand All @@ -18,6 +17,9 @@
#include <utility>
#include <vector>

#include "App.h"
#include "Loop.h"

namespace net
{

Expand Down
4 changes: 2 additions & 2 deletions lute/process/src/process.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "lute/process.h"

#include "lute/runtime.h"
#include "lute/uvutils.h"

Expand All @@ -9,14 +10,13 @@

#include "uv.h"

#include <climits> // IWYU pragma: keep
#include <functional>
#include <map>
#include <memory>
#include <optional>
#include <string>
#include <vector>

#include <climits> // IWYU pragma: keep
#ifdef PATH_MAX
#define LUTE_PATH_MAX PATH_MAX
#else
Expand Down
9 changes: 5 additions & 4 deletions lute/require/src/require.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@
#include "lute/modulepath.h"
#include "lute/options.h"

#include "lua.h"
#include "lualib.h"

#include "Luau/Compiler.h"
#include "Luau/CodeGen.h"
#include "Luau/Compiler.h"
#include "Luau/Require.h"
#include "Luau/StringUtils.h"

#include "lua.h"
#include "lualib.h"

#include <string>

static luarequire_WriteResult write(std::optional<std::string> contents, char* buffer, size_t bufferSize, size_t* sizeOut)
Expand Down
4 changes: 2 additions & 2 deletions lute/require/src/requirevfs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
#include "lute/modulepath.h"
#include "lute/stdlibvfs.h"

#include "lualib.h"

#include "Luau/Common.h"

#include "lualib.h"

RequireVfs::RequireVfs(CliVfs cliVfs)
: cliVfs(std::move(cliVfs))
{
Expand Down
3 changes: 2 additions & 1 deletion lute/runtime/include/lute/runtime.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
#pragma once

#include "Luau/Variant.h"
#include "lute/ref.h"

#include "Luau/Variant.h"

#include <atomic>
#include <condition_variable>
#include <functional>
Expand Down
1 change: 1 addition & 0 deletions lute/runtime/src/ref.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "lute/ref.h"

#include "lute/runtime.h"

#include "lua.h"
Expand Down
2 changes: 1 addition & 1 deletion lute/runtime/src/runtime.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

#include "uv.h"

#include <string>
#include <assert.h>
#include <string>

static void lua_close_checked(lua_State* L)
{
Expand Down
1 change: 1 addition & 0 deletions lute/system/include/lute/system.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#include "lua.h"
#include "lualib.h"

#include <string>

// open the library as a standard global luau library
Expand Down
1 change: 1 addition & 0 deletions lute/system/src/system.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "lute/system.h"

#include "lute/uvutils.h"

#include "lua.h"
Expand Down
10 changes: 6 additions & 4 deletions lute/task/src/task.cpp
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
#include "lute/task.h"

#include "lua.h"
#include "lualib.h"
#include "lute/ref.h"
#include "lute/runtime.h"
#include "uv.h"
#include "lute/runtime.h"
#include "lute/time.h"

#include "lua.h"
#include "lualib.h"

#include "uv.h"

#include <cassert>
#include <functional>
#include <iterator>
Expand Down
2 changes: 2 additions & 0 deletions lute/time/include/lute/time.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

#include "lua.h"
#include "lualib.h"

#include "uv.h"

#include <string>

// open the library as a standard global luau library
Expand Down
7 changes: 5 additions & 2 deletions lute/time/src/time.cpp
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
#include "lute/time.h"

#include "lute/userdatas.h"

#include "lua.h"
#include "lualib.h"
#include "lute/userdatas.h"

#include "uv.h"

#include <assert.h>
#include <cmath>
#include <cstdint>
#include <iterator>
#include <assert.h>

const int64_t NANOSECONDS_PER_SECOND = 1000000000;
const int64_t MICROSECONDS_PER_SECOND = 1000000;
Expand Down
4 changes: 2 additions & 2 deletions lute/vm/include/lute/vm.h
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#pragma once

#include "lute/spawn.h"

#include "lua.h"
#include "lualib.h"

#include "lute/spawn.h"

// open the library as a standard global luau library
int luaopen_vm(lua_State* L);
// open the library as a table on top of the stack
Expand Down
Loading