Skip to content

Commit a747e17

Browse files
committed
more cleanup
renames p5CompletionPreview because it's more of a generic preview and not p5 specific. prep for an eventual folder reorganizing
1 parent 74fa674 commit a747e17

3 files changed

Lines changed: 9 additions & 9 deletions

File tree

client/modules/IDE/components/Editor/p5CompletionPreview.js renamed to client/modules/IDE/components/Editor/completionPreview.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { StateField, RangeSetBuilder } from '@codemirror/state';
22
import { Decoration, EditorView, WidgetType } from '@codemirror/view';
33
import { selectedCompletion, completionStatus } from '@codemirror/autocomplete';
44

5+
/** Creates a "ghost" of what the completion would look like, for autocomplete selections. */
56
class GhostTextWidget extends WidgetType {
67
constructor(text) {
78
super();
@@ -94,7 +95,7 @@ const ghostTextField = StateField.define({
9495
provide: (field) => EditorView.decorations.from(field)
9596
});
9697

97-
export const p5CompletionPreviewTheme = EditorView.theme({
98+
export const completionPreviewTheme = EditorView.theme({
9899
'.cm-ghostCompletion': {
99100
opacity: '0.55',
100101
fontStyle: 'italic',
@@ -103,6 +104,6 @@ export const p5CompletionPreviewTheme = EditorView.theme({
103104
}
104105
});
105106

106-
export function p5CompletionPreview() {
107-
return [ghostTextField, p5CompletionPreviewTheme];
107+
export function completionPreview() {
108+
return [ghostTextField, completionPreviewTheme];
108109
}

client/modules/IDE/components/Editor/p5JavaScript.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { javascript } from '@codemirror/lang-javascript';
33
import { ViewPlugin, Decoration } from '@codemirror/view';
44
import { RangeSetBuilder } from '@codemirror/state';
55
import { p5Hinter } from '../../../../utils/p5-hinter';
6-
import { p5CompletionPreview } from './p5CompletionPreview';
6+
import { completionPreview } from './completionPreview';
77
import contextAwareHinter from '../../../../utils/contextAwareHinter';
88
import {
99
p5FunctionKeywords,
@@ -66,14 +66,14 @@ function addCompletions(context) {
6666
});
6767
}
6868

69-
export default function p5JavaScript() {
69+
export function p5JavaScript() {
7070
const jsLang = javascript();
7171
return new LanguageSupport(jsLang.language, [
7272
jsLang.extension,
7373
jsLang.language.data.of({
7474
autocomplete: addCompletions
7575
}),
76-
p5CompletionPreview(),
76+
completionPreview(),
7777
p5Highlight
7878
]);
7979
}

client/modules/IDE/components/Editor/stateUtils.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ import { emmetConfig } from '@emmetio/codemirror6-plugin';
5252
import { color as colorPicker } from '@connieye/codemirror-color-picker';
5353

5454
import { tidyCodeWithPrettier } from './tidier';
55-
import p5JavaScript from './p5JavaScript';
55+
import { p5JavaScript } from './p5JavaScript';
5656
import { highlightStyle } from './highlightStyle';
5757
import { errorDecorationStateField } from './consoleErrorDecoration';
5858
import {
@@ -407,8 +407,7 @@ export function createNewFileState(filename, document, settings) {
407407

408408
// Only enable the color picker for Javascript and CSS, which
409409
// have both been tested.
410-
const fileMode = getFileMode(filename);
411-
if (fileMode === 'javascript' || fileMode === 'css') {
410+
if (mode === 'javascript' || mode === 'css') {
412411
extensions.push(colorPicker);
413412
}
414413

0 commit comments

Comments
 (0)