Skip to content

Commit a132c04

Browse files
ahejlsbergahejlsberg
committed
Merge branch 'master' into fix39947
2 parents 95327f9 + 292b778 commit a132c04

File tree

9 files changed

+72
-4
lines changed

9 files changed

+72
-4
lines changed

‎package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/compiler/tracing.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,22 +101,27 @@ namespace ts.tracing {
101101
* deprecate these operations.
102102
*/
103103
export function begin(phase: Phase, name: string, args?: object) {
104+
if (!traceFd) return;
104105
writeEvent("B", phase, name, args);
105106
}
106107
export function end(phase: Phase, name: string, args?: object) {
108+
if (!traceFd) return;
107109
writeEvent("E", phase, name, args);
108110
}
109111

110112
export function instant(phase: Phase, name: string, args?: object) {
113+
if (!traceFd) return;
111114
writeEvent("I", phase, name, args, `"s":"g"`);
112115
}
113116

114117
// Used for "Complete" (ph:"X") events
115118
const completeEvents: { phase: Phase, name: string, args?: object, time: number }[] = [];
116119
export function push(phase: Phase, name: string, args?: object) {
120+
if (!traceFd) return;
117121
completeEvents.push({ phase, name, args, time: 1000 * timestamp() });
118122
}
119123
export function pop() {
124+
if (!traceFd) return;
120125
Debug.assert(completeEvents.length > 0);
121126
const { phase, name, args, time } = completeEvents.pop()!;
122127
const dur = 1000 * timestamp() - time;
@@ -125,7 +130,7 @@ namespace ts.tracing {
125130

126131
function writeEvent(eventType: string, phase: Phase, name: string, args: object | undefined, extras?: string,
127132
time: number = 1000 * timestamp()) {
128-
if (!traceFd) return;
133+
Debug.assert(traceFd);
129134
Debug.assert(fs);
130135
performance.mark("beginTracing");
131136
fs.writeSync(traceFd, `,\n{"pid":1,"tid":1,"ph":"${eventType}","cat":"${phase}","ts":${time},"name":"${name}"`);

‎src/loc/lcl/csy/diagnosticMessages/diagnosticMessages.generated.json.lcl

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8235,6 +8235,15 @@
82358235
</Str>
82368236
<Disp Icon="Str" />
82378237
</Item>
8238+
<Item ItemId=";Performance_timings_for_diagnostics_or_extendedDiagnostics_are_not_available_in_this_session_A_nativ_6386" ItemType="0" PsrId="306" Leaf="true">
8239+
<Str Cat="Text">
8240+
<Val><![CDATA[Performance timings for '--diagnostics' or '--extendedDiagnostics' are not available in this session. A native implementation of the Web Performance API could not be found.]]></Val>
8241+
<Tgt Cat="Text" Stat="Loc" Orig="New">
8242+
<Val><![CDATA[Časování výkonu pro --diagnostics nebo --extendedDiagnostics nejsou v této relaci k dispozici. Nepovedlo se najít nativní implementace rozhraní Web Performance API.]]></Val>
8243+
</Tgt>
8244+
</Str>
8245+
<Disp Icon="Str" />
8246+
</Item>
82388247
<Item ItemId=";Prefix_0_with_an_underscore_90025" ItemType="0" PsrId="306" Leaf="true">
82398248
<Str Cat="Text">
82408249
<Val><![CDATA[Prefix '{0}' with an underscore]]></Val>

‎src/loc/lcl/deu/diagnosticMessages/diagnosticMessages.generated.json.lcl

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8220,6 +8220,15 @@
82208220
</Str>
82218221
<Disp Icon="Str" />
82228222
</Item>
8223+
<Item ItemId=";Performance_timings_for_diagnostics_or_extendedDiagnostics_are_not_available_in_this_session_A_nativ_6386" ItemType="0" PsrId="306" Leaf="true">
8224+
<Str Cat="Text">
8225+
<Val><![CDATA[Performance timings for '--diagnostics' or '--extendedDiagnostics' are not available in this session. A native implementation of the Web Performance API could not be found.]]></Val>
8226+
<Tgt Cat="Text" Stat="Loc" Orig="New">
8227+
<Val><![CDATA[Leistungsdaten zum zeitlichen Ablauf sind für "--diagnostics" oder "--extendedDiagnostics" in dieser Sitzung nicht verfügbar. Eine native Implementierung der Webleistungs-API wurde nicht gefunden.]]></Val>
8228+
</Tgt>
8229+
</Str>
8230+
<Disp Icon="Str" />
8231+
</Item>
82238232
<Item ItemId=";Prefix_0_with_an_underscore_90025" ItemType="0" PsrId="306" Leaf="true">
82248233
<Str Cat="Text">
82258234
<Val><![CDATA[Prefix '{0}' with an underscore]]></Val>

‎src/loc/lcl/esn/diagnosticMessages/diagnosticMessages.generated.json.lcl

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8238,6 +8238,15 @@
82388238
</Str>
82398239
<Disp Icon="Str" />
82408240
</Item>
8241+
<Item ItemId=";Performance_timings_for_diagnostics_or_extendedDiagnostics_are_not_available_in_this_session_A_nativ_6386" ItemType="0" PsrId="306" Leaf="true">
8242+
<Str Cat="Text">
8243+
<Val><![CDATA[Performance timings for '--diagnostics' or '--extendedDiagnostics' are not available in this session. A native implementation of the Web Performance API could not be found.]]></Val>
8244+
<Tgt Cat="Text" Stat="Loc" Orig="New">
8245+
<Val><![CDATA[Los intervalos de rendimiento de "--diagnostics" o "--extendedDiagnostics" no están disponibles en esta sesión. No se encontró ninguna implementación nativa de la API de rendimiento web.]]></Val>
8246+
</Tgt>
8247+
</Str>
8248+
<Disp Icon="Str" />
8249+
</Item>
82418250
<Item ItemId=";Prefix_0_with_an_underscore_90025" ItemType="0" PsrId="306" Leaf="true">
82428251
<Str Cat="Text">
82438252
<Val><![CDATA[Prefix '{0}' with an underscore]]></Val>

‎src/loc/lcl/fra/diagnosticMessages/diagnosticMessages.generated.json.lcl

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8238,6 +8238,15 @@
82388238
</Str>
82398239
<Disp Icon="Str" />
82408240
</Item>
8241+
<Item ItemId=";Performance_timings_for_diagnostics_or_extendedDiagnostics_are_not_available_in_this_session_A_nativ_6386" ItemType="0" PsrId="306" Leaf="true">
8242+
<Str Cat="Text">
8243+
<Val><![CDATA[Performance timings for '--diagnostics' or '--extendedDiagnostics' are not available in this session. A native implementation of the Web Performance API could not be found.]]></Val>
8244+
<Tgt Cat="Text" Stat="Loc" Orig="New">
8245+
<Val><![CDATA[Les minutages de performances pour '--diagnostics' ou '--extendedDiagnostics' ne sont pas disponibles dans cette session. Une implémentation native de l'API de performances web est introuvable.]]></Val>
8246+
</Tgt>
8247+
</Str>
8248+
<Disp Icon="Str" />
8249+
</Item>
82418250
<Item ItemId=";Prefix_0_with_an_underscore_90025" ItemType="0" PsrId="306" Leaf="true">
82428251
<Str Cat="Text">
82438252
<Val><![CDATA[Prefix '{0}' with an underscore]]></Val>

‎src/loc/lcl/kor/diagnosticMessages/diagnosticMessages.generated.json.lcl

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8226,6 +8226,15 @@
82268226
</Str>
82278227
<Disp Icon="Str" />
82288228
</Item>
8229+
<Item ItemId=";Performance_timings_for_diagnostics_or_extendedDiagnostics_are_not_available_in_this_session_A_nativ_6386" ItemType="0" PsrId="306" Leaf="true">
8230+
<Str Cat="Text">
8231+
<Val><![CDATA[Performance timings for '--diagnostics' or '--extendedDiagnostics' are not available in this session. A native implementation of the Web Performance API could not be found.]]></Val>
8232+
<Tgt Cat="Text" Stat="Loc" Orig="New">
8233+
<Val><![CDATA[이 세션에서는 '--diagnostics' 또는 '--extendedDiagnostics'에 대해 성능 타이밍을 사용할 수 없습니다. Web Performance API의 네이티브 구현을 찾을 수 없습니다.]]></Val>
8234+
</Tgt>
8235+
</Str>
8236+
<Disp Icon="Str" />
8237+
</Item>
82298238
<Item ItemId=";Prefix_0_with_an_underscore_90025" ItemType="0" PsrId="306" Leaf="true">
82308239
<Str Cat="Text">
82318240
<Val><![CDATA[Prefix '{0}' with an underscore]]></Val>

‎src/loc/lcl/plk/diagnosticMessages/diagnosticMessages.generated.json.lcl

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8213,6 +8213,15 @@
82138213
</Str>
82148214
<Disp Icon="Str" />
82158215
</Item>
8216+
<Item ItemId=";Performance_timings_for_diagnostics_or_extendedDiagnostics_are_not_available_in_this_session_A_nativ_6386" ItemType="0" PsrId="306" Leaf="true">
8217+
<Str Cat="Text">
8218+
<Val><![CDATA[Performance timings for '--diagnostics' or '--extendedDiagnostics' are not available in this session. A native implementation of the Web Performance API could not be found.]]></Val>
8219+
<Tgt Cat="Text" Stat="Loc" Orig="New">
8220+
<Val><![CDATA[Chronometraż wydajności dla opcji „--diagnostics” lub „--extendedDiagnostics” nie jest dostępny w tej sesji. Nie można było znaleźć natywnej implementacji interfejsu Web Performance API.]]></Val>
8221+
</Tgt>
8222+
</Str>
8223+
<Disp Icon="Str" />
8224+
</Item>
82168225
<Item ItemId=";Prefix_0_with_an_underscore_90025" ItemType="0" PsrId="306" Leaf="true">
82178226
<Str Cat="Text">
82188227
<Val><![CDATA[Prefix '{0}' with an underscore]]></Val>

‎src/loc/lcl/ptb/diagnosticMessages/diagnosticMessages.generated.json.lcl

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8216,6 +8216,15 @@
82168216
</Str>
82178217
<Disp Icon="Str" />
82188218
</Item>
8219+
<Item ItemId=";Performance_timings_for_diagnostics_or_extendedDiagnostics_are_not_available_in_this_session_A_nativ_6386" ItemType="0" PsrId="306" Leaf="true">
8220+
<Str Cat="Text">
8221+
<Val><![CDATA[Performance timings for '--diagnostics' or '--extendedDiagnostics' are not available in this session. A native implementation of the Web Performance API could not be found.]]></Val>
8222+
<Tgt Cat="Text" Stat="Loc" Orig="New">
8223+
<Val><![CDATA[Os tempos de desempenho de '--diagnostics' ou '--extendedDiagnostics' não estão disponíveis nesta sessão. Não foi possível encontrar uma implementação nativa da API de Desempenho Web.]]></Val>
8224+
</Tgt>
8225+
</Str>
8226+
<Disp Icon="Str" />
8227+
</Item>
82198228
<Item ItemId=";Prefix_0_with_an_underscore_90025" ItemType="0" PsrId="306" Leaf="true">
82208229
<Str Cat="Text">
82218230
<Val><![CDATA[Prefix '{0}' with an underscore]]></Val>

0 commit comments

Comments
 (0)