IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2024-07-04 11:33:52 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add missing files from last commit. #7593

Browse Source
This commit is contained in:
Aditya Toshniwal 2024-06-19 17:57:04 +05:30
parent 20caa63508
commit 9279393dcd
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
web/pgadmin/static/js/components/ReactCodeMirror/CustomEditorView.js
View File

@ -1,7 +1,7 @@
import {
EditorView
} from '@codemirror/view';
import { StateEffect, EditorState, EditorSelection } from '@codemirror/state';
import { EditorState, EditorSelection } from '@codemirror/state';
import { syntaxTree } from '@codemirror/language';
import { autocompletion } from '@codemirror/autocomplete';
import {undo, indentMore, indentLess, toggleComment} from '@codemirror/commands';
@ -9,6 +9,7 @@ import { errorMarkerEffect } from './extensions/errorMarker';
import { currentQueryHighlighterEffect } from './extensions/currentQueryHighlighter';
import { activeLineEffect, activeLineField } from './extensions/activeLineMarker';
import { clearBreakpoints, hasBreakpoint, toggleBreakpoint } from './extensions/breakpointGutter';
import { autoCompleteCompartment } from './extensions/extraStates';
function getAutocompLoading({ bottom, left }, dom) {
@ -292,7 +293,7 @@ export default class CustomEditorView extends EditorView {
registerAutocomplete(completionFunc) {
this.dispatch({
effects: StateEffect.appendConfig.of(
effects: autoCompleteCompartment.reconfigure(
autocompletion({
override: [(context) => {
this.loadingDiv?.remove();

3
web/pgadmin/static/js/components/ReactCodeMirror/components/Editor.jsx
View File

@ -47,7 +47,7 @@ import CustomEditorView from '../CustomEditorView';
import breakpointGutter, { breakpointEffect } from '../extensions/breakpointGutter';
import activeLineExtn from '../extensions/activeLineMarker';
import currentQueryHighlighterExtn from '../extensions/currentQueryHighlighter';
import { indentNewLine } from '../extensions/extraStates';
import { autoCompleteCompartment, indentNewLine } from '../extensions/extraStates';
const arrowRightHtml = ReactDOMServer.renderToString(<KeyboardArrowRightRoundedIcon style={{fontSize: '1.2em'}} />);
const arrowDownHtml = ReactDOMServer.renderToString(<ExpandMoreRoundedIcon style={{fontSize: '1.2em'}} />);
@ -145,6 +145,7 @@ const defaultExtensions = [
}
return 0;
}),
autoCompleteCompartment.of([]),
];
export default function Editor({

4
web/pgadmin/static/js/components/ReactCodeMirror/extensions/extraStates.js
View File

@ -7,8 +7,10 @@
//
//////////////////////////////////////////////////////////////
import { Facet } from '@codemirror/state';
import { Facet, Compartment } from '@codemirror/state';
export const indentNewLine = Facet.define({
combine: values => values.length ? values[0] : true,
});
export const autoCompleteCompartment = new Compartment();

2
web/pgadmin/tools/sqleditor/static/js/components/QueryToolComponent.jsx
View File

@ -698,7 +698,7 @@ export default function QueryToolComponent({params, pgWindow, pgAdmin, selectedN
fgcolor: connectionData.fgcolor,
bgcolor: connectionData.bgcolor,
},
connected: respData.data.trans_id,
connected: Boolean(respData.data.trans_id),
obtaining_conn: false,
};
});