Skip to content

Commit 8ef39d1

Browse files
authored
Merge pull request #1227
pull the latest library upstream changes
2 parents 08c1356 + 118408b commit 8ef39d1

File tree

9 files changed

+23
-15
lines changed

9 files changed

+23
-15
lines changed

local-libs/traceviewer-libs/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ git remote add traceviewer-libs [email protected]:eclipse-cdt-cloud/traceviewer-lib
8484
# assumption: remote for official repo is named "origin"
8585
git checkout master && git pull origin master
8686
# push the latest local library changes to the git subtree upstream:
87-
git subtree push -p <subtree folder> <subtree remote repo> <remote review branch>
87+
git subtree push --prefix <subtree folder> <subtree remote repo> <remote review branch>
8888
# more concrete example:
89-
git subtree push -p local-libs/traceviewer-libs traceviewer-libs update-from-vscode-trace-extension
89+
git subtree push --prefix local-libs/traceviewer-libs traceviewer-libs update-from-vscode-trace-extension
9090

9191
# Then create a PR from the freshly pushed branch "update-from-vscode-trace-extension".
9292
# If tweaks are necessary, e.g. to remove some changes that are only relevant to

local-libs/traceviewer-libs/base/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"eslint-plugin-import": "^2.21.2",
2626
"eslint-plugin-no-null": "^1.0.2",
2727
"eslint-plugin-react": "^7.20.0",
28+
"prettier": "^3.6.2",
2829
"rimraf": "^5.0.0",
2930
"typescript": "4.9.5"
3031
},

local-libs/traceviewer-libs/react-components/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
"@types/d3": "^7.1.0",
4545
"@types/jest": "^28.0.0",
4646
"@types/lodash": "^4.14.142",
47+
"@types/lodash.debounce": "4.0.3",
4748
"@types/react-grid-layout": "^1.1.1",
4849
"@types/react-modal": "^3.8.2",
4950
"@types/react-test-renderer": "^18.3.0",
@@ -57,6 +58,7 @@
5758
"jest": "^28.1.3",
5859
"jest-canvas-mock": "^2.4.0",
5960
"jest-environment-jsdom": "^28.1.3",
61+
"prettier": "^3.6.2",
6062
"react-test-renderer": "^18.2.0",
6163
"rimraf": "^5.0.0",
6264
"ts-jest": "^28.0.8",

local-libs/traceviewer-libs/react-components/src/components/abstract-gantt-output-component.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -537,8 +537,8 @@ export abstract class AbstractGanttOutputComponent<
537537
return this.state.markerCategoryEntries.length <= 1
538538
? 0
539539
: this.state.collapsedMarkerNodes.length
540-
? rowHeight
541-
: this.state.markerCategoryEntries.length * rowHeight + scrollbarHeight;
540+
? rowHeight
541+
: this.state.markerCategoryEntries.length * rowHeight + scrollbarHeight;
542542
}
543543

544544
abstract renderTree(): React.ReactNode;

local-libs/traceviewer-libs/react-components/src/components/abstract-xy-output-component.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -383,12 +383,12 @@ export abstract class AbstractXYOutputComponent<
383383
d >= 1000000000000
384384
? Math.round(d / 100000000000) / 10 + 'G'
385385
: d >= 1000000000
386-
? Math.round(d / 100000000) / 10 + 'B'
387-
: d >= 1000000
388-
? Math.round(d / 100000) / 10 + 'M'
389-
: d >= 1000
390-
? Math.round(d / 100) / 10 + 'K'
391-
: Math.round(d * 10) / 10;
386+
? Math.round(d / 100000000) / 10 + 'B'
387+
: d >= 1000000
388+
? Math.round(d / 100000) / 10 + 'M'
389+
: d >= 1000
390+
? Math.round(d / 100) / 10 + 'K'
391+
: Math.round(d * 10) / 10;
392392

393393
if (this.state.allMax > 0) {
394394
select(this.yAxisRef.current)

local-libs/traceviewer-libs/react-components/src/components/data-providers/tsp-data-provider.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ export class TspDataProvider {
197197
start: arrow.start - offset,
198198
end: arrow.end - offset
199199
} as TimelineChart.TimeGraphRange
200-
} as TimelineChart.TimeGraphArrow)
200+
}) as TimelineChart.TimeGraphArrow
201201
);
202202
return arrows;
203203
}

local-libs/traceviewer-libs/react-components/src/components/utils/xy-output-component-utils.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,9 @@ export function drawSelection(params: DrawSelectionParams): void {
130130
const { startPixel, endPixel, isBarPlot, chartArea, props, ctx, invertSelection } = params;
131131
const minPixel = Math.min(startPixel, endPixel);
132132
const maxPixel = Math.max(startPixel, endPixel);
133-
const initialPoint = isBarPlot ? 0 : chartArea?.left ?? 0;
133+
const initialPoint = isBarPlot ? 0 : (chartArea?.left ?? 0);
134134
const chartHeight = parseInt(props.style.height.toString());
135-
const finalPoint = isBarPlot ? chartHeight : chartArea?.bottom ?? 0;
135+
const finalPoint = isBarPlot ? chartHeight : (chartArea?.bottom ?? 0);
136136

137137
if (ctx) {
138138
ctx.save();

local-libs/traceviewer-libs/react-components/src/components/xy-output-component.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,9 +185,9 @@ export class XYOutputComponent extends AbstractXYOutputComponent<AbstractOutputP
185185
) {
186186
const minPixel = Math.min(startPixel, endPixel);
187187
const maxPixel = Math.max(startPixel, endPixel);
188-
const initialPoint = this.isBarPlot ? 0 : chartArea?.left ?? 0;
188+
const initialPoint = this.isBarPlot ? 0 : (chartArea?.left ?? 0);
189189
const chartHeight = parseInt(this.props.style.height.toString());
190-
const finalPoint = this.isBarPlot ? chartHeight : chartArea?.bottom ?? 0;
190+
const finalPoint = this.isBarPlot ? chartHeight : (chartArea?.bottom ?? 0);
191191
if (ctx) {
192192
ctx.save();
193193

yarn.lock

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11897,6 +11897,11 @@ [email protected]:
1189711897
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
1189811898
integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
1189911899

11900+
prettier@^3.6.2:
11901+
version "3.6.2"
11902+
resolved "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz#ccda02a1003ebbb2bfda6f83a074978f608b9393"
11903+
integrity sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==
11904+
1190011905
pretty-format@^27.0.2:
1190111906
version "27.5.1"
1190211907
resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.1.tgz#2181879fdea51a7a5851fb39d920faa63f01d88e"

0 commit comments

Comments
 (0)