Merge branch 'main' into jabaile/symbol-tweaks

Author: jakebailey

ls-screenshot.png renamed to .github/ls-screenshot.png

@@ -101,18 +101,34 @@ jobs:
           path: testdata/baselines/local
 
   lint:
-    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-latest
+          - os: windows-latest
+          - os: macos-latest
+          - os: ubuntu-latest
+            name: 'noembed'
+            noembed: true
+
+    name: lint (${{ matrix.name || matrix.os }})
+
+    runs-on: ${{ matrix.os }}
+
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
       - uses: ./.github/actions/setup-go
         with:
-          cache-name: lint
+          cache-name: lint${{ (matrix.noembed && '-noembed') || ''}}
 
       - run: npm ci
 
       - run: npx hereby install-tools
-      - run: npx hereby lint
+      - run: npx hereby lint ${NOEMBED_FLAG:+"$NOEMBED_FLAG"}
+        env:
+          NOEMBED_FLAG: ${{ (matrix.noembed && '--noembed') || '' }}
 
   format:
     runs-on: ubuntu-latest
@@ -154,11 +170,8 @@ jobs:
         with:
           cache-name: tidy
 
-      - run: go mod tidy
-      - run: go -C ./_tools mod tidy
-
-      - run: git add .
-      - run: git diff --staged --exit-code --stat
+      - run: go mod tidy -diff
+      - run: go -C ./_tools mod tidy -diff
 
   smoke:
     runs-on: ubuntu-latest
@@ -181,6 +194,16 @@ jobs:
       - run: ./built/local/tsgo -p ./_submodules/TypeScript/src/compiler --singleThreaded
       - run: ./built/local/tsgo -p ./_submodules/TypeScript/src/compiler
 
+  misc:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: ./.github/actions/setup-go
+        with:
+          cache-name: misc
+
+      - run: go -C ./_tools run ./cmd/checkmodpaths $PWD
+
   required:
     runs-on: ubuntu-latest
     if: ${{ always() }}

.github/workflows/ci.yml

@@ -142,6 +142,7 @@ dist
 *.dll
 *.so
 *.dylib
+*.wasm
 
 # Test binary, built with `go test -c`
 *.test
@@ -186,3 +187,8 @@ custom-gcl.exe
 custom-gcl.hash
 
 /built
+
+# macOS Finder metadata
+.DS_Store
+
+.idea

.gitignore

@@ -17,6 +17,17 @@
             ],
             "autoAttachChildProcesses": true,
             "preLaunchTask": "Watch for extension run"
+        },
+        {
+            "name": "Launch submodule test",
+            "type": "go",
+            "request": "launch",
+            "mode": "test",
+            "program": "${workspaceFolder}/internal/testrunner",
+            "args": [
+                "-test.run",
+                "TestSubmodule/${fileBasename}"
+            ]
         }
     ]
 }

.vscode/launch.template.json

@@ -314,10 +314,13 @@ export const lint = task({
     run: async () => {
         await buildCustomLinter();
 
-        const lintArgs = ["run", "--sort-results"];
+        const lintArgs = ["run", "--sort-results", "--show-stats"];
         if (isCI) {
             lintArgs.push("--timeout=5m");
         }
+        if (defaultGoBuildTags.length) {
+            lintArgs.push("--build-tags", defaultGoBuildTags.join(","));
+        }
         if (options.fix) {
             lintArgs.push("--fix");
         }

Herebyfile.mjs

@@ -53,7 +53,7 @@ To try the prototype LSP experience:
 
 This will launch a new VS Code instance which uses the Corsa LS as the backend. If correctly set up, you should see "typescript-go" as an option in the Output pane:
 
-![LSP Prototype Screenshot](ls-screenshot.png)
+![LSP Prototype Screenshot](.github/ls-screenshot.png)
 
 
 ## What Works So Far?
@@ -92,7 +92,7 @@ Definitions:
 Long-term, we expect this repo is that its contents will be merged into `microsoft/TypeScript`.
 As a result, the repo and issue tracker for typescript-go will eventually be closed, so treat discussions/issues accordingly.
 
-For a list of intentional changes with respect to Typescript 5.7, see CHANGES.md.
+For a list of intentional changes with respect to TypeScript 5.7, see CHANGES.md.
 
 ## Contributing
 

README.md

@@ -0,0 +1,64 @@
+package main
+
+import (
+	"fmt"
+	"io/fs"
+	"os"
+	"path/filepath"
+
+	"golang.org/x/mod/module"
+)
+
+func main() {
+	os.Exit(run())
+}
+
+func run() int {
+	if len(os.Args) != 2 {
+		fmt.Println("Usage: checkmodpaths <path>")
+		return 1
+	}
+	path, err := filepath.Abs(os.Args[1])
+	if err != nil {
+		fmt.Println("Error getting absolute path:", err)
+		return 1
+	}
+
+	var errors []error
+	err = fs.WalkDir(os.DirFS(path), ".", func(p string, d fs.DirEntry, err error) error {
+		if err != nil {
+			return err
+		}
+
+		if p == "." {
+			return nil
+		}
+
+		if p[0] == '.' || p[0] == '_' {
+			if d.IsDir() {
+				return fs.SkipDir
+			}
+			return nil
+		}
+
+		if err := module.CheckFilePath(p); err != nil {
+			errors = append(errors, fmt.Errorf("%s: %w", p, err))
+		}
+
+		return nil
+	})
+	if err != nil {
+		fmt.Println("Error walking the directory:", err)
+		return 1
+	}
+
+	if len(errors) > 0 {
+		for _, err := range errors {
+			fmt.Println(err)
+		}
+		return 1
+	}
+
+	fmt.Println("All module paths are valid.")
+	return 0
+}

_tools/cmd/checkmodpaths/main.go

@@ -4,12 +4,12 @@ go 1.24.0
 
 require (
 	github.com/golangci/plugin-module-register v0.1.1
+	golang.org/x/mod v0.23.0
 	golang.org/x/tools v0.30.0
 	gotest.tools/v3 v3.5.2
 )
 
 require (
 	github.com/google/go-cmp v0.6.0 // indirect
-	golang.org/x/mod v0.23.0 // indirect
 	golang.org/x/sync v0.11.0 // indirect
 )

_tools/go.mod

@@ -0,0 +1,5 @@
+//go:build !windows
+
+package main
+
+func enableVirtualTerminalProcessing() {}

cmd/tsgo/enablevtprocessing_other.go

@@ -0,0 +1,22 @@
+package main
+
+import (
+	"golang.org/x/sys/windows"
+)
+
+func enableVirtualTerminalProcessing() {
+	h, err := windows.GetStdHandle(windows.STD_OUTPUT_HANDLE)
+	if err != nil || h == windows.InvalidHandle {
+		return
+	}
+	fileType, err := windows.GetFileType(h)
+	if err != nil || fileType == windows.FILE_TYPE_CHAR {
+		var mode uint32
+		if err := windows.GetConsoleMode(h, &mode); err != nil {
+			return
+		}
+		if mode&windows.ENABLE_VIRTUAL_TERMINAL_PROCESSING == 0 {
+			_ = windows.SetConsoleMode(h, mode|windows.ENABLE_VIRTUAL_TERMINAL_PROCESSING)
+		}
+	}
+}