set ignoreOverrides false for ipynb and sql files #10499
Conversation
| @@ -125,7 +125,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape { | |||
| // preserve pre 1.38 behaviour to not make group active when preserveFocus: true | |||
| // but make sure to restore the editor to fix https://github.com/microsoft/vscode/issues/79633 | |||
| activation: options.preserveFocus ? EditorActivation.RESTORE : undefined, | |||
| ignoreOverrides: true | |||
| ignoreOverrides: uri.fsPath.endsWith('ipynb') || uri.fsPath.endsWith('sql') ? false : true // {{SQL CARBON EDIT}} | |||
There was a problem hiding this comment.
do we need a toLower() here (i.e. a file is *.SQL or *.IPYNB)? Does that scenario work, or do we need a toLower() here?
| @@ -125,7 +125,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape { | |||
| // preserve pre 1.38 behaviour to not make group active when preserveFocus: true | |||
| // but make sure to restore the editor to fix https://github.com/microsoft/vscode/issues/79633 | |||
| activation: options.preserveFocus ? EditorActivation.RESTORE : undefined, | |||
| ignoreOverrides: true | |||
| ignoreOverrides: uri.fsPath.toLowerCase().endsWith('ipynb') || uri.fsPath.toLowerCase().endsWith('sql') ? false : true // {{SQL CARBON EDIT}} | |||
There was a problem hiding this comment.
do we know that uri will never be undefined here?
There was a problem hiding this comment.
I've been testing this myself. I haven't gotten into this case yet, but we should be defensive about this for uri and probably uri.fsPath as well.
There was a problem hiding this comment.
yeah, particularly with the change coming so close to the release. unless, we can see a null check further up the callstack, or uri being referenced unchecked lower in the stack (in which case it will fail anyways)
There was a problem hiding this comment.
right, those 2 scenarios don't appear to be true.
There was a problem hiding this comment.
there's no null check for uri, but further up the callstack they're resolving the document uri before calling this:
* set ignoreOverrides false for ipynb and sql files * toLowerCase * null checks added
This PR fixes #10490