commit ccls for openSUSE:Factory
Hello community, here is the log from the commit of package ccls for openSUSE:Factory checked in at 2019-11-01 15:14:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ccls (Old) and /work/SRC/openSUSE:Factory/.ccls.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ccls" Fri Nov 1 15:14:09 2019 rev:7 rq:744704 version:0.20190823.4 Changes: -------- --- /work/SRC/openSUSE:Factory/ccls/ccls.changes 2019-10-02 11:57:44.711208611 +0200 +++ /work/SRC/openSUSE:Factory/.ccls.new.2990/ccls.changes 2019-11-01 15:14:10.592758069 +0100 @@ -1,0 +2,9 @@ +Tue Oct 29 08:53:30 UTC 2019 - Dan Čermák <dcermak@suse.com> + +- Update to release 0.20190823.4 + + Add 0001-Fix-builds-for-LLVM-9-for-LLVM-build-without-BUILD_S.patch + (fixes builds with LLVM 9 that was build without the unsuported flag + BUILD_SHARED_LIBS=ON, see boo#1155416) + +------------------------------------------------------------------- Old: ---- ccls-0.20190823.3.tar.gz New: ---- 0001-Fix-builds-for-LLVM-9-for-LLVM-build-without-BUILD_S.patch ccls-0.20190823.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ccls.spec ++++++ --- /var/tmp/diff_new_pack.yQU7VE/_old 2019-11-01 15:14:11.136758778 +0100 +++ /var/tmp/diff_new_pack.yQU7VE/_new 2019-11-01 15:14:11.140758783 +0100 @@ -17,7 +17,7 @@ Name: ccls -Version: 0.20190823.3 +Version: 0.20190823.4 Release: 0 Summary: C/C++/ObjC language server # main package is Apache 2.0 @@ -27,6 +27,9 @@ URL: https://github.com/MaskRay/ccls Source0: %{URL}/archive/%{version}/%{name}-%{version}.tar.gz +# FIXME: drop this patch on the next release after +# https://github.com/MaskRay/ccls/pull/518 gets merged +Patch0: 0001-Fix-builds-for-LLVM-9-for-LLVM-build-without-BUILD_S.patch BuildRequires: clang-devel >= 7.0 BuildRequires: cmake >= 3.8 @@ -71,7 +74,7 @@ # ccls currently consumes ~1GB of memory during compilation per thread %limit_build -m 1500 -make %{?_smp_mflags} +%make_build popd %install ++++++ 0001-Fix-builds-for-LLVM-9-for-LLVM-build-without-BUILD_S.patch ++++++
From 97c5d6c7ad23122495943021423f034ef5c461f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com> Date: Fri, 1 Nov 2019 10:02:57 +0100 Subject: [PATCH] Fix builds for LLVM 9 (for LLVM build without BUILD_SHARED_LIBS=ON)
LLVM 9 officially ships the C++ libraries as a single library libclang-cpp.so. This makes ccls fail to link as the individual libraries libclangIndex, libclangFormat, etc. are no longer present. We instead try to find the clang-cpp library and if it is found we link against it instead of the individual libraries. If it is not found, then we proceed as previously. --- CMakeLists.txt | 43 +++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 278e0735..919b2460 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,22 +69,33 @@ endif() ### Libraries find_package(Clang REQUIRED) - -target_link_libraries(ccls PRIVATE - clangIndex - clangFormat - clangTooling - clangToolingInclusions - clangToolingCore - clangFrontend - clangParse - clangSerialization - clangSema - clangAST - clangLex - clangDriver - clangBasic -) +# LLVM >= 9 ships the C++ libraries by default in a single library libclang-cpp, +# but this is not universally enabled on all distributions. +# Try to find libclang-cpp and if we find it, link against it, otherwise link +# against the individual clang libraries. +find_library(LIBCLANG_CPP clang-cpp) + +if(LIBCLANG_CPP STREQUAL LIBCLANG_CPP-NOTFOUND) + target_link_libraries(ccls PRIVATE + clangIndex + clangFormat + clangTooling + clangToolingInclusions + clangToolingCore + clangFrontend + clangParse + clangSerialization + clangSema + clangAST + clangLex + clangDriver + clangBasic + ) +else() + target_link_libraries(ccls PRIVATE + "${LIBCLANG_CPP}" + ) +endif() if(LLVM_LINK_LLVM_DYLIB) target_link_libraries(ccls PRIVATE LLVM) -- 2.23.0 ++++++ ccls-0.20190823.3.tar.gz -> ccls-0.20190823.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/README.md new/ccls-0.20190823.4/README.md --- old/ccls-0.20190823.3/README.md 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/README.md 2019-10-25 03:37:55.000000000 +0200 @@ -11,7 +11,7 @@ * formatting * hierarchies: [call (caller/callee) hierarchy](src/messages/ccls_call.cc), [inheritance (base/derived) hierarchy](src/messages/ccls_inheritance.cc), [member hierarchy](src/messages/ccls_member.cc) * [symbol rename](src/messages/textDocument_rename.cc) - * [document symbols](src/messages/textDocument_documentSymbol.cc) and approximate search of [workspace symbol](src/messages/workspace_symbol.cc) + * [document symbols](src/messages/textDocument_document.cc) and approximate search of [workspace symbol](src/messages/workspace_symbol.cc) * [hover information](src/messages/textDocument_hover.cc) * diagnostics and code actions (clang FixIts) * semantic highlighting and preprocessor skipped regions @@ -21,26 +21,9 @@ It starts indexing the whole project (including subprojects if exist) parallelly when you open the first file, while the main thread can serve requests before the indexing is complete. Saving files will incrementally update the index. -Compared with cquery, it makes use of C++17 features, has less third-party dependencies and slimmed-down code base. -It leverages Clang C++ API as [clangd](https://clang.llvm.org/extra/clangd.html) does, which provides better support for code completion and diagnostics. -Refactoring is a non-goal as it can be provided by clang-include-fixer and other Clang based tools. - -The comparison with cquery as noted on 2018-07-15: - -| | cquery | ccls | -|------------ |--------------------------------|------------------------------| -| third_party | more | fewer | -| C++ | C++14 | C++17 | -| clang API | libclang (C) | clang/llvm C++ | -| Filesystem | AbsolutePath + custom routines | llvm/Support | -| index | libclang | clangIndex, some enhancement | -| pipeline | index merge+id remapping | simpler and more robust | - -cquery has system include path detection (through running the compiler driver) while ccls uses clangDriver. - # >>> [Getting started](../../wiki/Home) (CLICK HERE) <<< * [Build](../../wiki/Build) * [FAQ](../../wiki/FAQ) -ccls can index itself (~180MiB RSS when idle, noted on 2018-09-01), FreeBSD, glibc, Linux, LLVM (~1800MiB RSS), musl (~60MiB RSS), ... with decent memory footprint. See [wiki/compile_commands.json](../../wiki/compile_commands.json) for examples. +ccls can index itself (~180MiB RSS when idle, noted on 2018-09-01), FreeBSD, glibc, Linux, LLVM (~1800MiB RSS), musl (~60MiB RSS), ... with decent memory footprint. See [wiki/Project-Setup](../../wiki/Project-Setup) for examples. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/clang_tu.cc new/ccls-0.20190823.4/src/clang_tu.cc --- old/ccls-0.20190823.3/src/clang_tu.cc 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/clang_tu.cc 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #include "clang_tu.hh" @@ -36,8 +24,8 @@ static Pos decomposed2LineAndCol(const SourceManager &sm, std::pair<FileID, unsigned> i) { - int l = sm.getLineNumber(i.first, i.second) - 1, - c = sm.getColumnNumber(i.first, i.second) - 1; + int l = (int)sm.getLineNumber(i.first, i.second) - 1, + c = (int)sm.getColumnNumber(i.first, i.second) - 1; bool invalid = false; StringRef buf = sm.getBufferData(i.first, &invalid); if (!invalid) { @@ -114,7 +102,6 @@ case BuiltinType::Bool: return "bool"; case BuiltinType::Char_S: - return "char"; case BuiltinType::Char_U: return "char"; case BuiltinType::SChar: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/clang_tu.hh new/ccls-0.20190823.4/src/clang_tu.hh --- old/ccls-0.20190823.3/src/clang_tu.hh 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/clang_tu.hh 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/config.cc new/ccls-0.20190823.4/src/config.cc --- old/ccls-0.20190823.3/src/config.cc 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/config.cc 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #include "config.hh" @@ -20,11 +8,11 @@ void doPathMapping(std::string &arg) { for (const std::string &mapping : g_config->clang.pathMappings) { - auto colon = mapping.find('>'); - if (colon != std::string::npos) { - auto p = arg.find(mapping.substr(0, colon)); + auto sep = mapping.find('>'); + if (sep != std::string::npos) { + auto p = arg.find(mapping.substr(0, sep)); if (p != std::string::npos) - arg.replace(p, colon, mapping.substr(colon + 1)); + arg.replace(p, sep, mapping.substr(sep + 1)); } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/config.hh new/ccls-0.20190823.4/src/config.hh --- old/ccls-0.20190823.3/src/config.hh 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/config.hh 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/filesystem.cc new/ccls-0.20190823.4/src/filesystem.cc --- old/ccls-0.20190823.3/src/filesystem.cc 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/filesystem.cc 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #include "filesystem.hh" using namespace llvm; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/filesystem.hh new/ccls-0.20190823.4/src/filesystem.hh --- old/ccls-0.20190823.3/src/filesystem.hh 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/filesystem.hh 2019-10-25 03:37:55.000000000 +0200 @@ -1,3 +1,6 @@ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include <llvm/Support/FileSystem.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/fuzzy_match.cc new/ccls-0.20190823.4/src/fuzzy_match.cc --- old/ccls-0.20190823.3/src/fuzzy_match.cc 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/fuzzy_match.cc 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #include "fuzzy_match.hh" @@ -101,7 +89,7 @@ for (size_t i = 0; i < pattern.size(); i++) if (pattern[i] != ' ') { pat += pattern[i]; - low_pat[n] = ::tolower(pattern[i]); + low_pat[n] = (char)::tolower(pattern[i]); pat_role[n] = pat_role[i]; n++; } @@ -115,7 +103,7 @@ return kMinScore + 1; this->text = text; for (int i = 0; i < n; i++) - low_text[i] = ::tolower(text[i]); + low_text[i] = (char)::tolower(text[i]); calculateRoles(text, text_role, &text_set); if (strict && n && !!pat_role[0] != !!text_role[0]) return kMinScore; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/fuzzy_match.hh new/ccls-0.20190823.4/src/fuzzy_match.hh --- old/ccls-0.20190823.3/src/fuzzy_match.hh 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/fuzzy_match.hh 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/hierarchy.hh new/ccls-0.20190823.4/src/hierarchy.hh --- old/ccls-0.20190823.3/src/hierarchy.hh 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/hierarchy.hh 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/include_complete.cc new/ccls-0.20190823.4/src/include_complete.cc --- old/ccls-0.20190823.3/src/include_complete.cc 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/include_complete.cc 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #include "include_complete.hh" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/include_complete.hh new/ccls-0.20190823.4/src/include_complete.hh --- old/ccls-0.20190823.3/src/include_complete.hh 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/include_complete.hh 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/indexer.cc new/ccls-0.20190823.4/src/indexer.cc --- old/ccls-0.20190823.3/src/indexer.cc 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/indexer.cc 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #include "indexer.hh" @@ -461,9 +449,7 @@ } while (ret.size() && isspace(ret.back())) ret.pop_back(); - if (StringRef(ret).endswith("*/")) - ret.resize(ret.size() - 2); - else if (StringRef(ret).endswith("\n/")) + if (StringRef(ret).endswith("*/") || StringRef(ret).endswith("\n/")) ret.resize(ret.size() - 2); while (ret.size() && isspace(ret.back())) ret.pop_back(); @@ -786,6 +772,7 @@ SourceRange sr = origD->getSourceRange(); entity->def.spell = {use, fromTokenRangeDefaulted(sm, lang, sr, fid, loc)}; + entity->def.parent_kind = SymbolKind::File; getKind(cast<Decl>(sem_dc), entity->def.parent_kind); } else if (is_decl) { SourceRange sr = origD->getSourceRange(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/indexer.hh new/ccls-0.20190823.4/src/indexer.hh --- old/ccls-0.20190823.3/src/indexer.hh 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/indexer.hh 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/log.cc new/ccls-0.20190823.4/src/log.cc --- old/ccls-0.20190823.3/src/log.cc 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/log.cc 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #include "log.hh" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/log.hh new/ccls-0.20190823.4/src/log.hh --- old/ccls-0.20190823.3/src/log.hh 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/log.hh 2019-10-25 03:37:55.000000000 +0200 @@ -1,3 +1,6 @@ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include <sstream> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/lsp.cc new/ccls-0.20190823.4/src/lsp.cc --- old/ccls-0.20190823.3/src/lsp.cc 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/lsp.cc 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #include "lsp.hh" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/lsp.hh new/ccls-0.20190823.4/src/lsp.hh --- old/ccls-0.20190823.3/src/lsp.hh 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/lsp.hh 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/main.cc new/ccls-0.20190823.4/src/main.cc --- old/ccls-0.20190823.3/src/main.cc 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/main.cc 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #include "log.hh" #include "pipeline.hh" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/message_handler.cc new/ccls-0.20190823.4/src/message_handler.cc --- old/ccls-0.20190823.3/src/message_handler.cc 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/message_handler.cc 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #include "message_handler.hh" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/messages/ccls_call.cc new/ccls-0.20190823.4/src/messages/ccls_call.cc --- old/ccls-0.20190823.3/src/messages/ccls_call.cc 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/messages/ccls_call.cc 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #include "hierarchy.hh" #include "message_handler.hh" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/messages/ccls_inheritance.cc new/ccls-0.20190823.4/src/messages/ccls_inheritance.cc --- old/ccls-0.20190823.3/src/messages/ccls_inheritance.cc 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/messages/ccls_inheritance.cc 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #include "hierarchy.hh" #include "message_handler.hh" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/messages/ccls_member.cc new/ccls-0.20190823.4/src/messages/ccls_member.cc --- old/ccls-0.20190823.3/src/messages/ccls_member.cc 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/messages/ccls_member.cc 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #include "clang_tu.hh" #include "hierarchy.hh" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/messages/ccls_reload.cc new/ccls-0.20190823.4/src/messages/ccls_reload.cc --- old/ccls-0.20190823.3/src/messages/ccls_reload.cc 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/messages/ccls_reload.cc 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #include "message_handler.hh" #include "pipeline.hh" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/messages/ccls_vars.cc new/ccls-0.20190823.4/src/messages/ccls_vars.cc --- old/ccls-0.20190823.3/src/messages/ccls_vars.cc 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/messages/ccls_vars.cc 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #include "message_handler.hh" #include "pipeline.hh" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/messages/initialize.cc new/ccls-0.20190823.4/src/messages/initialize.cc --- old/ccls-0.20190823.3/src/messages/initialize.cc 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/messages/initialize.cc 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #include "filesystem.hh" #include "include_complete.hh" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/messages/textDocument_completion.cc new/ccls-0.20190823.4/src/messages/textDocument_completion.cc --- old/ccls-0.20190823.3/src/messages/textDocument_completion.cc 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/messages/textDocument_completion.cc 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #include "fuzzy_match.hh" #include "include_complete.hh" @@ -504,11 +492,11 @@ if (param.position.line >= 0 && param.position.line < wf->buffer_lines.size()) buffer_line = wf->buffer_lines[param.position.line]; - clang::CodeCompleteOptions cCOpts; - cCOpts.IncludeBriefComments = true; - cCOpts.IncludeCodePatterns = StringRef(buffer_line).ltrim().startswith("#"); - cCOpts.IncludeFixIts = true; - cCOpts.IncludeMacros = true; + clang::CodeCompleteOptions ccOpts; + ccOpts.IncludeBriefComments = true; + ccOpts.IncludeCodePatterns = StringRef(buffer_line).ltrim().startswith("#"); + ccOpts.IncludeFixIts = true; + ccOpts.IncludeMacros = true; if (param.context.triggerKind == CompletionTriggerKind::TriggerCharacter && param.context.triggerCharacter) { @@ -518,7 +506,7 @@ case '"': case '/': case '<': - ok = cCOpts.IncludeCodePatterns; // start with # + ok = ccOpts.IncludeCodePatterns; // start with # break; case ':': ok = col >= 0 && buffer_line[col] == ':'; // :: @@ -584,13 +572,13 @@ }; if (cache.isCacheValid(path, begin_pos)) { - CompletionConsumer consumer(cCOpts, true); + CompletionConsumer consumer(ccOpts, true); cache.withLock([&]() { consumer.ls_items = cache.result; }); callback(&consumer); } else { manager->comp_tasks.pushBack(std::make_unique<SemaManager::CompTask>( reply.id, param.textDocument.uri.getPath(), begin_pos, - std::make_unique<CompletionConsumer>(cCOpts, false), cCOpts, callback)); + std::make_unique<CompletionConsumer>(ccOpts, false), ccOpts, callback)); } } } // namespace ccls diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/messages/textDocument_definition.cc new/ccls-0.20190823.4/src/messages/textDocument_definition.cc --- old/ccls-0.20190823.3/src/messages/textDocument_definition.cc 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/messages/textDocument_definition.cc 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #include "message_handler.hh" #include "query.hh" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/messages/textDocument_document.cc new/ccls-0.20190823.4/src/messages/textDocument_document.cc --- old/ccls-0.20190823.3/src/messages/textDocument_document.cc 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/messages/textDocument_document.cc 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #include "message_handler.hh" #include "pipeline.hh" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/messages/textDocument_hover.cc new/ccls-0.20190823.4/src/messages/textDocument_hover.cc --- old/ccls-0.20190823.3/src/messages/textDocument_hover.cc 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/messages/textDocument_hover.cc 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #include "message_handler.hh" #include "query.hh" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/messages/textDocument_references.cc new/ccls-0.20190823.4/src/messages/textDocument_references.cc --- old/ccls-0.20190823.3/src/messages/textDocument_references.cc 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/messages/textDocument_references.cc 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #include "message_handler.hh" #include "query.hh" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/messages/textDocument_rename.cc new/ccls-0.20190823.4/src/messages/textDocument_rename.cc --- old/ccls-0.20190823.3/src/messages/textDocument_rename.cc 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/messages/textDocument_rename.cc 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #include "message_handler.hh" #include "query.hh" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/messages/textDocument_signatureHelp.cc new/ccls-0.20190823.4/src/messages/textDocument_signatureHelp.cc --- old/ccls-0.20190823.3/src/messages/textDocument_signatureHelp.cc 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/messages/textDocument_signatureHelp.cc 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #include "message_handler.hh" #include "pipeline.hh" @@ -184,18 +172,18 @@ } }; - CodeCompleteOptions cCOpts; - cCOpts.IncludeGlobals = false; - cCOpts.IncludeMacros = false; - cCOpts.IncludeBriefComments = true; + CodeCompleteOptions ccOpts; + ccOpts.IncludeGlobals = false; + ccOpts.IncludeMacros = false; + ccOpts.IncludeBriefComments = true; if (cache.isCacheValid(path, begin_pos)) { - SignatureHelpConsumer consumer(cCOpts, true); + SignatureHelpConsumer consumer(ccOpts, true); cache.withLock([&]() { consumer.ls_sighelp = cache.result; }); callback(&consumer); } else { manager->comp_tasks.pushBack(std::make_unique<SemaManager::CompTask>( reply.id, param.textDocument.uri.getPath(), param.position, - std::make_unique<SignatureHelpConsumer>(cCOpts, false), cCOpts, + std::make_unique<SignatureHelpConsumer>(ccOpts, false), ccOpts, callback)); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/pipeline.cc new/ccls-0.20190823.4/src/pipeline.cc --- old/ccls-0.20190823.3/src/pipeline.cc 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/pipeline.cc 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #include "pipeline.hh" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/pipeline.hh new/ccls-0.20190823.4/src/pipeline.hh --- old/ccls-0.20190823.3/src/pipeline.hh 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/pipeline.hh 2019-10-25 03:37:55.000000000 +0200 @@ -1,3 +1,6 @@ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "lsp.hh" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/platform.hh new/ccls-0.20190823.4/src/platform.hh --- old/ccls-0.20190823.3/src/platform.hh 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/platform.hh 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/platform_posix.cc new/ccls-0.20190823.4/src/platform_posix.cc --- old/ccls-0.20190823.3/src/platform_posix.cc 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/platform_posix.cc 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #if defined(__unix__) || defined(__APPLE__) #include "platform.hh" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/platform_win.cc new/ccls-0.20190823.4/src/platform_win.cc --- old/ccls-0.20190823.3/src/platform_win.cc 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/platform_win.cc 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #if defined(_WIN32) #include "platform.hh" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/position.cc new/ccls-0.20190823.4/src/position.cc --- old/ccls-0.20190823.3/src/position.cc 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/position.cc 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #include "position.hh" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/position.hh new/ccls-0.20190823.4/src/position.hh --- old/ccls-0.20190823.3/src/position.hh 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/position.hh 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/project.cc new/ccls-0.20190823.4/src/project.cc --- old/ccls-0.20190823.3/src/project.cc 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/project.cc 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #include "project.hh" @@ -538,7 +526,7 @@ } } - bool append; + bool append = false; if (best_dot_ccls_args && !(append = appendToCDB(*best_dot_ccls_args)) && !exact_match) { // If the first line is not %compile_commands.json, override the compdb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/project.hh new/ccls-0.20190823.4/src/project.hh --- old/ccls-0.20190823.3/src/project.hh 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/project.hh 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/query.cc new/ccls-0.20190823.4/src/query.cc --- old/ccls-0.20190823.3/src/query.cc 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/query.cc 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #include "query.hh" @@ -135,7 +123,7 @@ previous = ∅ r.lid2path = std::move(current->lid2path); - r.funcs_hint = current->usr2func.size() - previous->usr2func.size(); + r.funcs_hint = int(current->usr2func.size() - previous->usr2func.size()); for (auto &it : previous->usr2func) { auto &func = it.second; if (func.def.detailed_name[0]) @@ -153,7 +141,7 @@ r.funcs_derived[func.usr].second = std::move(func.derived); } - r.types_hint = current->usr2type.size() - previous->usr2type.size(); + r.types_hint = int(current->usr2type.size() - previous->usr2type.size()); for (auto &it : previous->usr2type) { auto &type = it.second; if (type.def.detailed_name[0]) @@ -173,7 +161,7 @@ r.types_instances[type.usr].second = std::move(type.instances); }; - r.vars_hint = current->usr2var.size() - previous->usr2var.size(); + r.vars_hint = int(current->usr2var.size() - previous->usr2var.size()); for (auto &it : previous->usr2var) { auto &var = it.second; if (var.def.detailed_name[0]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/query.hh new/ccls-0.20190823.4/src/query.hh --- old/ccls-0.20190823.3/src/query.hh 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/query.hh 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once @@ -21,6 +9,7 @@ #include <llvm/ADT/DenseMap.h> #include <llvm/ADT/SmallVector.h> +#include <llvm/ADT/StringMap.h> namespace llvm { template <> struct DenseMapInfo<ccls::ExtentRef> { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/sema_manager.cc new/ccls-0.20190823.4/src/sema_manager.cc --- old/ccls-0.20190823.3/src/sema_manager.cc 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/sema_manager.cc 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #include "sema_manager.hh" @@ -231,7 +219,7 @@ } public: - StoreDiags(std::string path) : path(path) {} + StoreDiags(std::string path) : path(std::move(path)) {} std::vector<Diag> take() { return std::move(output); } bool isConcerned(const SourceManager &sm, SourceLocation l) { FileID fid = sm.getFileID(l); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/sema_manager.hh new/ccls-0.20190823.4/src/sema_manager.hh --- old/ccls-0.20190823.3/src/sema_manager.hh 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/sema_manager.hh 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/serializer.cc new/ccls-0.20190823.4/src/serializer.cc --- old/ccls-0.20190823.3/src/serializer.cc 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/serializer.cc 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #include "serializer.hh" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/serializer.hh new/ccls-0.20190823.4/src/serializer.hh --- old/ccls-0.20190823.3/src/serializer.hh 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/serializer.hh 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/test.cc new/ccls-0.20190823.4/src/test.cc --- old/ccls-0.20190823.3/src/test.cc 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/test.cc 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #include "test.hh" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/test.hh new/ccls-0.20190823.4/src/test.hh --- old/ccls-0.20190823.3/src/test.hh 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/test.hh 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/threaded_queue.hh new/ccls-0.20190823.4/src/threaded_queue.hh --- old/ccls-0.20190823.3/src/threaded_queue.hh 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/threaded_queue.hh 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/utils.cc new/ccls-0.20190823.4/src/utils.cc --- old/ccls-0.20190823.3/src/utils.cc 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/utils.cc 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #include "utils.hh" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/utils.hh new/ccls-0.20190823.4/src/utils.hh --- old/ccls-0.20190823.3/src/utils.hh 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/utils.hh 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/working_files.cc new/ccls-0.20190823.4/src/working_files.cc --- old/ccls-0.20190823.3/src/working_files.cc 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/working_files.cc 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #include "working_files.hh" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20190823.3/src/working_files.hh new/ccls-0.20190823.4/src/working_files.hh --- old/ccls-0.20190823.3/src/working_files.hh 2019-09-24 07:48:42.000000000 +0200 +++ new/ccls-0.20190823.4/src/working_files.hh 2019-10-25 03:37:55.000000000 +0200 @@ -1,17 +1,5 @@ -/* Copyright 2017-2018 ccls Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ +// Copyright 2017-2018 ccls Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once
participants (1)
-
root