Skip to content

Commit 269fa3a

Browse files
committed
comments from alexet
Put 'the query directory of the current file` back in the description.
1 parent a57b060 commit 269fa3a

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

docs/language/ql-handbook/language.rst

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,8 @@ If both a ``queries.xml`` and a ``qlpack.yml`` exist in the same
7979
directory, the latter takes precedence (and the former is assumed to
8080
exist for compatibility with older tooling).
8181

82-
The query directory itself becomes the first element of the library
83-
path.
84-
8582
In legacy QL tools that don't recognize ``qlpack.yml`` files, the default
86-
value of the rest of the library path for
83+
value of the library path for
8784
each supported language is hard-coded. The tools contain directories within the ODASA
8885
distribution that define the default CodeQL libraries for the selected
8986
language. Which language to use depends on the ``language`` attribute
@@ -92,7 +89,7 @@ option to the ODASA CLI.
9289

9390
On the other hand, the CodeQL CLI and newer tools based on it (such as
9491
GitHub Code Scanning and the CodeQL extension for Visual Studio Code)
95-
construct a default library path using QL packs. For each QL pack
92+
construct a library path using QL packs. For each QL pack
9693
added to the library path, the QL packs named in its
9794
``libraryPathDependencies`` will be subsequently added to the library
9895
path, and the process continues until all packs have been
@@ -236,7 +233,8 @@ For selection identifiers (``a::b``):
236233
For qualified identifiers (``a.b``):
237234

238235
- Build up a list of *candidate search paths*, consisting of the
239-
current file's directory, and each of the directories on the
236+
current file's directory, then the *query directory* of the current
237+
file, and finally each of the directories on the
240238
`library path <#library-path>`__ (in order).
241239

242240
- Determine the first candidate search path that has a *matching* QLL file for the import directive's qualified name. A QLL file in a candidate search path is said to match a qualified name if, starting from the candidate search path, there is a subdirectory for each successive qualifier in the qualified name, and the directory named by the final qualifier contains a file whose base name matches the qualified name's base name, with the addition of the file extension ``.qll``. The file and directory names are matched case-sensitively, regardless of whether the filesystem is case-sensitive or not.

0 commit comments

Comments
 (0)