obsidian-plugin/h-sphere_sql-seal
1
0
Fork 0
mirror of https://github.com/h-sphere/sql-seal.git synced 2026-07-22 10:10:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #157 from mAAdhaTTah/fix-filename-with-commas

Browse source 
Fix parsing of filename with commas in it
This commit is contained in:
Kacper Kula 2025-05-22 16:07:49 +02:00 committed by GitHub
commit cdcdb0e3d0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 32 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/editorExtension/syntaxHighlight.ts
View file

@ -87,20 +87,27 @@ export class SQLSealViewPlugin implements PluginValue {
if (decorations) {
decorations.forEach(dec => {
if (dec.type === 'filename') {
let hasQuotes = false;
// Get the actual filename text from the document
const filePath = view.state.doc.sliceString(
let filePath = view.state.doc.sliceString(
contentStart + dec.start,
contentStart + dec.end
);
// Remove leading & trailing quotes, if captured.
if (filePath.startsWith('"')) {
filePath = filePath.substring(1, filePath.length - 1)
hasQuotes = true;
}
// Create widget decoration for the filename
const widget = new FilePathWidget(filePath, this.app);
builder.push(Decoration.replace({
widget,
inclusive: true
}).range(
contentStart + dec.start,
contentStart + dec.end
contentStart + dec.start + Number(hasQuotes),
contentStart + dec.end - Number(hasQuotes)
));
} else {
const decoration = markDecorations[dec.type as keyof typeof markDecorations];

20
src/grammar/parser.test.ts
View file

@ -49,6 +49,26 @@ describe('Ohm parser', () => {
})
})
it("should parse table expression with comma in name with name quoted", () => {
expect(parse('TABLE x = file("abcdef, ghijk.csv")', DEFAULT_VIEWS)).toEqual(
{
query: "",
tables: [
{
arguments: ["abcdef, ghijk.csv"],
type: "file",
tableAlias: "x",
},
],
flags: {},
renderer: {
name: "GRID",
options: "",
},
},
);
})
it('should parse SELECT statement alone', () => {
expect(parse('SELECT * FROM files', DEFAULT_VIEWS)).toEqual({
query: 'SELECT * FROM files',

3
src/grammar/parser.ts
View file

@ -38,7 +38,8 @@ export const SQLSealLangDefinition = (views: ViewDefinition[], flags: readonly F
| tableOpening NonemptyListOf<listElement, ","> tableDefinitionClosing -- mdtable
TableFileExpressionArgs = filename ("," NonemptyListOf<listElement, ",">)?
identifier = (alnum | "_")+
filename = (alnum | "." | "-" | space | "_" | "/" | "\\" | "$" | "[" | "]" | "\"")+
filename = ~("\"") (alnum | "." | "-" | space | "_" | "/" | "\\" | "$" | "[" | "]" | "\"")+ ~("\"") -- unquoted
| "\"" (alnum | "." | "-" | space | "_" | "/" | "\\" | "$" | "[" | "]" | ",")+ "\"" -- quoted
fileOpening = caseInsensitive<"file(">
tableOpening = caseInsensitive<"table(">
tableDefinitionClosing = ")"