Merge branch 'main' into graphql-schema-update

Author: docubot

assets/images/help/repository/code-navigation-popover.png

@@ -15,16 +15,34 @@ topics:
 
 ## About navigating code on {% data variables.product.prodname_dotcom %}
 
-Code navigation uses the open source library [`tree-sitter`](https://github.com/tree-sitter/tree-sitter). The following languages are supported:
-- C#
-- CodeQL
-- Go
-- Java
-- JavaScript
-- PHP
-- Python
-- Ruby
-- TypeScript
+Code navigation helps you to read, navigate, and understand code by showing and linking definitions of a named entity corresponding to a reference to that entity, as well as references corresponding to an entity's definition.
+
+![Code navigation display](/assets/images/help/repository/code-navigation-popover.png)
+
+Code navigation uses the open source [`tree-sitter`](https://github.com/tree-sitter/tree-sitter) library. The following languages and navigation strategies are supported:
+
+| Language   | search-based code navigation | precise code navigation |
+|:----------:|:----------------------------:|:-----------------------:|
+| C#         | ✅                           |                         |
+| CodeQL     | ✅                           |                         |
+| Go         | ✅                           |                         |
+| Java       | ✅                           |                         |
+| JavaScript | ✅                           |                         |
+| PHP        | ✅                           |                         |
+| Python     | ✅                           | ✅                      |
+| Ruby       | ✅                           |                         |
+| TypeScript | ✅                           |                         |
+
+
+You do not need to configure anything in your repository to enable code navigation. We will automatically extract search-based and precise code navigation information for these supported languages in all repositories and you can switch between the two supported code navigation approaches if your programming language is supported by both.
+
+{% data variables.product.prodname_dotcom %} has developed two code navigation approaches based on the open source [`tree-sitter`](https://github.com/tree-sitter/tree-sitter) and [`stack-graphs`](https://github.com/github/stack-graphs) library:
+ - search-based - searches all definitions and references across a repository to find entities with a given name
+ - precise - resolves definitions and references based on the set of classes, functions, and imported definitions at a given point in your code
+
+To learn more about these approaches, see "[Precise and search-based navigation](#precise-and-search-based-navigation)."
+
+Future releases will add *precise code navigation* for more languages, which is a code navigation approach that can give more accurate results.
 
 ## Jumping to the definition of a function or method
 
@@ -38,11 +56,21 @@ You can find all references for a function or method within the same repository
 
 ![Find all references tab](/assets/images/help/repository/find-all-references-tab.png)
 
+## Precise and search-based navigation
+
+Certain languages supported by {% data variables.product.prodname_dotcom %} have access to *precise code navigation*, which uses an algorithm (based on the open source [`stack-graphs`](https://github.com/github/stack-graphs) library) that resolves definitions and references based on the set of classes, functions, and imported definitions that are visible at any given point in your code. Other languages use *search-based code navigation*, which searches all definitions and references across a repository to find entities with a given name. Both strategies are effective at finding results and both make sure to avoid inappropriate results such as comments, but precise code navigation can give more accurate results, especially when a repository contains multiple methods or functions with the same name.
+
+If you don't see the results you expect from a precise code navigation query, you can click on the "search-based" link in the displayed popover to perform search-based navigation.
+
+![Search-based code navigation link](/assets/images/help/repository/search-based-code-navigation-link.png)
+
+If your precise results appear inaccurate, you can file a support request.
+
 ## Troubleshooting code navigation
 
 If code navigation is enabled for you but you don't see links to the definitions of functions and methods:
 - Code navigation only works for active branches. Push to the branch and try again.
-- Code navigation only works for repositories with less than 100,000 files.
+- Code navigation only works for repositories with fewer than 100,000 files.
 
 ## Further reading
 - "[Searching code](/github/searching-for-information-on-github/searching-code)"

assets/images/help/repository/search-based-code-navigation-link.png

@@ -1 +1 @@
-| Python {% ifversion fpt or ghec %}| {% octicon "check" aria-label="The check icon" %} | {% octicon "check" aria-label="The check icon" %} | {% octicon "check" aria-label="The check icon" %}<br>pip | {% octicon "check" aria-label="The check icon" %}<br>pip | {% octicon "check" aria-label="The check icon" %} | {% octicon "x" aria-label="The X icon" %} |{% elsif ghes %}| {% octicon "check" aria-label="The check icon" %} | {% octicon "check" aria-label="The check icon" %}<br>pip {% ifversion ghes > 3.2 %}| {% octicon "check" aria-label="The check icon" %}<br>pip{% endif %} | {% octicon "check" aria-label="The check icon" %} | {% octicon "x" aria-label="The X icon" %} |{% elsif ghae %}| {% octicon "check" aria-label="The check icon" %} | {% octicon "check" aria-label="The check icon" %} | {% octicon "x" aria-label="The X icon" %} |{% endif %}
+| Python {% ifversion fpt or ghec %}| {% octicon "check" aria-label="The check icon" %} <br>precise| {% octicon "check" aria-label="The check icon" %} | {% octicon "check" aria-label="The check icon" %}<br>pip | {% octicon "check" aria-label="The check icon" %}<br>pip | {% octicon "check" aria-label="The check icon" %} | {% octicon "x" aria-label="The X icon" %} |{% elsif ghes %}| {% octicon "check" aria-label="The check icon" %} | {% octicon "check" aria-label="The check icon" %}<br>pip {% ifversion ghes > 3.2 %}| {% octicon "check" aria-label="The check icon" %}<br>pip{% endif %} | {% octicon "check" aria-label="The check icon" %} | {% octicon "x" aria-label="The X icon" %} |{% elsif ghae %}| {% octicon "check" aria-label="The check icon" %} | {% octicon "check" aria-label="The check icon" %} | {% octicon "x" aria-label="The X icon" %} |{% endif %}

content/repositories/working-with-files/using-files/navigating-code-on-github.md

@@ -4,6 +4,8 @@ const externalSites = readJsonFile('./lib/redirects/external-sites.json')
 // blanket redirects to external websites
 export default function externalRedirects(req, res, next) {
   if (req.path in externalSites) {
+    // Undo the cookie setting that CSRF sets.
+    res.removeHeader('set-cookie')
     return res.redirect(301, externalSites[req.path])
   } else {
     return next()

data/reusables/supported-languages/python.md

@@ -23,7 +23,11 @@ export default function handleRedirects(req, res, next) {
       language = req.context.userLanguage
     }
 
+    // Undo the cookie setting that CSRF sets.
+    res.removeHeader('set-cookie')
+
     noCacheControl(res)
+
     return res.redirect(302, `/${language}`)
   }
 
@@ -67,6 +71,9 @@ export default function handleRedirects(req, res, next) {
     return next()
   }
 
+  // Undo the cookie setting that CSRF sets.
+  res.removeHeader('set-cookie')
+
   // do the redirect if the from-URL already had a language in it
   if (pathLanguagePrefixed(req.path)) {
     cacheControl(res)

middleware/redirects/external.js

@@ -53,6 +53,7 @@ const PUBLIC_REPOS = new Set([
   'hello-world.git',
   'insights-releases',
   'help-docs-archived-enterprise-versions',
+  'stack-graphs',
 ])
 
 const ALLOW_DOCS_PATHS = [

middleware/redirects/handle-redirects.js

@@ -7,6 +7,7 @@ import CspParse from 'csp-parse'
 import { productMap } from '../../lib/all-products.js'
 import { SURROGATE_ENUMS } from '../../middleware/set-fastly-surrogate-key.js'
 import { jest } from '@jest/globals'
+import { languageKeys } from '../../lib/languages.js'
 
 const AZURE_STORAGE_URL = 'githubdocs.azureedge.net'
 const activeProducts = Object.values(productMap).filter(
@@ -610,6 +611,7 @@ describe('server', () => {
     test('redirects old articles to their English URL', async () => {
       const res = await get('/articles/deleting-a-team')
       expect(res.statusCode).toBe(302)
+      expect(res.headers['set-cookie']).toBeUndefined()
       // no cache control because a language prefix had to be injected
       expect(res.headers['cache-control']).toBeUndefined()
     })
@@ -621,17 +623,48 @@ describe('server', () => {
       )
     })
 
-    test('redirects / to /en', async () => {
+    test('redirects / to /en when no language preference is specified', async () => {
       const res = await get('/')
       expect(res.statusCode).toBe(302)
       expect(res.headers.location).toBe('/en')
       expect(res.headers['cache-control']).toBe('private, no-store')
+      expect(res.headers['set-cookie']).toBeUndefined()
+    })
+
+    test('redirects / to appropriate language preference if specified', async () => {
+      await Promise.all(
+        languageKeys.map(async (languageKey) => {
+          const res = await get('/', {
+            headers: {
+              'accept-language': `${languageKey}`,
+            },
+          })
+          expect(res.statusCode).toBe(302)
+          expect(res.headers.location).toBe(`/${languageKey}`)
+          expect(res.headers['cache-control']).toBe('private, no-store')
+          expect(res.headers['set-cookie']).toBeUndefined()
+        })
+      )
+    })
+
+    test('redirects / to /en when unsupported language preference is specified', async () => {
+      const res = await get('/', {
+        headers: {
+          // Tagalog: https://www.loc.gov/standards/iso639-2/php/langcodes_name.php?iso_639_1=tl
+          'accept-language': 'tl',
+        },
+      })
+      expect(res.statusCode).toBe(302)
+      expect(res.headers.location).toBe('/en')
+      expect(res.headers['cache-control']).toBe('private, no-store')
+      expect(res.headers['set-cookie']).toBeUndefined()
     })
 
     test('adds English prefix to old article URLs', async () => {
       const res = await get('/articles/deleting-a-team')
       expect(res.statusCode).toBe(302)
       expect(res.headers.location.startsWith('/en/')).toBe(true)
+      expect(res.headers['set-cookie']).toBeUndefined()
       expect(res.headers['cache-control']).toBeUndefined()
     })
 
@@ -646,6 +679,7 @@ describe('server', () => {
       const res = await get('/desktop-classic')
       expect(res.statusCode).toBe(301)
       expect(res.headers.location).toBe('https://desktop.github.com')
+      expect(res.headers['set-cookie']).toBeUndefined()
       expect(res.headers['cache-control']).toBeUndefined()
     })