From 728062eea0e4c8a37e97672711af2dc9f3f60a29 Mon Sep 17 00:00:00 2001 From: Parker Lougheed Date: Fri, 8 Jan 2021 19:11:11 -0600 Subject: [PATCH] Misc cleanup --- lib/context.dart | 2 +- lib/core/keys.dart | 4 ++-- lib/dialogs.dart | 6 +++--- lib/documentation.dart | 8 ++++---- lib/editing/editor.dart | 2 +- lib/editing/editor_codemirror.dart | 2 +- lib/elements/analysis_results_controller.dart | 6 +++--- lib/elements/counter.dart | 4 ++-- lib/elements/elements.css | 7 +++---- lib/elements/elements.dart | 10 +++++----- lib/scss/shared.scss | 2 +- lib/sharing/exercise_metadata.dart | 2 +- lib/src/sample.dart | 8 ++++---- lib/src/util.dart | 2 +- 14 files changed, 32 insertions(+), 33 deletions(-) diff --git a/lib/context.dart b/lib/context.dart index 8db1f510b..db5da8105 100644 --- a/lib/context.dart +++ b/lib/context.dart @@ -9,7 +9,7 @@ import 'dart:async'; import 'services/dartservices.dart'; abstract class Context { - List issues = []; + final List issues = []; String get focusedEditor; diff --git a/lib/core/keys.dart b/lib/core/keys.dart index 983f52b0e..84e76bf39 100644 --- a/lib/core/keys.dart +++ b/lib/core/keys.dart @@ -141,7 +141,7 @@ String makeKeyPresentable(String key) { bool isMac() => _isMac; -final Map _codeMap = { +const Map _codeMap = { KeyCode.ZERO: '0', KeyCode.ONE: '1', KeyCode.TWO: '2', @@ -234,7 +234,7 @@ final Map _codeMap = { KeyCode.SHIFT: '', // }; -final Map _unicodeMac = { +const Map _unicodeMac = { 'macctrl': '\u2303', 'alt': '\u2325', 'shift': '\u21E7', diff --git a/lib/dialogs.dart b/lib/dialogs.dart index 718fe36de..479930a5b 100644 --- a/lib/dialogs.dart +++ b/lib/dialogs.dart @@ -48,9 +48,9 @@ class AboutDialog extends DDialog { } class SharingDialog extends DDialog { - final String home = 'dartpad.dev'; - final String _dartThumbnail = 'pictures/embed-dart.png'; - final String _htmlThumbnail = 'pictures/embed-html.png'; + static const String home = 'dartpad.dev'; + static const String _dartThumbnail = 'pictures/embed-dart.png'; + static const String _htmlThumbnail = 'pictures/embed-html.png'; final GistContainer gistContainer; final GistController gistController; diff --git a/lib/documentation.dart b/lib/documentation.dart index 5cdfbc0ec..eec0b8d6a 100644 --- a/lib/documentation.dart +++ b/lib/documentation.dart @@ -71,7 +71,7 @@ class DocHandler { if (a is AnchorElement) a.target = 'docs'; } for (final h in docPanel.querySelectorAll('h1')) { - h.classes.add('type-${docResult.entitykind}'); + h.classes.add('type-${docResult.entityKind}'); } }); } @@ -109,7 +109,7 @@ class DocHandler { if (a is AnchorElement) a.target = 'docs'; } for (final h in docPanel.querySelectorAll('h1')) { - h.classes.add('type-${docResult.entitykind}'); + h.classes.add('type-${docResult.entityKind}'); } }); } @@ -174,9 +174,9 @@ ${libraryName == null ? '' : apiLink}\n\n'''; class _DocResult { final String html; - final String entitykind; + final String entityKind; - _DocResult(this.html, [this.entitykind]); + _DocResult(this.html, [this.entityKind]); } class InlineBracketsColon extends markdown.InlineSyntax { diff --git a/lib/editing/editor.dart b/lib/editing/editor.dart index cfb715129..32591e926 100644 --- a/lib/editing/editor.dart +++ b/lib/editing/editor.dart @@ -148,7 +148,7 @@ class Position { final int line; final int char; - Position(this.line, this.char); + const Position(this.line, this.char); @override String toString() => '[$line,$char]'; diff --git a/lib/editing/editor_codemirror.dart b/lib/editing/editor_codemirror.dart index dd9593d81..ea329bf6a 100644 --- a/lib/editing/editor_codemirror.dart +++ b/lib/editing/editor_codemirror.dart @@ -33,7 +33,7 @@ class CodeMirrorFactory extends EditorFactory { List get themes => CodeMirror.THEMES; @override - Editor createFromElement(html.Element element, {Map options}) { + Editor createFromElement(html.Element element, {Map /*?*/ options}) { options ??= { 'continueComments': {'continueLineComment': false}, 'autofocus': false, diff --git a/lib/elements/analysis_results_controller.dart b/lib/elements/analysis_results_controller.dart index 468b9852f..b7bec809d 100644 --- a/lib/elements/analysis_results_controller.dart +++ b/lib/elements/analysis_results_controller.dart @@ -20,9 +20,9 @@ class AnalysisResultsController { 'error': ['issuelabel', 'error'], }; - DElement flash; - DElement message; - DElement toggle; + final DElement flash; + final DElement message; + final DElement toggle; bool _flashHidden; final StreamController _onClickController = diff --git a/lib/elements/counter.dart b/lib/elements/counter.dart index 36cca4296..020c02aae 100644 --- a/lib/elements/counter.dart +++ b/lib/elements/counter.dart @@ -6,12 +6,12 @@ import 'dart:html'; /// Displays a counter that is only visible if the count is greater than zero. class Counter { - Counter(this.element); - final SpanElement element; int _itemCount = 0; + Counter(this.element); + void increment() { _itemCount++; element.text = '$_itemCount'; diff --git a/lib/elements/elements.css b/lib/elements/elements.css index 03b602937..3ed257ab8 100644 --- a/lib/elements/elements.css +++ b/lib/elements/elements.css @@ -186,7 +186,7 @@ button.close:hover { border-radius: 2px; background-color: #3a3a3a; padding: 8px 16px; - box-shadow: 3px 3px 4px 0px rgba(15, 14, 14, 0.7); + box-shadow: 3px 3px 4px 0 rgba(15, 14, 14, 0.7); } /* issues css */ @@ -276,8 +276,7 @@ button.close:hover { position: absolute; padding: 10px; background-color: #444; - border: 1px solid; - border-color: rgba(0, 0, 0, 0.5); + border: 1px solid rgba(0, 0, 0, 0.5); border-radius: 4px; box-shadow: rgba(255, 255, 255, 0.1) 0 0 0, rgba(0, 0, 0, 0.4) 0 1px 7px 0; @@ -348,7 +347,7 @@ button.close:hover { /* style the