Skip to content

SI-3368 Default to coalescing for 2.11#4451

Merged
adriaanm merged 1 commit intoscala:2.11.xfrom
som-snytt:issue/3368-remediate
Apr 16, 2015
Merged

SI-3368 Default to coalescing for 2.11#4451
adriaanm merged 1 commit intoscala:2.11.xfrom
som-snytt:issue/3368-remediate

Conversation

@som-snytt
Copy link
Contributor

Preserve current behavior (no PCData nodes, only Text)
for 2.11.

The coalescing flag is on if enabled or if source level
is not 2.12 and no flag was supplied.

The subtle change is that adjacent Text nodes are thereby
coalesced. This happens in the presence of CData sections,
but this is at the discretion of the parser anyway.

Also, no PCData nodes are emitted under coalescing, even
if there were no sibling text nodes. That is the correct
behavior: the general idea is that coalescing mode says,
I only want to deal with text.

Preserve current behavior (no PCData nodes, only Text)
for 2.11.

The coalescing flag is on if enabled or if source level
is not 2.12 and no flag was supplied.

The subtle change is that adjacent Text nodes are thereby
coalesced. This happens in the presence of CData sections,
but this is at the discretion of the parser anyway.

Also, no PCData nodes are emitted under coalescing, even
if there were no sibling text nodes. That is the correct
behavior: the general idea is that coalescing mode says,
I only want to deal with text.
@scala-jenkins scala-jenkins added this to the 2.11.7 milestone Apr 16, 2015
@som-snytt
Copy link
Contributor Author

This is a tweak to #4306

@som-snytt
Copy link
Contributor Author

/rebuild

Guessing spurious because ide. changingManyPreferencesAtOnce is the failure and it looks sensitive to slow CI, what with maxIdlenessLengthMillis and little sleeps.

I have no idea what this means --

// decrease max length to lower than current inactivity duration but disable closing

but next time someone asks, How ya doin'?, I'm going to reply, Lower than current inactivity duration.

@adriaanm
Copy link
Contributor

I've bene looking into saving time here, e.g.: scala-ide/uber-build#71

@adriaanm
Copy link
Contributor

Scabot doesn't expose fine-grained enough rebuild, sadly -- I've been hitting rebuild directly on jenkins to avoid redoing validate-test. I'm going to cancel the full rebuild since the IDE-only rebuild was already pending. Behemoth numero duo was slow to come up, it seems.

Another fine day in infrastructure land.

@adriaanm
Copy link
Contributor

/nothingtoseehere -- the IDE run will pop up soon

@adriaanm
Copy link
Contributor

My priority is to get our nightly back up, and it will run before the IDE job will finish, so I'm going to merge this, as it LGTM, and will take it upon me to fix the IDE build if for some bizarre reason it fails for reals.

@adriaanm
Copy link
Contributor

LGTM -- thanks, @som-snytt!

adriaanm added a commit that referenced this pull request Apr 16, 2015
SI-3368 Default to coalescing for 2.11
@adriaanm adriaanm merged commit b730937 into scala:2.11.x Apr 16, 2015
@som-snytt
Copy link
Contributor Author

OK @adriaanm , thx, I guess I can't break the build worse at this point.

I tried to bounce the ball back quicker, but it turns out that a setting with default = coalescing means what is enabled for -Xxml with no flag, as for -Xlint, obviously. Sometimes the obvious is elusive.

@adriaanm
Copy link
Contributor

No worries -- the breakage was due to some pretty dubious test in scala-xml, of course.

Sorry, I'm having a hard time parsing

that a setting with default = coalescing means what is enabled for -Xxml with no flag, as for -Xlint, obviously

@som-snytt
Copy link
Contributor Author

I tried and failed to make coalescing default to true by using the wrong mechanism, is all. I shouldn't have called the parameter "default" when you create a MultiChoiceSetting; a year later, that simple thing wasted some of my time. Ha. I don't know the emoji for that. A snake biting itself in the ass?

@adriaanm
Copy link
Contributor

:orobourous:?

@som-snytt
Copy link
Contributor Author

I was gonna add, if snakes had asses, but this is close 🐉 Or that might actually be "chasing your own tail".

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants