Group some files to their own folders (#3384)

* Group some files to their own folders

In etc/scripts/, added disasms/, docenizers/, and util/ folders
In lib/, added mapfiles/, and parsers/ folders (+moved google.js to
shortener)
In static/, added widgets/ folder

Added cypress folder to .gitignore

* Address Matt's PR reviews

* Move new Pane renaming to folder

.github/workflows/test-and-deploy.yml

@@ -30,7 +30,7 @@ jobs:
         run: |
           npm run lint
           npm run ci-test
-          python3 ./etc/scripts/orphancompiler.py
+          python3 ./etc/scripts/util/orphancompiler.py
       - name: Code coverage
         run: npm run codecov
 

.husky/pre-commit

@@ -4,4 +4,4 @@
 make prereqs
 npx lint-staged
 npm run test
-python3 ./etc/scripts/orphancompiler.py
+python3 ./etc/scripts/util/orphancompiler.py

app.js

@@ -50,7 +50,6 @@ import { CompilationQueue } from './lib/compilation-queue';
 import { CompilerFinder } from './lib/compiler-finder';
 // import { policy as csp } from './lib/csp';
 import { initialiseWine } from './lib/exec';
-import { ShortLinkResolver } from './lib/google';
 import { CompileHandler } from './lib/handlers/compile';
 import * as healthCheck from './lib/handlers/health-check';
 import { NoScriptHandler } from './lib/handlers/noscript';
@@ -60,6 +59,7 @@ import { languages as allLanguages } from './lib/languages';
 import { logger, logToLoki, logToPapertrail, suppressConsoleLog } from './lib/logger';
 import { ClientOptionsHandler } from './lib/options-handler';
 import * as props from './lib/properties';
+import { ShortLinkResolver } from './lib/shortener/google';
 import { sources } from './lib/sources';
 import { loadSponsorsFromString } from './lib/sponsors';
 import { getStorageTypeByKey } from './lib/storage';

cypress/.gitignore

@@ -0,0 +1,5 @@
+/fixtures
+/plugins
+/screenshots
+/support
+/videos

docs/AddingAssemblyDocumentation.md

@@ -27,10 +27,10 @@ can be found in `/lib/asm-docs/generated/asm-docs-amd64.js`.
 
 How you generate this file is completely up to you, just make sure it's easy for others to run the script if needed as
 well. If you need inspiration on how to write this tool, you can look at the `docenizer-*` scripts found in
-`/etc/scripts` in the source control tree.
+`/etc/scripts/docenizers` in the source control tree.
 
 CE expects the tool to output the file into the `/lib/asm-docs/generated/` folder with a name following the existing 
-convention.  Each case in the switch should return a piece of formatted HTML to insert into the popup, a tooltip text 
+convention. Each case in the switch should return a piece of formatted HTML to insert into the popup, a tooltip text 
 for the on-hover tooltip and a URL to external documentation.
 
 ```js

docs/internal/UpdatingAsmDocsx86.md

@@ -1,4 +1,4 @@
-If you need to update the x86 asm documentation, just run `etc/scripts/docenizer.py`, which requires:
+If you need to update the x86 asm documentation, just run `etc/scripts/docenizers/docenizer.py`, which requires:
  - Python 3.x with BeautifulSoup
 
 You can use some options in the script:

etc/scripts/build-dist.sh

@@ -18,8 +18,8 @@ echo "${HASH}" >out/dist/git_hash
 echo "${RELEASE_NAME}" >out/dist/release_build
 
 # Create any autogenerated files.
-python3 ./etc/scripts/changelog.py
-python3 ./etc/scripts/politic.py
+python3 ./etc/scripts/util/changelog.py
+python3 ./etc/scripts/util/politic.py
 
 
 # Set up and build and webpack everything

etc/scripts/docenizers/docenizer6502.py

@@ -176,7 +176,7 @@ def escape_quotes(string):
 def get_arguments():
     parser = argparse.ArgumentParser()
     help_text = "the location to which the script will be written"
-    relative_path = "/../../lib/handlers/asm-docs-6502.js"
+    relative_path = "/../../../lib/handlers/asm-docs-6502.js"
     script_path = os.path.realpath(__file__)
     script_dir = os.path.dirname(script_path)
     default_path = os.path.normpath(script_dir + relative_path)

etc/scripts/docenizers/docenizerAVR.py

@@ -36,7 +36,7 @@ def main():
 def get_arguments():
     parser = argparse.ArgumentParser()
     help_text = "the location to which the script will be written"
-    relative_path = "/../../lib/handlers/asm-docs-avr.js"
+    relative_path = "/../../../lib/handlers/asm-docs-avr.js"
     script_path = os.path.realpath(__file__)
     script_dir = os.path.dirname(script_path)
     default_path = os.path.normpath(script_dir + relative_path)

etc/scripts/docenizers/docenizerJava.sh

@@ -4,5 +4,5 @@ JVMS_PATH=$(pwd)/vendor/jvms.html
 
 [ -f "$JVMS_PATH" ] || curl https://docs.oracle.com/javase/specs/jvms/se16/html/jvms-6.html -o "$JVMS_PATH"
 
-$(pwd)/find-node ../../.node-bin
-$(cat ../../.node-bin) docenizer-java.js > ../../lib/handlers/asm-docs-java.js
+$(pwd)/find-node ../../../.node-bin
+$(cat ../../../.node-bin) docenizer-java.js > ../../../lib/handlers/asm-docs-java.js

lib/base-compiler.js

@@ -29,7 +29,6 @@ import fs from 'fs-extra';
 import temp from 'temp';
 import _ from 'underscore';
 
-import { AsmParser } from './asm-parser';
 import { BuildEnvSetupBase, getBuildEnvTypeByKey } from './buildenvsetup';
 import * as cfg from './cfg';
 import { CompilerArguments } from './compiler-arguments';
@@ -44,6 +43,7 @@ import { LlvmIrParser } from './llvm-ir';
 import { logger } from './logger';
 import { getObjdumperTypeByKey } from './objdumper';
 import { Packager } from './packager';
+import { AsmParser } from './parsers/asm-parser';
 import { getToolchainPath } from './toolchain-utils';
 import * as utils from './utils';
 

lib/compilers/assembly.js

@@ -25,8 +25,8 @@
 import fs from 'fs';
 import path from 'path';
 
-import { AsmRaw } from '../asm-raw';
 import { BaseCompiler } from '../base-compiler';
+import { AsmRaw } from '../parsers/asm-raw';
 import * as utils from '../utils';
 
 import { BaseParser } from './argument-parsers';

lib/compilers/clang.js

@@ -24,9 +24,9 @@
 
 import path from 'path';
 
-import { AmdgpuAsmParser } from '../asm-parser-amdgpu';
-import { SassAsmParser } from '../asm-parser-sass';
 import { BaseCompiler } from '../base-compiler';
+import { AmdgpuAsmParser } from '../parsers/asm-parser-amdgpu';
+import { SassAsmParser } from '../parsers/asm-parser-sass';
 
 const offloadRegexp = /^#\s+__CLANG_OFFLOAD_BUNDLE__(__START__|__END__)\s+(.*)$/gm;
 

lib/compilers/crystal.js

@@ -26,8 +26,8 @@ import path from 'path';
 
 import _ from 'underscore';
 
-import { CrystalAsmParser } from '../asm-parser-crystal';
 import { BaseCompiler } from '../base-compiler';
+import { CrystalAsmParser } from '../parsers/asm-parser-crystal';
 
 import { CrystalParser } from './argument-parsers';
 

lib/compilers/dart.js

@@ -24,8 +24,8 @@
 
 import Semver from 'semver';
 
-import { DartAsmParser } from '../asm-parser-dart';
 import { BaseCompiler } from '../base-compiler';
+import { DartAsmParser } from '../parsers/asm-parser-dart';
 import * as utils from '../utils';
 
 import { BaseParser } from './argument-parsers';

lib/compilers/dotnet.ts

@@ -27,8 +27,8 @@ import path from 'path';
 import fs from 'fs-extra';
 
 /// <reference types="../base-compiler" />
-import { DotNetAsmParser } from '../asm-parser-dotnet';
 import { BaseCompiler } from '../base-compiler';
+import { DotNetAsmParser } from '../parsers/asm-parser-dotnet';
 
 class DotNetCompiler extends BaseCompiler {
     private rID: string;

lib/compilers/ewarm.js

@@ -24,8 +24,8 @@
 
 import temp from 'temp';
 
-import { AsmEWAVRParser } from '../asm-parser-ewavr';
 import { BaseCompiler } from '../base-compiler';
+import { AsmEWAVRParser } from '../parsers/asm-parser-ewavr';
 
 export class EWARMCompiler extends BaseCompiler {
     static get key() { return 'ewarm'; }

lib/compilers/ewavr.js

@@ -24,8 +24,8 @@
 
 import temp from 'temp';
 
-import { AsmEWAVRParser } from '../asm-parser-ewavr';
 import { BaseCompiler } from '../base-compiler';
+import { AsmEWAVRParser } from '../parsers/asm-parser-ewavr';
 
 export class EWAVRCompiler extends BaseCompiler {
     static get key() { return 'ewavr'; }

lib/compilers/nvcc.js

@@ -24,8 +24,8 @@
 
 import path from 'path';
 
-import { SassAsmParser } from '../asm-parser-sass';
 import { BaseCompiler } from '../base-compiler';
+import { SassAsmParser } from '../parsers/asm-parser-sass';
 
 import { ClangParser } from './argument-parsers';
 

lib/compilers/pascal-win.js

@@ -27,7 +27,7 @@ import path from 'path';
 import fs from 'fs-extra';
 
 import { BaseCompiler } from '../base-compiler';
-import { MapFileReaderDelphi } from '../map-file-delphi';
+import { MapFileReaderDelphi } from '../mapfiles/map-file-delphi';
 import { PELabelReconstructor } from '../pe32-support';
 import * as utils from '../utils';
 

lib/compilers/ptxas.js

@@ -24,8 +24,8 @@
 
 import path from 'path';
 
-import { SassAsmParser } from '../asm-parser-sass';
 import { BaseCompiler } from '../base-compiler';
+import { SassAsmParser } from '../parsers/asm-parser-sass';
 import * as utils from '../utils';
 
 import { BaseParser } from './argument-parsers';

lib/compilers/python.js

@@ -35,7 +35,7 @@ export class PythonCompiler extends BaseCompiler {
         this.compiler.demangler = null;
         this.demanglerClass = null;
         this.disasmScriptPath =
-            this.compilerProps('disasmScript') || resolvePathFromAppRoot('etc', 'scripts', 'dis_all.py');
+            this.compilerProps('disasmScript') || resolvePathFromAppRoot('etc', 'scripts', 'disasms', 'dis_all.py');
     }
 
     // eslint-disable-next-line no-unused-vars

lib/compilers/ruby.js

@@ -37,7 +37,7 @@ export class RubyCompiler extends BaseCompiler {
         this.compiler.demangler = null;
         this.demanglerClass = null;
         this.disasmScriptPath =
-            this.compilerProps('disasmScript') || resolvePathFromAppRoot('etc', 'scripts', 'ruby', 'disasm.rb');
+            this.compilerProps('disasmScript') || resolvePathFromAppRoot('etc', 'scripts', 'disasms', 'disasm.rb');
     }
 
     processAsm(result) {

lib/compilers/win32-vc.js

@@ -22,7 +22,7 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-import { VcAsmParser } from '../asm-parser-vc';
+import { VcAsmParser } from '../parsers/asm-parser-vc';
 
 import { VCParser } from './argument-parsers';
 import { Win32Compiler } from './win32';

lib/compilers/win32-vc6.js

@@ -22,7 +22,7 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-import { Vc6AsmParser } from '../asm-parser-vc6';
+import { Vc6AsmParser } from '../parsers/asm-parser-vc6';
 
 import { VCParser } from './argument-parsers';
 import { Win32Compiler } from './win32';

lib/compilers/win32.js

@@ -27,9 +27,9 @@ import path from 'path';
 import temp from 'temp';
 import _ from 'underscore';
 
-import { AsmParser } from '../asm-parser';
 import { BaseCompiler } from '../base-compiler';
-import { MapFileReaderVS } from '../map-file-vs';
+import { MapFileReaderVS } from '../mapfiles/map-file-vs';
+import { AsmParser } from '../parsers/asm-parser';
 import { PELabelReconstructor } from '../pe32-support';
 import * as utils from '../utils';
 

lib/compilers/wine-vc.js

@@ -24,9 +24,9 @@
 
 import path from 'path';
 
-import { VcAsmParser } from '../asm-parser-vc';
 import { BaseCompiler } from '../base-compiler';
-import { MapFileReaderVS } from '../map-file-vs';
+import { MapFileReaderVS } from '../mapfiles/map-file-vs';
+import { VcAsmParser } from '../parsers/asm-parser-vc';
 import { PELabelReconstructor } from '../pe32-support';
 
 import { VCParser } from './argument-parsers';

lib/compilers/wsl-vc.js

@@ -29,7 +29,7 @@ import path from 'path';
 
 import temp from 'temp';
 
-import { VcAsmParser } from '../asm-parser-vc';
+import { VcAsmParser } from '../parsers/asm-parser-vc';
 
 import { Win32VcCompiler } from './win32-vc';
 

lib/demangler/base.js

@@ -22,8 +22,8 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-import { AsmRegex } from '../asmregex';
 import { logger } from '../logger';
+import { AsmRegex } from '../parsers/asmregex';
 import { SymbolStore } from '../symbol-store';
 import * as utils from '../utils';
 

lib/mapfiles/map-file.js

@@ -24,7 +24,7 @@
 
 import fs from 'fs';
 
-import * as utils from './utils';
+import * as utils from '../utils';
 
 export class MapFileReader {
     /**

lib/parsers/asm-parser-dart.js

@@ -22,9 +22,10 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
+import * as utils from '../utils';
+
 import { AsmParser } from './asm-parser';
 import { AsmRegex } from './asmregex';
-import * as utils from './utils';
 
 export class DartAsmParser extends AsmParser {
     constructor() {

lib/parsers/asm-parser-dotnet.ts

@@ -22,7 +22,7 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-import * as utils from './utils';
+import * as utils from '../utils';
 
 type InlineLabel = { name: string, range: { startCol: number, endCol: number } };
 type Source = { file: string, line: number };

lib/parsers/asm-parser-ewavr.js

@@ -22,10 +22,11 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
+import { logger } from '../logger';
+import * as utils from '../utils';
+
 import { AsmParser } from './asm-parser';
 import { AsmRegex } from './asmregex';
-import { logger } from './logger';
-import * as utils from './utils';
 
 export class AsmEWAVRParser extends AsmParser {
     constructor(compilerProps) {

lib/parsers/asm-parser-vc.js

@@ -22,10 +22,11 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
+import { logger } from '../logger';
+import * as utils from '../utils';
+
 import { AsmParser } from './asm-parser';
 import { AsmRegex } from './asmregex';
-import { logger } from './logger';
-import * as utils from './utils';
 
 export class VcAsmParser extends AsmParser {
     constructor(compilerProps) {

lib/parsers/asm-parser-vc6.js

@@ -22,10 +22,11 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
+import { logger } from '../logger';
+import * as utils from '../utils';
+
 import { AsmParser } from './asm-parser';
 import { AsmRegex } from './asmregex';
-import { logger } from './logger';
-import * as utils from './utils';
 
 export class Vc6AsmParser extends AsmParser {
     constructor(compilerProps) {

lib/parsers/asm-parser.js

@@ -24,8 +24,9 @@
 
 import _ from 'underscore';
 
+import * as utils from '../utils';
+
 import { AsmRegex } from './asmregex';
-import * as utils from './utils';
 
 export class AsmParser extends AsmRegex {
     constructor(compilerProps) {

lib/parsers/asmregex.js

@@ -22,7 +22,7 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-import * as utils from './utils';
+import * as utils from '../utils';
 
 const findQuotes = /(.*?)("(?:[^"\\]|\\.)*")(.*)/;
 

lib/tooling/x86to6502-tool.js

@@ -24,7 +24,7 @@
 
 import _ from 'underscore';
 
-import { AsmParser } from '../asm-parser';
+import { AsmParser } from '../parsers/asm-parser';
 
 import { BaseTool } from './base-tool';
 

static/main.js

@@ -47,8 +47,8 @@ var Alert = require('./alert').Alert;
 var themer = require('./themes');
 var motd = require('./motd');
 var jsCookie = require('js-cookie');
-var SimpleCook = require('./simplecook').SimpleCook;
-var HistoryWidget = require('./history-widget').HistoryWidget;
+var SimpleCook = require('./widgets/simplecook').SimpleCook;
+var HistoryWidget = require('./widgets/history-widget').HistoryWidget;
 var History = require('./history');
 var presentation = require('./presentation');
 

static/noscript.js

@@ -30,7 +30,7 @@ var $ = require('jquery');
 require('popper.js');
 require('bootstrap');
 
-var Toggles = require('./toggles').Toggles;
+var Toggles = require('./widgets/toggles').Toggles;
 
 function initMenus() {
     $('.button-checkbox').each(function () {

static/panes/ast-view.js

@@ -24,14 +24,14 @@
 
 'use strict';
 
-var FontScale = require('../fontscale').FontScale;
+var FontScale = require('../widgets/fontscale').FontScale;
 var monaco = require('monaco-editor');
 var _ = require('underscore');
 var $ = require('jquery');
 var colour = require('../colour');
 var ga = require('../analytics').ga;
 var monacoConfig = require('../monaco-config');
-var PaneRenaming = require('../pane-renaming').PaneRenaming;
+var PaneRenaming = require('../widgets/pane-renaming').PaneRenaming;
 
 function Ast(hub, container, state) {
     this.container = container;

static/panes/cfg-view.ts

@@ -24,12 +24,12 @@
 
 import * as vis from 'vis-network';
 import _ from 'underscore';
-import { Toggles } from '../toggles';
+import { Toggles } from '../widgets/toggles';
 import { ga } from '../analytics';
 import TomSelect from 'tom-select';
 import { Container } from 'golden-layout';
 import { CfgState } from './cfg-view.interfaces';
-import { PaneRenaming } from '../pane-renaming';
+import { PaneRenaming } from '../widgets/pane-renaming';
 
 interface NodeInfo {
     edges: string[],

static/panes/compiler.js

@@ -27,8 +27,8 @@ var $ = require('jquery');
 var _ = require('underscore');
 var ga = require('../analytics').ga;
 var colour = require('../colour');
-var Toggles = require('../toggles').Toggles;
-var FontScale = require('../fontscale').FontScale;
+var Toggles = require('../widgets/toggles').Toggles;
+var FontScale = require('../widgets/fontscale').FontScale;
 var Promise = require('es6-promise').Promise;
 var Components = require('../components');
 var LruCache = require('lru-cache');
@@ -36,16 +36,16 @@ var options = require('../options').options;
 var monaco = require('monaco-editor');
 var Alert = require('../alert').Alert;
 var bigInt = require('big-integer');
-var LibsWidget = require('../libs-widget').LibsWidget;
+var LibsWidget = require('../widgets/libs-widget').LibsWidget;
 var codeLensHandler = require('../codelens-handler');
 var monacoConfig = require('../monaco-config');
-var TimingWidget = require('../timing-info-widget');
+var TimingWidget = require('../widgets/timing-info-widget');
 var CompilerPicker = require('../compiler-picker').CompilerPicker;
 var Settings = require('../settings').Settings;
 var utils = require('../utils');
 var LibUtils = require('../lib-utils');
 var getAssemblyDocumentation = require('../api/api').getAssemblyDocumentation;
-var PaneRenaming = require('../pane-renaming').PaneRenaming;
+var PaneRenaming = require('../widgets/pane-renaming').PaneRenaming;
 
 
 require('../modes/asm-mode');

static/panes/conformance-view.js

@@ -30,11 +30,11 @@ var $ = require('jquery');
 var Promise = require('es6-promise').Promise;
 var ga = require('../analytics').ga;
 var Components = require('../components');
-var LibsWidget = require('../libs-widget').LibsWidget;
+var LibsWidget = require('../widgets/libs-widget').LibsWidget;
 var CompilerPicker = require('../compiler-picker').CompilerPicker;
 var utils = require('../utils');
 var LibUtils = require('../lib-utils');
-var PaneRenaming = require('../pane-renaming').PaneRenaming;
+var PaneRenaming = require('../widgets/pane-renaming').PaneRenaming;
 
 function Conformance(hub, container, state) {
     this.hub = hub;

static/panes/device-view.js

@@ -24,14 +24,14 @@
 
 'use strict';
 
-var FontScale = require('../fontscale').FontScale;
+var FontScale = require('../widgets/fontscale').FontScale;
 var monaco = require('monaco-editor');
 var _ = require('underscore');
 var $ = require('jquery');
 var colour = require('../colour');
 var ga = require('../analytics').ga;
 var monacoConfig = require('../monaco-config');
-var PaneRenaming = require('../pane-renaming').PaneRenaming;
+var PaneRenaming = require('../widgets/pane-renaming').PaneRenaming;
 
 var TomSelect = require('tom-select');
 

static/panes/diff.js

@@ -24,13 +24,13 @@
 
 'use strict';
 
-var FontScale = require('../fontscale').FontScale;
+var FontScale = require('../widgets/fontscale').FontScale;
 var monaco = require('monaco-editor');
 var _ = require('underscore');
 var $ = require('jquery');
 var ga = require('../analytics').ga;
 var TomSelect = require('tom-select');
-var PaneRenaming = require('../pane-renaming').PaneRenaming;
+var PaneRenaming = require('../widgets/pane-renaming').PaneRenaming;
 
 require('../modes/asm-mode');
 

static/panes/editor.js

@@ -26,8 +26,8 @@
 var _ = require('underscore');
 var $ = require('jquery');
 var colour = require('../colour');
-var loadSaveLib = require('../load-save');
-var FontScale = require('../fontscale').FontScale;
+var loadSaveLib = require('../widgets/load-save');
+var FontScale = require('../widgets/fontscale').FontScale;
 var Components = require('../components');
 var monaco = require('monaco-editor');
 var options = require('../options').options;

static/panes/executor.js

@@ -26,18 +26,18 @@
 var $ = require('jquery');
 var _ = require('underscore');
 var ga = require('../analytics').ga;
-var Toggles = require('../toggles').Toggles;
-var FontScale = require('../fontscale').FontScale;
+var Toggles = require('../widgets/toggles').Toggles;
+var FontScale = require('../widgets/fontscale').FontScale;
 var options = require('../options').options;
 var Alert = require('../alert').Alert;
-var LibsWidget = require('../libs-widget').LibsWidget;
+var LibsWidget = require('../widgets/libs-widget').LibsWidget;
 var AnsiToHtml = require('../ansi-to-html').Filter;
-var TimingWidget = require('../timing-info-widget');
+var TimingWidget = require('../widgets/timing-info-widget');
 var CompilerPicker = require('../compiler-picker').CompilerPicker;
 var Settings = require('../settings').Settings;
 var utils = require('../utils');
 var LibUtils = require('../lib-utils');
-var PaneRenaming = require('../pane-renaming').PaneRenaming;
+var PaneRenaming = require('../widgets/pane-renaming').PaneRenaming;
 
 require('../modes/asm-mode');
 require('../modes/ptx-mode');

static/panes/flags-view.js

@@ -24,14 +24,14 @@
 
 'use strict';
 
-var FontScale = require('../fontscale').FontScale;
+var FontScale = require('../widgets/fontscale').FontScale;
 var monaco = require('monaco-editor');
 var _ = require('underscore');
 var $ = require('jquery');
 var ga = require('../analytics').ga;
 var monacoConfig = require('../monaco-config');
 var Settings = require('../settings').Settings;
-var PaneRenaming = require('../pane-renaming').PaneRenaming;
+var PaneRenaming = require('../widgets/pane-renaming').PaneRenaming;
 
 require('../modes/asm-mode');
 

static/panes/gccdump-view.js

@@ -25,9 +25,9 @@
 
 'use strict';
 
-var FontScale = require('../fontscale').FontScale;
+var FontScale = require('../widgets/fontscale').FontScale;
 var monaco = require('monaco-editor');
-var Toggles = require('../toggles').Toggles;
+var Toggles = require('../widgets/toggles').Toggles;
 require('../modes/gccdump-rtl-gimple-mode');
 var _ = require('underscore');
 var $ = require('jquery');
@@ -35,7 +35,7 @@ var ga = require('../analytics').ga;
 var monacoConfig = require('../monaco-config');
 var TomSelect = require('tom-select');
 var utils = require('../utils');
-var PaneRenaming = require('../pane-renaming').PaneRenaming;
+var PaneRenaming = require('../widgets/pane-renaming').PaneRenaming;
 
 
 function GccDump(hub, container, state) {

static/panes/ir-view.ts

@@ -34,7 +34,7 @@ import { ga } from '../analytics';
 import { extendConfig } from '../monaco-config';
 import { applyColours } from '../colour';
 
-import { PaneRenaming } from '../pane-renaming';
+import { PaneRenaming } from '../widgets/pane-renaming';
 
 export class Ir extends Pane<monaco.editor.IStandaloneCodeEditor, IrState> {
     linkedFadeTimeoutId = -1;

static/panes/opt-view.js

@@ -24,13 +24,13 @@
 
 'use strict';
 
-var FontScale = require('../fontscale').FontScale;
+var FontScale = require('../widgets/fontscale').FontScale;
 var monaco = require('monaco-editor');
 var _ = require('underscore');
 var $ = require('jquery');
 var ga = require('../analytics').ga;
 var monacoConfig = require('../monaco-config');
-var PaneRenaming = require('../pane-renaming').PaneRenaming;
+var PaneRenaming = require('../widgets/pane-renaming').PaneRenaming;
 
 require('../modes/asm-mode');
 

static/panes/output.js

@@ -26,11 +26,11 @@
 
 var _ = require('underscore');
 var $ = require('jquery');
-var FontScale = require('../fontscale').FontScale;
+var FontScale = require('../widgets/fontscale').FontScale;
 var AnsiToHtml = require('../ansi-to-html').Filter;
-var Toggles = require('../toggles').Toggles;
+var Toggles = require('../widgets/toggles').Toggles;
 var ga = require('../analytics').ga;
-var PaneRenaming = require('../pane-renaming').PaneRenaming;
+var PaneRenaming = require('../widgets/pane-renaming').PaneRenaming;
 
 function makeAnsiToHtml(color) {
     return new AnsiToHtml({

static/panes/pane.ts

@@ -28,11 +28,11 @@ import * as monaco from 'monaco-editor';
 
 import { BasePaneState, PaneCompilerState } from './pane.interfaces';
 
-import { FontScale } from '../fontscale';
+import { FontScale } from '../widgets/fontscale';
 import { SiteSettings } from '../settings';
 import * as utils from '../utils';
 
-import { PaneRenaming } from '../pane-renaming';
+import { PaneRenaming } from '../widgets/pane-renaming';
 
 /**
  * Basic container for a tool pane in Compiler Explorer

static/panes/pp-view.ts

@@ -24,7 +24,7 @@
 
 'use strict';
 
-import { Toggles } from '../toggles';
+import { Toggles } from '../widgets/toggles';
 import * as monaco from 'monaco-editor';
 import _ from 'underscore';
 import $ from 'jquery';

static/panes/tool-input-view.js

@@ -24,7 +24,7 @@
 
 'use strict';
 
-var FontScale = require('../fontscale').FontScale;
+var FontScale = require('../widgets/fontscale').FontScale;
 var monaco = require('monaco-editor');
 var _ = require('underscore');
 var $ = require('jquery');

static/panes/tool.js

@@ -26,16 +26,16 @@
 
 var _ = require('underscore');
 var $ = require('jquery');
-var FontScale = require('../fontscale').FontScale;
+var FontScale = require('../widgets/fontscale').FontScale;
 var AnsiToHtml = require('../ansi-to-html').Filter;
-var Toggles = require('../toggles').Toggles;
+var Toggles = require('../widgets/toggles').Toggles;
 var ga = require('../analytics').ga;
 var Components = require('../components');
 var monaco = require('monaco-editor');
 var monacoConfig = require('../monaco-config');
 var ceoptions = require('../options').options;
 var utils = require('../utils');
-var PaneRenaming = require('../pane-renaming').PaneRenaming;
+var PaneRenaming = require('../widgets/pane-renaming').PaneRenaming;
 require('../modes/asm6502-mode');
 
 function makeAnsiToHtml(color) {

static/panes/tree.ts

@@ -26,7 +26,7 @@ import {MultifileFile, MultifileService, MultifileServiceState} from '../multifi
 import {LineColouring} from '../line-colouring';
 import * as utils from '../utils';
 import { Settings } from '../settings';
-import { PaneRenaming } from '../pane-renaming';
+import { PaneRenaming } from '../widgets/pane-renaming';
 
 const _ = require('underscore');
 const $ = require('jquery');
@@ -34,7 +34,7 @@ const Alert = require('../alert').Alert;
 const Components = require('../components');
 const ga = require('../analytics').ga;
 const TomSelect = require('tom-select');
-const Toggles = require('../toggles').Toggles;
+const Toggles = require('../widgets/toggles').Toggles;
 const options = require('../options').options;
 const languages = options.languages;
 const saveAs = require('file-saver').saveAs;

static/widgets/fontscale.ts

@@ -24,7 +24,7 @@
 
 import EventEmitter from 'events';
 import $ from 'jquery';
-import {options} from './options';
+import {options} from '../options';
 import {editor} from 'monaco-editor';
 import IEditor = editor.IEditor;
 

static/widgets/history-widget.ts

@@ -23,8 +23,8 @@
 // POSSIBILITY OF SUCH DAMAGE.
 
 import { pluck } from 'underscore';
-import { ga } from './analytics';
-import { sortedList, HistoryEntry, EditorSource } from './history';
+import { ga } from '../analytics';
+import { sortedList, HistoryEntry, EditorSource } from '../history';
 import { editor } from 'monaco-editor';
 
 import IStandaloneDiffEditor = editor.IStandaloneDiffEditor;

static/widgets/libs-widget.ts

@@ -22,9 +22,9 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-import { options } from './options';
-import * as local from './local';
-import { Library, LibraryVersion } from './options.interfaces';
+import { options } from '../options';
+import * as local from '../local';
+import { Library, LibraryVersion } from '../options.interfaces';
 
 
 const FAV_LIBS_STORE_KEY = 'favlibs';

static/widgets/load-save.ts

@@ -24,12 +24,12 @@
 
 import _ from 'underscore';
 import { saveAs } from 'file-saver';
-import { Alert } from './alert';
-import { ga } from './analytics';
-import * as local from './local';
-import { Language } from '../types/languages.interfaces';
+import { Alert } from '../alert';
+import { ga } from '../analytics';
+import * as local from '../local';
+import { Language } from '../../types/languages.interfaces';
 
-const history = require('./history');
+const history = require('../history');
 
 
 export class LoadSave {

static/widgets/pane-renaming.ts

@@ -25,9 +25,9 @@
 import _ from 'underscore';
 import { Tab } from 'golden-layout';
 import { EventEmitter } from 'events';
-import { Alert } from './alert';
+import { Alert } from '../alert';
 
-export class PaneRenaming extends EventEmitter.EventEmitter{
+export class PaneRenaming extends EventEmitter.EventEmitter {
     private pane: any;
     private alertSystem: any;
     private state: any;

test/asm-tests.js

@@ -22,9 +22,9 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-import { AsmParser } from '../lib/asm-parser';
-import { VcAsmParser } from '../lib/asm-parser-vc';
-import { AsmRegex } from '../lib/asmregex';
+import { AsmParser } from '../lib/parsers/asm-parser';
+import { VcAsmParser } from '../lib/parsers/asm-parser-vc';
+import { AsmRegex } from '../lib/parsers/asmregex';
 
 describe('ASM CL parser', () => {
     it('should work for error documents', () => {

test/filter-tests.js

@@ -26,9 +26,9 @@ import path from 'path';
 
 import approvals from 'approvals';
 
-import { AsmParser } from '../lib/asm-parser';
-import { SassAsmParser } from '../lib/asm-parser-sass';
-import { VcAsmParser } from '../lib/asm-parser-vc';
+import { AsmParser } from '../lib/parsers/asm-parser';
+import { SassAsmParser } from '../lib/parsers/asm-parser-sass';
+import { VcAsmParser } from '../lib/parsers/asm-parser-vc';
 
 import { fs, resolvePathFromTestRoot } from './utils';
 

test/google-tests.js

@@ -24,7 +24,7 @@
 
 import nock from 'nock';
 
-import * as google from '../lib/google';
+import * as google from '../lib/shortener/google';
 
 const googlDomain = 'https://goo.gl';
 const shortUrl = '/short';

test/map-file-tests.js

@@ -22,8 +22,8 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-import { MapFileReaderDelphi } from '../lib/map-file-delphi';
-import { MapFileReaderVS } from '../lib/map-file-vs';
+import { MapFileReaderDelphi } from '../lib/mapfiles/map-file-delphi';
+import { MapFileReaderVS } from '../lib/mapfiles/map-file-vs';
 
 describe('Map setup', function () {
     it('VS-map preferred load address', function () {