740805 - Treat JSM files as JS scripts in the debugger

Status: RESOLVED FIXED

(DevTools :: Debugger, defect, P2)

Description

[Panos Astithas (he/him) [:past] (please ni?)]

When displaying JS module files we need to have the editor use the JavaScript highlighting mode, not the HTML one.

Comment 1

[Panos Astithas (he/him) [:past] (please ni?)]

Attachment: Working patch

The patch from the remote-debug repo.

Comment 2

[Rob Campbell [:rc] (:robcee)]

Comment on attachment 610878 [details] [diff] [review]
Working patch

you're using a regex above this. What about:

if (/\.jsm?$/.test(this._trimUrlQuery(aUrl))) {
  window.editor.setMode(SourceEditor.MODES.JAVASCRIPT);
}

?

It doesn't exactly help readability (so a comment describing the regexp could be helpful) but it does cut down on an extra call to _trimUrlQuery() and .slice().

Comment 3

[Panos Astithas (he/him) [:past] (please ni?)]

(In reply to Rob Campbell [:rc] (:robcee) from comment #2)
> Comment on attachment 610878 [details] [diff] [review]
> Working patch
> 
> you're using a regex above this. What about:
> 
> if (/\.jsm?$/.test(this._trimUrlQuery(aUrl))) {
>   window.editor.setMode(SourceEditor.MODES.JAVASCRIPT);
> }
> 
> ?
> 
> It doesn't exactly help readability (so a comment describing the regexp
> could be helpful) but it does cut down on an extra call to _trimUrlQuery()
> and .slice().

Yes, that's a good idea!

Comment 5

[Panos Astithas (he/him) [:past] (please ni?)]

Attachment: Working patch v2

Updated to use a regex.

Comment 6

[Victor Porof [:vporof][:vp]]

(In reply to Panos Astithas [:past] from comment #5)
> Created attachment 613659 [details] [diff] [review]
> Working patch v2
> 
> Updated to use a regex.

This needs a quick and easy rebase.

Comment 7

[Rob Campbell [:rc] (:robcee)]

Comment on attachment 613659 [details] [diff] [review]
Working patch v2

rebasing is easy!

Comment 8

[Panos Astithas (he/him) [:past] (please ni?)]

Rebased and landed:

https://hg.mozilla.org/integration/fx-team/rev/0319eb7b084a

Comment 9

[Rob Campbell [:rc] (:robcee)]

https://hg.mozilla.org/mozilla-central/rev/0319eb7b084a