GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — Fix `insertNodeAtClassStart` for empty class with comment · Pull Request #23342 · microsoft/TypeScript

Conversation

Deleted user (ghost) commented Apr 11, 2018 •

edited by ghost

Loading

Uh oh!

There was an error while loading. Please reload this page.

Copy link

Copy Markdown

Fixes #23333
Review #23343 before reviewing this

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions

ghost requested a review from Andrew Casey (amcasey)

April 11, 2018 20:16


          Fix insertNodeAtClassStart for empty class with comment

37d21b5

ghost force-pushed the insertNodeAtClassStart branch from 44173aa to 37d21b5 Compare

April 11, 2018 20:27

Mohamed Hegazy (mhegazy) approved these changes

Apr 11, 2018

View reviewed changes

Mohamed Hegazy (mhegazy) left a comment

Copy link

Copy Markdown

Contributor

There was a problem hiding this comment.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Andrew Casey (@amcasey) can you please review as well.

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions

Andrew Casey (amcasey) reviewed

Apr 12, 2018

View reviewed changes

Andrew Casey (amcasey) left a comment

Copy link

Copy Markdown

Member

There was a problem hiding this comment.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor concerns.

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions

Comment thread

src/compiler/utilities.ts

		export function addToSeen(seen: Map<true>, key: string \| number): boolean {
		export function addToSeen(seen: Map<true>, key: string \| number): boolean;
		export function addToSeen<T>(seen: Map<T>, key: string \| number, value: T): boolean;
		export function addToSeen<T>(seen: Map<T>, key: string \| number, value: T = true as any): boolean {

Andrew Casey (amcasey) Apr 12, 2018

Copy link

Copy Markdown

Member

There was a problem hiding this comment.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For my own edification, why not use {} as the default value?

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions

Deleted user (ghost) Apr 12, 2018

Copy link

Copy Markdown

Author

There was a problem hiding this comment.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've been using Map<true> everywhere for sets; to me Map<{}> would imply actually being a map from string to something, where we didn't specify that something.

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions

Comment thread

src/services/textChanges.ts

		if (addToSeen(this.classesWithNodesInsertedAtStart, getNodeId(cls), cls)) {
		prefix = this.newLineCharacter;
		// For `class C {\n}`, don't add the trailing "\n"
		if (cls.members.length === 0 && !(positionsAreOnSameLine as any)(...getClassBraceEnds(cls, sourceFile), sourceFile)) { // TODO: GH#4130 remove 'as any'

Andrew Casey (amcasey) Apr 12, 2018

Copy link

Copy Markdown

Member

There was a problem hiding this comment.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does the number of members matter? It seems like you want to omit the linebreak as long as the class is on a single line.

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions

Deleted user (ghost) Apr 12, 2018

Copy link

Copy Markdown

Author

There was a problem hiding this comment.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's the opposite -- if the class is on a single line I want to add line breaks on both sides to get {\n member\n}; if the class is already multiline I only want the first line break.

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions

Comment thread

src/services/textChanges.ts

		this.insertNodeBefore(sourceFile, firstMember, newElement);
		}

		const indentation = formatting.SmartIndenter.findFirstNonWhitespaceColumn(getLineStartPositionForPosition(clsStart, sourceFile), clsStart, sourceFile, this.formatContext.options)

Andrew Casey (amcasey) Apr 12, 2018

Copy link

Copy Markdown

Member

There was a problem hiding this comment.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should the indentation be omitted if the class is on a single line?

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions

Deleted user (ghost) Apr 12, 2018

Copy link

Copy Markdown

Author

There was a problem hiding this comment.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's about to be multiline since we're adding a member, and that new member should be indented.

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions

Comment thread

src/services/textChanges.ts

		this.classesWithNodesInsertedAtStart.forEach(cls => {
		const sourceFile = cls.getSourceFile();
		const [openBraceEnd, closeBraceEnd] = getClassBraceEnds(cls, sourceFile);
		// For `class C { }` remove the whitespace inside the braces.

Andrew Casey (amcasey) Apr 12, 2018

Copy link

Copy Markdown

Member

There was a problem hiding this comment.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why? I like having a space there.
Shouldn't this be handled by the formatter (or at least consume the formatting options)?

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions

Deleted user (ghost) Apr 12, 2018

Copy link

Copy Markdown

Author

There was a problem hiding this comment.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Leaving the space would result in the class ending in \n } instead of just \n} The formatter won't handle this since it only formats the new nodes we're adding, not the existing whitespace surrounding them.

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions


          Merge branch 'master' into insertNodeAtClassStart

d8af64d

Deleted user (ghost) commented Apr 16, 2018

Copy link

Copy Markdown

Author

Andrew Casey (@amcasey) Could you update your review?

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

ghost merged commit aa10243 into master

Apr 26, 2018

ghost deleted the insertNodeAtClassStart branch

April 26, 2018 15:00

Microsoft (microsoft) locked and limited conversation to collaborators

Jul 31, 2018

This pull request was closed.

Reviewers

No reviews

Uh oh!

There was an error while loading. Please reload this page.

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Uh oh!

There was an error while loading. Please reload this page.

2 participants

Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.

You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.

Conversation

Deleted user (ghost) commented Apr 11, 2018 • edited by ghost Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Mohamed Hegazy (mhegazy) left a comment

Choose a reason for hiding this comment

Uh oh!

Andrew Casey (amcasey) left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Deleted user (ghost) commented Apr 16, 2018

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Deleted user (ghost) commented Apr 11, 2018 •

edited by ghost

Loading

Uh oh!

There was an error while loading. Please reload this page.