diff options
| author | Matt Godbolt <matt@godbolt.org> | 2021-12-13 23:12:25 -0600 |
|---|---|---|
| committer | Matt Godbolt <matt@godbolt.org> | 2021-12-13 23:12:25 -0600 |
| commit | eb002af78fa7a83cb46ef5e7bbaf9b870386454a (patch) | |
| tree | f5b8e038f500f2c194facca4b8c68d0a0a6351f8 | |
| parent | 91f52c6c98d8bb3f53ae7a3bbc88d6130cedc8bf (diff) | |
| download | compiler-explorer-gh-1370.tar.gz compiler-explorer-gh-1370.zip | |
Update prettier, reformat json filesgh-1370
| -rw-r--r-- | package-lock.json | 6 | ||||
| -rw-r--r-- | package.json | 6 | ||||
| -rw-r--r-- | static/tsconfig.json | 22 | ||||
| -rw-r--r-- | test/cfg-cases/cfg-gcc.binary.json | 76 | ||||
| -rw-r--r-- | test/state/andthekitchensink.json | 516 | ||||
| -rw-r--r-- | test/state/bug-2231.json | 118 | ||||
| -rw-r--r-- | test/state/conformanceview.json | 400 | ||||
| -rw-r--r-- | test/state/executor.json | 276 | ||||
| -rw-r--r-- | test/state/executorwrap.json | 346 | ||||
| -rw-r--r-- | test/state/output-editor-id.json | 300 | ||||
| -rw-r--r-- | test/state/output-editor-id.normalized.json | 60 | ||||
| -rw-r--r-- | test/state/tree-gl-outputpane.json | 468 | ||||
| -rw-r--r-- | test/state/tree-gl-outputpane.normalized.json | 168 | ||||
| -rw-r--r-- | test/state/tree-gl.json | 528 | ||||
| -rw-r--r-- | test/state/tree-mobile.goldenified.json | 294 | ||||
| -rw-r--r-- | test/state/tree-mobile.json | 168 | ||||
| -rw-r--r-- | test/state/tree.goldenified.json | 396 | ||||
| -rw-r--r-- | test/state/tree.json | 204 | ||||
| -rw-r--r-- | test/state/tree.normalized.json | 204 | ||||
| -rw-r--r-- | test/state/twocompilers.json | 376 |
20 files changed, 2438 insertions, 2494 deletions
diff --git a/package-lock.json b/package-lock.json index 2e0b0fda5..e51c17a24 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12408,9 +12408,9 @@ "dev": true }, "prettier": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz", - "integrity": "sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==", + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.5.1.tgz", + "integrity": "sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==", "dev": true }, "private": { diff --git a/package.json b/package.json index c38e45ae7..ee663537d 100644 --- a/package.json +++ b/package.json @@ -119,7 +119,7 @@ "nock": "^13.2.1", "nyc": "^15.1.0", "optimize-css-assets-webpack-plugin": "^5.0.8", - "prettier": "2.3.2", + "prettier": "^2.5.1", "sass": "^1.45.0", "sass-loader": "^10.2.0", "sinon": "^12.0.1", @@ -156,8 +156,8 @@ "sentry": "npx -p @sentry/cli sentry-cli", "update-browserslist": "npx browserslist@latest -- --update-db", "prepare": "husky install", - "format": "prettier --ignore-unknown", - "format-fix": "prettier --write --ignore-unknown" + "format": "prettier --ignore-unknown .", + "format-fix": "prettier --write --ignore-unknown ." }, "lint-staged": { "*.js": [ diff --git a/static/tsconfig.json b/static/tsconfig.json index 47f099568..28db24f30 100644 --- a/static/tsconfig.json +++ b/static/tsconfig.json @@ -1,13 +1,13 @@ { - "compilerOptions": { - /* Module options */ - "target": "es5", - "rootDir": ".", - /* Code emitting options */ - "sourceMap": true, - "downlevelIteration": true, - "importHelpers": true, - /* Interoperability constraints */ - "esModuleInterop": true, - } + "compilerOptions": { + /* Module options */ + "target": "es5", + "rootDir": ".", + /* Code emitting options */ + "sourceMap": true, + "downlevelIteration": true, + "importHelpers": true, + /* Interoperability constraints */ + "esModuleInterop": true + } } diff --git a/test/cfg-cases/cfg-gcc.binary.json b/test/cfg-cases/cfg-gcc.binary.json index beaf8c90c..3f6f176f1 100644 --- a/test/cfg-cases/cfg-gcc.binary.json +++ b/test/cfg-cases/cfg-gcc.binary.json @@ -5,20 +5,14 @@ "source": null }, { - "opcodes": [ - "85", - "ff" - ], + "opcodes": ["85", "ff"], "address": 4195280, "text": " test edi,edi", "source": 3, "links": null }, { - "opcodes": [ - "78", - "16" - ], + "opcodes": ["78", "16"], "address": 4195282, "text": " js 4003ea <main+0x1a>", "source": 3, @@ -31,85 +25,56 @@ ] }, { - "opcodes": [ - "83", - "c7", - "01" - ], + "opcodes": ["83", "c7", "01"], "address": 4195284, "text": " add edi,0x1", "source": 3, "links": null }, { - "opcodes": [ - "31", - "c0" - ], + "opcodes": ["31", "c0"], "address": 4195287, "text": " xor eax,eax", "source": 2, "links": null }, { - "opcodes": [ - "31", - "d2" - ], + "opcodes": ["31", "d2"], "address": 4195289, "text": " xor edx,edx", "source": 3, "links": null }, { - "opcodes": [ - "0f", - "1f", - "44", - "00", - "00" - ], + "opcodes": ["0f", "1f", "44", "00", "00"], "address": 4195291, "text": " nop DWORD PTR [rax+rax*1+0x0]", "source": 3, "links": null }, { - "opcodes": [ - "01", - "d0" - ], + "opcodes": ["01", "d0"], "address": 4195296, "text": " add eax,edx", "source": 4, "links": null }, { - "opcodes": [ - "83", - "c2", - "01" - ], + "opcodes": ["83", "c2", "01"], "address": 4195298, "text": " add edx,0x1", "source": 3, "links": null }, { - "opcodes": [ - "39", - "fa" - ], + "opcodes": ["39", "fa"], "address": 4195301, "text": " cmp edx,edi", "source": 3, "links": null }, { - "opcodes": [ - "75", - "f7" - ], + "opcodes": ["75", "f7"], "address": 4195303, "text": " jne 4003e0 <main+0x10>", "source": 3, @@ -122,39 +87,28 @@ ] }, { - "opcodes": [ - "c3" - ], + "opcodes": ["c3"], "address": 4195305, "text": " ret ", "source": 3, "links": null }, { - "opcodes": [ - "31", - "c0" - ], + "opcodes": ["31", "c0"], "address": 4195306, "text": " xor eax,eax", "source": 2, "links": null }, { - "opcodes": [ - "c3" - ], + "opcodes": ["c3"], "address": 4195308, "text": " ret ", "source": 9, "links": null }, { - "opcodes": [ - "0f", - "1f", - "00" - ], + "opcodes": ["0f", "1f", "00"], "address": 4195309, "text": " nop DWORD PTR [rax]", "source": 9, @@ -223,4 +177,4 @@ ] } } -}
\ No newline at end of file +} diff --git a/test/state/andthekitchensink.json b/test/state/andthekitchensink.json index 73b4234d9..48384f3df 100644 --- a/test/state/andthekitchensink.json +++ b/test/state/andthekitchensink.json @@ -1,264 +1,264 @@ { - "settings": { - "hasHeaders": true, - "constrainDragToContainer": false, - "reorderEnabled": true, - "selectionEnabled": false, - "popoutWholeStack": false, - "blockedPopoutsThrowError": true, - "closePopoutsOnUnload": true, - "showPopoutIcon": false, - "showMaximiseIcon": true, - "showCloseIcon": true, - "responsiveMode": "onload", - "tabOverlapAllowance": 0, - "reorderOnTabMenuClick": true, - "tabControlOffset": 10 - }, - "dimensions": { - "borderWidth": 5, - "borderGrabWidth": 15, - "minItemHeight": 10, - "minItemWidth": 10, - "headerHeight": 20, - "dragProxyWidth": 300, - "dragProxyHeight": 200 - }, - "labels": { - "close": "close", - "maximise": "maximise", - "minimise": "minimise", - "popout": "open in new window", - "popin": "pop in", - "tabDropdown": "additional tabs" - }, - "content": [ + "settings": { + "hasHeaders": true, + "constrainDragToContainer": false, + "reorderEnabled": true, + "selectionEnabled": false, + "popoutWholeStack": false, + "blockedPopoutsThrowError": true, + "closePopoutsOnUnload": true, + "showPopoutIcon": false, + "showMaximiseIcon": true, + "showCloseIcon": true, + "responsiveMode": "onload", + "tabOverlapAllowance": 0, + "reorderOnTabMenuClick": true, + "tabControlOffset": 10 + }, + "dimensions": { + "borderWidth": 5, + "borderGrabWidth": 15, + "minItemHeight": 10, + "minItemWidth": 10, + "headerHeight": 20, + "dragProxyWidth": 300, + "dragProxyHeight": 200 + }, + "labels": { + "close": "close", + "maximise": "maximise", + "minimise": "minimise", + "popout": "open in new window", + "popin": "pop in", + "tabDropdown": "additional tabs" + }, + "content": [ + { + "type": "row", + "isClosable": true, + "reorderEnabled": true, + "title": "", + "content": [ { - "type": "row", - "isClosable": true, - "reorderEnabled": true, - "title": "", - "content": [ - { - "type": "stack", - "width": 12.500000000000004, - "isClosable": true, - "reorderEnabled": true, - "title": "", - "activeItemIndex": 0, - "content": [ - { - "type": "component", - "componentName": "codeEditor", - "componentState": { - "id": 1, - "source": "\ntemplate<typename T>\nconcept TheSameAndAddable = requires(T a, T b) {\n {a+b} -> T;\n};\n\ntemplate<TheSameAndAddable T>\nT sum(T x, T y) {\n return x + y;\n}\n\n#include <string>\n\nint main() {\n int z = 0;\n int w;\n\n return sum(z, w);\n}\n", - "lang": "c++" - }, - "isClosable": true, - "reorderEnabled": true, - "title": "C++ source #1" - } - ] - }, - { - "type": "stack", - "width": 14.915966386554626, - "isClosable": true, - "reorderEnabled": true, - "title": "", - "activeItemIndex": 0, - "content": [ - { - "type": "component", - "componentName": "compiler", - "componentState": { - "compiler": "clang_concepts", - "source": 1, - "options": "-std=c++1z -Wuninitialized -O3", - "filters": { - "binary": false, - "execute": false, - "labels": true, - "directives": true, - "commentOnly": true, - "trim": false, - "intel": true, - "demangle": true - }, - "wantOptInfo": true, - "libs": [], - "lang": "c++" - }, - "isClosable": true, - "reorderEnabled": true, - "title": "x86-64 clang (experimental concepts) (Editor #1, Compiler #1) C++" - } - ] - }, - { - "type": "stack", - "width": 10.08403361344538, - "isClosable": true, - "reorderEnabled": true, - "title": "", - "activeItemIndex": 0, - "content": [ - { - "type": "component", - "componentName": "output", - "componentState": { - "compiler": 1, - "editor": 1, - "wrap": false - }, - "isClosable": true, - "reorderEnabled": true, - "title": "#1 with x86-64 clang (experimental concepts)" - } - ] - }, - { - "type": "stack", - "width": 12.500000000000004, - "isClosable": true, - "reorderEnabled": true, - "title": "", - "activeItemIndex": 0, - "content": [ - { - "type": "component", - "componentName": "ast", - "componentState": { - "id": 1, - "source": "\ntemplate<typename T>\nconcept TheSameAndAddable = requires(T a, T b) {\n {a+b} -> T;\n};\n\ntemplate<TheSameAndAddable T>\nT sum(T x, T y) {\n return x + y;\n}\n\n#include <string>\n\nint main() {\n int z = 0;\n int w;\n\n return sum(z, w);\n}\n", - "compilerName": "x86-64 clang (experimental concepts)", - "editorid": 1 - }, - "isClosable": true, - "reorderEnabled": true, - "title": "x86-64 clang (experimental concepts) Ast Viewer (Editor #1, Compiler #1)" - } - ] - }, - { - "type": "stack", - "width": 5.507131537242474, - "isClosable": true, - "reorderEnabled": true, - "title": "", - "activeItemIndex": 0, - "content": [ - { - "type": "component", - "componentName": "opt", - "componentState": { - "id": 1, - "source": "\ntemplate<typename T>\nconcept TheSameAndAddable = requires(T a, T b) {\n {a+b} -> T;\n};\n\ntemplate<TheSameAndAddable T>\nT sum(T x, T y) {\n return x + y;\n}\n\n#include <string>\n\nint main() {\n int z = 0;\n int w;\n\n return sum(z, w);\n}\n", - "compilerName": "x86-64 clang (experimental concepts)", - "editorid": 1 - }, - "isClosable": true, - "reorderEnabled": true, - "title": "x86-64 clang (experimental concepts) Opt Viewer (Editor #1, Compiler #1)" - } - ] - }, - { - "type": "stack", - "width": 15.27879391130244, - "isClosable": true, - "reorderEnabled": true, - "title": "", - "activeItemIndex": 0, - "content": [ - { - "type": "component", - "componentName": "cfg", - "componentState": { - "id": 1, - "editorid": 1, - "selectedFn": "main: ", - "pos": { - "x": 31.664837339408276, - "y": -134.74509810060746 - }, - "scale": 0.9914309396855399, - "options": { - "navigation": true, - "physics": false - } - }, - "isClosable": true, - "reorderEnabled": true, - "title": "x86-64 clang (experimental concepts) Graph Viewer (Editor #1, Compiler #1)" - } - ] + "type": "stack", + "width": 12.500000000000004, + "isClosable": true, + "reorderEnabled": true, + "title": "", + "activeItemIndex": 0, + "content": [ + { + "type": "component", + "componentName": "codeEditor", + "componentState": { + "id": 1, + "source": "\ntemplate<typename T>\nconcept TheSameAndAddable = requires(T a, T b) {\n {a+b} -> T;\n};\n\ntemplate<TheSameAndAddable T>\nT sum(T x, T y) {\n return x + y;\n}\n\n#include <string>\n\nint main() {\n int z = 0;\n int w;\n\n return sum(z, w);\n}\n", + "lang": "c++" + }, + "isClosable": true, + "reorderEnabled": true, + "title": "C++ source #1" + } + ] + }, + { + "type": "stack", + "width": 14.915966386554626, + "isClosable": true, + "reorderEnabled": true, + "title": "", + "activeItemIndex": 0, + "content": [ + { + "type": "component", + "componentName": "compiler", + "componentState": { + "compiler": "clang_concepts", + "source": 1, + "options": "-std=c++1z -Wuninitialized -O3", + "filters": { + "binary": false, + "execute": false, + "labels": true, + "directives": true, + "commentOnly": true, + "trim": false, + "intel": true, + "demangle": true }, - { - "type": "stack", - "width": 16.71407455145509, - "isClosable": true, - "reorderEnabled": true, - "title": "", - "activeItemIndex": 0, - "content": [ - { - "type": "component", - "componentName": "compiler", - "componentState": { - "compiler": "g82", - "source": 1, - "options": "", - "filters": { - "binary": false, - "execute": false, - "labels": true, - "directives": true, - "commentOnly": true, - "trim": false, - "intel": true, - "demangle": true - }, - "libs": [], - "lang": "c++" - }, - "isClosable": true, - "reorderEnabled": true, - "title": "x86-64 gcc 8.2 (Editor #1, Compiler #2) C++" - } - ] + "wantOptInfo": true, + "libs": [], + "lang": "c++" + }, + "isClosable": true, + "reorderEnabled": true, + "title": "x86-64 clang (experimental concepts) (Editor #1, Compiler #1) C++" + } + ] + }, + { + "type": "stack", + "width": 10.08403361344538, + "isClosable": true, + "reorderEnabled": true, + "title": "", + "activeItemIndex": 0, + "content": [ + { + "type": "component", + "componentName": "output", + "componentState": { + "compiler": 1, + "editor": 1, + "wrap": false + }, + "isClosable": true, + "reorderEnabled": true, + "title": "#1 with x86-64 clang (experimental concepts)" + } + ] + }, + { + "type": "stack", + "width": 12.500000000000004, + "isClosable": true, + "reorderEnabled": true, + "title": "", + "activeItemIndex": 0, + "content": [ + { + "type": "component", + "componentName": "ast", + "componentState": { + "id": 1, + "source": "\ntemplate<typename T>\nconcept TheSameAndAddable = requires(T a, T b) {\n {a+b} -> T;\n};\n\ntemplate<TheSameAndAddable T>\nT sum(T x, T y) {\n return x + y;\n}\n\n#include <string>\n\nint main() {\n int z = 0;\n int w;\n\n return sum(z, w);\n}\n", + "compilerName": "x86-64 clang (experimental concepts)", + "editorid": 1 + }, + "isClosable": true, + "reorderEnabled": true, + "title": "x86-64 clang (experimental concepts) Ast Viewer (Editor #1, Compiler #1)" + } + ] + }, + { + "type": "stack", + "width": 5.507131537242474, + "isClosable": true, + "reorderEnabled": true, + "title": "", + "activeItemIndex": 0, + "content": [ + { + "type": "component", + "componentName": "opt", + "componentState": { + "id": 1, + "source": "\ntemplate<typename T>\nconcept TheSameAndAddable = requires(T a, T b) {\n {a+b} -> T;\n};\n\ntemplate<TheSameAndAddable T>\nT sum(T x, T y) {\n return x + y;\n}\n\n#include <string>\n\nint main() {\n int z = 0;\n int w;\n\n return sum(z, w);\n}\n", + "compilerName": "x86-64 clang (experimental concepts)", + "editorid": 1 + }, + "isClosable": true, + "reorderEnabled": true, + "title": "x86-64 clang (experimental concepts) Opt Viewer (Editor #1, Compiler #1)" + } + ] + }, + { + "type": "stack", + "width": 15.27879391130244, + "isClosable": true, + "reorderEnabled": true, + "title": "", + "activeItemIndex": 0, + "content": [ + { + "type": "component", + "componentName": "cfg", + "componentState": { + "id": 1, + "editorid": 1, + "selectedFn": "main: ", + "pos": { + "x": 31.664837339408276, + "y": -134.74509810060746 }, - { - "type": "stack", - "width": 12.5, - "isClosable": true, - "reorderEnabled": true, - "title": "", - "activeItemIndex": 0, - "content": [ - { - "type": "component", - "componentName": "gccdump", - "componentState": { - "_compilerid": 2, - "_editorid": 1, - "selectedPass": "004t.gimple", - "treeDump": true, - "rtlDump": true - }, - "isClosable": true, - "reorderEnabled": true, - "title": "x86-64 gcc 8.2 GCC Tree/RTL Viewer (Editor #1, Compiler #2)" - } - ] + "scale": 0.9914309396855399, + "options": { + "navigation": true, + "physics": false } - ] + }, + "isClosable": true, + "reorderEnabled": true, + "title": "x86-64 clang (experimental concepts) Graph Viewer (Editor #1, Compiler #1)" + } + ] + }, + { + "type": "stack", + "width": 16.71407455145509, + "isClosable": true, + "reorderEnabled": true, + "title": "", + "activeItemIndex": 0, + "content": [ + { + "type": "component", + "componentName": "compiler", + "componentState": { + "compiler": "g82", + "source": 1, + "options": "", + "filters": { + "binary": false, + "execute": false, + "labels": true, + "directives": true, + "commentOnly": true, + "trim": false, + "intel": true, + "demangle": true + }, + "libs": [], + "lang": "c++" + }, + "isClosable": true, + "reorderEnabled": true, + "title": "x86-64 gcc 8.2 (Editor #1, Compiler #2) C++" + } + ] + }, + { + "type": "stack", + "width": 12.5, + "isClosable": true, + "reorderEnabled": true, + "title": "", + "activeItemIndex": 0, + "content": [ + { + "type": "component", + "componentName": "gccdump", + "componentState": { + "_compilerid": 2, + "_editorid": 1, + "selectedPass": "004t.gimple", + "treeDump": true, + "rtlDump": true + }, + "isClosable": true, + "reorderEnabled": true, + "title": "x86-64 gcc 8.2 GCC Tree/RTL Viewer (Editor #1, Compiler #2)" + } + ] } - ], - "isClosable": true, - "reorderEnabled": true, - "title": "", - "openPopouts": [], - "maximisedItemId": null -}
\ No newline at end of file + ] + } + ], + "isClosable": true, + "reorderEnabled": true, + "title": "", + "openPopouts": [], + "maximisedItemId": null +} diff --git a/test/state/bug-2231.json b/test/state/bug-2231.json index 5ed8bbe23..3110ebcae 100644 --- a/test/state/bug-2231.json +++ b/test/state/bug-2231.json @@ -1,63 +1,61 @@ { - "sessions": [ + "sessions": [ + { + "id": 1, + "language": "c++", + "source": "#include <Groundfloor/Atoms/Defines.h>\n#include <cstdio>\n\nint main() {\n const char crlf[] = GFNATIVENEXTLINE;\n\n printf(\"hello%s\", crlf);\n return 46;\n}\n\n\n", + "conformanceview": false, + "compilers": [ { - "id": 1, - "language": "c++", - "source": "#include <Groundfloor/Atoms/Defines.h>\n#include <cstdio>\n\nint main() {\n const char crlf[] = GFNATIVENEXTLINE;\n\n printf(\"hello%s\", crlf);\n return 46;\n}\n\n\n", - "conformanceview": false, - "compilers": [ - { - "id": "vc2017_64", - "options": "", - "filters": { - "binary": true, - "commentOnly": false, - "demangle": false, - "directives": false, - "execute": false, - "intel": true, - "labels": false, - "trim": false - }, - "libs": [ - { - "name": "openssl", - "ver": "111c" - }, - { - "name": "crosscables", - "ver": "trunk" - } - ], - "specialoutputs": [], - "tools": [] - }, - { - "id": "", - "options": "", - "filters": { - "binary": false, - "commentOnly": true, - "demangle": true, - "directives": true, - "execute": false, - "intel": true, - "labels": true, - "trim": false - }, - "libs": [], - "specialoutputs": [ - "compilerOutput" - ], - "tools": [ - { - "id": "strings", - "args": "" - } - ] - } - ], - "executors": [] + "id": "vc2017_64", + "options": "", + "filters": { + "binary": true, + "commentOnly": false, + "demangle": false, + "directives": false, + "execute": false, + "intel": true, + "labels": false, + "trim": false + }, + "libs": [ + { + "name": "openssl", + "ver": "111c" + }, + { + "name": "crosscables", + "ver": "trunk" + } + ], + "specialoutputs": [], + "tools": [] + }, + { + "id": "", + "options": "", + "filters": { + "binary": false, + "commentOnly": true, + "demangle": true, + "directives": true, + "execute": false, + "intel": true, + "labels": true, + "trim": false + }, + "libs": [], + "specialoutputs": ["compilerOutput"], + "tools": [ + { + "id": "strings", + "args": "" + } + ] } - ] -}
\ No newline at end of file + ], + "executors": [] + } + ] +} diff --git a/test/state/conformanceview.json b/test/state/conformanceview.json index a89e35af6..da5c80237 100644 --- a/test/state/conformanceview.json +++ b/test/state/conformanceview.json @@ -1,206 +1,206 @@ { - "settings": { - "hasHeaders": true, - "constrainDragToContainer": false, - "reorderEnabled": true, - "selectionEnabled": false, - "popoutWholeStack": false, - "blockedPopoutsThrowError": true, - "closePopoutsOnUnload": true, - "showPopoutIcon": false, - "showMaximiseIcon": true, - "showCloseIcon": true, - "responsiveMode": "onload", - "tabOverlapAllowance": 0, - "reorderOnTabMenuClick": true, - "tabControlOffset": 10 - }, - "dimensions": { - "borderWidth": 5, - "borderGrabWidth": 15, - "minItemHeight": 10, - "minItemWidth": 10, - "headerHeight": 20, - "dragProxyWidth": 300, - "dragProxyHeight": 200 - }, - "labels": { - "close": "close", - "maximise": "maximise", - "minimise": "minimise", - "popout": "open in new window", - "popin": "pop in", - "tabDropdown": "additional tabs" - }, - "content": [ + "settings": { + "hasHeaders": true, + "constrainDragToContainer": false, + "reorderEnabled": true, + "selectionEnabled": false, + "popoutWholeStack": false, + "blockedPopoutsThrowError": true, + "closePopoutsOnUnload": true, + "showPopoutIcon": false, + "showMaximiseIcon": true, + "showCloseIcon": true, + "responsiveMode": "onload", + "tabOverlapAllowance": 0, + "reorderOnTabMenuClick": true, + "tabControlOffset": 10 + }, + "dimensions": { + "borderWidth": 5, + "borderGrabWidth": 15, + "minItemHeight": 10, + "minItemWidth": 10, + "headerHeight": 20, + "dragProxyWidth": 300, + "dragProxyHeight": 200 + }, + "labels": { + "close": "close", + "maximise": "maximise", + "minimise": "minimise", + "popout": "open in new window", + "popin": "pop in", + "tabDropdown": "additional tabs" + }, + "content": [ + { + "type": "row", + "isClosable": true, + "reorderEnabled": true, + "title": "", + "content": [ { - "type": "row", - "isClosable": true, - "reorderEnabled": true, - "title": "", - "content": [ - { - "type": "stack", - "width": 20, - "isClosable": true, - "reorderEnabled": true, - "title": "", - "activeItemIndex": 0, - "content": [ - { - "type": "component", - "componentName": "codeEditor", - "componentState": { - "id": 1, - "source": "// Type your code here, or load an example.\r\nint square(int num) {\r\n return num * num;\r\n}", - "lang": "c++" - }, - "isClosable": true, - "reorderEnabled": true, - "title": "C++ source #1" - } - ] - }, - { - "type": "stack", - "width": 20, - "isClosable": true, - "reorderEnabled": true, - "title": "", - "activeItemIndex": 0, - "content": [ - { - "type": "component", - "componentName": "compiler", - "componentState": { - "compiler": "vc2017_64", - "source": 1, - "options": "", - "filters": { - "binary": false, - "execute": false, - "labels": true, - "directives": true, - "commentOnly": true, - "trim": false, - "intel": true, - "demangle": true - }, - "libs": [], - "lang": "c++" - }, - "isClosable": true, - "reorderEnabled": true, - "title": "VC 2017 amd64 (Editor #1, Compiler #1) C++" - } - ] + "type": "stack", + "width": 20, + "isClosable": true, + "reorderEnabled": true, + "title": "", + "activeItemIndex": 0, + "content": [ + { + "type": "component", + "componentName": "codeEditor", + "componentState": { + "id": 1, + "source": "// Type your code here, or load an example.\r\nint square(int num) {\r\n return num * num;\r\n}", + "lang": "c++" + }, + "isClosable": true, + "reorderEnabled": true, + "title": "C++ source #1" + } + ] + }, + { + "type": "stack", + "width": 20, + "isClosable": true, + "reorderEnabled": true, + "title": "", + "activeItemIndex": 0, + "content": [ + { + "type": "component", + "componentName": "compiler", + "componentState": { + "compiler": "vc2017_64", + "source": 1, + "options": "", + "filters": { + "binary": false, + "execute": false, + "labels": true, + "directives": true, + "commentOnly": true, + "trim": false, + "intel": true, + "demangle": true }, - { - "type": "stack", - "width": 20, - "isClosable": true, - "reorderEnabled": true, - "title": "", - "activeItemIndex": 0, - "content": [ - { - "type": "component", - "componentName": "conformance", - "componentState": { - "editorid": 1, - "langId": "c++", - "compilers": [ - { - "compilerId": "vc2017_32", - "options": "-O3" - }, - { - "compilerId": "vc2017_64", - "options": "-O2" - } - ], - "libs": [] - }, - "isClosable": true, - "reorderEnabled": true, - "title": "Conformance viewer (Editor #1) 2/10" - } - ] + "libs": [], + "lang": "c++" + }, + "isClosable": true, + "reorderEnabled": true, + "title": "VC 2017 amd64 (Editor #1, Compiler #1) C++" + } + ] + }, + { + "type": "stack", + "width": 20, + "isClosable": true, + "reorderEnabled": true, + "title": "", + "activeItemIndex": 0, + "content": [ + { + "type": "component", + "componentName": "conformance", + "componentState": { + "editorid": 1, + "langId": "c++", + "compilers": [ + { + "compilerId": "vc2017_32", + "options": "-O3" + }, + { + "compilerId": "vc2017_64", + "options": "-O2" + } + ], + "libs": [] + }, + "isClosable": true, + "reorderEnabled": true, + "title": "Conformance viewer (Editor #1) 2/10" + } + ] + }, + { + "type": "stack", + "width": 20, + "isClosable": true, + "reorderEnabled": true, + "title": "", + "activeItemIndex": 0, + "content": [ + { + "type": "component", + "componentName": "compiler", + "componentState": { + "compiler": "vc2017_32", + "source": 1, + "options": "-O3", + "filters": { + "binary": false, + "execute": false, + "labels": true, + "directives": true, + "commentOnly": true, + "trim": false, + "intel": true, + "demangle": true }, - { - "type": "stack", - "width": 20, - "isClosable": true, - "reorderEnabled": true, - "title": "", - "activeItemIndex": 0, - "content": [ - { - "type": "component", - "componentName": "compiler", - "componentState": { - "compiler": "vc2017_32", - "source": 1, - "options": "-O3", - "filters": { - "binary": false, - "execute": false, - "labels": true, - "directives": true, - "commentOnly": true, - "trim": false, - "intel": true, - "demangle": true - }, - "libs": [], - "lang": "c++" - }, - "isClosable": true, - "reorderEnabled": true, - "title": "VC 2017 x86 (Editor #1, Compiler #2) C++" - } - ] + "libs": [], + "lang": "c++" + }, + "isClosable": true, + "reorderEnabled": true, + "title": "VC 2017 x86 (Editor #1, Compiler #2) C++" + } + ] + }, + { + "type": "stack", + "width": 20, + "isClosable": true, + "reorderEnabled": true, + "title": "", + "activeItemIndex": 0, + "content": [ + { + "type": "component", + "componentName": "compiler", + "componentState": { + "compiler": "vc2017_64", + "source": 1, + "options": "-O2", + "filters": { + "binary": false, + "execute": false, + "labels": true, + "directives": true, + "commentOnly": true, + "trim": false, + "intel": true, + "demangle": true }, - { - "type": "stack", - "width": 20, - "isClosable": true, - "reorderEnabled": true, - "title": "", - "activeItemIndex": 0, - "content": [ - { - "type": "component", - "componentName": "compiler", - "componentState": { - "compiler": "vc2017_64", - "source": 1, - "options": "-O2", - "filters": { - "binary": false, - "execute": false, - "labels": true, - "directives": true, - "commentOnly": true, - "trim": false, - "intel": true, - "demangle": true - }, - "libs": [], - "lang": "c++" - }, - "isClosable": true, - "reorderEnabled": true, - "title": "VC 2017 amd64 (Editor #1, Compiler #3) C++" - } - ] - } - ] + "libs": [], + "lang": "c++" + }, + "isClosable": true, + "reorderEnabled": true, + "title": "VC 2017 amd64 (Editor #1, Compiler #3) C++" + } + ] } - ], - "isClosable": true, - "reorderEnabled": true, - "title": "", - "openPopouts": [], - "maximisedItemId": null -}
\ No newline at end of file + ] + } + ], + "isClosable": true, + "reorderEnabled": true, + "title": "", + "openPopouts": [], + "maximisedItemId": null +} diff --git a/test/state/executor.json b/test/state/executor.json index ec46d6f69..0c8ef1584 100644 --- a/test/state/executor.json +++ b/test/state/executor.json @@ -1,142 +1,142 @@ { - "settings": { - "hasHeaders": true, - "constrainDragToContainer": false, - "reorderEnabled": true, - "selectionEnabled": false, - "popoutWholeStack": false, - "blockedPopoutsThrowError": true, - "closePopoutsOnUnload": true, - "showPopoutIcon": false, - "showMaximiseIcon": true, - "showCloseIcon": true, - "responsiveMode": "onload", - "tabOverlapAllowance": 0, - "reorderOnTabMenuClick": true, - "tabControlOffset": 10 - }, - "dimensions": { - "borderWidth": 5, - "borderGrabWidth": 15, - "minItemHeight": 10, - "minItemWidth": 10, - "headerHeight": 20, - "dragProxyWidth": 300, - "dragProxyHeight": 200 - }, - "labels": { - "close": "close", - "maximise": "maximise", - "minimise": "minimise", - "popout": "open in new window", - "popin": "pop in", - "tabDropdown": "additional tabs" - }, - "content": [ + "settings": { + "hasHeaders": true, + "constrainDragToContainer": false, + "reorderEnabled": true, + "selectionEnabled": false, + "popoutWholeStack": false, + "blockedPopoutsThrowError": true, + "closePopoutsOnUnload": true, + "showPopoutIcon": false, + "showMaximiseIcon": true, + "showCloseIcon": true, + "responsiveMode": "onload", + "tabOverlapAllowance": 0, + "reorderOnTabMenuClick": true, + "tabControlOffset": 10 + }, + "dimensions": { + "borderWidth": 5, + "borderGrabWidth": 15, + "minItemHeight": 10, + "minItemWidth": 10, + "headerHeight": 20, + "dragProxyWidth": 300, + "dragProxyHeight": 200 + }, + "labels": { + "close": "close", + "maximise": "maximise", + "minimise": "minimise", + "popout": "open in new window", + "popin": "pop in", + "tabDropdown": "additional tabs" + }, + "content": [ + { + "type": "row", + "isClosable": true, + "reorderEnabled": true, + "title": "", + "content": [ { - "type": "row", - "isClosable": true, - "reorderEnabled": true, - "title": "", - "content": [ - { - "type": "stack", - "width": 33.333333333333336, - "isClosable": true, - "reorderEnabled": true, - "title": "", - "activeItemIndex": 0, - "content": [ - { - "type": "component", - "componentName": "codeEditor", - "componentState": { - "id": 1, - "source": "// Type your code here, or load an example.\nint square(int num) {\n auto x = 344 + 5 + 1;\n return num * num + 234 + x;\n}\n\nint main() {\n return square(23);\n}\n", - "lang": "c++" - }, - "isClosable": true, - "reorderEnabled": true, - "title": "C++ source #1" - } - ] - }, - { - "type": "stack", - "width": 33.333333333333336, - "isClosable": true, - "reorderEnabled": true, - "title": "", - "activeItemIndex": 0, - "content": [ - { - "type": "component", - "componentName": "compiler", - "componentState": { - "compiler": "g92", - "source": 1, - "options": "-O3", - "filters": { - "binary": false, - "execute": false, - "labels": true, - "libraryCode": false, - "directives": true, - "commentOnly": true, - "trim": false, - "intel": true, - "demangle": true - }, - "libs": [], - "lang": "c++" - }, - "isClosable": true, - "reorderEnabled": true, - "title": "x86-64 gcc 9.2 (Editor #1, Compiler #1) C++" - } - ] + "type": "stack", + "width": 33.333333333333336, + "isClosable": true, + "reorderEnabled": true, + "title": "", + "activeItemIndex": 0, + "content": [ + { + "type": "component", + "componentName": "codeEditor", + "componentState": { + "id": 1, + "source": "// Type your code here, or load an example.\nint square(int num) {\n auto x = 344 + 5 + 1;\n return num * num + 234 + x;\n}\n\nint main() {\n return square(23);\n}\n", + "lang": "c++" + }, + "isClosable": true, + "reorderEnabled": true, + "title": "C++ source #1" + } + ] + }, + { + "type": "stack", + "width": 33.333333333333336, + "isClosable": true, + "reorderEnabled": true, + "title": "", + "activeItemIndex": 0, + "content": [ + { + "type": "component", + "componentName": "compiler", + "componentState": { + "compiler": "g92", + "source": 1, + "options": "-O3", + "filters": { + "binary": false, + "execute": false, + "labels": true, + "libraryCode": false, + "directives": true, + "commentOnly": true, + "trim": false, + "intel": true, + "demangle": true }, - { - "type": "stack", - "width": 33.33333333333333, - "isClosable": true, - "reorderEnabled": true, - "title": "", - "activeItemIndex": 0, - "content": [ - { - "type": "component", - "componentName": "executor", - "componentState": { - "compiler": "g92", - "source": 1, - "options": "-O3", - "execArgs": "test", - "execStdin": "", - "libs": [ - { - "name": "openssl", - "ver": "111c" - } - ], - "lang": "c++", - "compilationPanelShown": false, - "compilerOutShown": true, - "argsPanelShown": true, - "stdinPanelShown": false - }, - "isClosable": true, - "reorderEnabled": true, - "title": "x86-64 gcc 9.2 Executor (Editor #1) C++" - } - ] - } - ] + "libs": [], + "lang": "c++" + }, + "isClosable": true, + "reorderEnabled": true, + "title": "x86-64 gcc 9.2 (Editor #1, Compiler #1) C++" + } + ] + }, + { + "type": "stack", + "width": 33.33333333333333, + "isClosable": true, + "reorderEnabled": true, + "title": "", + "activeItemIndex": 0, + "content": [ + { + "type": "component", + "componentName": "executor", + "componentState": { + "compiler": "g92", + "source": 1, + "options": "-O3", + "execArgs": "test", + "execStdin": "", + "libs": [ + { + "name": "openssl", + "ver": "111c" + } + ], + "lang": "c++", + "compilationPanelShown": false, + "compilerOutShown": true, + "argsPanelShown": true, + "stdinPanelShown": false + }, + "isClosable": true, + "reorderEnabled": true, + "title": "x86-64 gcc 9.2 Executor (Editor #1) C++" + } + ] } - ], - "isClosable": true, - "reorderEnabled": true, - "title": "", - "openPopouts": [], - "maximisedItemId": null -}
\ No newline at end of file + ] + } + ], + "isClosable": true, + "reorderEnabled": true, + "title": "", + "openPopouts": [], + "maximisedItemId": null +} diff --git a/test/state/executorwrap.json b/test/state/executorwrap.json index 4805bfe2a..8122115dc 100644 --- a/test/state/executorwrap.json +++ b/test/state/executorwrap.json @@ -1,179 +1,179 @@ { - "settings": { - "hasHeaders": true, - "constrainDragToContainer": false, - "reorderEnabled": true, - "selectionEnabled": false, - "popoutWholeStack": false, - "blockedPopoutsThrowError": true, - "closePopoutsOnUnload": true, - "showPopoutIcon": false, - "showMaximiseIcon": true, - "showCloseIcon": true, - "responsiveMode": "onload", - "tabOverlapAllowance": 0, - "reorderOnTabMenuClick": true, - "tabControlOffset": 10 - }, - "dimensions": { - "borderWidth": 5, - "borderGrabWidth": 15, - "minItemHeight": 10, - "minItemWidth": 10, - "headerHeight": 20, - "dragProxyWidth": 300, - "dragProxyHeight": 200 - }, - "labels": { - "close": "close", - "maximise": "maximise", - "minimise": "minimise", - "popout": "open in new window", - "popin": "pop in", - "tabDropdown": "additional tabs" - }, - "content": [ + "settings": { + "hasHeaders": true, + "constrainDragToContainer": false, + "reorderEnabled": true, + "selectionEnabled": false, + "popoutWholeStack": false, + "blockedPopoutsThrowError": true, + "closePopoutsOnUnload": true, + "showPopoutIcon": false, + "showMaximiseIcon": true, + "showCloseIcon": true, + "responsiveMode": "onload", + "tabOverlapAllowance": 0, + "reorderOnTabMenuClick": true, + "tabControlOffset": 10 + }, + "dimensions": { + "borderWidth": 5, + "borderGrabWidth": 15, + "minItemHeight": 10, + "minItemWidth": 10, + "headerHeight": 20, + "dragProxyWidth": 300, + "dragProxyHeight": 200 + }, + "labels": { + "close": "close", + "maximise": "maximise", + "minimise": "minimise", + "popout": "open in new window", + "popin": "pop in", + "tabDropdown": "additional tabs" + }, + "content": [ + { + "type": "column", + "isClosable": true, + "reorderEnabled": true, + "title": "", + "content": [ { - "type": "column", - "isClosable": true, - "reorderEnabled": true, - "title": "", - "content": [ - { - "type": "stack", - "width": 100, - "height": 50, - "isClosable": true, - "reorderEnabled": true, - "title": "", - "activeItemIndex": 0, - "content": [ - { - "type": "component", - "componentName": "codeEditor", - "componentState": { - "id": 1, - "source": "// Type your code here, or load an example.\nint square(int num) {\n return num * num;\n}", - "lang": "c++", - "selection": { - "startLineNumber": 2, - "startColumn": 12, - "endLineNumber": 2, - "endColumn": 19, - "selectionStartLineNumber": 2, - "selectionStartColumn": 19, - "positionLineNumber": 2, - "positionColumn": 12 - }, - "fontScale": 14, - "fontUsePx": true - }, - "isClosable": true, - "reorderEnabled": true, - "title": "C++ source #1" - } - ] + "type": "stack", + "width": 100, + "height": 50, + "isClosable": true, + "reorderEnabled": true, + "title": "", + "activeItemIndex": 0, + "content": [ + { + "type": "component", + "componentName": "codeEditor", + "componentState": { + "id": 1, + "source": "// Type your code here, or load an example.\nint square(int num) {\n return num * num;\n}", + "lang": "c++", + "selection": { + "startLineNumber": 2, + "startColumn": 12, + "endLineNumber": 2, + "endColumn": 19, + "selectionStartLineNumber": 2, + "selectionStartColumn": 19, + "positionLineNumber": 2, + "positionColumn": 12 }, + "fontScale": 14, + "fontUsePx": true + }, + "isClosable": true, + "reorderEnabled": true, + "title": "C++ source #1" + } + ] + }, + { + "type": "row", + "isClosable": true, + "reorderEnabled": true, + "title": "", + "height": 50, + "content": [ + { + "type": "stack", + "header": {}, + "isClosable": true, + "reorderEnabled": true, + "title": "", + "activeItemIndex": 0, + "height": 50, + "width": 50, + "content": [ { - "type": "row", - "isClosable": true, - "reorderEnabled": true, - "title": "", - "height": 50, - "content": [ - { - "type": "stack", - "header": {}, - "isClosable": true, - "reorderEnabled": true, - "title": "", - "activeItemIndex": 0, - "height": 50, - "width": 50, - "content": [ - { - "type": "component", - "componentName": "compiler", - "componentState": { - "id": 1, - "compiler": "g111", - "source": 1, - "options": "", - "filters": { - "binary": false, - "execute": false, - "intel": true, - "demangle": true, - "labels": true, - "libraryCode": true, - "directives": true, - "commentOnly": true, - "trim": false - }, - "libs": [], - "lang": "c++", - "selection": { - "startLineNumber": 4, - "startColumn": 17, - "endLineNumber": 4, - "endColumn": 39, - "selectionStartLineNumber": 4, - "selectionStartColumn": 17, - "positionLineNumber": 4, - "positionColumn": 39 - }, - "fontScale": 14, - "fontUsePx": true - }, - "isClosable": true, - "reorderEnabled": true, - "title": "x86-64 gcc 11.1 (Editor #1, Compiler #1) C++" - } - ] - }, - { - "type": "stack", - "header": {}, - "isClosable": true, - "reorderEnabled": true, - "title": "", - "activeItemIndex": 0, - "width": 50, - "content": [ - { - "type": "component", - "componentName": "executor", - "componentState": { - "id": 1, - "compiler": "g111", - "source": 1, - "options": "", - "execArgs": "", - "execStdin": "", - "libs": [], - "lang": "c++", - "compilationPanelShown": true, - "compilerOutShown": true, - "argsPanelShown": false, - "stdinPanelShown": false, - "wrap": true, - "fontScale": 14, - "fontUsePx": true - }, - "isClosable": true, - "reorderEnabled": true, - "title": "x86-64 gcc 11.1 Executor (Editor #1) C++" - } - ] - } - ] + "type": "component", + "componentName": "compiler", + "componentState": { + "id": 1, + "compiler": "g111", + "source": 1, + "options": "", + "filters": { + "binary": false, + "execute": false, + "intel": true, + "demangle": true, + "labels": true, + "libraryCode": true, + "directives": true, + "commentOnly": true, + "trim": false + }, + "libs": [], + "lang": "c++", + "selection": { + "startLineNumber": 4, + "startColumn": 17, + "endLineNumber": 4, + "endColumn": 39, + "selectionStartLineNumber": 4, + "selectionStartColumn": 17, + "positionLineNumber": 4, + "positionColumn": 39 + }, + "fontScale": 14, + "fontUsePx": true + }, + "isClosable": true, + "reorderEnabled": true, + "title": "x86-64 gcc 11.1 (Editor #1, Compiler #1) C++" } - ] + ] + }, + { + "type": "stack", + "header": {}, + "isClosable": true, + "reorderEnabled": true, + "title": "", + "activeItemIndex": 0, + "width": 50, + "content": [ + { + "type": "component", + "componentName": "executor", + "componentState": { + "id": 1, + "compiler": "g111", + "source": 1, + "options": "", + "execArgs": "", + "execStdin": "", + "libs": [], + "lang": "c++", + "compilationPanelShown": true, + "compilerOutShown": true, + "argsPanelShown": false, + "stdinPanelShown": false, + "wrap": true, + "fontScale": 14, + "fontUsePx": true + }, + "isClosable": true, + "reorderEnabled": true, + "title": "x86-64 gcc 11.1 Executor (Editor #1) C++" + } + ] + } + ] } - ], - "isClosable": true, - "reorderEnabled": true, - "title": "", - "openPopouts": [], - "maximisedItemId": null -}
\ No newline at end of file + ] + } + ], + "isClosable": true, + "reorderEnabled": true, + "title": "", + "openPopouts": [], + "maximisedItemId": null +} diff --git a/test/state/output-editor-id.json b/test/state/output-editor-id.json index f6ffbf15e..62ab5f5ef 100644 --- a/test/state/output-editor-id.json +++ b/test/state/output-editor-id.json @@ -1,156 +1,156 @@ { - "settings": { - "hasHeaders": true, - "constrainDragToContainer": false, - "reorderEnabled": true, - "selectionEnabled": false, - "popoutWholeStack": false, - "blockedPopoutsThrowError": true, - "closePopoutsOnUnload": true, - "showPopoutIcon": true, - "showMaximiseIcon": true, - "showCloseIcon": true, - "responsiveMode": "onload", - "tabOverlapAllowance": 0, - "reorderOnTabMenuClick": true, - "tabControlOffset": 10, - "theme": "dark" - }, - "dimensions": { - "borderWidth": 5, - "borderGrabWidth": 15, - "minItemHeight": 10, - "minItemWidth": 10, - "headerHeight": 20, - "dragProxyWidth": 300, - "dragProxyHeight": 200 - }, - "labels": { - "close": "close", - "maximise": "maximise", - "minimise": "minimise", - "popout": "open in new window", - "popin": "pop in", - "tabDropdown": "additional tabs" - }, - "content": [ + "settings": { + "hasHeaders": true, + "constrainDragToContainer": false, + "reorderEnabled": true, + "selectionEnabled": false, + "popoutWholeStack": false, + "blockedPopoutsThrowError": true, + "closePopoutsOnUnload": true, + "showPopoutIcon": true, + "showMaximiseIcon": true, + "showCloseIcon": true, + "responsiveMode": "onload", + "tabOverlapAllowance": 0, + "reorderOnTabMenuClick": true, + "tabControlOffset": 10, + "theme": "dark" + }, + "dimensions": { + "borderWidth": 5, + "borderGrabWidth": 15, + "minItemHeight": 10, + "minItemWidth": 10, + "headerHeight": 20, + "dragProxyWidth": 300, + "dragProxyHeight": 200 + }, + "labels": { + "close": "close", + "maximise": "maximise", + "minimise": "minimise", + "popout": "open in new window", + "popin": "pop in", + "tabDropdown": "additional tabs" + }, + "content": [ + { + "type": "row", + "isClosable": true, + "reorderEnabled": true, + "title": "", + "content": [ + { + "type": "stack", + "width": 50, + "isClosable": true, + "reorderEnabled": true, + "title": "", + "activeItemIndex": 0, + "content": [ + { + "type": "component", + "componentName": "codeEditor", + "componentState": { + "id": 1, + "source": "#include <iostream>\n \nint main() {\n std::cout << \"Hello CE!\";\n}", + "lang": "c++", + "fontScale": 25, + "fontUsePx": true + }, + "isClosable": true, + "reorderEnabled": true, + "title": "C++ source #1" + } + ] + }, { - "type": "row", - "isClosable": true, - "reorderEnabled": true, - "title": "", - "content": [ + "type": "column", + "isClosable": true, + "reorderEnabled": true, + "title": "", + "width": 50, + "content": [ + { + "type": "stack", + "height": 50, + "isClosable": true, + "reorderEnabled": true, + "title": "", + "activeItemIndex": 0, + "content": [ { - "type": "stack", - "width": 50, - "isClosable": true, - "reorderEnabled": true, - "title": "", - "activeItemIndex": 0, - "content": [ - { - "type": "component", - "componentName": "codeEditor", - "componentState": { - "id": 1, - "source": "#include <iostream>\n \nint main() {\n std::cout << \"Hello CE!\";\n}", - "lang": "c++", - "fontScale": 25, - "fontUsePx": true - }, - "isClosable": true, - "reorderEnabled": true, - "title": "C++ source #1" - } - ] - }, + "type": "component", + "componentName": "compiler", + "componentState": { + "id": 1, + "compiler": "g83", + "source": 1, + "options": "-O2 -march=haswell -Wall -Wextra -pedantic -Wno-unused-variable -Wno-unused-parameter", + "filters": { + "commentOnly": true, + "directives": true, + "intel": true, + "labels": true, + "trim": true, + "execute": true, + "binary": false, + "demangle": true, + "libraryCode": true + }, + "libs": [], + "lang": "c++", + "selection": { + "startLineNumber": 1, + "startColumn": 1, + "endLineNumber": 1, + "endColumn": 1, + "selectionStartLineNumber": 1, + "selectionStartColumn": 1, + "positionLineNumber": 1, + "positionColumn": 1 + }, + "flagsViewOpen": false, + "fontScale": 30, + "fontUsePx": true + }, + "isClosable": true, + "reorderEnabled": true, + "title": "x86-64 gcc 8.3 (Editor #1, Compiler #1) C++" + } + ] + }, + { + "type": "stack", + "height": 50, + "isClosable": true, + "reorderEnabled": true, + "title": "", + "activeItemIndex": 0, + "content": [ { - "type": "column", - "isClosable": true, - "reorderEnabled": true, - "title": "", - "width": 50, - "content": [ - { - "type": "stack", - "height": 50, - "isClosable": true, - "reorderEnabled": true, - "title": "", - "activeItemIndex": 0, - "content": [ - { - "type": "component", - "componentName": "compiler", - "componentState": { - "id": 1, - "compiler": "g83", - "source": 1, - "options": "-O2 -march=haswell -Wall -Wextra -pedantic -Wno-unused-variable -Wno-unused-parameter", - "filters": { - "commentOnly": true, - "directives": true, - "intel": true, - "labels": true, - "trim": true, - "execute": true, - "binary": false, - "demangle": true, - "libraryCode": true - }, - "libs": [], - "lang": "c++", - "selection": { - "startLineNumber": 1, - "startColumn": 1, - "endLineNumber": 1, - "endColumn": 1, - "selectionStartLineNumber": 1, - "selectionStartColumn": 1, - "positionLineNumber": 1, - "positionColumn": 1 - }, - "flagsViewOpen": false, - "fontScale": 30, - "fontUsePx": true - }, - "isClosable": true, - "reorderEnabled": true, - "title": "x86-64 gcc 8.3 (Editor #1, Compiler #1) C++" - } - ] - }, - { - "type": "stack", - "height": 50, - "isClosable": true, - "reorderEnabled": true, - "title": "", - "activeItemIndex": 0, - "content": [ - { - "type": "component", - "componentName": "output", - "componentState": { - "compiler": 1, - "wrap": false, - "fontScale": 14, - "fontUsePx": true - }, - "isClosable": true, - "reorderEnabled": true, - "title": "Output of x86-64 gcc 8.3 (Compiler #1)" - } - ] - } - ] + "type": "component", + "componentName": "output", + "componentState": { + "compiler": 1, + "wrap": false, + "fontScale": 14, + "fontUsePx": true + }, + "isClosable": true, + "reorderEnabled": true, + "title": "Output of x86-64 gcc 8.3 (Compiler #1)" } - ] + ] + } + ] } - ], - "isClosable": true, - "reorderEnabled": true, - "title": "", - "openPopouts": [], - "maximisedItemId": null -}
\ No newline at end of file + ] + } + ], + "isClosable": true, + "reorderEnabled": true, + "title": "", + "openPopouts": [], + "maximisedItemId": null +} diff --git a/test/state/output-editor-id.normalized.json b/test/state/output-editor-id.normalized.json index ccad6c124..2a6d61608 100644 --- a/test/state/output-editor-id.normalized.json +++ b/test/state/output-editor-id.normalized.json @@ -1,34 +1,32 @@ { - "sessions": [ + "sessions": [ + { + "id": 1, + "language": "c++", + "source": "#include <iostream>\n \nint main() {\n std::cout << \"Hello CE!\";\n}", + "conformanceview": false, + "compilers": [ { - "id": 1, - "language": "c++", - "source": "#include <iostream>\n \nint main() {\n std::cout << \"Hello CE!\";\n}", - "conformanceview": false, - "compilers": [ - { - "_internalid": 1, - "id": "g83", - "options": "-O2 -march=haswell -Wall -Wextra -pedantic -Wno-unused-variable -Wno-unused-parameter", - "filters": { - "binary": false, - "commentOnly": true, - "demangle": true, - "directives": true, - "execute": true, - "intel": true, - "labels": true, - "trim": true - }, - "libs": [], - "specialoutputs": [ - "compilerOutput" - ], - "tools": [] - } - ], - "executors": [] + "_internalid": 1, + "id": "g83", + "options": "-O2 -march=haswell -Wall -Wextra -pedantic -Wno-unused-variable -Wno-unused-parameter", + "filters": { + "binary": false, + "commentOnly": true, + "demangle": true, + "directives": true, + "execute": true, + "intel": true, + "labels": true, + "trim": true + }, + "libs": [], + "specialoutputs": ["compilerOutput"], + "tools": [] } - ], - "trees": [] -}
\ No newline at end of file + ], + "executors": [] + } + ], + "trees": [] +} diff --git a/test/state/tree-gl-outputpane.json b/test/state/tree-gl-outputpane.json index 11cbbf619..0a7ce4519 100644 --- a/test/state/tree-gl-outputpane.json +++ b/test/state/tree-gl-outputpane.json @@ -1,240 +1,240 @@ { - "settings": { - "hasHeaders": true, - "constrainDragToContainer": false, - "reorderEnabled": true, - "selectionEnabled": false, - "popoutWholeStack": false, - "blockedPopoutsThrowError": true, - "closePopoutsOnUnload": true, - "showPopoutIcon": false, - "showMaximiseIcon": true, - "showCloseIcon": true, - "responsiveMode": "onload", - "tabOverlapAllowance": 0, - "reorderOnTabMenuClick": true, - "tabControlOffset": 10 - }, - "dimensions": { - "borderWidth": 5, - "borderGrabWidth": 15, - "minItemHeight": 10, - "minItemWidth": 10, - "headerHeight": 20, - "dragProxyWidth": 300, - "dragProxyHeight": 200 - }, - "labels": { - "close": "close", - "maximise": "maximise", - "minimise": "minimise", - "popout": "open in new window", - "popin": "pop in", - "tabDropdown": "additional tabs" - }, - "content": [ + "settings": { + "hasHeaders": true, + "constrainDragToContainer": false, + "reorderEnabled": true, + "selectionEnabled": false, + "popoutWholeStack": false, + "blockedPopoutsThrowError": true, + "closePopoutsOnUnload": true, + "showPopoutIcon": false, + "showMaximiseIcon": true, + "showCloseIcon": true, + "responsiveMode": "onload", + "tabOverlapAllowance": 0, + "reorderOnTabMenuClick": true, + "tabControlOffset": 10 + }, + "dimensions": { + "borderWidth": 5, + "borderGrabWidth": 15, + "minItemHeight": 10, + "minItemWidth": 10, + "headerHeight": 20, + "dragProxyWidth": 300, + "dragProxyHeight": 200 + }, + "labels": { + "close": "close", + "maximise": "maximise", + "minimise": "minimise", + "popout": "open in new window", + "popin": "pop in", + "tabDropdown": "additional tabs" + }, + "content": [ + { + "type": "row", + "isClosable": true, + "reorderEnabled": true, + "title": "", + "content": [ { - "type": "row", - "isClosable": true, - "reorderEnabled": true, - "title": "", - "content": [ - { - "type": "stack", - "header": {}, - "isClosable": true, - "reorderEnabled": true, - "title": "", - "activeItemIndex": 0, - "width": 32.68232718579945, - "content": [ - { - "type": "component", - "componentName": "tree", - "componentState": { - "id": 1, - "cmakeArgs": "", - "customOutputFilename": "hellow", - "isCMakeProject": true, - "compilerLanguageId": "c++", - "files": [ - { - "fileId": 1, - "filename": "CMakeLists.txt", - "isIncluded": true, - "isOpen": true, - "editorId": 1, - "isMainSource": true, - "content": "project(hello)\n\nadd_executable(hellow\n example.cpp)\n\ntarget_link_libraries(hellow\n fmtd)\n", - "langId": "cmake" - }, - { - "fileId": 2, - "filename": "example.cpp", - "isIncluded": true, - "isOpen": true, - "editorId": 2, - "isMainSource": false, - "content": "#include \"fmt/core.h\"\n\nint main() {\n fmt::print(\"H€llo, world!\\n\");\n return 0;\n}", - "langId": "c++" - }, - { - "fileId": 3, - "filename": "subdir/hello.txt", - "isIncluded": true, - "isOpen": false, - "editorId": -1, - "isMainSource": false, - "content": "Hello, World!!!!\n", - "langId": "cmake" - } - ], - "newFileId": 4 - }, - "isClosable": true, - "reorderEnabled": true, - "title": "Tree #1" - } - ] - }, + "type": "stack", + "header": {}, + "isClosable": true, + "reorderEnabled": true, + "title": "", + "activeItemIndex": 0, + "width": 32.68232718579945, + "content": [ + { + "type": "component", + "componentName": "tree", + "componentState": { + "id": 1, + "cmakeArgs": "", + "customOutputFilename": "hellow", + "isCMakeProject": true, + "compilerLanguageId": "c++", + "files": [ + { + "fileId": 1, + "filename": "CMakeLists.txt", + "isIncluded": true, + "isOpen": true, + "editorId": 1, + "isMainSource": true, + "content": "project(hello)\n\nadd_executable(hellow\n example.cpp)\n\ntarget_link_libraries(hellow\n fmtd)\n", + "langId": "cmake" + }, + { + "fileId": 2, + "filename": "example.cpp", + "isIncluded": true, + "isOpen": true, + "editorId": 2, + "isMainSource": false, + "content": "#include \"fmt/core.h\"\n\nint main() {\n fmt::print(\"H€llo, world!\\n\");\n return 0;\n}", + "langId": "c++" + }, + { + "fileId": 3, + "filename": "subdir/hello.txt", + "isIncluded": true, + "isOpen": false, + "editorId": -1, + "isMainSource": false, + "content": "Hello, World!!!!\n", + "langId": "cmake" + } + ], + "newFileId": 4 + }, + "isClosable": true, + "reorderEnabled": true, + "title": "Tree #1" + } + ] + }, + { + "type": "column", + "isClosable": true, + "reorderEnabled": true, + "title": "", + "width": 33.984339480867234, + "content": [ + { + "type": "stack", + "header": {}, + "isClosable": true, + "reorderEnabled": true, + "title": "", + "activeItemIndex": 0, + "width": 34.10502675378526, + "height": 50, + "content": [ { - "type": "column", - "isClosable": true, - "reorderEnabled": true, - "title": "", - "width": 33.984339480867234, - "content": [ - { - "type": "stack", - "header": {}, - "isClosable": true, - "reorderEnabled": true, - "title": "", - "activeItemIndex": 0, - "width": 34.10502675378526, - "height": 50, - "content": [ - { - "type": "component", - "componentName": "compiler", - "componentState": { - "id": 1, - "compiler": "g103", - "source": false, - "tree": 1, - "options": "-g -O3 -flto", - "filters": { - "binary": false, - "execute": true, - "intel": true, - "demangle": true, - "labels": true, - "libraryCode": true, - "directives": true, - "commentOnly": true, - "trim": false - }, - "libs": [ - { - "name": "fmt", - "ver": "700" - } - ], - "lang": "c++", - "selection": { - "startLineNumber": 1, - "startColumn": 1, - "endLineNumber": 1, - "endColumn": 1, - "selectionStartLineNumber": 1, - "selectionStartColumn": 1, - "positionLineNumber": 1, - "positionColumn": 1 - }, - "flagsViewOpen": false, - "fontScale": 14, - "fontUsePx": true - }, - "isClosable": true, - "reorderEnabled": true, - "title": "x86-64 gcc 10.3 (C++, Tree #1, Compiler #1)" - } - ] - }, - { - "type": "stack", - "header": {}, - "isClosable": true, - "reorderEnabled": true, - "title": "", - "activeItemIndex": 0, - "height": 50, - "content": [ - { - "type": "component", - "componentName": "output", - "componentState": { - "compiler": 1, - "editor": false, - "tree": 1, - "wrap": false, - "fontScale": 14, - "fontUsePx": true - }, - "isClosable": true, - "reorderEnabled": true, - "title": "Output of x86-64 gcc 10.3 (Compiler #1)" - } - ] - } - ] - }, + "type": "component", + "componentName": "compiler", + "componentState": { + "id": 1, + "compiler": "g103", + "source": false, + "tree": 1, + "options": "-g -O3 -flto", + "filters": { + "binary": false, + "execute": true, + "intel": true, + "demangle": true, + "labels": true, + "libraryCode": true, + "directives": true, + "commentOnly": true, + "trim": false + }, + "libs": [ + { + "name": "fmt", + "ver": "700" + } + ], + "lang": "c++", + "selection": { + "startLineNumber": 1, + "startColumn": 1, + "endLineNumber": 1, + "endColumn": 1, + "selectionStartLineNumber": 1, + "selectionStartColumn": 1, + "positionLineNumber": 1, + "positionColumn": 1 + }, + "flagsViewOpen": false, + "fontScale": 14, + "fontUsePx": true + }, + "isClosable": true, + "reorderEnabled": true, + "title": "x86-64 gcc 10.3 (C++, Tree #1, Compiler #1)" + } + ] + }, + { + "type": "stack", + "header": {}, + "isClosable": true, + "reorderEnabled": true, + "title": "", + "activeItemIndex": 0, + "height": 50, + "content": [ { - "type": "stack", - "width": 33.33333333333333, - "isClosable": true, - "reorderEnabled": true, - "title": "", - "activeItemIndex": 1, - "content": [ - { - "type": "component", - "componentName": "codeEditor", - "componentState": { - "id": 1, - "source": "project(hello)\n\nadd_executable(hellow\n example.cpp)\n\ntarget_link_libraries(hellow\n fmtd)\n", - "lang": "cmake", - "filename": "CMakeLists.txt", - "fontScale": 14, - "fontUsePx": true - }, - "isClosable": true, - "reorderEnabled": true, - "title": "CMakeLists.txt" - }, - { - "type": "component", - "componentName": "codeEditor", - "componentState": { - "id": 2, - "source": "#include \"fmt/core.h\"\n\nint main() {\n fmt::print(\"H€llo, world!\\n\");\n return 0;\n}", - "lang": "c++", - "filename": "example.cpp", - "fontScale": 14, - "fontUsePx": true - }, - "isClosable": true, - "reorderEnabled": true, - "title": "example.cpp" - } - ] + "type": "component", + "componentName": "output", + "componentState": { + "compiler": 1, + "editor": false, + "tree": 1, + "wrap": false, + "fontScale": 14, + "fontUsePx": true + }, + "isClosable": true, + "reorderEnabled": true, + "title": "Output of x86-64 gcc 10.3 (Compiler #1)" } - ] + ] + } + ] + }, + { + "type": "stack", + "width": 33.33333333333333, + "isClosable": true, + "reorderEnabled": true, + "title": "", + "activeItemIndex": 1, + "content": [ + { + "type": "component", + "componentName": "codeEditor", + "componentState": { + "id": 1, + "source": "project(hello)\n\nadd_executable(hellow\n example.cpp)\n\ntarget_link_libraries(hellow\n fmtd)\n", + "lang": "cmake", + "filename": "CMakeLists.txt", + "fontScale": 14, + "fontUsePx": true + }, + "isClosable": true, + "reorderEnabled": true, + "title": "CMakeLists.txt" + }, + { + "type": "component", + "componentName": "codeEditor", + "componentState": { + "id": 2, + "source": "#include \"fmt/core.h\"\n\nint main() {\n fmt::print(\"H€llo, world!\\n\");\n return 0;\n}", + "lang": "c++", + "filename": "example.cpp", + "fontScale": 14, + "fontUsePx": true + }, + "isClosable": true, + "reorderEnabled": true, + "title": "example.cpp" + } + ] } - ], - "isClosable": true, - "reorderEnabled": true, - "title": "", - "openPopouts": [], - "maximisedItemId": null -}
\ No newline at end of file + ] + } + ], + "isClosable": true, + "reorderEnabled": true, + "title": "", + "openPopouts": [], + "maximisedItemId": null +} diff --git a/test/state/tree-gl-outputpane.normalized.json b/test/state/tree-gl-outputpane.normalized.json index 5a3c96571..5a668914b 100644 --- a/test/state/tree-gl-outputpane.normalized.json +++ b/test/state/tree-gl-outputpane.normalized.json @@ -1,92 +1,90 @@ { - "sessions": [ + "sessions": [ + { + "id": 1, + "language": "cmake", + "source": "project(hello)\n\nadd_executable(hellow\n example.cpp)\n\ntarget_link_libraries(hellow\n fmtd)\n", + "conformanceview": false, + "compilers": [], + "executors": [], + "filename": "CMakeLists.txt" + }, + { + "id": 2, + "language": "c++", + "source": "#include \"fmt/core.h\"\n\nint main() {\n fmt::print(\"H€llo, world!\\n\");\n return 0;\n}", + "conformanceview": false, + "compilers": [], + "executors": [], + "filename": "example.cpp" + } + ], + "trees": [ + { + "id": 1, + "cmakeArgs": "", + "customOutputFilename": "hellow", + "isCMakeProject": true, + "compilerLanguageId": "c++", + "files": [ { - "id": 1, - "language": "cmake", - "source": "project(hello)\n\nadd_executable(hellow\n example.cpp)\n\ntarget_link_libraries(hellow\n fmtd)\n", - "conformanceview": false, - "compilers": [], - "executors": [], - "filename": "CMakeLists.txt" + "fileId": 1, + "isIncluded": true, + "isOpen": true, + "isMainSource": true, + "filename": "CMakeLists.txt", + "content": "project(hello)\n\nadd_executable(hellow\n example.cpp)\n\ntarget_link_libraries(hellow\n fmtd)\n", + "editorId": 1, + "langId": "cmake" }, { - "id": 2, - "language": "c++", - "source": "#include \"fmt/core.h\"\n\nint main() {\n fmt::print(\"H€llo, world!\\n\");\n return 0;\n}", - "conformanceview": false, - "compilers": [], - "executors": [], - "filename": "example.cpp" + "fileId": 2, + "isIncluded": true, + "isOpen": true, + "isMainSource": false, + "filename": "example.cpp", + "content": "#include \"fmt/core.h\"\n\nint main() {\n fmt::print(\"H€llo, world!\\n\");\n return 0;\n}", + "editorId": 2, + "langId": "c++" + }, + { + "fileId": 3, + "isIncluded": true, + "isOpen": false, + "isMainSource": false, + "filename": "subdir/hello.txt", + "content": "Hello, World!!!!\n", + "editorId": -1, + "langId": "cmake" } - ], - "trees": [ + ], + "newFileId": 4, + "compilers": [ { - "id": 1, - "cmakeArgs": "", - "customOutputFilename": "hellow", - "isCMakeProject": true, - "compilerLanguageId": "c++", - "files": [ - { - "fileId": 1, - "isIncluded": true, - "isOpen": true, - "isMainSource": true, - "filename": "CMakeLists.txt", - "content": "project(hello)\n\nadd_executable(hellow\n example.cpp)\n\ntarget_link_libraries(hellow\n fmtd)\n", - "editorId": 1, - "langId": "cmake" - }, - { - "fileId": 2, - "isIncluded": true, - "isOpen": true, - "isMainSource": false, - "filename": "example.cpp", - "content": "#include \"fmt/core.h\"\n\nint main() {\n fmt::print(\"H€llo, world!\\n\");\n return 0;\n}", - "editorId": 2, - "langId": "c++" - }, - { - "fileId": 3, - "isIncluded": true, - "isOpen": false, - "isMainSource": false, - "filename": "subdir/hello.txt", - "content": "Hello, World!!!!\n", - "editorId": -1, - "langId": "cmake" - } - ], - "newFileId": 4, - "compilers": [ - { - "_internalid": 1, - "id": "g103", - "options": "-g -O3 -flto", - "filters": { - "binary": false, - "commentOnly": true, - "demangle": true, - "directives": true, - "execute": true, - "intel": true, - "labels": true, - "trim": false - }, - "libs": [ - { - "name": "fmt", - "ver": "700" - } - ], - "specialoutputs": [ - "compilerOutput" - ], - "tools": [] - } - ], - "executors": [] + "_internalid": 1, + "id": "g103", + "options": "-g -O3 -flto", + "filters": { + "binary": false, + "commentOnly": true, + "demangle": true, + "directives": true, + "execute": true, + "intel": true, + "labels": true, + "trim": false + }, + "libs": [ + { + "name": "fmt", + "ver": "700" + } + ], + "specialoutputs": ["compilerOutput"], + "tools": [] } - ] -}
\ No newline at end of file + ], + "executors": [] + } + ] +} diff --git a/test/state/tree-gl.json b/test/state/tree-gl.json index 67b2a0402..4e7d10141 100644 --- a/test/state/tree-gl.json +++ b/test/state/tree-gl.json @@ -1,269 +1,269 @@ { - "settings": { - "hasHeaders": true, - "constrainDragToContainer": false, - "reorderEnabled": true, - "selectionEnabled": false, - "popoutWholeStack": false, - "blockedPopoutsThrowError": true, - "closePopoutsOnUnload": true, - "showPopoutIcon": false, - "showMaximiseIcon": true, - "showCloseIcon": true, - "responsiveMode": "onload", - "tabOverlapAllowance": 0, - "reorderOnTabMenuClick": true, - "tabControlOffset": 10 - }, - "dimensions": { - "borderWidth": 5, - "borderGrabWidth": 15, - "minItemHeight": 10, - "minItemWidth": 10, - "headerHeight": 20, - "dragProxyWidth": 300, - "dragProxyHeight": 200 - }, - "labels": { - "close": "close", - "maximise": "maximise", - "minimise": "minimise", - "popout": "open in new window", - "popin": "pop in", - "tabDropdown": "additional tabs" - }, - "content": [ + "settings": { + "hasHeaders": true, + "constrainDragToContainer": false, + "reorderEnabled": true, + "selectionEnabled": false, + "popoutWholeStack": false, + "blockedPopoutsThrowError": true, + "closePopoutsOnUnload": true, + "showPopoutIcon": false, + "showMaximiseIcon": true, + "showCloseIcon": true, + "responsiveMode": "onload", + "tabOverlapAllowance": 0, + "reorderOnTabMenuClick": true, + "tabControlOffset": 10 + }, + "dimensions": { + "borderWidth": 5, + "borderGrabWidth": 15, + "minItemHeight": 10, + "minItemWidth": 10, + "headerHeight": 20, + "dragProxyWidth": 300, + "dragProxyHeight": 200 + }, + "labels": { + "close": "close", + "maximise": "maximise", + "minimise": "minimise", + "popout": "open in new window", + "popin": "pop in", + "tabDropdown": "additional tabs" + }, + "content": [ + { + "type": "row", + "isClosable": true, + "reorderEnabled": true, + "title": "", + "content": [ + { + "type": "stack", + "header": {}, + "isClosable": true, + "reorderEnabled": true, + "title": "", + "activeItemIndex": 0, + "width": 23.193297464602633, + "content": [ + { + "type": "component", + "componentName": "tree", + "componentState": { + "id": 1, + "cmakeArgs": "", + "customOutputFilename": "", + "isCMakeProject": true, + "compilerLanguageId": "c++", + "files": [ + { + "fileId": 1, + "isIncluded": true, + "isOpen": true, + "isMainSource": false, + "filename": "example.cpp", + "content": "// Type your code here, or load an example.\nint square(int num) {\n return num * num;\n}", + "editorId": 1, + "langId": "c++" + }, + { + "fileId": 2, + "isIncluded": true, + "isOpen": true, + "isMainSource": false, + "filename": "square.h", + "content": "#pragma once\n\nint square(int num);\n", + "editorId": 2, + "langId": "c++" + }, + { + "fileId": 3, + "isIncluded": true, + "isOpen": false, + "isMainSource": true, + "filename": "CMakeLists.txt", + "content": "project(hello)\n\nadd_executable(output.s\n example.cpp\n square.cpp)\n", + "editorId": -1, + "langId": "cmake" + }, + { + "fileId": 4, + "isIncluded": true, + "isOpen": true, + "isMainSource": false, + "filename": "square.cpp", + "content": "", + "editorId": 4, + "langId": "" + }, + { + "fileId": 6, + "isIncluded": false, + "isOpen": true, + "isMainSource": false, + "filename": "", + "content": "", + "editorId": 3, + "langId": "" + } + ], + "newFileId": 7 + }, + "isClosable": true, + "reorderEnabled": true, + "title": "Tree #1" + } + ] + }, + { + "type": "stack", + "width": 37.22445710458798, + "isClosable": true, + "reorderEnabled": true, + "title": "", + "activeItemIndex": 3, + "content": [ + { + "type": "component", + "componentName": "codeEditor", + "componentState": { + "id": 1, + "source": "#include \"square.h\"\n\nint main(int argc, char **argv) {\n return square(argc);\n}\n", + "lang": "c++", + "selection": { + "startLineNumber": 6, + "startColumn": 1, + "endLineNumber": 6, + "endColumn": 1, + "selectionStartLineNumber": 6, + "selectionStartColumn": 1, + "positionLineNumber": 6, + "positionColumn": 1 + }, + "filename": "example.cpp", + "fontScale": 14, + "fontUsePx": true + }, + "isClosable": true, + "reorderEnabled": true, + "title": "example.cpp" + }, + { + "type": "component", + "componentName": "codeEditor", + "componentState": { + "id": 2, + "source": "#pragma once\n\nint square(int num);\n", + "lang": "c++", + "filename": "square.h", + "fontScale": 14, + "fontUsePx": true + }, + "isClosable": true, + "reorderEnabled": true, + "title": "square.h" + }, + { + "type": "component", + "componentName": "codeEditor", + "componentState": { + "id": 4, + "source": "#include \"square.h\"\n\nint square(int num) {\n return num * num;\n}\n", + "lang": "c++", + "selection": { + "startLineNumber": 6, + "startColumn": 1, + "endLineNumber": 6, + "endColumn": 1, + "selectionStartLineNumber": 6, + "selectionStartColumn": 1, + "positionLineNumber": 6, + "positionColumn": 1 + }, + "filename": "square.cpp", + "fontScale": 14, + "fontUsePx": true + }, + "isClosable": true, + "reorderEnabled": true, + "title": "square.cpp" + }, + { + "type": "component", + "componentName": "codeEditor", + "componentState": { + "id": 3, + "source": "project(hello)\n\nadd_executable(output.s\n example.cpp\n square.cpp)\n", + "lang": "cmake", + "filename": "CMakeLists.txt", + "fontScale": 14, + "fontUsePx": true + }, + "isClosable": true, + "reorderEnabled": true, + "title": "CMakeLists.txt" + } + ] + }, { - "type": "row", - "isClosable": true, - "reorderEnabled": true, - "title": "", - "content": [ - { - "type": "stack", - "header": {}, - "isClosable": true, - "reorderEnabled": true, - "title": "", - "activeItemIndex": 0, - "width": 23.193297464602633, - "content": [ - { - "type": "component", - "componentName": "tree", - "componentState": { - "id": 1, - "cmakeArgs": "", - "customOutputFilename": "", - "isCMakeProject": true, - "compilerLanguageId": "c++", - "files": [ - { - "fileId": 1, - "isIncluded": true, - "isOpen": true, - "isMainSource": false, - "filename": "example.cpp", - "content": "// Type your code here, or load an example.\nint square(int num) {\n return num * num;\n}", - "editorId": 1, - "langId": "c++" - }, - { - "fileId": 2, - "isIncluded": true, - "isOpen": true, - "isMainSource": false, - "filename": "square.h", - "content": "#pragma once\n\nint square(int num);\n", - "editorId": 2, - "langId": "c++" - }, - { - "fileId": 3, - "isIncluded": true, - "isOpen": false, - "isMainSource": true, - "filename": "CMakeLists.txt", - "content": "project(hello)\n\nadd_executable(output.s\n example.cpp\n square.cpp)\n", - "editorId": -1, - "langId": "cmake" - }, - { - "fileId": 4, - "isIncluded": true, - "isOpen": true, - "isMainSource": false, - "filename": "square.cpp", - "content": "", - "editorId": 4, - "langId": "" - }, - { - "fileId": 6, - "isIncluded": false, - "isOpen": true, - "isMainSource": false, - "filename": "", - "content": "", - "editorId": 3, - "langId": "" - } - ], - "newFileId": 7 - }, - "isClosable": true, - "reorderEnabled": true, - "title": "Tree #1" - } - ] + "type": "stack", + "header": {}, + "isClosable": true, + "reorderEnabled": true, + "title": "", + "activeItemIndex": 0, + "width": 39.5822454308094, + "content": [ + { + "type": "component", + "componentName": "compiler", + "componentState": { + "id": 1, + "compiler": "g103", + "source": false, + "tree": 1, + "options": "-g -O3 -flto", + "filters": { + "binary": true, + "execute": false, + "intel": true, + "demangle": true, + "labels": true, + "libraryCode": true, + "directives": true, + "commentOnly": true, + "trim": false }, - { - "type": "stack", - "width": 37.22445710458798, - "isClosable": true, - "reorderEnabled": true, - "title": "", - "activeItemIndex": 3, - "content": [ - { - "type": "component", - "componentName": "codeEditor", - "componentState": { - "id": 1, - "source": "#include \"square.h\"\n\nint main(int argc, char **argv) {\n return square(argc);\n}\n", - "lang": "c++", - "selection": { - "startLineNumber": 6, - "startColumn": 1, - "endLineNumber": 6, - "endColumn": 1, - "selectionStartLineNumber": 6, - "selectionStartColumn": 1, - "positionLineNumber": 6, - "positionColumn": 1 - }, - "filename": "example.cpp", - "fontScale": 14, - "fontUsePx": true - }, - "isClosable": true, - "reorderEnabled": true, - "title": "example.cpp" - }, - { - "type": "component", - "componentName": "codeEditor", - "componentState": { - "id": 2, - "source": "#pragma once\n\nint square(int num);\n", - "lang": "c++", - "filename": "square.h", - "fontScale": 14, - "fontUsePx": true - }, - "isClosable": true, - "reorderEnabled": true, - "title": "square.h" - }, - { - "type": "component", - "componentName": "codeEditor", - "componentState": { - "id": 4, - "source": "#include \"square.h\"\n\nint square(int num) {\n return num * num;\n}\n", - "lang": "c++", - "selection": { - "startLineNumber": 6, - "startColumn": 1, - "endLineNumber": 6, - "endColumn": 1, - "selectionStartLineNumber": 6, - "selectionStartColumn": 1, - "positionLineNumber": 6, - "positionColumn": 1 - }, - "filename": "square.cpp", - "fontScale": 14, - "fontUsePx": true - }, - "isClosable": true, - "reorderEnabled": true, - "title": "square.cpp" - }, - { - "type": "component", - "componentName": "codeEditor", - "componentState": { - "id": 3, - "source": "project(hello)\n\nadd_executable(output.s\n example.cpp\n square.cpp)\n", - "lang": "cmake", - "filename": "CMakeLists.txt", - "fontScale": 14, - "fontUsePx": true - }, - "isClosable": true, - "reorderEnabled": true, - "title": "CMakeLists.txt" - } - ] + "libs": [], + "lang": "c++", + "selection": { + "startLineNumber": 1, + "startColumn": 1, + "endLineNumber": 1, + "endColumn": 1, + "selectionStartLineNumber": 1, + "selectionStartColumn": 1, + "positionLineNumber": 1, + "positionColumn": 1 }, - { - "type": "stack", - "header": {}, - "isClosable": true, - "reorderEnabled": true, - "title": "", - "activeItemIndex": 0, - "width": 39.5822454308094, - "content": [ - { - "type": "component", - "componentName": "compiler", - "componentState": { - "id": 1, - "compiler": "g103", - "source": false, - "tree": 1, - "options": "-g -O3 -flto", - "filters": { - "binary": true, - "execute": false, - "intel": true, - "demangle": true, - "labels": true, - "libraryCode": true, - "directives": true, - "commentOnly": true, - "trim": false - }, - "libs": [], - "lang": "c++", - "selection": { - "startLineNumber": 1, - "startColumn": 1, - "endLineNumber": 1, - "endColumn": 1, - "selectionStartLineNumber": 1, - "selectionStartColumn": 1, - "positionLineNumber": 1, - "positionColumn": 1 - }, - "flagsViewOpen": false, - "fontScale": 14, - "fontUsePx": true - }, - "isClosable": true, - "reorderEnabled": true, - "title": "x86-64 gcc 10.3 (Tree #1, Compiler #1) C++" - } - ] - } - ] + "flagsViewOpen": false, + "fontScale": 14, + "fontUsePx": true + }, + "isClosable": true, + "reorderEnabled": true, + "title": "x86-64 gcc 10.3 (Tree #1, Compiler #1) C++" + } + ] } - ], - "isClosable": true, - "reorderEnabled": true, - "title": "", - "openPopouts": [], - "maximisedItemId": null -}
\ No newline at end of file + ] + } + ], + "isClosable": true, + "reorderEnabled": true, + "title": "", + "openPopouts": [], + "maximisedItemId": null +} diff --git a/test/state/tree-mobile.goldenified.json b/test/state/tree-mobile.goldenified.json index 7e86ac2f8..f6157d1fa 100644 --- a/test/state/tree-mobile.goldenified.json +++ b/test/state/tree-mobile.goldenified.json @@ -1,154 +1,154 @@ [ - { - "settings": { - "hasHeaders": true, - "constrainDragToContainer": false, - "reorderEnabled": true, - "selectionEnabled": false, - "popoutWholeStack": false, - "blockedPopoutsThrowError": true, - "closePopoutsOnUnload": true, - "showPopoutIcon": false, - "showMaximiseIcon": true, - "showCloseIcon": false, - "responsiveMode": "onload", - "tabOverlapAllowance": 0, - "reorderOnTabMenuClick": true, - "tabControlOffset": 10 - }, - "dimensions": { - "borderWidth": 5, - "borderGrabWidth": 15, - "minItemHeight": 10, - "minItemWidth": 10, - "headerHeight": 20, - "dragProxyWidth": 300, - "dragProxyHeight": 200 - }, - "labels": { - "close": "close", - "maximise": "maximise", - "minimise": "minimise", - "popout": "open in new window", - "popin": "pop in", - "tabDropdown": "additional tabs" - }, + { + "settings": { + "hasHeaders": true, + "constrainDragToContainer": false, + "reorderEnabled": true, + "selectionEnabled": false, + "popoutWholeStack": false, + "blockedPopoutsThrowError": true, + "closePopoutsOnUnload": true, + "showPopoutIcon": false, + "showMaximiseIcon": true, + "showCloseIcon": false, + "responsiveMode": "onload", + "tabOverlapAllowance": 0, + "reorderOnTabMenuClick": true, + "tabControlOffset": 10 + }, + "dimensions": { + "borderWidth": 5, + "borderGrabWidth": 15, + "minItemHeight": 10, + "minItemWidth": 10, + "headerHeight": 20, + "dragProxyWidth": 300, + "dragProxyHeight": 200 + }, + "labels": { + "close": "close", + "maximise": "maximise", + "minimise": "minimise", + "popout": "open in new window", + "popin": "pop in", + "tabDropdown": "additional tabs" + }, + "content": [ + { + "type": "column", "content": [ - { - "type": "column", + { + "type": "column", + "width": 100, + "content": [ + { + "type": "row", + "height": 50, "content": [ - { - "type": "column", - "width": 100, - "content": [ - { - "type": "row", - "height": 50, - "content": [ - { - "type": "component", - "componentName": "tree", - "componentState": { - "id": 1, - "cmakeArgs": "", - "customOutputFilename": "hellow", - "isCMakeProject": true, - "compilerLanguageId": "c++", - "files": [ - { - "fileId": 1, - "isIncluded": true, - "isOpen": false, - "isMainSource": true, - "filename": "CMakeLists.txt", - "content": "project(hello)\n\nadd_executable(hellow\n example.cpp)\n\ntarget_link_libraries(hellow\n fmtd)\n", - "editorId": -1, - "langId": "cmake" - }, - { - "fileId": 2, - "isIncluded": true, - "isOpen": false, - "isMainSource": false, - "filename": "example.cpp", - "content": "#include \"fmt/core.h\"\n\nint main() {\n fmt::print(\"H€llo, world!\\n\");\n return 0;\n}", - "editorId": -1, - "langId": "c++" - }, - { - "fileId": 3, - "isIncluded": true, - "isOpen": false, - "isMainSource": false, - "filename": "subdir/hello.txt", - "content": "Hello, World!!!!\n", - "editorId": -1, - "langId": "cmake" - } - ], - "newFileId": 4 - }, - "isClosable": true, - "reorderEnabled": true - } - ] - }, + { + "type": "component", + "componentName": "tree", + "componentState": { + "id": 1, + "cmakeArgs": "", + "customOutputFilename": "hellow", + "isCMakeProject": true, + "compilerLanguageId": "c++", + "files": [ + { + "fileId": 1, + "isIncluded": true, + "isOpen": false, + "isMainSource": true, + "filename": "CMakeLists.txt", + "content": "project(hello)\n\nadd_executable(hellow\n example.cpp)\n\ntarget_link_libraries(hellow\n fmtd)\n", + "editorId": -1, + "langId": "cmake" + }, + { + "fileId": 2, + "isIncluded": true, + "isOpen": false, + "isMainSource": false, + "filename": "example.cpp", + "content": "#include \"fmt/core.h\"\n\nint main() {\n fmt::print(\"H€llo, world!\\n\");\n return 0;\n}", + "editorId": -1, + "langId": "c++" + }, + { + "fileId": 3, + "isIncluded": true, + "isOpen": false, + "isMainSource": false, + "filename": "subdir/hello.txt", + "content": "Hello, World!!!!\n", + "editorId": -1, + "langId": "cmake" + } + ], + "newFileId": 4 + }, + "isClosable": true, + "reorderEnabled": true + } + ] + }, + { + "type": "row", + "height": 50, + "content": [ + { + "type": "stack", + "width": 100, + "content": [ + { + "type": "component", + "componentName": "compiler", + "componentState": { + "id": 1, + "compiler": "g103", + "tree": 1, + "options": "-g -O3 -flto", + "filters": { + "binary": false, + "commentOnly": true, + "demangle": true, + "directives": true, + "execute": false, + "intel": true, + "labels": true, + "trim": false + }, + "libs": [ { - "type": "row", - "height": 50, - "content": [ - { - "type": "stack", - "width": 100, - "content": [ - { - "type": "component", - "componentName": "compiler", - "componentState": { - "id": 1, - "compiler": "g103", - "tree": 1, - "options": "-g -O3 -flto", - "filters": { - "binary": false, - "commentOnly": true, - "demangle": true, - "directives": true, - "execute": false, - "intel": true, - "labels": true, - "trim": false - }, - "libs": [ - { - "name": "fmt", - "ver": "700" - } - ], - "lang": "c++" - }, - "isClosable": true, - "reorderEnabled": true - }, - { - "type": "component", - "componentName": "output", - "componentState": { - "compiler": 1, - "wrap": false, - "fontScale": 14 - }, - "isClosable": true, - "reorderEnabled": true - } - ] - } - ] + "name": "fmt", + "ver": "700" } - ] - } + ], + "lang": "c++" + }, + "isClosable": true, + "reorderEnabled": true + }, + { + "type": "component", + "componentName": "output", + "componentState": { + "compiler": 1, + "wrap": false, + "fontScale": 14 + }, + "isClosable": true, + "reorderEnabled": true + } + ] + } ] - } + } + ] + } ] - } -]
\ No newline at end of file + } + ] + } +] diff --git a/test/state/tree-mobile.json b/test/state/tree-mobile.json index e79bbf6ef..cbe350231 100644 --- a/test/state/tree-mobile.json +++ b/test/state/tree-mobile.json @@ -1,92 +1,90 @@ { - "sessions": [ + "sessions": [ + { + "id": 1, + "language": "cmake", + "source": "project(hello)\n\nadd_executable(hellow\n example.cpp)\n\ntarget_link_libraries(hellow\n fmtd)\n", + "conformanceview": false, + "compilers": [], + "executors": [], + "filename": "CMakeLists.txt" + }, + { + "id": 2, + "language": "c++", + "source": "#include \"fmt/core.h\"\n\nint main() {\n fmt::print(\"H€llo, world!\\n\");\n return 0;\n}", + "conformanceview": false, + "compilers": [], + "executors": [], + "filename": "example.cpp" + } + ], + "trees": [ + { + "id": 1, + "cmakeArgs": "", + "customOutputFilename": "hellow", + "isCMakeProject": true, + "compilerLanguageId": "c++", + "files": [ { - "id": 1, - "language": "cmake", - "source": "project(hello)\n\nadd_executable(hellow\n example.cpp)\n\ntarget_link_libraries(hellow\n fmtd)\n", - "conformanceview": false, - "compilers": [], - "executors": [], - "filename": "CMakeLists.txt" + "fileId": 1, + "isIncluded": true, + "isOpen": true, + "isMainSource": true, + "filename": "CMakeLists.txt", + "content": "project(hello)\n\nadd_executable(hellow\n example.cpp)\n\ntarget_link_libraries(hellow\n fmtd)\n", + "editorId": 1, + "langId": "cmake" }, { - "id": 2, - "language": "c++", - "source": "#include \"fmt/core.h\"\n\nint main() {\n fmt::print(\"H€llo, world!\\n\");\n return 0;\n}", - "conformanceview": false, - "compilers": [], - "executors": [], - "filename": "example.cpp" + "fileId": 2, + "isIncluded": true, + "isOpen": true, + "isMainSource": false, + "filename": "example.cpp", + "content": "#include \"fmt/core.h\"\n\nint main() {\n fmt::print(\"H€llo, world!\\n\");\n return 0;\n}", + "editorId": 2, + "langId": "c++" + }, + { + "fileId": 3, + "isIncluded": true, + "isOpen": false, + "isMainSource": false, + "filename": "subdir/hello.txt", + "content": "Hello, World!!!!\n", + "editorId": -1, + "langId": "cmake" } - ], - "trees": [ + ], + "newFileId": 4, + "compilers": [ { - "id": 1, - "cmakeArgs": "", - "customOutputFilename": "hellow", - "isCMakeProject": true, - "compilerLanguageId": "c++", - "files": [ - { - "fileId": 1, - "isIncluded": true, - "isOpen": true, - "isMainSource": true, - "filename": "CMakeLists.txt", - "content": "project(hello)\n\nadd_executable(hellow\n example.cpp)\n\ntarget_link_libraries(hellow\n fmtd)\n", - "editorId": 1, - "langId": "cmake" - }, - { - "fileId": 2, - "isIncluded": true, - "isOpen": true, - "isMainSource": false, - "filename": "example.cpp", - "content": "#include \"fmt/core.h\"\n\nint main() {\n fmt::print(\"H€llo, world!\\n\");\n return 0;\n}", - "editorId": 2, - "langId": "c++" - }, - { - "fileId": 3, - "isIncluded": true, - "isOpen": false, - "isMainSource": false, - "filename": "subdir/hello.txt", - "content": "Hello, World!!!!\n", - "editorId": -1, - "langId": "cmake" - } - ], - "newFileId": 4, - "compilers": [ - { - "_internalid": 1, - "id": "g103", - "options": "-g -O3 -flto", - "filters": { - "binary": false, - "commentOnly": true, - "demangle": true, - "directives": true, - "execute": false, - "intel": true, - "labels": true, - "trim": false - }, - "libs": [ - { - "name": "fmt", - "ver": "700" - } - ], - "specialoutputs": [ - "compilerOutput" - ], - "tools": [] - } - ], - "executors": [] + "_internalid": 1, + "id": "g103", + "options": "-g -O3 -flto", + "filters": { + "binary": false, + "commentOnly": true, + "demangle": true, + "directives": true, + "execute": false, + "intel": true, + "labels": true, + "trim": false + }, + "libs": [ + { + "name": "fmt", + "ver": "700" + } + ], + "specialoutputs": ["compilerOutput"], + "tools": [] } - ] -}
\ No newline at end of file + ], + "executors": [] + } + ] +} diff --git a/test/state/tree.goldenified.json b/test/state/tree.goldenified.json index ca448ae65..86f325331 100644 --- a/test/state/tree.goldenified.json +++ b/test/state/tree.goldenified.json @@ -1,202 +1,202 @@ { - "settings": { - "hasHeaders": true, - "constrainDragToContainer": false, - "reorderEnabled": true, - "selectionEnabled": false, - "popoutWholeStack": false, - "blockedPopoutsThrowError": true, - "closePopoutsOnUnload": true, - "showPopoutIcon": false, - "showMaximiseIcon": true, - "showCloseIcon": true, - "responsiveMode": "onload", - "tabOverlapAllowance": 0, - "reorderOnTabMenuClick": true, - "tabControlOffset": 10 - }, - "dimensions": { - "borderWidth": 5, - "borderGrabWidth": 15, - "minItemHeight": 10, - "minItemWidth": 10, - "headerHeight": 20, - "dragProxyWidth": 300, - "dragProxyHeight": 200 - }, - "labels": { - "close": "close", - "maximise": "maximise", - "minimise": "minimise", - "popout": "open in new window", - "popin": "pop in", - "tabDropdown": "additional tabs" - }, - "content": [ + "settings": { + "hasHeaders": true, + "constrainDragToContainer": false, + "reorderEnabled": true, + "selectionEnabled": false, + "popoutWholeStack": false, + "blockedPopoutsThrowError": true, + "closePopoutsOnUnload": true, + "showPopoutIcon": false, + "showMaximiseIcon": true, + "showCloseIcon": true, + "responsiveMode": "onload", + "tabOverlapAllowance": 0, + "reorderOnTabMenuClick": true, + "tabControlOffset": 10 + }, + "dimensions": { + "borderWidth": 5, + "borderGrabWidth": 15, + "minItemHeight": 10, + "minItemWidth": 10, + "headerHeight": 20, + "dragProxyWidth": 300, + "dragProxyHeight": 200 + }, + "labels": { + "close": "close", + "maximise": "maximise", + "minimise": "minimise", + "popout": "open in new window", + "popin": "pop in", + "tabDropdown": "additional tabs" + }, + "content": [ + { + "type": "row", + "content": [ { - "type": "row", - "content": [ - { - "type": "stack", - "width": 25, - "content": [ - { - "type": "component", - "componentName": "tree", - "componentState": { - "id": 1, - "cmakeArgs": "", - "customOutputFilename": "", - "isCMakeProject": true, - "newFileId": 7, - "compilerLanguageId": "c++", - "files": [ - { - "fileId": 1, - "isIncluded": true, - "isOpen": true, - "isMainSource": false, - "filename": "example.cpp", - "content": "#include \"square.h\"\n\nint main(int argc, char **argv) {\n return square(argc);\n}\n", - "editorId": 1, - "langId": "c++" - }, - { - "fileId": 2, - "isIncluded": true, - "isOpen": true, - "isMainSource": false, - "filename": "square.h", - "content": "#pragma once\n\nint square(int num);\n", - "editorId": 2, - "langId": "c++" - }, - { - "fileId": 3, - "isIncluded": true, - "isOpen": false, - "isMainSource": true, - "filename": "CMakeLists.txt", - "content": "project(hello)\n\nadd_executable(output.s\n example.cpp\n square.cpp)\n", - "editorId": -1, - "langId": "cmake" - }, - { - "fileId": 4, - "isIncluded": true, - "isOpen": true, - "isMainSource": false, - "filename": "square.cpp", - "content": "#include \"square.h\"\n\nint square(int num) {\n return num * num;\n}\n", - "editorId": 4, - "langId": "" - } - ] - }, - "isClosable": true, - "reorderEnabled": true - } - ] - }, - { - "type": "stack", - "width": 40, - "content": [ - { - "type": "component", - "componentName": "codeEditor", - "componentState": { - "id": 1, - "source": "#include \"square.h\"\n\nint main(int argc, char **argv) {\n return square(argc);\n}\n", - "lang": "c++", - "filename": "example.cpp" - }, - "isClosable": true, - "reorderEnabled": true, - "title": "example.cpp" - }, - { - "type": "component", - "componentName": "codeEditor", - "componentState": { - "id": 2, - "source": "#pragma once\n\nint square(int num);\n", - "lang": "c++", - "filename": "square.h" - }, - "isClosable": true, - "reorderEnabled": true, - "title": "square.h" - }, - { - "type": "component", - "componentName": "codeEditor", - "componentState": { - "id": 4, - "source": "#include \"square.h\"\n\nint square(int num) {\n return num * num;\n}\n", - "lang": "c++", - "filename": "square.cpp" - }, - "isClosable": true, - "reorderEnabled": true, - "title": "square.cpp" - }, - { - "type": "component", - "componentName": "codeEditor", - "componentState": { - "id": 3, - "source": "project(hello)\n\nadd_executable(output.s\n example.cpp\n square.cpp)\n", - "lang": "cmake", - "filename": "CMakeLists.txt" - }, - "isClosable": true, - "reorderEnabled": true, - "title": "CMakeLists.txt" - } - ] + "type": "stack", + "width": 25, + "content": [ + { + "type": "component", + "componentName": "tree", + "componentState": { + "id": 1, + "cmakeArgs": "", + "customOutputFilename": "", + "isCMakeProject": true, + "newFileId": 7, + "compilerLanguageId": "c++", + "files": [ + { + "fileId": 1, + "isIncluded": true, + "isOpen": true, + "isMainSource": false, + "filename": "example.cpp", + "content": "#include \"square.h\"\n\nint main(int argc, char **argv) {\n return square(argc);\n}\n", + "editorId": 1, + "langId": "c++" + }, + { + "fileId": 2, + "isIncluded": true, + "isOpen": true, + "isMainSource": false, + "filename": "square.h", + "content": "#pragma once\n\nint square(int num);\n", + "editorId": 2, + "langId": "c++" + }, + { + "fileId": 3, + "isIncluded": true, + "isOpen": false, + "isMainSource": true, + "filename": "CMakeLists.txt", + "content": "project(hello)\n\nadd_executable(output.s\n example.cpp\n square.cpp)\n", + "editorId": -1, + "langId": "cmake" + }, + { + "fileId": 4, + "isIncluded": true, + "isOpen": true, + "isMainSource": false, + "filename": "square.cpp", + "content": "#include \"square.h\"\n\nint square(int num) {\n return num * num;\n}\n", + "editorId": 4, + "langId": "" + } + ] + }, + "isClosable": true, + "reorderEnabled": true + } + ] + }, + { + "type": "stack", + "width": 40, + "content": [ + { + "type": "component", + "componentName": "codeEditor", + "componentState": { + "id": 1, + "source": "#include \"square.h\"\n\nint main(int argc, char **argv) {\n return square(argc);\n}\n", + "lang": "c++", + "filename": "example.cpp" + }, + "isClosable": true, + "reorderEnabled": true, + "title": "example.cpp" + }, + { + "type": "component", + "componentName": "codeEditor", + "componentState": { + "id": 2, + "source": "#pragma once\n\nint square(int num);\n", + "lang": "c++", + "filename": "square.h" + }, + "isClosable": true, + "reorderEnabled": true, + "title": "square.h" + }, + { + "type": "component", + "componentName": "codeEditor", + "componentState": { + "id": 4, + "source": "#include \"square.h\"\n\nint square(int num) {\n return num * num;\n}\n", + "lang": "c++", + "filename": "square.cpp" + }, + "isClosable": true, + "reorderEnabled": true, + "title": "square.cpp" + }, + { + "type": "component", + "componentName": "codeEditor", + "componentState": { + "id": 3, + "source": "project(hello)\n\nadd_executable(output.s\n example.cpp\n square.cpp)\n", + "lang": "cmake", + "filename": "CMakeLists.txt" + }, + "isClosable": true, + "reorderEnabled": true, + "title": "CMakeLists.txt" + } + ] + }, + { + "type": "stack", + "width": 40, + "content": [ + { + "componentName": "compiler", + "componentState": { + "compiler": "g103", + "filters": { + "binary": true, + "commentOnly": true, + "demangle": true, + "directives": true, + "execute": false, + "intel": true, + "labels": true, + "trim": false }, - { - "type": "stack", - "width": 40, - "content": [ - { - "componentName": "compiler", - "componentState": { - "compiler": "g103", - "filters": { - "binary": true, - "commentOnly": true, - "demangle": true, - "directives": true, - "execute": false, - "intel": true, - "labels": true, - "trim": false - }, - "lang": "c++", - "libs": [], - "options": "-g -O3 -flto", - "tree": 1 - }, - "isClosable": true, - "reorderEnabled": true, - "type": "component" - }, - { - "componentName": "output", - "componentState": { - "compiler": 1, - "fontScale": 14, - "wrap": false - }, - "isClosable": true, - "reorderEnabled": true, - "type": "component" - } - ] - } - ] + "lang": "c++", + "libs": [], + "options": "-g -O3 -flto", + "tree": 1 + }, + "isClosable": true, + "reorderEnabled": true, + "type": "component" + }, + { + "componentName": "output", + "componentState": { + "compiler": 1, + "fontScale": 14, + "wrap": false + }, + "isClosable": true, + "reorderEnabled": true, + "type": "component" + } + ] } - ] -}
\ No newline at end of file + ] + } + ] +} diff --git a/test/state/tree.json b/test/state/tree.json index d53a36154..a8ab80569 100644 --- a/test/state/tree.json +++ b/test/state/tree.json @@ -1,114 +1,112 @@ { - "sessions": [ + "sessions": [ + { + "id": 1, + "language": "c++", + "source": "#include \"square.h\"\n\nint main(int argc, char **argv) {\n return square(argc);\n}\n", + "conformanceview": false, + "compilers": [], + "executors": [], + "filename": "example.cpp" + }, + { + "id": 2, + "language": "c++", + "source": "#pragma once\n\nint square(int num);\n", + "conformanceview": false, + "compilers": [], + "executors": [], + "filename": "square.h" + }, + { + "id": 4, + "language": "c++", + "source": "#include \"square.h\"\n\nint square(int num) {\n return num * num;\n}\n", + "conformanceview": false, + "compilers": [], + "executors": [], + "filename": "square.cpp" + }, + { + "id": 3, + "language": "cmake", + "source": "project(hello)\n\nadd_executable(output.s\n example.cpp\n square.cpp)\n", + "conformanceview": false, + "compilers": [], + "executors": [], + "filename": "CMakeLists.txt" + } + ], + "trees": [ + { + "id": 1, + "cmakeArgs": "", + "customOutputFilename": "", + "isCMakeProject": true, + "compilerLanguageId": "c++", + "files": [ { - "id": 1, - "language": "c++", - "source": "#include \"square.h\"\n\nint main(int argc, char **argv) {\n return square(argc);\n}\n", - "conformanceview": false, - "compilers": [], - "executors": [], - "filename": "example.cpp" + "fileId": 1, + "isIncluded": true, + "isOpen": true, + "isMainSource": false, + "filename": "example.cpp", + "content": "#include \"square.h\"\n\nint main(int argc, char **argv) {\n return square(argc);\n}\n", + "editorId": 1, + "langId": "c++" }, { - "id": 2, - "language": "c++", - "source": "#pragma once\n\nint square(int num);\n", - "conformanceview": false, - "compilers": [], - "executors": [], - "filename": "square.h" + "fileId": 2, + "isIncluded": true, + "isOpen": true, + "isMainSource": false, + "filename": "square.h", + "content": "#pragma once\n\nint square(int num);\n", + "editorId": 2, + "langId": "c++" }, { - "id": 4, - "language": "c++", - "source": "#include \"square.h\"\n\nint square(int num) {\n return num * num;\n}\n", - "conformanceview": false, - "compilers": [], - "executors": [], - "filename": "square.cpp" + "fileId": 3, + "isIncluded": true, + "isOpen": false, + "isMainSource": true, + "filename": "CMakeLists.txt", + "content": "project(hello)\n\nadd_executable(output.s\n example.cpp\n square.cpp)\n", + "editorId": -1, + "langId": "cmake" }, { - "id": 3, - "language": "cmake", - "source": "project(hello)\n\nadd_executable(output.s\n example.cpp\n square.cpp)\n", - "conformanceview": false, - "compilers": [], - "executors": [], - "filename": "CMakeLists.txt" + "fileId": 4, + "isIncluded": true, + "isOpen": true, + "isMainSource": false, + "filename": "square.cpp", + "content": "#include \"square.h\"\n\nint square(int num) {\n return num * num;\n}\n", + "editorId": 4, + "langId": "" } - ], - "trees": [ + ], + "newFileId": 7, + "compilers": [ { - "id": 1, - "cmakeArgs": "", - "customOutputFilename": "", - "isCMakeProject": true, - "compilerLanguageId": "c++", - "files": [ - { - "fileId": 1, - "isIncluded": true, - "isOpen": true, - "isMainSource": false, - "filename": "example.cpp", - "content": "#include \"square.h\"\n\nint main(int argc, char **argv) {\n return square(argc);\n}\n", - "editorId": 1, - "langId": "c++" - }, - { - "fileId": 2, - "isIncluded": true, - "isOpen": true, - "isMainSource": false, - "filename": "square.h", - "content": "#pragma once\n\nint square(int num);\n", - "editorId": 2, - "langId": "c++" - }, - { - "fileId": 3, - "isIncluded": true, - "isOpen": false, - "isMainSource": true, - "filename": "CMakeLists.txt", - "content": "project(hello)\n\nadd_executable(output.s\n example.cpp\n square.cpp)\n", - "editorId": -1, - "langId": "cmake" - }, - { - "fileId": 4, - "isIncluded": true, - "isOpen": true, - "isMainSource": false, - "filename": "square.cpp", - "content": "#include \"square.h\"\n\nint square(int num) {\n return num * num;\n}\n", - "editorId": 4, - "langId": "" - } - ], - "newFileId": 7, - "compilers": [ - { - "id": "g103", - "options": "-g -O3 -flto", - "filters": { - "binary": true, - "commentOnly": true, - "demangle": true, - "directives": true, - "execute": false, - "intel": true, - "labels": true, - "trim": false - }, - "libs": [], - "specialoutputs": [ - "compilerOutput" - ], - "tools": [] - } - ], - "executors": [] + "id": "g103", + "options": "-g -O3 -flto", + "filters": { + "binary": true, + "commentOnly": true, + "demangle": true, + "directives": true, + "execute": false, + "intel": true, + "labels": true, + "trim": false + }, + "libs": [], + "specialoutputs": ["compilerOutput"], + "tools": [] } - ] -}
\ No newline at end of file + ], + "executors": [] + } + ] +} diff --git a/test/state/tree.normalized.json b/test/state/tree.normalized.json index 9b5b21fee..cc12f5938 100644 --- a/test/state/tree.normalized.json +++ b/test/state/tree.normalized.json @@ -1,113 +1,113 @@ { - "sessions": [ + "sessions": [ + { + "id": 1, + "language": "c++", + "source": "#include \"square.h\"\n\nint main(int argc, char **argv) {\n return square(argc);\n}\n", + "conformanceview": false, + "compilers": [], + "executors": [], + "filename": "example.cpp" + }, + { + "id": 2, + "language": "c++", + "source": "#pragma once\n\nint square(int num);\n", + "conformanceview": false, + "compilers": [], + "executors": [], + "filename": "square.h" + }, + { + "id": 4, + "language": "c++", + "source": "#include \"square.h\"\n\nint square(int num) {\n return num * num;\n}\n", + "conformanceview": false, + "compilers": [], + "executors": [], + "filename": "square.cpp" + }, + { + "id": 3, + "language": "cmake", + "source": "project(hello)\n\nadd_executable(output.s\n example.cpp\n square.cpp)\n", + "conformanceview": false, + "compilers": [], + "executors": [], + "filename": "CMakeLists.txt" + } + ], + "trees": [ + { + "id": 1, + "cmakeArgs": "", + "customOutputFilename": "", + "isCMakeProject": true, + "compilerLanguageId": "c++", + "files": [ { - "id": 1, - "language": "c++", - "source": "#include \"square.h\"\n\nint main(int argc, char **argv) {\n return square(argc);\n}\n", - "conformanceview": false, - "compilers": [], - "executors": [], - "filename": "example.cpp" + "fileId": 1, + "isIncluded": true, + "isOpen": true, + "isMainSource": false, + "filename": "example.cpp", + "content": "#include \"square.h\"\n\nint main(int argc, char **argv) {\n return square(argc);\n}\n", + "editorId": 1, + "langId": "c++" }, { - "id": 2, - "language": "c++", - "source": "#pragma once\n\nint square(int num);\n", - "conformanceview": false, - "compilers": [], - "executors": [], - "filename": "square.h" + "fileId": 2, + "isIncluded": true, + "isOpen": true, + "isMainSource": false, + "filename": "square.h", + "content": "#pragma once\n\nint square(int num);\n", + "editorId": 2, + "langId": "c++" }, { - "id": 4, - "language": "c++", - "source": "#include \"square.h\"\n\nint square(int num) {\n return num * num;\n}\n", - "conformanceview": false, - "compilers": [], - "executors": [], - "filename": "square.cpp" + "fileId": 3, + "isIncluded": true, + "isOpen": false, + "isMainSource": true, + "filename": "CMakeLists.txt", + "content": "project(hello)\n\nadd_executable(output.s\n example.cpp\n square.cpp)\n", + "editorId": -1, + "langId": "cmake" }, { - "id": 3, - "language": "cmake", - "source": "project(hello)\n\nadd_executable(output.s\n example.cpp\n square.cpp)\n", - "conformanceview": false, - "compilers": [], - "executors": [], - "filename": "CMakeLists.txt" + "fileId": 4, + "isIncluded": true, + "isOpen": true, + "isMainSource": false, + "filename": "square.cpp", + "content": "#include \"square.h\"\n\nint square(int num) {\n return num * num;\n}\n", + "editorId": 4, + "langId": "" } - ], - "trees": [ + ], + "newFileId": 7, + "compilers": [ { - "id": 1, - "cmakeArgs": "", - "customOutputFilename": "", - "isCMakeProject": true, - "compilerLanguageId": "c++", - "files": [ - { - "fileId": 1, - "isIncluded": true, - "isOpen": true, - "isMainSource": false, - "filename": "example.cpp", - "content": "#include \"square.h\"\n\nint main(int argc, char **argv) {\n return square(argc);\n}\n", - "editorId": 1, - "langId": "c++" - }, - { - "fileId": 2, - "isIncluded": true, - "isOpen": true, - "isMainSource": false, - "filename": "square.h", - "content": "#pragma once\n\nint square(int num);\n", - "editorId": 2, - "langId": "c++" - }, - { - "fileId": 3, - "isIncluded": true, - "isOpen": false, - "isMainSource": true, - "filename": "CMakeLists.txt", - "content": "project(hello)\n\nadd_executable(output.s\n example.cpp\n square.cpp)\n", - "editorId": -1, - "langId": "cmake" - }, - { - "fileId": 4, - "isIncluded": true, - "isOpen": true, - "isMainSource": false, - "filename": "square.cpp", - "content": "#include \"square.h\"\n\nint square(int num) {\n return num * num;\n}\n", - "editorId": 4, - "langId": "" - } - ], - "newFileId": 7, - "compilers": [ - { - "_internalid": 1, - "id": "g103", - "options": "-g -O3 -flto", - "filters": { - "binary": true, - "commentOnly": true, - "demangle": true, - "directives": true, - "execute": false, - "intel": true, - "labels": true, - "trim": false - }, - "libs": [], - "specialoutputs": [], - "tools": [] - } - ], - "executors": [] + "_internalid": 1, + "id": "g103", + "options": "-g -O3 -flto", + "filters": { + "binary": true, + "commentOnly": true, + "demangle": true, + "directives": true, + "execute": false, + "intel": true, + "labels": true, + "trim": false + }, + "libs": [], + "specialoutputs": [], + "tools": [] } - ] -}
\ No newline at end of file + ], + "executors": [] + } + ] +} diff --git a/test/state/twocompilers.json b/test/state/twocompilers.json index 16218c390..fdfb8029f 100644 --- a/test/state/twocompilers.json +++ b/test/state/twocompilers.json @@ -1,195 +1,195 @@ { - "settings": { - "hasHeaders": true, - "constrainDragToContainer": false, - "reorderEnabled": true, - "selectionEnabled": false, - "popoutWholeStack": false, - "blockedPopoutsThrowError": true, - "closePopoutsOnUnload": true, - "showPopoutIcon": false, - "showMaximiseIcon": true, - "showCloseIcon": true, - "responsiveMode": "onload", - "tabOverlapAllowance": 0, - "reorderOnTabMenuClick": true, - "tabControlOffset": 10 - }, - "dimensions": { - "borderWidth": 5, - "borderGrabWidth": 15, - "minItemHeight": 10, - "minItemWidth": 10, - "headerHeight": 20, - "dragProxyWidth": 300, - "dragProxyHeight": 200 - }, - "labels": { - "close": "close", - "maximise": "maximise", - "minimise": "minimise", - "popout": "open in new window", - "popin": "pop in", - "tabDropdown": "additional tabs" - }, - "content": [ + "settings": { + "hasHeaders": true, + "constrainDragToContainer": false, + "reorderEnabled": true, + "selectionEnabled": false, + "popoutWholeStack": false, + "blockedPopoutsThrowError": true, + "closePopoutsOnUnload": true, + "showPopoutIcon": false, + "showMaximiseIcon": true, + "showCloseIcon": true, + "responsiveMode": "onload", + "tabOverlapAllowance": 0, + "reorderOnTabMenuClick": true, + "tabControlOffset": 10 + }, + "dimensions": { + "borderWidth": 5, + "borderGrabWidth": 15, + "minItemHeight": 10, + "minItemWidth": 10, + "headerHeight": 20, + "dragProxyWidth": 300, + "dragProxyHeight": 200 + }, + "labels": { + "close": "close", + "maximise": "maximise", + "minimise": "minimise", + "popout": "open in new window", + "popin": "pop in", + "tabDropdown": "additional tabs" + }, + "content": [ + { + "type": "row", + "isClosable": true, + "reorderEnabled": true, + "title": "", + "content": [ { - "type": "row", - "isClosable": true, - "reorderEnabled": true, - "title": "", - "content": [ + "type": "column", + "isClosable": true, + "reorderEnabled": true, + "title": "", + "width": 25.000000000000004, + "content": [ + { + "type": "stack", + "width": 25.000000000000004, + "isClosable": true, + "reorderEnabled": true, + "title": "", + "activeItemIndex": 0, + "height": 50, + "content": [ { - "type": "column", - "isClosable": true, - "reorderEnabled": true, - "title": "", - "width": 25.000000000000004, - "content": [ - { - "type": "stack", - "width": 25.000000000000004, - "isClosable": true, - "reorderEnabled": true, - "title": "", - "activeItemIndex": 0, - "height": 50, - "content": [ - { - "type": "component", - "componentName": "codeEditor", - "componentState": { - "id": 1, - "source": "// Type your code here, or load an example.\r\nint square(int num) {\r\n return num * num + 3;\r\n}\r\n\r\n", - "lang": "c++" - }, - "isClosable": true, - "reorderEnabled": true, - "title": "C++ source #1" - } - ] - }, - { - "type": "stack", - "header": {}, - "isClosable": true, - "reorderEnabled": true, - "title": "", - "activeItemIndex": 0, - "height": 50, - "content": [ - { - "type": "component", - "componentName": "codeEditor", - "componentState": { - "id": 2, - "source": "// Type your code here, or load an example.\r\nint square(int num) {\r\n return num * num;\r\n}", - "lang": "c++" - }, - "isClosable": true, - "reorderEnabled": true, - "title": "C++ source #2" - } - ] - } - ] - }, + "type": "component", + "componentName": "codeEditor", + "componentState": { + "id": 1, + "source": "// Type your code here, or load an example.\r\nint square(int num) {\r\n return num * num + 3;\r\n}\r\n\r\n", + "lang": "c++" + }, + "isClosable": true, + "reorderEnabled": true, + "title": "C++ source #1" + } + ] + }, + { + "type": "stack", + "header": {}, + "isClosable": true, + "reorderEnabled": true, + "title": "", + "activeItemIndex": 0, + "height": 50, + "content": [ { - "type": "stack", - "width": 25.000000000000004, - "isClosable": true, - "reorderEnabled": true, - "title": "", - "activeItemIndex": 0, - "content": [ - { - "type": "component", - "componentName": "compiler", - "componentState": { - "compiler": "vc2017_64", - "source": 1, - "options": "-O2", - "filters": { - "binary": false, - "execute": false, - "labels": true, - "directives": true, - "commentOnly": true, - "trim": false, - "intel": true, - "demangle": true - }, - "libs": [], - "lang": "c++" - }, - "isClosable": true, - "reorderEnabled": true, - "title": "VC 2017 amd64 (Editor #1, Compiler #1) C++" - } - ] + "type": "component", + "componentName": "codeEditor", + "componentState": { + "id": 2, + "source": "// Type your code here, or load an example.\r\nint square(int num) {\r\n return num * num;\r\n}", + "lang": "c++" + }, + "isClosable": true, + "reorderEnabled": true, + "title": "C++ source #2" + } + ] + } + ] + }, + { + "type": "stack", + "width": 25.000000000000004, + "isClosable": true, + "reorderEnabled": true, + "title": "", + "activeItemIndex": 0, + "content": [ + { + "type": "component", + "componentName": "compiler", + "componentState": { + "compiler": "vc2017_64", + "source": 1, + "options": "-O2", + "filters": { + "binary": false, + "execute": false, + "labels": true, + "directives": true, + "commentOnly": true, + "trim": false, + "intel": true, + "demangle": true }, - { - "type": "stack", - "width": 25.000000000000004, - "isClosable": true, - "reorderEnabled": true, - "title": "", - "activeItemIndex": 0, - "content": [ - { - "type": "component", - "componentName": "output", - "componentState": { - "compiler": 1, - "editor": 1, - "wrap": false - }, - "isClosable": true, - "reorderEnabled": true, - "title": "#1 with VC 2017 amd64" - } - ] + "libs": [], + "lang": "c++" + }, + "isClosable": true, + "reorderEnabled": true, + "title": "VC 2017 amd64 (Editor #1, Compiler #1) C++" + } + ] + }, + { + "type": "stack", + "width": 25.000000000000004, + "isClosable": true, + "reorderEnabled": true, + "title": "", + "activeItemIndex": 0, + "content": [ + { + "type": "component", + "componentName": "output", + "componentState": { + "compiler": 1, + "editor": 1, + "wrap": false + }, + "isClosable": true, + "reorderEnabled": true, + "title": "#1 with VC 2017 amd64" + } + ] + }, + { + "type": "stack", + "width": 25.000000000000004, + "isClosable": true, + "reorderEnabled": true, + "title": "", + "activeItemIndex": 0, + "content": [ + { + "type": "component", + "componentName": "compiler", + "componentState": { + "compiler": "vc2017_32", + "source": 2, + "options": "-O3", + "filters": { + "binary": false, + "execute": false, + "labels": true, + "directives": true, + "commentOnly": true, + "trim": false, + "intel": true, + "demangle": true }, - { - "type": "stack", - "width": 25.000000000000004, - "isClosable": true, - "reorderEnabled": true, - "title": "", - "activeItemIndex": 0, - "content": [ - { - "type": "component", - "componentName": "compiler", - "componentState": { - "compiler": "vc2017_32", - "source": 2, - "options": "-O3", - "filters": { - "binary": false, - "execute": false, - "labels": true, - "directives": true, - "commentOnly": true, - "trim": false, - "intel": true, - "demangle": true - }, - "libs": [], - "lang": "c++" - }, - "isClosable": true, - "reorderEnabled": true, - "title": "VC 2017 x86 (Editor #2, Compiler #2) C++" - } - ] - } - ] + "libs": [], + "lang": "c++" + }, + "isClosable": true, + "reorderEnabled": true, + "title": "VC 2017 x86 (Editor #2, Compiler #2) C++" + } + ] } - ], - "isClosable": true, - "reorderEnabled": true, - "title": "", - "openPopouts": [], - "maximisedItemId": null -}
\ No newline at end of file + ] + } + ], + "isClosable": true, + "reorderEnabled": true, + "title": "", + "openPopouts": [], + "maximisedItemId": null +} |