Skip to content

Commit 10b1cae

Browse files
committed
deploy: 606b7d0
1 parent 4143ef0 commit 10b1cae

116 files changed

Lines changed: 2025 additions & 715 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎appConfig.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ window.AppConfig = {
2424
"app_notification_url": "assets/notifications/dev/",
2525
"app_update_url": "https://updates.phcode.io/tauri/update-latest-experimental-build.json",
2626
"linting.enabled_by_default": true,
27-
"build_timestamp": "2024-04-22T18:36:01.979Z",
27+
"build_timestamp": "2024-04-24T14:00:02.084Z",
2828
"googleAnalyticsID": "G-P4HJFPDB76",
2929
"googleAnalyticsIDDesktop": "G-VE5BXWJ0HF",
3030
"mixPanelID": "49c4d164b592be2350fc7af06a259bf3",
@@ -36,7 +36,7 @@ window.AppConfig = {
3636
"bugsnagEnv": "development"
3737
},
3838
"name": "Phoenix Code",
39-
"version": "3.6.1-20186",
39+
"version": "3.6.1-20197",
4040
"apiVersion": "3.6.1",
4141
"homepage": "https://core.ai",
4242
"issues": {

‎assets/default-project/en.zip‎

-2 Bytes
Binary file not shown.

‎assets/default-project/en/styles.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ img {
1313

1414
#starsLeft {
1515
position: absolute;
16-
left: 0px;
16+
left: 0;
1717
top: 5%;
1818
opacity: 0.7;
1919
z-index: 2;
@@ -22,7 +22,7 @@ img {
2222
#starsRight {
2323
position: absolute;
2424
z-index: 2;
25-
right: 0px;
25+
right: 0;
2626
top: 5%;
2727
opacity: 0.7;
2828
}

‎assets/sample-projects/HTML5.zip‎

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

‎assets/sample-projects/explore.zip‎

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

‎brackets-min.js‎

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -24490,6 +24490,7 @@ define("editor/EditorManager", function (require, exports, module) {
2449024490
exports.focusEditor = focusEditor;
2449124491
exports.getCurrentlyViewedPath = getCurrentlyViewedPath;
2449224492
exports.setEditorHolder = setEditorHolder;
24493+
window.ed = exports;
2449324494
});
2449424495

2449524496
/*
@@ -42655,7 +42656,8 @@ define("features/QuickViewManager", function (require, exports, module) {
4265542656
content: $("<div id='quick-view-popover-root'></div>")
4265642657
};
4265742658
// Each provider return popover { start, end, content}
42658-
for(let result of popoverResults){
42659+
for(let i=0; i<popoverResults.length; i++) {
42660+
const result = popoverResults[i];
4265942661
if(_isResultBeforePopoverStart(editor, popover, result)){
4266042662
popover.start = result.start;
4266142663
}
@@ -42665,7 +42667,11 @@ define("features/QuickViewManager", function (require, exports, module) {
4266542667
if(result.editsDoc){
4266642668
popover.editsDoc = true;
4266742669
}
42668-
popover.content.append(result.content);
42670+
let cssClass = `class='quick-view-partition quick-view-item'`;
42671+
if(i === (popoverResults.length - 1)) {
42672+
cssClass = "class='quick-view-item'";
42673+
}
42674+
popover.content.append($(`<div ${cssClass} ></div>`).append(result.content));
4266942675
}
4267042676

4267142677
let startCoord = editor.charCoords(popover.start),
@@ -51421,21 +51427,7 @@ define("language/CodeInspection", function (require, exports, module) {
5142151427
console.warn("CodeInspector: Invalid error position: ", error);
5142251428
return false;
5142351429
}
51424-
// now we only apply a style if there is not already a higher priority style applied to it.
51425-
// Ie. If an error style is applied, we don't apply an info style over it as error takes precedence.
51426-
let markings = editor.findMarksAt(error.pos, CODE_MARK_TYPE_INSPECTOR);
51427-
let MarkToApplyPriority = _getMarkTypePriority(error.type);
51428-
let shouldMark = true;
51429-
for(let mark of markings){
51430-
let markTypePriority = _getMarkTypePriority(mark.type);
51431-
if(markTypePriority<=MarkToApplyPriority){
51432-
mark.clear();
51433-
} else {
51434-
// there's something with a higher priority marking the token
51435-
shouldMark = false;
51436-
}
51437-
}
51438-
return shouldMark;
51430+
return true;
5143951431
}
5144051432

5144151433
/**
@@ -51525,13 +51517,13 @@ define("language/CodeInspection", function (require, exports, module) {
5152551517
let codeInspectionMarks = editor.findMarksAt(pos, CODE_MARK_TYPE_INSPECTOR) || [];
5152651518
let hoverMessage = '';
5152751519
for(let mark of codeInspectionMarks){
51528-
hoverMessage = `${hoverMessage}${mark.message}\n`;
51520+
hoverMessage = `${hoverMessage}${mark.message}<br/>`;
5152951521
}
5153051522
if(hoverMessage){
5153151523
resolve({
5153251524
start: {line: pos.line, ch: token.start},
5153351525
end: {line: pos.line, ch: token.end},
51534-
content: hoverMessage
51526+
content: `<div class="code-inspection-item">${hoverMessage}</div>`
5153551527
});
5153651528
return;
5153751529
}
@@ -51559,16 +51551,20 @@ define("language/CodeInspection", function (require, exports, module) {
5155951551
for (let resultProvider of resultProviderEntries) {
5156051552
let errors = (resultProvider.result && resultProvider.result.errors) || [];
5156151553
for (let error of errors) {
51562-
// todo: add error.message on hover
51563-
// add gutter markers
5156451554
let line = error.pos.line || 0;
5156551555
let ch = error.pos.ch || 0;
5156651556
let gutterMessage = gutterErrorMessages[line] || [];
5156751557
gutterMessage.push({message: error.message, type: error.type, line, ch});
5156851558
gutterErrorMessages[line] = gutterMessage;
5156951559
// add squiggly lines
5157051560
if (_shouldMarkTokenAtPosition(editor, error)) {
51571-
let mark = editor.markToken(CODE_MARK_TYPE_INSPECTOR, error.pos, _getMarkOptions(error));
51561+
let mark;
51562+
if(error.endPos){
51563+
mark = editor.markText(CODE_MARK_TYPE_INSPECTOR, error.pos, error.endPos,
51564+
_getMarkOptions(error));
51565+
} else {
51566+
mark = editor.markToken(CODE_MARK_TYPE_INSPECTOR, error.pos, _getMarkOptions(error));
51567+
}
5157251568
mark.type = error.type;
5157351569
mark.message = error.message;
5157451570
}
@@ -86176,6 +86172,9 @@ define("nls/root/strings", {
8617686172
// extensions/default/JSLint
8617786173
"JSHINT_NAME": "JSHint",
8617886174

86175+
// extension css code hints
86176+
"CSS_LINT_NAME": "{0} Lint",
86177+
8617986178
// Features/QuickView and quick view extensions
8618086179
"CMD_ENABLE_QUICK_VIEW": "Quick View on Hover",
8618186180
"CMD_ENABLE_SELECTION_VIEW": "Selection View",

0 commit comments

Comments
 (0)