@@ -17,11 +17,7 @@ import { isStandalone } from 'vs/base/browser/browser';
17
17
import { localize } from 'vs/nls' ;
18
18
import { Schemas } from 'vs/base/common/network' ;
19
19
import product from 'vs/platform/product/common/product' ;
20
- < < < << << HEAD
21
20
import { encodePath } from 'vs/server/node/util' ;
22
- === === =
23
- import { parseLogLevel } from 'vs/platform/log/common/log' ;
24
- >>> >>> > e4a830e9b7ca039c7c70697786d29f5b6679d775
25
21
26
22
function doCreateUri ( path : string , queryValues : Map < string , string > ) : URI {
27
23
let query : string | undefined = undefined ;
@@ -442,50 +438,7 @@ class WindowIndicator implements IWindowIndicator {
442
438
// Find workspace to open and payload
443
439
let foundWorkspace = false ;
444
440
let workspace : IWorkspace ;
445
- < < < << << HEAD
446
441
let payload = config . workspaceProvider ?. payload || Object . create ( null ) ;
447
- === === =
448
- let payload = Object . create ( null ) ;
449
- let logLevel : string | undefined = undefined ;
450
-
451
- const query = new URL ( document . location . href ) . searchParams ;
452
- query . forEach ( ( value , key ) => {
453
- switch ( key ) {
454
-
455
- // Folder
456
- case WorkspaceProvider . QUERY_PARAM_FOLDER :
457
- workspace = { folderUri : URI . parse ( value ) } ;
458
- foundWorkspace = true ;
459
- break ;
460
-
461
- // Workspace
462
- case WorkspaceProvider . QUERY_PARAM_WORKSPACE :
463
- workspace = { workspaceUri : URI . parse ( value ) } ;
464
- foundWorkspace = true ;
465
- break ;
466
-
467
- // Empty
468
- case WorkspaceProvider . QUERY_PARAM_EMPTY_WINDOW :
469
- workspace = undefined ;
470
- foundWorkspace = true ;
471
- break ;
472
-
473
- // Payload
474
- case WorkspaceProvider . QUERY_PARAM_PAYLOAD :
475
- try {
476
- payload = JSON . parse ( value ) ;
477
- } catch ( error ) {
478
- console . error ( error ) ; // possible invalid JSON
479
- }
480
- break ;
481
-
482
- // Log level
483
- case 'logLevel' :
484
- logLevel = value ;
485
- break ;
486
- }
487
- } ) ;
488
- > >>> >>> e4a830e9b7ca039c7c70697786d29f5b6679d775
489
442
490
443
// If no workspace is provided through the URL, check for config attribute from server
491
444
if ( ! foundWorkspace ) {
@@ -543,7 +496,6 @@ class WindowIndicator implements IWindowIndicator {
543
496
// Finally create workbench
544
497
create ( document . body , {
545
498
...config ,
546
- logLevel : logLevel ? parseLogLevel ( logLevel ) : undefined ,
547
499
settingsSyncOptions,
548
500
windowIndicator,
549
501
productQualityChangeHandler,
0 commit comments