Skip to content
This repository has been archived by the owner on Jan 30, 2022. It is now read-only.

Some small improvements #4

Merged
merged 3 commits into from
Jan 25, 2022
Merged

Some small improvements #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
31a67af
feat: remove __etsTrace for quickinfo
0x706b Jan 24, 2022
3430f69
feat: allow overloaded fluent signatures
0x706b Jan 24, 2022
7db766d
fix: improve fluent static constant goToDefinition
0x706b Jan 24, 2022
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
12 changes: 6 additions & 6 deletions effect/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@ import { Effect } from "./prelude.js";
import { Maybe } from "./prelude.js";

export const isPositive = (n: number) =>
n > 0 ? Maybe.just("positive") : Maybe.nothing()
n > 0 ? Maybe.just("positive") : Maybe.nothing();

export const isPositiveEff = (n: number) =>
n > 0 ? Effect("positive") : Effect.fail("negative")
n > 0 ? Effect("positive") : Effect.fail("negative");

export const resultEither = isPositive(0).match(() => "nope", () => "yeah")
export const resultEither = isPositive(0).match(() => "nope", () => "yeah");

export const prog = Effect.do
.bind("a", () => Effect(0))
.bind("b", () => Effect(1))
.bind("c", () => Effect(2))
.bind("d", () => Effect(4) + Effect(5))
.map(({ a, b, c, d: { tuple: [e, f] } }) => `result: ${a + b + c} ${e} ${f}`)
.flatMap((s) => Effect(console.log(s)))
.flatMap((s) => Effect(console.log(s)));

export const result = prog | Effect.fail("error")
export const result = prog | Effect.fail("error");

prog.unsafeRunPromise()

export const xxx = pipe(0, n => n + 1, n => `hello: ${n}`)
export const xxx = pipe(0, n => n + 1, n => `hello: ${n}`)
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

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

9 changes: 4 additions & 5 deletions src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42776,22 +42776,21 @@ namespace ts {
function getEtsFluentSymbol(name: string, dataFirst: FunctionDeclaration) {
const type = getTypeOfNode(dataFirst);
const signatures = getSignaturesOfType(type, SignatureKind.Call);
const method = etsThisifySignature(signatures[0]);
const methods = signatures.map(etsThisifySignature);
const symbol = createSymbol(SymbolFlags.Function, name as __String);
symbol.declarations = [dataFirst];
symbol.valueDeclaration = dataFirst;
symbol.parent = dataFirst.symbol.parent;
const final = createAnonymousType(symbol, emptySymbols, [method], [], []);
const final = createAnonymousType(symbol, emptySymbols, methods, [], []);
return createSymbolWithType(symbol, final);
}
function getEtsStaticSymbol(name: string, dataFirst: FunctionDeclaration) {
const signatures = getSignaturesOfType(getTypeOfNode(dataFirst), SignatureKind.Call);
const call = signatures[0];
const method = cloneSignature(call);
const methods = signatures.map(cloneSignature);
const symbol = createSymbol(SymbolFlags.Function, name as __String);
symbol.declarations = [dataFirst];
symbol.parent = dataFirst.symbol.parent;
const final = createAnonymousType(symbol, emptySymbols, [method], [], []);
const final = createAnonymousType(symbol, emptySymbols, methods, [], []);
return createSymbolWithType(symbol, final);
}
function etsInitTypeChecker() {
Expand Down
24 changes: 20 additions & 4 deletions src/services/goToDefinition.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,28 @@ namespace ts.GoToDefinition {
const staticSymbol = typeChecker.getStaticExtension(type, name);
if(staticSymbol && !isCallExpression(parent.parent)) {
const declaration = staticSymbol.patched.valueDeclaration!;
let start: number;
let length: number;
if(declaration.original && isNamedDeclaration(declaration.original)) {
start = declaration.original.name.getStart();
length = declaration.original.getWidth();
}
else if(isNamedDeclaration(declaration)) {
start = declaration.name.getStart();
length = declaration.getWidth();
}
else {
start = declaration.getStart();
length = declaration.getWidth();
}

if(start === -1 || length === -1) {
return undefined;
}

return [{
fileName: staticSymbol.definition.fileName,
textSpan: {
start: declaration.pos + 1,
length: declaration.end - declaration.pos
},
textSpan: { start, length },
kind: SymbolDisplay.getSymbolKind(typeChecker, staticSymbol.patched, node),
name: typeChecker.symbolToString(staticSymbol.patched),
containerKind: undefined!,
Expand Down
44 changes: 44 additions & 0 deletions src/services/services.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1663,6 +1663,50 @@ namespace ts {

if (!symbol || typeChecker.isUnknownSymbol(symbol)) {
const type = shouldGetType(sourceFile, nodeForQuickInfo, position) ? typeChecker.getTypeAtLocation(nodeForQuickInfo) : undefined;
// BEGIN: ___etsTrace removal
let callSignatures: readonly Signature[];
if(type && (callSignatures = type.getCallSignatures()).length > 0) {
const resolvedSignature = callSignatures[0];
const declaration = resolvedSignature.declaration;
if(declaration && isFunctionDeclaration(declaration)) {
const lastParam = declaration.parameters[declaration.parameters.length - 1];
if(lastParam && isIdentifier(lastParam.name) && lastParam.name.escapedText.toString() === "___etsTrace") {
const untracedDeclaration = factory.createFunctionDeclaration(
declaration.decorators,
declaration.modifiers,
declaration.asteriskToken,
declaration.name,
declaration.typeParameters,
declaration.parameters.slice(0, declaration.parameters.length - 1),
declaration.type,
undefined
);
setParent(untracedDeclaration, declaration.parent);
untracedDeclaration.jsDoc = declaration.jsDoc;
const untracedSignature = typeChecker.createSignature(
untracedDeclaration,
resolvedSignature.typeParameters,
resolvedSignature.thisParameter,
resolvedSignature.parameters.slice(0, resolvedSignature.parameters.length - 1),
resolvedSignature.getReturnType(),
resolvedSignature.resolvedTypePredicate,
resolvedSignature.minArgumentCount - 1,
resolvedSignature.flags
);
const symbol = typeChecker.createSymbol(SymbolFlags.Function, untracedDeclaration.name?.escapedText || "" as __String);
const newType = typeChecker.createAnonymousType(symbol, new Map(), [untracedSignature], [], []);
return {
kind: ScriptElementKind.unknown,
kindModifiers: ScriptElementKindModifier.none,
textSpan: createTextSpanFromNode(nodeForQuickInfo, sourceFile),
displayParts: typeChecker.runWithCancellationToken(cancellationToken, typeChecker => typeToDisplayParts(typeChecker, newType, getContainerNode(nodeForQuickInfo))),
documentation: type.symbol ? type.symbol.getDocumentationComment(typeChecker) : undefined,
tags: type.symbol ? type.symbol.getJsDocTags(typeChecker) : undefined
};
}
}
}
// END: ___etsTrace removal
return type && {
kind: ScriptElementKind.unknown,
kindModifiers: ScriptElementKindModifier.none,
Expand Down