Merge pull request #5439 from JetBrains/ktl-4236-gammar-links

fix(KTL-4236): Grammar: Links to documentation were broken

Author: zoobestik

blocks/grammar/markdown.tsx

@@ -25,6 +25,8 @@ function rebaseRelativeUrl(href: string) {
         // Not a valid absolute URL, treat as relative path
     }
 
+    if (href.startsWith('#')) return href;
+
     // Construct absolute URL using old grammar documentation as base
     url = new URL(href, `${OLD_GRAMMAR_HOST}${OLD_GRAMMAR_PATH}`);
 

package.json

@@ -138,7 +138,7 @@
         "generate-redirects": "node scripts/generate-redirect-pages.js",
         "lint": "next lint",
         "test": "playwright test test",
-        "test:ci": "playwright test test/production",
+        "test:ci": "playwright test test/production test/e2e/grammar/",
         "test:e2e": "playwright test test/e2e",
         "test:e2e:ci": "CI=true playwright test test/e2e",
         "test:e2e:headed": "playwright test test/e2e --headed",

test/e2e/grammar.spec.ts test/e2e/grammar/grammar.spec.tstest/e2e/grammar.spec.ts renamed to test/e2e/grammar/grammar.spec.ts

@@ -1,9 +1,29 @@
 import { expect, test } from '@playwright/test';
-import { GrammarPage } from '../page/grammar-page';
-import { checkScreenshot } from '../utils';
-import { MICRO_ANIMATION_TIMEOUT_LONG } from './visual-constants';
+import { GrammarPage } from './page';
+import { checkScreenshot } from '../../utils';
+import { MICRO_ANIMATION_TIMEOUT_LONG } from '../visual-constants';
 
-test.describe('Grammar page', () => {
+test.describe('Grammar: support', () => {
+    test('Should redirect from .html to clean URL', async ({ page }) => {
+        await page.goto('/docs/reference/grammar.html');
+
+        await expect(page).toHaveURL('/grammar/');
+
+        const redirected = new GrammarPage(page);
+        await expect(redirected.layout).toBeVisible();
+    });
+
+    test('Should redirect from nested URL', async ({ page }) => {
+        await page.goto('/docs/reference/grammar/');
+
+        await expect(page).toHaveURL('/grammar/');
+
+        const redirected = new GrammarPage(page);
+        await expect(redirected.layout).toBeVisible();
+    });
+})
+
+test.describe('Grammar: content', () => {
     let grammar: GrammarPage;
 
     test.beforeEach(async ({ page }) => {
@@ -82,7 +102,7 @@ test.describe('Grammar page', () => {
         const docsLink = grammar.layout.locator('a[href*="packages.html"]').first();
         await expect(docsLink).toBeVisible();
         const docsHref = await docsLink.getAttribute('href');
-        expect(docsHref).toMatch(/^\/docs\/.*packages\.html/);
+        expect(docsHref).toMatch('/docs/reference/packages.html');
     });
 
     test('Should render links with Inline Attribute List (target="_blank")', async () => {

test/page/grammar-page.ts test/e2e/grammar/page.tstest/page/grammar-page.ts renamed to test/e2e/grammar/page.ts

@@ -1,5 +1,5 @@
 import { Locator, Page } from '@playwright/test';
-import { BasePage } from './base-page';
+import { BasePage } from '../../page/base-page';
 
 export const GRAMMAR_URL = '/grammar/';
 

test/production/grammar.spec.ts

@@ -23,8 +23,8 @@ export function Markdown(props: MarkdownProps) {
         options={{
             ...props.options,
             overrides: {
+                ...overriddenClassNamesForTags,
                 ...props.options?.overrides,
-                ...overriddenClassNamesForTags
             }
         }}
     />;