Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/update-tsgo-f3911d25.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@effect/tsgo": patch
---

Update the pinned `typescript-go` submodule to `f3911d25a18e746c1d8ec68b175350c2b333da6d` and rebase local patch files so setup and validation continue to pass.
12 changes: 8 additions & 4 deletions _patches/010-fourslash-fourslash.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/internal/fourslash/fourslash.go b/internal/fourslash/fourslash.go
index b8575b1933..022443c14d 100644
index d1087aabdf..803535aedc 100644
--- a/internal/fourslash/fourslash.go
+++ b/internal/fourslash/fourslash.go
@@ -41,6 +41,16 @@ import (
Expand All @@ -19,7 +19,7 @@ index b8575b1933..022443c14d 100644
type FourslashTest struct {
client *lsptestutil.LSPClient
vfs vfs.FS
@@ -149,6 +159,11 @@ func NewFourslash(t *testing.T, capabilities *lsproto.ClientCapabilities, conten
@@ -155,6 +165,11 @@ func NewFourslash(t *testing.T, capabilities *lsproto.ClientCapabilities, conten
testfs[filePath] = vfstest.Symlink(tspath.GetNormalizedAbsolutePath(target, rootDir))
}

Expand All @@ -31,10 +31,10 @@ index b8575b1933..022443c14d 100644
// !!! use default compiler options for inferred project as base
compilerOptions := &core.CompilerOptions{
SkipDefaultLibCheck: core.TSTrue,
@@ -4319,3 +4334,379 @@ func (f *FourslashTest) VerifyErrorExistsBeforeMarker(t *testing.T, markerName s
}
@@ -5586,6 +5601,383 @@ func (f *FourslashTest) VerifyErrorExistsBeforeMarker(t *testing.T, markerName s
t.Fatalf("Expected error before marker '%s' but none was found", markerName)
}

+
+// QuickFixInfo holds a diagnostic and the titles of its available quick fixes.
+type QuickFixInfo struct {
Expand Down Expand Up @@ -411,3 +411,7 @@ index b8575b1933..022443c14d 100644
+
+ return result
+}
+
func updatePositionForTextEdit(position int, editStart int, editEnd int, newTextLength int) int {
if position <= editStart {
return position
12 changes: 6 additions & 6 deletions _patches/025-tsoptions-diagnostic-scopes.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/internal/tsoptions/tsconfigparsing.go b/internal/tsoptions/tsconfigparsing.go
index 15118ae27..5e282dfd7 100644
index b2d3d4093a..e1ba3214c4 100644
--- a/internal/tsoptions/tsconfigparsing.go
+++ b/internal/tsoptions/tsconfigparsing.go
@@ -1087,7 +1087,7 @@ func parseConfig(
@@ -1108,7 +1108,7 @@ func parseConfig(
result.compileOnSave = compileOnSave
}
}
Expand All @@ -11,7 +11,7 @@ index 15118ae27..5e282dfd7 100644
}
}

@@ -1121,7 +1121,7 @@ func parseConfig(
@@ -1142,7 +1142,7 @@ func parseConfig(
sourceFile.ExtendedSourceFiles = core.InsertSorted(sourceFile.ExtendedSourceFiles, extendedSourceFile, cmp.Compare)
}
}
Expand All @@ -20,10 +20,10 @@ index 15118ae27..5e282dfd7 100644
// ownConfig.watchOptions = ownConfig.watchOptions && result.watchOptions ?
// assignWatchOptions(result, ownConfig.watchOptions) :
// ownConfig.watchOptions || result.watchOptions;
@@ -1166,7 +1166,7 @@ func parseJsonConfigFileContentWorker(
@@ -1186,7 +1186,7 @@ func parseJsonConfigFileContentWorker(

var errors []*ast.Diagnostic
resolutionStackString := []string{}
parsedConfig, errors := parseConfig(json, sourceFile, host, basePath, configFileName, resolutionStackString, extendedConfigCache)
parsedConfig, errors := parseConfig(json, sourceFile, host, basePath, configFileName, resolutionStack, extendedConfigCache)
- mergeCompilerOptions(parsedConfig.options, existingOptions, existingOptionsRaw)
+ mergeCompilerOptions(parsedConfig.options, existingOptions, existingOptionsRaw, configFileName, basePath)
handleOptionConfigDirTemplateSubstitution(parsedConfig.options, basePathForFileNames)
Expand Down
2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
/* Source of truth: git submodule `typescript-go` commit.
Keep in sync via `_tools/update-flake-vendor-hash.sh`. */
typescript-go-src = {
url = "github:microsoft/typescript-go/c282336ea94f8a2e63187afd0f8d4bfb3b3f4d3b?submodules=1";
url = "github:microsoft/typescript-go/f3911d25a18e746c1d8ec68b175350c2b333da6d?submodules=1";
flake = false;
};
/* Source of truth: typescript-go's `_submodules/TypeScript` commit.
Expand Down
6 changes: 6 additions & 0 deletions shim/checker/shim.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions shim/ls/shim.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions shim/lsp/lsproto/shim.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions shim/project/shim.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion shim/tsoptions/shim.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion typescript-go
Submodule typescript-go updated 480 files