@@ -81,11 +81,11 @@ static llvm::cl::list<std::string> UserStylesheets(
81
81
llvm::cl::desc (" CSS stylesheets to extend the default styles." ),
82
82
llvm::cl::cat(ClangDocCategory));
83
83
84
- static llvm::cl::opt<std::string>
85
- UserAssetPath ( " asset" ,
86
- llvm::cl::desc (" User supplied asset path to "
87
- " override the default css and js files for html output" ),
88
- llvm::cl::cat(ClangDocCategory));
84
+ static llvm::cl::opt<std::string> UserAssetPath (
85
+ " asset" ,
86
+ llvm::cl::desc (" User supplied asset path to "
87
+ " override the default css and js files for html output" ),
88
+ llvm::cl::cat(ClangDocCategory));
89
89
90
90
static llvm::cl::opt<std::string> SourceRoot (" source-root" , llvm::cl::desc(R"(
91
91
Directory where processed files are stored.
@@ -144,7 +144,7 @@ llvm::Error GetAssetFiles(clang::doc::ClangDocContext &CDCtx) {
144
144
!Code && DirIt != DirEnd; DirIt.increment (Code)) {
145
145
llvm::SmallString<128 > FilePath = llvm::SmallString<128 >(DirIt->path ());
146
146
if (!Code) {
147
- return llvm::createFileError (FilePath, Code);
147
+ return llvm::createFileError (FilePath, Code);
148
148
}
149
149
if (llvm::sys::fs::is_regular_file (FilePath)) {
150
150
if (llvm::sys::path::extension (FilePath) == " .css" ) {
@@ -158,7 +158,7 @@ llvm::Error GetAssetFiles(clang::doc::ClangDocContext &CDCtx) {
158
158
}
159
159
160
160
llvm::Error GetDefaultAssetFiles (const char *Argv0,
161
- clang::doc::ClangDocContext &CDCtx) {
161
+ clang::doc::ClangDocContext &CDCtx) {
162
162
void *MainAddr = (void *)(intptr_t )GetExecutablePath;
163
163
std::string ClangDocPath = GetExecutablePath (Argv0, MainAddr);
164
164
llvm::SmallString<128 > NativeClangDocPath;
@@ -177,32 +177,37 @@ llvm::Error GetDefaultAssetFiles(const char *Argv0,
177
177
178
178
if (!llvm::sys::fs::is_regular_file (IndexJS)) {
179
179
return llvm::createStringError (llvm::inconvertibleErrorCode (),
180
- " error default index.js file at " + IndexJS + " \n " );
180
+ " error default index.js file at " + IndexJS +
181
+ " \n " );
181
182
}
182
183
183
184
if (!llvm::sys::fs::is_regular_file (DefaultStylesheet)) {
184
- return llvm::createStringError (llvm::inconvertibleErrorCode (),
185
- " error default clang-doc-default-stylesheet.css file at " + DefaultStylesheet + " \n " );
185
+ return llvm::createStringError (
186
+ llvm::inconvertibleErrorCode (),
187
+ " error default clang-doc-default-stylesheet.css file at " +
188
+ DefaultStylesheet + " \n " );
186
189
}
187
190
188
191
CDCtx.UserStylesheets .insert (CDCtx.UserStylesheets .begin (),
189
192
std::string (DefaultStylesheet));
190
193
CDCtx.FilesToCopy .emplace_back (IndexJS.str ());
191
194
192
- llvm::outs () << " Using default asset: "
193
- << AssetsPath << " \n " ;
195
+ llvm::outs () << " Using default asset: " << AssetsPath << " \n " ;
194
196
195
197
return llvm::Error::success ();
196
198
}
197
199
198
- llvm::Error GetHTMLAssetFiles (const char *Argv0, clang::doc::ClangDocContext &CDCtx) {
199
- if (!UserAssetPath.empty () && !llvm::sys::fs::is_directory (std::string (UserAssetPath))) {
200
- llvm::outs () << " Asset path supply is not a directory: " << UserAssetPath << " falling back to default\n " ;
201
- }
202
- if (llvm::sys::fs::is_directory (std::string (UserAssetPath))) {
203
- return GetAssetFiles (CDCtx);
204
- }
205
- return GetDefaultAssetFiles (Argv0, CDCtx);
200
+ llvm::Error GetHTMLAssetFiles (const char *Argv0,
201
+ clang::doc::ClangDocContext &CDCtx) {
202
+ if (!UserAssetPath.empty () &&
203
+ !llvm::sys::fs::is_directory (std::string (UserAssetPath))) {
204
+ llvm::outs () << " Asset path supply is not a directory: " << UserAssetPath
205
+ << " falling back to default\n " ;
206
+ }
207
+ if (llvm::sys::fs::is_directory (std::string (UserAssetPath))) {
208
+ return GetAssetFiles (CDCtx);
209
+ }
210
+ return GetDefaultAssetFiles (Argv0, CDCtx);
206
211
}
207
212
208
213
int main (int argc, const char **argv) {
@@ -256,11 +261,11 @@ Example usage for a project using a compile commands database:
256
261
{" index.js" , " index_json.js" }};
257
262
258
263
if (Format == " html" ) {
259
- auto Err = GetHTMLAssetFiles (argv[0 ], CDCtx);
260
- if (Err) {
261
- llvm::errs () << toString (std::move (Err)) << " \n " ;
262
- return 1 ;
263
- }
264
+ auto Err = GetHTMLAssetFiles (argv[0 ], CDCtx);
265
+ if (Err) {
266
+ llvm::errs () << toString (std::move (Err)) << " \n " ;
267
+ return 1 ;
268
+ }
264
269
}
265
270
266
271
// Mapping phase
0 commit comments